From 35d43044100915f7a63642a357c126c59228e138 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Sat, 3 Aug 2024 16:57:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=95=86=E5=93=81=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=EF=BC=8C=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8=E5=A4=B4?=
 =?UTF-8?q?=E9=83=A8=E5=9B=BE=E7=89=87=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/js/api.js                |  2 +-
 pages/order/confirm_order.vue   |  8 ++++++--
 pages/order_food/order_food.vue | 17 +++++++++--------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/common/js/api.js b/common/js/api.js
index c019c09..54d83de 100644
--- a/common/js/api.js
+++ b/common/js/api.js
@@ -61,7 +61,7 @@ export default {
 		return uni.api.get("/groupOrderInfo/list", data);
 	},
 	orderorderInfo(data) { //订单回显
-		return uni.api.get("/order/orderInfo", data);
+		return uni.api.get("/order/orderInfo", data ,false);
 	},
 	groupOrderInfoDetail(data) { //订单回显
 		return uni.api.get("/groupOrderInfo/get", data);
diff --git a/pages/order/confirm_order.vue b/pages/order/confirm_order.vue
index bae2690..9caa7d2 100644
--- a/pages/order/confirm_order.vue
+++ b/pages/order/confirm_order.vue
@@ -267,8 +267,12 @@
 							}, 1000)
 							break;
 						case 'addcart':
-							this.listinfo.details = msg.data;
-							this.listinfo.payAmount = msg.amount;
+							if (this.listinfoid) {
+								this.orderorderInfo()
+							} else {
+								this.listinfo.details = msg.data;
+								this.listinfo.payAmount = msg.amount;
+							}
 							break;
 					}
 					this.$set(this, 'cartLists', msg)
diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue
index 222d9f0..c419e77 100644
--- a/pages/order_food/order_food.vue
+++ b/pages/order_food/order_food.vue
@@ -10,7 +10,7 @@
 		<view class="top--panel">
 			<navseat :opacity='opacity' :titleshow='true'></navseat>
 			<!-- 顶部面板，可添加所需要放在页面顶部的内容代码。比如banner图 -->
-			<image class="panelimgbackground" :src="shopInfo.storeInfo.coverImg" mode="aspectFill">
+			<image class="panelimgbackground" :src="shopInfo.storeInfo.coverImg||'https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/topBanner.png'" mode="aspectFill">
 			</image>
 			<view class="panelone">
 				{{ shopInfo.storeInfo.shopName }}
@@ -922,17 +922,16 @@
 		}
 
 		.top--panel {
-			padding: 0 20rpx;
+			// padding: 0 20rpx;
 			background-color: #fff;
 
 			.panelimgbackground {
-				width: 382rpx;
-				margin: 82rpx auto 0 auto;
-				height: 158rpx;
+				width: 100%;
+				height: 272rpx;
 			}
 
 			.panelone {
-				margin-top: 32rpx;
+				padding: 20rpx 20rpx 0 20rpx;
 				font-family: Source Han Sans CN, Source Han Sans CN;
 				font-weight: 500;
 				font-size: 32rpx;
@@ -940,6 +939,7 @@
 			}
 
 			.paneltow {
+				padding: 0 20rpx;
 				margin-top: 16rpx;
 				font-family: Source Han Sans CN, Source Han Sans CN;
 				font-weight: 400;
@@ -954,7 +954,7 @@
 				font-weight: 400;
 				font-size: 24rpx;
 				color: #999999;
-
+				padding: 0 20rpx;
 				.paneltheretext {
 					font-family: Source Han Sans CN, Source Han Sans CN;
 					font-weight: 400;
@@ -977,11 +977,12 @@
 				font-weight: bold;
 				font-size: 32rpx;
 				color: #333333;
+				padding: 0 20rpx;
 			}
 
 			.panelfive {
 				width: 100%;
-
+				padding: 0 20rpx;
 				.panelfive_list {
 					display: flex;
 				}