From bfc63507f7b09f3ba29e1e225982648e196b528c Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Thu, 8 Aug 2024 10:50:36 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8B=9B=E7=89=8C=E8=8F=9C=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=BB=91=E5=8A=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order_food/order_food.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue
index 95c80be..615b527 100644
--- a/pages/order_food/order_food.vue
+++ b/pages/order_food/order_food.vue
@@ -35,7 +35,7 @@
 				本店招牌菜
 			</view>
 			<view class="panelfive">
-				<scroll-view :scroll-into-view="leftIntoView" :scroll-with-animation="false">
+				<scroll-view :scroll-x="true" :scroll-with-animation="false">
 					<view class="panelfive_list">
 						<view class="panelfiveitem" @click="clickspecifications(item,index,index,'热销')"
 							v-for="(item,index) in shopProductList.hots" :key="index">

From f7cea2ceb7966460655636f2a13827404537b515 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Thu, 8 Aug 2024 13:36:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order_food/order_food.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue
index 615b527..1c9115d 100644
--- a/pages/order_food/order_food.vue
+++ b/pages/order_food/order_food.vue
@@ -740,6 +740,7 @@
 				this.specifications.typeName = type
 				try {
 					if (item1.productSkuResult == null) {
+						this.isSpec = true;
 						// 但但单个规格弹框的处理
 						this.hodgepodge(this.specifications, 2) //获取skuid /2查找价格和数量
 					} else {