支付密码界面更新

pages/index/components/diamond.vue

@@ -58,8 +58,7 @@
 								let tableCode = this.getQueryString(decodeURIComponent(res.result), 'code')
 								uni.cache.set('tableCode', tableCode)
 								if (tableCode) {
-									// uni.pro.navigateTo('order_food/order_food')
-									uni.pro.navigateTo('order_food/goodsList_scroll')
+									uni.pro.navigateTo('order_food/order_food')
 								}
 							}
 						});

pages/order/confirm_order.vue

@@ -125,17 +125,20 @@
 		</view>
 		
 		<!-- 支付密码 -->
-		<payPassword ref="payPwd" @accountPayevent="accountPayevent" v-if="ispws"></payPassword>
+		<payPasswordtwo ref="payPwd" :listinfo="listinfo" @accountPayevent="accountPayevent" v-if="ispws"></payPasswordtwo>
 	</view>
 </template>
 
 <script>
 	import navseat from '@/components/navseat.vue'
 	import webSocketUtils from '@/common/js/websocket.js'
-	import payPassword from '@/components/payPassword.vue'
+	import payPasswordtwo from '@/components/payPasswordtwo.vue'
+	// import cwxKeyboard from '@/components/cwx-keyboard/cwx-keyboard.vue'
+	
+	
 	export default {
 		components: {
-			payPassword,
+			payPasswordtwo,
 			navseat
 		},
 		data() {
@@ -149,13 +152,6 @@
 					{ title: "送餐到桌", url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab1.png" , url_active: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab1_active.png"},
 					{ title: "打包外带", url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab2.png" , url_active: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/tab2_active.png"},
 				],
-				orderList: [
-					{ name: "美式咖啡", url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/img.png", type: "热+浓郁型+2份浓郁型浓缩", num: 1, Price: 33,},
-					{ name: "美式咖啡", url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/img.png", type: "热+浓郁型+2份浓郁型浓缩", num: 1, Price: 33,},
-					{ name: "美式咖啡", url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/img.png", type: "热+浓郁型+2份浓郁型浓缩", num: 1, Price: 33,},
-					{ name: "美式咖啡", url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/img.png", type: "热+浓郁型+2份浓郁型浓缩", num: 1, Price: 33,},
-					{ name: "美式咖啡", url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/img.png", type: "热+浓郁型+2份浓郁型浓缩", num: 1, Price: 33,},
-				],
 				favorable: [
 					{ name: "优惠券", url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/coupon.png"},
 					{ name: "团购优惠", url: "https://czg-qr-order.oss-cn-beijing.aliyuncs.com/confirmOrder/groupOffer.png"},
@@ -167,6 +163,7 @@
 				order: {
 					phone: "",
 				},
+				passwordArr: [],
 				cartLists: [],
 				listinfo: {
 					details: [],
@@ -253,10 +250,8 @@
 							}, 1000)
 							break;
 						case 'addcart':
-							/*插入一条弹幕*/
-							// this.$refs.lBarrage.add(
-							// 	`${msg.reqData.nickName?msg.reqData.nickName:'微信用户'}${msg.reqData.num==-1?'取消了':'添加了'}${msg.reqData.name}(${msg.reqData.num})`
-							// );
+							this.listinfo.details = msg.data;
+							this.listinfo.payAmount = msg.amount;
 							break;
 					}
 					this.$set(this, 'cartLists', msg)
@@ -466,6 +461,7 @@
 			 */
 			async accountPayevent(pwd) {
 				this.ispws = false
+				console.log(pwd)
 				let res = await this.api.accountPay({
 					orderId: this.listinfoid,
 					memberId: this.amountVIP.id,
@@ -954,4 +950,73 @@
 			text-align: center;
 		}
 	}
+	.page-total{
+			position: inherit;
+		}
+	.pay-info-wrap{
+		padding: 0 30rpx 50rpx;
+		box-sizing: border-box;
+		.info-wrap{
+			padding: 30rpx 0;
+			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;
+				}
+			}
+		}
+		
+	}
 </style>