fix::新版确认订单调整

pages/order/confirm_order.vue

@@ -46,7 +46,7 @@
 		<!-- 订单内容区域 -->
 		<view class="content_box">
 			<view class="content">
-				<view class="title">后海&双屿</view>
+				<view class="title"> {{ listinfo.name }} </view>
 				<view class="list_item" v-for="(item,index) in listinfo.details" :key="item.id">
 					<view class="left">
 						<image class="img" :src="item.coverImg" mode="aspectFill"/>
@@ -58,13 +58,13 @@
 					</view>
 					<view class="price"> ￥{{ item.totalAmount}} </view>
 				</view>
-			<!-- 	<view class="favorable" v-for="(item,index) in favorable" :key="index">
+				<view class="favorable" v-for="(item,index) in favorable" :key="index">
 					<view class="favorable_left"> 
 						<image class="icon" :src="item.url" mode="aspectFill"/>
 						<text class="name"> {{ item.name }} </text>
 					</view>
-					<view class="favorable_right">暂无可用优惠券 ></view>
-				</view> -->
+					<view class="favorable_right"><text class="favorable_right_text">暂无可用优惠券</text> <u-icon name="arrow-right" color="#575B66" size="28"></u-icon></view>
+				</view>
 				<view class="totalPrice">
 					<text style="margin-bottom: 5rpx;">小计￥</text>
 					<text class="totalPriceNum"> {{listinfo.payAmount}} </text>
@@ -168,6 +168,7 @@
 				listinfo: {
 					details: [],
 					payAmount: 0,
+					name: "",
 				},
 				tableValue: "A203",	// 桌台号
 				totalPrice: 0, 	// 小计金额
@@ -186,6 +187,7 @@
 			},
 		},
 		onUnload() {
+			console.log(this)
 			this.socketTicket.Close()
 			uni.$off('getMessage')
 			this.ispws = false
@@ -194,6 +196,9 @@
 			this.socketTicket.Close()
 			uni.$off('message')
 		},
+		onLoad(e) {
+			this.listinfo.name = JSON.parse(e.storeInfo).shopName;
+		},
 		onShow() {
 			uni.$on('message', this.getMessage)
 			if (this.listinfoid) {
@@ -790,9 +795,14 @@
 					}
 				}
 				.favorable_right{
-					font-size: 24rpx;
-					color: #999;
-					font-weight: 400rpx;
+					display: flex;
+					align-items: center;
+					.favorable_right_text{
+						font-size: 24rpx;
+						color: #999;
+						font-weight: 400rpx;
+					}
+				
 				}
 			}
 			.totalPrice{

pages/order_food/order_food.vue

@@ -605,6 +605,10 @@
 					})
 					return false
 				}
+				uni.navigateTo({
+					url: '/pages/order/confirm_order?storeInfo=' + JSON.stringify(this.shopList.storeInfo)
+				});
+				return;
 				uni.navigateTo({
 					url: '/pages/order_detail/indexs?tableId=' + JSON.stringify(this.cartLists)
 				});