修改

pages/CommodityDetails/CommodityDetails.vue

@@ -175,7 +175,6 @@
 			},
 			//立即购买跳转确认订单页面
 			tapbuy() {
-				this.buyshow = false
 				let that = this
 				try {
 					const value = uni.getStorageSync('patientId');
@@ -198,6 +197,7 @@
 											type: 'error'
 										})
 									} else {
+										that.buyshow = false
 										that.updata.totalPrice = (that.updata.goodsPrice * that.updata
 											.goodsCount).toFixed(
 											2)
@@ -206,6 +206,7 @@
 										})
 									}
 								} else {
+									that.buyshow = false
 									uni.navigateTo({
 										url: `/pages/confirmOrder/confirmOrder?updata=${JSON.stringify(that.updata)}`
 									})

pages/CommodityOrder/CommodityOrder.vue

@@ -39,7 +39,7 @@
 			<view class="anniu">
 				<view class="logistics" v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'" @tap='gologistics(item)'>查看物流
 				</view>
-				<view class="logistics harvest" @tap='Receipt(item)' v-if="item.orderStatus=='WAIT_PAY'">
+				<view class="logistics harvest" v-if="item.orderStatus=='WAIT_PAY'" @tap='buy(item)'>
 					去支付</view>
 				<view class="logistics harvest" @tap='Receipt(item)' v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'">
 					确认收货</view>
@@ -89,6 +89,18 @@
 			}
 		},
 		methods: {
+			//支付
+			buy(item) {
+				let obj = {
+					patientId: this.patientId,
+					orderNo: item.goOrderNo,
+					orderChannel: "WECHAT_APPLET",
+					paymentPrice: item.totalPrice,
+					payType: "WECHAT_PAY",
+					buySource: item.buySource,
+				}
+				console.log(obj)
+			},
 			//物流页面
 			gologistics(item) {
 				uni.navigateTo({
@@ -112,7 +124,6 @@
 			},
 			//确认收货
 			Receipt(item) {
-				console.log(item)
 				this.img = item.attributePitureUrl
 				this.show = true
 			},

pages/Nursingstationserviceorder/Nursingstationserviceorder.scss

@@ -8,9 +8,9 @@
 			background: #FFFFFF;
 			box-shadow: 0px 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
 			border-radius: 20rpx;
-			padding: 0 0 20rpx 0;
+			padding: 0 0 100rpx 0;
 			margin: 20rpx auto;
-
+			position: relative;
 			.name {
 				width: 95%;
 				height: 90rpx;
@@ -82,7 +82,8 @@
 				text-align: center;
 				font-size: 32rpx;
 				color: #FFFFFF;
-				margin-left: 70%;
+				position: absolute;
+				right:2%;
 			}
 		}
 	}

pages/ServiceDetails/ServiceDetails.scss

@@ -38,14 +38,20 @@
 
 		//按钮取消订单和评价
 		.evaluate {
-			width: 35%;
+			width: 90%;
-			display: flex;
+			margin: 0 auto;
-			// float: right;
-			margin: 100rpx 0 50rpx 60%;
 			font-size: 32rpx;
-
+			position: relative;
+			height: 200rpx;
+			.price{
+				position: absolute;
+				line-height: 68rpx;
+				left:0%;
+				top:50%;
+				color: red;
+				font-size: 46rpx;
+			}
 			.cancelorder {
-				margin-left: 5%;
 				width: 216rpx;
 				height: 68rpx;
 				background: #E1AE3C;
@@ -53,6 +59,9 @@
 				text-align: center;
 				color: #ffffff;
 				line-height: 68rpx;
+				position: absolute;
+				right:0%;
+				top:50%;
 			}
 		}
 

pages/ServiceDetails/ServiceDetails.vue

@@ -54,9 +54,15 @@
 			<input placeholder="请输入" v-model='userinfo.remark'>
 		</view>
 		<view class="evaluate">
+			<view class="price">
+				￥{{orderlist.totalPrice}}
+			</view>
 			<view class="cancelorder" @tap="cancelorderment()"
 				v-if="orderStatus=='PAY'||orderStatus=='WAIT_DISPATCH'||orderStatus=='NOT_FINISH'">取消订单</view>
 			<!-- <view class="cancelorder " style="background: #4C7BC9;">评价</view> -->
+			<view class="cancelorder" @tap='buy' style="background-color: darkorange;" v-if="orderStatus=='WAIT_PAY'">
+				去支付
+			</view>
 		</view>
 	</view>
 </template>
@@ -98,6 +104,17 @@
 
 		},
 		methods: {
+			//支付
+			buy() {
+				let obj = {
+					patientId: this.patientId,
+					orderNo: this.item.orderNo,
+					orderChannel: "WECHAT_APPLET",
+					paymentPrice: this.item.totalPrice,
+					payType: "WECHAT_PAY",
+					buySource: "NURSE_STATION",
+				}
+			},
 			gophone() {
 				var that = this
 				uni.getSystemInfo({

pages/confirmOrder/confirmOrder.scss

@@ -122,7 +122,7 @@
 		background: #FFFFFF;
 		box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0,0,0,0.03);
 		border-radius: 20rpx;
-		margin: 0 auto;
+		margin: 20rpx auto;
 		font-size: 36rpx;
 		.money{
 			line-height: 68rpx;

pages/confirmOrder/confirmOrder.vue

@@ -40,14 +40,14 @@
 				</view>
 			</view>
 		</view>
-		<view class="integral">
+		<!-- <view class="integral">
 			<view class="header">
 				积分抵扣
 			</view>
 			<view class="number">
 				共5积分，满100可用
 			</view>
-		</view>
+		</view> -->
 		<view class="price">
 			<view class="priceinfo">
 				<view class="header money">
@@ -100,7 +100,6 @@
 		<u-toast ref="uToast" />
 	</view>
 </template>
-
 <script>
 	import baseurl from '@/api/baseurl.js'
 	import {
@@ -144,18 +143,6 @@
 					url: `/pages/modifyAddress/modifyAddress?updata=${JSON.stringify(this.updata)}`
 				})
 			},
-			// 收件人
-			goodsList() {
-				goodPatientInfo(this.updata.patientId).then(res => {
-					res.data.forEach(e => {
-						e.address = e.provinceName + e.cityName + e.regionName + e.streetName + e
-							.receiveAddress
-					})
-					this.updata.receiver = res.data[0].receiveName
-					this.updata.receiveAddress = res.data[0].address
-					this.updata.phone = res.data[0].receivePhone
-				})
-			},
 		},
 		onLoad(options) {
 			this.updata = JSON.parse(options.updata)

pages/orderDetails/orderDetails.scss

@@ -1,6 +1,15 @@
 .app {
 		height: 100vh;
-
+		padding: 10rpx 0 0 ;
+		.time{
+			height: 80rpx;
+			width: 95%;
+			text-align: center;
+			line-height: 80rpx;
+			background-color: #fff;
+			margin: 0 auto 10rpx;
+			border-radius: 20rpx;
+		}
 		.buy {
 			background: #FFFFFF;
 			position: fixed;

pages/orderDetails/orderDetails.vue

@@ -1,5 +1,10 @@
 <template>
 	<view class="app">
+		<view class="time" style="">
+			剩余付款时间：
+			<u-count-down style='' v-if="order.orderStatus=='WAIT_PAY'" :timestamp="timestamp">
+			</u-count-down>
+		</view>
 		<view class="content">
 			<view class="name">
 				店铺名称
@@ -72,6 +77,7 @@
 				orderStatus: '',
 				pageSize: 10,
 				pageNum: 1,
+				timestamp: 0, //倒计时
 			}
 		},
 		methods: {
@@ -84,6 +90,9 @@
 			goodsOrderinfo(goodsOrderId) {
 				goodsOrder(this.patientId, this.orderStatus, goodsOrderId, this.pageSize, this.pageNum).then(res => {
 					this.order = res.rows[0]
+					var time = new Date(this.order.orderTime).getTime() / 1000 + (60 * 60 * 24)
+					var times = new Date().getTime() / 1000
+					this.timestamp = time - times
 				})
 			},
 			//跳转售后详情