订单逻辑修改

pagesOrder/order_detail/index.vue

@@ -4,7 +4,7 @@
 		<orderInfoBefore ref="orderInfoBefore" :listinfo="listinfo" v-else></orderInfoBefore>
 		
 		
-		<paymentMethod ref="paymentMethod" :amountVIP="amountVIP" @groupChange="groupChange"></paymentMethod>
+		<paymentMethod ref="paymentMethod" v-if="amountVIP&&listinfo.status == 'unpaid' ||  listinfo.status == 'paying'" :amountVIP="amountVIP" @groupChange="groupChange"></paymentMethod>
 		
 		<view class="fixedview">
 			<view class="flex-between" v-if="listinfo.status == 'unpaid' ||  listinfo.status == 'paying'">
@@ -39,11 +39,13 @@
 </template>
 
 <script>
+	import payPasswordtwo from '@/components/payPasswordtwo.vue'
 	import orderInfoAfter from '../components/orderInfoAfter.vue'
 	import orderInfoBefore from '../components/orderInfoBefore.vue'
 	import paymentMethod from '../components/paymentMethod.vue'
 	export default {
 		components: {
+			payPasswordtwo,
 			orderInfoAfter,
 			orderInfoBefore,
 			paymentMethod,
@@ -56,8 +58,9 @@
 				paymentBtnText: "余额支付",
 				orderId: '',
 				listinfo: {},
+				listinfoid: null,
 				status: [],
-				amountVIP: {},
+				amountVIP: null,
 				srcimge: 'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/wx.jpg'
 			};
 		},
@@ -67,6 +70,7 @@
 		},
 		onShow() {
 			this.orderorderInfo()
+			this.getAount();
 		},
 		onUnload() {
 			this.ispws = false
@@ -104,6 +108,7 @@
 				})
 				if (res.code == 0) {
 					this.listinfo = res.data;
+					this.listinfoid = res.data.orderId;
 					uni.cache.set('shopId',res.data.shopId)
 					if (this.listinfo.useType == "	") {
 						//堂食先付费
@@ -184,8 +189,7 @@
 							tmplIds:["z0fUG7-jhSfYCrw6poOvSRzh4_hgnPkm_5C7E5s5bCQ","AV-KybUHaK3KtFVLqpy6PHccHBS7XeX__mOM4RbufnQ"],
 							complete() {
 								uni.redirectTo({
-									url: '/pagesOrder/order_detail/index?orderId=' + _this
-										.listinfoid
+									url: '/pagesOrder/order_detail/index?orderId=' + _this.listinfoid
 								});
 							},
 						})
@@ -591,7 +595,72 @@
 		
 	}
 	
-
+	.pay-info-wrap{
+		padding: 0;
+		box-sizing: border-box;
+		.info-wrap{
+			padding: 64rpx 30rpx 30rpx 30rpx;
+			box-sizing: border-box;
+			.title{
+				align-self: center;
+				font-size: 32rpx;
+				color: #333;
+				font-weight: bold;
+			}
+		}
+		
+		.info-content{
+			.pay-title {
+				display: flex;
+				align-items: flex-end;
+				justify-content: center;
+				font-weight: bold;
+				width: 100%;
+				font-size: 48rpx;
+				color: #333;
+				margin-top: 48rpx;
+				text {
+					font-size: 60rpx;
+					color: #333;
+				}
+			}
+			
+			.pay-password {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				margin-top: 64rpx;
+			
+				.list {
+					width: 88rpx;
+					height: 88rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					border: 2rpx solid #999;
+					border-radius: 8rpx;
+					text {
+						font-size: 32rpx;
+					}
+				}
+			
+			}
+			
+			.hint {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 100%;
+				height: 100rpx;
+			
+				text {
+					font-size: 28rpx;
+					color: #ccc;
+				}
+			}
+		}
+		
+	}
 
 	.fixedview {
 		position: fixed;