From bb805f6f934ec5bc2d41c4d31b648e06ea4ef4d0 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Sat, 3 Aug 2024 17:50:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E8=AE=A2=E5=8D=95=E5=A4=B4?=
 =?UTF-8?q?=E9=83=A8=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=95=86=E5=93=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=AB=98=E5=BA=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                      | 3 +--
 pages/order/confirm_order.vue   | 6 +++---
 pages/order_food/order_food.vue | 8 +++++---
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pages.json b/pages.json
index 37ed61a..5ab0d1d 100644
--- a/pages.json
+++ b/pages.json
@@ -92,8 +92,7 @@
 			"path": "pages/order/confirm_order",
 			"style": {
 				"navigationBarTitleText": "确认订单",
-				"navigationStyle": "custom",
-				"navigationBarTextStyle": "white"
+				"navigationBarBackgroundColor": "#E8AD7B"
 			}
 		},
 		{
diff --git a/pages/order/confirm_order.vue b/pages/order/confirm_order.vue
index 3ac8178..d09d1bc 100644
--- a/pages/order/confirm_order.vue
+++ b/pages/order/confirm_order.vue
@@ -1,10 +1,10 @@
 <template>
 	<view>
 		<!-- 占位符导航栏 -->
-		<navseat class="navbar" :opacity='opacitys' :backColor="'#E8AD7B'" :title='toplist.name' :titleshow='true'></navseat>
+		<!-- <navseat class="navbar" :opacity='opacitys' :backColor="'#E8AD7B'" :title='toplist.name' :titleshow='true'></navseat> -->
 		<!-- #ifdef MP-WEIXIN -->
-		<view :style="{'height':HeighT.customBar+HeighT.heightBar+'px;background-color: #E8AD7B;position: fixed;top: 0;width: 100%;z-index: 9'}"></view>
-		<view :style="{'height':HeighT.customBar+HeighT.heightBar+'px;background-color: #E8AD7B;'}"></view>
+		<!-- <view :style="{'height':HeighT.customBar+HeighT.heightBar+'px;background-color: #E8AD7B;position: fixed;top: 0;width: 100%;z-index: 9'}"></view> -->
+		<!-- <view :style="{'height':HeighT.customBar+HeighT.heightBar+'px;background-color: #E8AD7B;'}"></view> -->
 		<!-- #endif -->
 		<!-- 头部内容 -->
 		<view class="head">
diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue
index c419e77..c5cdde3 100644
--- a/pages/order_food/order_food.vue
+++ b/pages/order_food/order_food.vue
@@ -45,9 +45,9 @@
 							<view class="panelfiveitemthere flex-start">
 								<text>招牌</text>
 							</view>
-							<view class="panelfiveitemfour">
+						<!-- 	<view class="panelfiveitemfour">
 								{{item.shortTitle?item.shortTitle:''}}
-							</view>
+							</view> -->
 							<view class="panelfiveitemfive">
 								月售{{item.stockNumber}}
 							</view>
@@ -253,7 +253,7 @@
 		<!-- 规格 -->
 		<u-popup :show="showShopsku" :round="20" mode="bottom" @close="showShopsku = false"
 			:safeAreaInsetBottom='false'>
-			<view class="shop_sku" :style="{ 'max-height':scrollHeight + 'px' }">
+			<view class="shop_sku" :style="{ 'max-height': (scrollHeight-100)+'px' }">
 				<view class="positionabsolute">
 					<u-icon name="close-circle" @click="showShopsku = false" color="#000" size="50"></u-icon>
 				</view>
@@ -647,6 +647,8 @@
 					this.cartLists.data.forEach((v, e) => {
 						this.cartLists_count += v.number;
 					})
+				} else {
+					this.cartLists_count = 0;
 				}
 			},
 			/**