From 035c63ce2bfbc88eb331b06c75077b4e6edd9f73 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Sat, 3 Aug 2024 11:36:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=A4=9A=E7=94=A8=E6=88=B7=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E7=94=A8=E6=88=B7=E6=94=AF=E4=BB=98=20=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E7=94=A8=E6=88=B7=E8=B4=AD=E7=89=A9=E6=B8=85=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order_food/order_food.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue
index a6e1c1a..8b5103f 100644
--- a/pages/order_food/order_food.vue
+++ b/pages/order_food/order_food.vue
@@ -798,9 +798,11 @@
 							case 'sku': // sku  数量 查询这个商品的价格和数量
 								break;
 							case 'order':
-								this.skuidname = []
-								this.showCart = false
-								this.cartLists = msg
+								this.cartLists_count = 0;
+								this.skuidname = [];
+								this.cartListsdatashow = false;
+								this.showCart = false;
+								this.cartLists = msg;
 								break;
 							case 'addCart': //初始化add
 								this.cartLists = msg

From 29af36c446bf791ab36a6f03d85cee163190788c Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Sat, 3 Aug 2024 11:39:20 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=9A=E7=94=A8=E6=88=B7=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=95=20=E5=85=B6=E4=BB=96=E7=94=A8=E6=88=B7=E4=BB=98?=
 =?UTF-8?q?=E6=AC=BE=20=E5=BD=93=E5=89=8D=E7=94=A8=E6=88=B7=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=87=8D=E7=BD=AE?=
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 8b5103f..d1bd258 100644
--- a/pages/order_food/order_food.vue
+++ b/pages/order_food/order_food.vue
@@ -803,6 +803,7 @@
 								this.cartListsdatashow = false;
 								this.showCart = false;
 								this.cartLists = msg;
+								this.productqueryProduct() //list  数据
 								break;
 							case 'addCart': //初始化add
 								this.cartLists = msg

From 703f53c8ac53717264aab15769835322e8fd5386 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Sat, 3 Aug 2024 15:31:42 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=95=86=E5=93=81=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/confirm_order.vue          |  17 +-
 pages/order_food/order_food - 副本.vue | 731 ++++++++++++++-----------
 pages/order_food/order_food.vue        |  16 +-
 3 files changed, 417 insertions(+), 347 deletions(-)

diff --git a/pages/order/confirm_order.vue b/pages/order/confirm_order.vue
index 1ee7b04..e455202 100644
--- a/pages/order/confirm_order.vue
+++ b/pages/order/confirm_order.vue
@@ -52,14 +52,14 @@
 				<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"/>
+						<image class="img" :src="item.coverImg || item.productImg || ''" mode="aspectFill"/>
 						<view class="center">
-							<text class="center_title"> {{item.name}} </text>
-							<text class="type"> {{ item.skuName}} </text>
-							<text class="num"> X{{ item.totalNumber}} </text>
+							<text class="center_title"> {{item.name || item.productName || "" }} </text>
+							<text class="type"> {{ item.skuName || item.productSkuName || ""}} </text>
+							<text class="num"> X{{ item.totalNumber || item.num}} </text>
 						</view>
 					</view>
-					<view class="price"> ￥{{ item.totalAmount}} </view>
+					<view class="price"> ￥{{ item.totalAmount || item.priceAmount || 0}} </view>
 				</view>
 	<!-- 			<view class="favorable" v-for="(item,index) in favorable" :key="index">
 					<view class="favorable_left"> 
@@ -122,7 +122,7 @@
 			<view class="pay-info-wrap">
 				<view class="info-wrap flex-between">
 					<view class="close" @click="ispws = false">
-						<u-icon name="close" color="#999999" size="28"></u-icon>
+						<u-icon name="close" color="#999999" size="40"></u-icon>
 					</view>
 					<text class="title">请输入支付密码</text>
 					<view></view>
@@ -242,6 +242,9 @@
 					switch (msg.type) {
 						case 'createOrder':
 							this.listinfoid = msg.data.id
+							console.log(msg)
+							this.listinfo.details = msg.data.detailList;
+							this.listinfo.payAmount = msg.data.amount;
 							uni.$off('getMessage')
 							this.orderorderInfo(1)
 							break;
@@ -968,7 +971,7 @@
 		padding: 0;
 		box-sizing: border-box;
 		.info-wrap{
-			padding: 30rpx;
+			padding: 64rpx 30rpx 30rpx 30rpx;
 			box-sizing: border-box;
 			.title{
 				align-self: center;
diff --git a/pages/order_food/order_food - 副本.vue b/pages/order_food/order_food - 副本.vue
index d9defce..03e33d2 100644
--- a/pages/order_food/order_food - 副本.vue	
+++ b/pages/order_food/order_food - 副本.vue	
@@ -1,17 +1,16 @@
 <template>
 	<view class="container">
-		<!-- 占位符导航栏 -->
+		<!-- 占位符  接口请求完毕才显示 -->
+		<view v-if="fixedtrue"
+			style="height: 100vh; width: 100%; position: fixed; z-index: 999; top: 0; left: 0; background-color: #fff; display: flex; justify-content: center; align-items: center;">
+			<image style="width: 140rpx; height: 140rpx;" src="@/static/1.gif" mode="aspectFill"></image>
+			<text style="margin-left:10rpx;font-size: 40rpx;color: #7d7d76;">加载中</text>
+		</view>
 		<!-- 顶部面板 -->
 		<view class="top--panel">
-			<navseat :opacity='opacity' :titleshow='true' :heightshow='opacity' @Topdistance='Topdistance'></navseat>
-			<!-- #ifdef MP-WEIXIN -->
-			<view v-show="isNavShow" :style="{'height':HeighT.customBar+HeighT.heightBar+'px;background-color: #fff;position: fixed;top: 0;left: 0;width: 100%;z-index: 999'}"></view>
-			<!-- #endif -->
+			<navseat :opacity='opacity' :titleshow='true' :heightshow='opacity'></navseat>
 			<!-- 顶部面板，可添加所需要放在页面顶部的内容代码。比如banner图 -->
-			<!-- https://czg-qr-order.oss-cn-beijing.aliyuncs.com/orderfood/shuangyu1.png -->
-			<image class="panelimgbackground"
-				:src="shopInfo.storeInfo.coverImg"
-				 mode="aspectFill">
+			<image class="panelimgbackground" :src="shopInfo.storeInfo.coverImg" mode="aspectFill">
 			</image>
 			<view class="panelone">
 				{{ shopInfo.storeInfo.shopName }}
@@ -32,9 +31,10 @@
 				本店招牌菜
 			</view>
 			<view class="panelfive">
-				<scroll-view :scroll-x="panelfiveShow"  :scroll-into-view="leftIntoView" :scroll-with-animation="false">
+				<scroll-view :scroll-x="true" :scroll-into-view="leftIntoView" :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">
+						<view class="panelfiveitem" @click="clickspecifications(item,index,index,'热销')"
+							v-for="(item,index) in shopProductList.hots" :key="index">
 							<image class="panelfiveitemimage" :src="item.coverImg" mode="aspectFill"></image>
 							<view class="panelfiveitemone">
 								{{ item.name }}
@@ -59,20 +59,22 @@
 									<text>「{{item.suit}}份起点」</text>
 								</view>
 								<!-- <u-icon name="plus-circle-fill" color="#E9AB7A" size="40"></u-icon> -->
-								
+
 							</view>
 							<view class="panelfiveitemNum">
 								<view class="sku-wrap flex-center" v-if="item.productSkuResult != null"
 									@click.stop="clickspecifications(item,index,index1)">
 									<text class="t">选规格</text>
-									<text class="dot num" v-if="item.cartNumber != '0'">{{item.cartNumber<99?item.cartNumber:'99+'}}</text>
+									<text class="dot num"
+										v-if="item.cartNumber != '0'">{{item.cartNumber<99?item.cartNumber:'99+'}}</text>
 								</view>
 								<view class="Controls" v-else>
-									<view v-if="item.cartNumber != '0'" @click.stop="cartadd(item,'-',item.productSkuResult == null ? '单规格':'',$event)">
-										<u-icon   name="minus-circle-fill" color="#E9AB7A" size="50"></u-icon>
+									<view v-if="item.cartNumber != '0'"
+										@click.stop="cartadd(item,'-',item.productSkuResult == null ? '单规格':'',$event)">
+										<u-icon name="minus-circle-fill" color="#E9AB7A" size="50"></u-icon>
 									</view>
 									<text class="num"> {{ item.cartNumber }} </text>
-									<view  @click.stop="cartadd(item,'+',item.productSkuResult == null ? '单规格':'')">
+									<view @click.stop="cartadd(item,'+',item.productSkuResult == null ? '单规格':'')">
 										<u-icon name="plus-circle-fill" color="#E9AB7A" size="50"></u-icon>
 									</view>
 								</view>
@@ -80,7 +82,7 @@
 						</view>
 					</view>
 				</scroll-view>
-			
+
 			</view>
 		</view>
 		<!-- 滚动区域 -->
@@ -91,43 +93,54 @@
 						:scroll-into-view="leftIntoView" :scroll-with-animation="false">
 						<view class="item" v-for="(item,index) in shopProductList.productInfo" :key="index"
 							:class="{ 'active':index==leftIndex }" :id="'left-'+index" :data-index="index"
-							@tap="leftTap($event,index)">{{item.name}}</view>
+							@tap="leftTap">{{item.name}}</view>
+						<view class="items"></view>
 					</scroll-view>
 				</view>
 				<view class="main">
-					<scroll-view :scroll-y="!isFixed" :scroll-top="scrollHeight" :style="{ 'height':scrollHeight + 'px' }" @scroll="mainScroll"
-						:scroll-into-view="scrollInto" :scroll-with-animation="true">
-						<view class="item main-item" v-for="(item,index) in shopProductList.productInfo" :key="index" :id="'item-'+index">
+					<scroll-view :scroll-y="!isFixed" :scroll-top="scrollHeight"
+						:style="{ 'height':scrollHeight + 'px' }" @scroll="mainScroll" :scroll-into-view="scrollInto"
+						:scroll-with-animation="false">
+						<view class="item main-item" v-for="(item,index) in shopProductList.productInfo" :key="index"
+							:id="'item-'+index">
 							<view class="title">
 								<view>{{item.name}}</view>
 							</view>
-							<view class="goods"  @click="clickspecifications(item1,index,index1)" v-for="(item1,index1) in item.products" :key="index1">
-								<image class="goodsImg" v-if="item1.coverImg!=null" :lazy-load="true" :src="`${item1.coverImg}?x-oss-process=image/resize,m_lfit,w_90,h_90`"></image>
-								<image class="goodsImg" src="@/static/1.gif" mode="" v-else :lazy-load="true" ></image>
-								<view v-if="item.name=='热销'" class="topSort" :class="'c'+(index1+1)">TOP{{index1+1}}</view>
+							<view class="goods" @click="clickspecifications(item1,index,index1)"
+								v-for="(item1,index1) in item.products" :key="index1">
+								<image class="goodsImg" v-if="item1.coverImg!=null" :lazy-load="true"
+									:src="`${item1.coverImg}?x-oss-process=image/resize,m_lfit,w_90,h_90`"></image>
+								<image class="goodsImg" src="@/static/1.gif" mode="" v-else :lazy-load="true"></image>
+								<view v-if="item.name=='热销'" class="topSort" :class="'c'+(index1+1)">TOP{{index1+1}}
+								</view>
 								<view class="goods_right">
 									<view class="name">{{ item1.name }}</view>
 									<view class="lookBack" v-if="item.name=='热销'">本店回头客第{{index1+1}}名</view>
 									<view class="describe"> {{item1.shortTitle?item1.shortTitle:''}} </view>
 									<view class="monthlySale">月售{{item1.stockNumber}}</view>
-									<view class="money">￥<text class="money_num">{{ item1.lowPrice }}</text>/份<text class="suit">「{{item1.suit}}份起点」</text></view>
-									
+									<view class="money">￥<text class="money_num">{{ item1.lowPrice }}</text>/份<text
+											class="suit">「{{item1.suit}}份起点」</text></view>
+
 									<view class="flex-end" v-if="item1.productSkuResult != null">
-										<view class="sku-wrap flex-center" @click.stop="clickspecifications(item1,index,index1)">
+										<view class="sku-wrap flex-center"
+											@click.stop="clickspecifications(item1,index,index1)">
 											<text class="t">选规格</text>
-											<text class="dot num" v-if="item1.cartNumber != '0'">{{item1.cartNumber<99?item1.cartNumber:'99+'}}</text>
+											<text class="dot num"
+												v-if="item1.cartNumber != '0'">{{item1.cartNumber<99?item1.cartNumber:'99+'}}</text>
 										</view>
 									</view>
-									
+
 									<view class="Controls" v-else>
-										<view v-if="item1.cartNumber != '0'" @click.stop="cartadd(item1,'-',item1.productSkuResult == null ? '单规格':'',$event)">
-											<u-icon   name="minus-circle-fill" color="#E9AB7A" size="50"></u-icon>
+										<view v-if="item1.cartNumber != '0'"
+											@click.stop="cartadd(item1,'-',item1.productSkuResult == null ? '单规格':'',$event)">
+											<u-icon name="minus-circle-fill" color="#E9AB7A" size="50"></u-icon>
 										</view>
 										<text class="num"> {{ item1.cartNumber }} </text>
-										<view  @click.stop="cartadd(item1,'+',item1.productSkuResult == null ? '单规格':'')">
+										<view
+											@click.stop="cartadd(item1,'+',item1.productSkuResult == null ? '单规格':'')">
 											<u-icon name="plus-circle-fill" color="#E9AB7A" size="50"></u-icon>
 										</view>
-								
+
 									</view>
 								</view>
 							</view>
@@ -137,25 +150,19 @@
 				</view>
 			</view>
 		</view>
-		<!-- 底部面板 底部面板，可添加所需要放在页面底部的内容代码。比如购物车栏目 -->
-		<!-- <view class="bottom-panel">
-			<view style="background-color: #ffaa00;text-align: center;font-size: 28rpx;padding: 10px 0;color: #fff;">
-				<view>这里底部内容占位区域，不需要则删除</view>
-				<view>可添加需放在页面底部的内容，比如购物车栏目</view>
-			</view>
-		</view> -->
-		
+
 		<!-- 购物车悬浮条 -->
 		<view class="cart-wrap" v-if="cartListsdatashow">
 			<view class="cart-content">
 				<view class="left">
 					<view class="iconBox">
-						<image class="icon" src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/shopIcon.png"
+						<image class="icon"
+							src="https://czg-qr-order.oss-cn-beijing.aliyuncs.com/shopDetails/shopIcon.png"
 							mode="aspectFill" @click="showCart = !showCart">
 						</image>
 						<text class="u-badge"> {{cartLists_count<99?cartLists_count:'99+'}} </text>
 					</view>
-				
+
 					<text class="i">￥</text>
 					<text class="num">{{cartLists.amount||'0.00'}}</text>
 				</view>
@@ -164,9 +171,10 @@
 				</view>
 			</view>
 		</view>
-		
+
 		<!-- 购物车 -->
-		<u-popup :show="showCart" :round="20" :safeAreaInsetBottom="false" :zIndex="98" :overlayStyle="{ zIndex: 98 }" @close="showCart = false">
+		<u-popup :show="showCart" :round="20" :safeAreaInsetBottom="false" :zIndex="98" :overlayStyle="{ zIndex: 98 }"
+			@close="showCart = false">
 			<view class="cart-list-wrap">
 				<view class="cart-header flex-between">
 					<view class="num">已点 {{cartLists_count}} 份</view>
@@ -184,7 +192,7 @@
 							<view class="info">
 								<view class="name"> {{ item.name }} </view>
 								<view class="select-sku-wrap"> {{ item.skuName }} </view>
-							
+
 								<view class="price-wrap" style="padding-top: 0;">
 									<view class="price">
 										<text class="i">￥</text>
@@ -192,7 +200,7 @@
 									</view>
 									<view class="operation-wrap">
 										<view class="btn" v-if="item.number" @click="cartListadd(item,index,'-')">
-											<u-icon   name="minus-circle-fill" color="#E9AB7A" size="50"></u-icon>
+											<u-icon name="minus-circle-fill" color="#E9AB7A" size="50"></u-icon>
 										</view>
 										<text class="num" v-if="item.number">{{ item.number }}</text>
 										<view class="btn" @click="cartListadd(item,index,'+')">
@@ -206,10 +214,10 @@
 				</scroll-view>
 			</view>
 		</u-popup>
-		
-		
+
+
 		<!-- 店铺详情 -->
-		<u-popup :show="showShopInfo" :round="20" mode="bottom" @close="showShopInfo = false" height="500" >
+		<u-popup :show="showShopInfo" :round="20" mode="bottom" @close="showShopInfo = false" height="500">
 			<view class="shop-info-wrap">
 				<view class="info-wrap flex-between">
 					<view></view>
@@ -222,7 +230,8 @@
 				<view class="row" style="margin-bottom: 20rpx;">
 					<view class="col">
 						<text class="l">营业时间：</text>
-						<text class="t">{{ shopInfo.storeInfo.businessStartDay +'至'+ shopInfo.storeInfo.businessEndDay +' '+ shopInfo.storeInfo.businessTime }}</text>
+						<text
+							class="t">{{ shopInfo.storeInfo.businessStartDay +'至'+ shopInfo.storeInfo.businessEndDay +' '+ shopInfo.storeInfo.businessTime }}</text>
 					</view>
 					<view class="col">
 						<text class="l">商家地址：</text>
@@ -240,23 +249,23 @@
 						<text class="t">{{ shopInfo.storeInfo.detail }}</text>
 					</view>
 				</view>
-			
+
 			</view>
 		</u-popup>
-		
-		
+
 		<!-- 规格 -->
 		<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 + 'px' }">
 				<view class="positionabsolute">
 					<u-icon name="close-circle" @click="showShopsku = false" color="#000" size="50"></u-icon>
 				</view>
 				<image class="shop_skucimage" :src="specifications.coverImg" mode="aspectFill"></image>
 				<view class="shop_sku_name"> {{specifications.name}} </view>
-				<view class="shop_sku_returned" v-if="specifications.typeName&&specifications.typeName=='热销'"> 本店回头客第{{specifications.indexb+1}}名 </view>
+				<view class="shop_sku_returned" v-if="specifications.typeName&&specifications.typeName=='热销'">
+					本店回头客第{{specifications.indexb+1}}名 </view>
 				<view class="shop_sku_description"> {{specifications.shortTitle?specifications.shortTitle:''}} </view>
-				
+
 				<view class="shop_sku_box" v-for="(item,index) in specifications.tagSnap" :key="index"
 					v-if="specifications.tagSnap">
 					<view class="shop_sku_box_name">
@@ -270,8 +279,8 @@
 						</view>
 					</view>
 				</view>
-			
-				
+
+
 				<view class="shop_bottom ">
 					<view class="flex-between">
 						<view class="price">
@@ -280,22 +289,24 @@
 							<text class="i">/杯</text>
 						</view>
 						<view class="operation-wrap">
-							
+
 							<view class="btn"
 								@click="shopAdd(specifications,specifications.indexa,specifications.indexb,'-',specifications.tagSnap == null ? '单规格':'')">
-								<u-icon   name="minus-circle-fill" color="#E9AB7A" size="40"></u-icon>
+								<u-icon name="minus-circle-fill" color="#E9AB7A" size="50"></u-icon>
 							</view>
 							<text class="num">{{amountcartNumber}}</text>
 							<view class="btn"
 								@click="shopAdd(specifications,specifications.indexa,specifications.indexb,'+',specifications.tagSnap == null ? '单规格':'')">
-								<u-icon name="plus-circle-fill" color="#E9AB7A" size="40"></u-icon>
+								<u-icon name="plus-circle-fill" color="#E9AB7A" size="50"></u-icon>
 							</view>
 						</view>
 					</view>
 					<view class="shop_skuselect flex-start" v-if="specifications.tagSnap">
 						<view class="shop_skuselectname">{{skuidname.toString()}}</view>
 					</view>
-					<view class="addShopping" :class="amountcartNumber>0?'active':''" @click="addShopping(specifications,specifications.indexa,specifications.indexb,'+',specifications.tagSnap == null ? '单规格':'')">添加到购物车</view>
+					<view class="addShopping" :class="amountcartNumber>0?'active':''"
+						@click="addShopping(specifications,specifications.indexa,specifications.indexb,'+',specifications.tagSnap == null ? '单规格':'')">
+						添加到购物车</view>
 				</view>
 			</view>
 		</u-popup>
@@ -303,7 +314,7 @@
 
 </template>
 <script>
-	import navseat from '@/components/navseat.vue' 
+	import navseat from '@/components/navseat.vue'
 	import webSocketUtils from '@/common/js/websocket.js';
 	export default {
 		components: {
@@ -311,6 +322,7 @@
 		},
 		data() {
 			return {
+				fixedtrue: true,
 				userInfo: uni.cache.get('userInfo'), //个人信息
 				opacity: false, //是否显示
 				scrollHeight: 1000,
@@ -322,53 +334,47 @@
 				leftIndex: 0,
 				scrollInto: '',
 				isFixed: true,
-				isNavShow: false,
-				heightnav: '' ,//点击获取的距离
-				showShopInfo: false,   //店铺信息弹窗是否显示
-				showShopsku: false,   //多规格弹窗是否显示
-				skuId: null,  // 多规格ID
+				showShopInfo: false, //店铺信息弹窗是否显示
+				showShopsku: false, //多规格弹窗是否显示
+				skuId: null, // 多规格ID
 				cartLists: {}, //购物车
 				cartLists_count: 0,
-				shopInfo: {},  //店铺信息
-				panelfiveShow: false,
-				shopProductList: {  
-				
-				},  //商品信息
-				specifications: {    
-					
-				},  // 规格信息
+				shopInfo: {}, //店铺信息
+				shopProductList: {}, //商品信息
+				specifications: {
+
+				}, // 规格信息
 				socketTicket: null,
 				amountcartNumber: 0,
 				skuNumber: 0,
+				skuSuit: 0,
 				salePrice: '', //钱数
-				cartListsdatashow: false ,//是否显示购物车
+				cartListsdatashow: false, //是否显示购物车
 				showCart: false,
 			}
 		},
 		onPageScroll(e) {
-			try {
-				if (e.scrollTop <= 44) { //搜索导航栏显示影藏
-					this.isNavShow = false
-				} else {
-					this.isNavShow = true
-				}
-			} catch (e) {
-				//TODO handle the exception
-			}
-			console.log(e.scrollTop,this.scrollTopSize)
-			if (e.scrollTop >= this.scrollTopSize) { //控制大图层
-				this.isFixed = false;
+			if (e.scrollTop <= 44) { //搜索导航栏显示影藏
+				this.opacity = false
 			} else {
-				this.isFixed = true;
+				this.opacity = true
 			}
+			this.$u.debounce(() => {
+				if (e.scrollTop + 20 >= this.scrollTopSize) { //控制大图层
+					this.isFixed = false;
+				} else {
+					this.isFixed = true;
+				}
+			}, 10)
+
 		},
 		computed: {
 			/* 计算左侧滚动位置定位 */
 			leftIntoView() {
-				return `left-${this.leftIndex > 20 ? (this.leftIndex-20):0}`;
+				return `left-${this.leftIndex? this.leftIndex:0}`;
 			},
-			HeighT() { //手机类型的尺寸
-				return this.$store.getters.is_BarHeight
+			HeighT() { //手机类型的尺寸    导航栏高度
+				return this.$store.getters.is_BarHeight.heightBar + this.$store.getters.is_BarHeight.customBar
 			},
 		},
 		onReady() {
@@ -378,10 +384,7 @@
 						this.scrollHeight = data.windowHeight
 					}
 				})
-				this.panelfiveShow = true;
 			}, 100);
-			/* 在非H5平台，nextTick回调后有概率获取到错误的元素高度，则添加200ms的延迟来减少BUG的产生 */
-
 		},
 		onLoad(e) {
 			if (e.q) {
@@ -389,7 +392,7 @@
 				uni.cache.set('tableCode', this.tableCode)
 			}
 			uni.cache.set('types', 'types');
-			
+
 		},
 		onUnload() {
 			this.socketTicket.Close()
@@ -434,7 +437,7 @@
 			}
 		},
 		methods: {
-			
+
 			/**
 			 * socket初始化
 			 */
@@ -447,11 +450,11 @@
 					"type": "connect",
 				})
 			},
-			
+
 			/**
 			 * 通过桌码获取店铺信息
 			 */
-			async productqueryShop () {
+			async productqueryShop() {
 				let res = await this.api.productqueryShop({
 					code: uni.cache.get('tableCode'),
 					lng: uni.cache.get('getLocationstorage').lng,
@@ -459,17 +462,17 @@
 				})
 				if (res.code == 0) {
 					uni.cache.set('shopUser', res.data.storeInfo.id)
-					this.handlemessage() //监听websocket返回
 					this.shopInfo = res.data;
 					this.productqueryProduct() //list  数据
+					this.handlemessage() //监听websocket返回
 				} else {
 					setTimeout(() => {
 						uni.pro.switchTab('index/index')
 					}, 1000)
 				}
-				
+
 			},
-			
+
 			/**
 			 * 获取商品数据
 			 */
@@ -480,7 +483,7 @@
 				})
 				if (res.code == 0) {
 					this.shopProductList = res.data;
-					if ( this.cartLists && this.cartLists.data && this.cartLists.data.length >= 0 ) {
+					if (this.cartLists && this.cartLists.data && this.cartLists.data.length >= 0) {
 						this.setNumber()
 					}
 					setTimeout(() => {
@@ -488,7 +491,7 @@
 					}, 100);
 				}
 			},
-			
+
 			/**
 			 * 商品数量增加/减少
 			 * @param {Object} item
@@ -501,10 +504,10 @@
 				if (b == '单规格') { //没有规格为空
 					this.skuidname = []
 				}
-				let cartNumber = a == '+' ? item.cartNumber+1 : item.cartNumber-1;
+				let cartNumber = a == '+' ? item.cartNumber + 1 : item.cartNumber - 1;
 				this.hodgepodge(item, 1, a, cartNumber) //获取skuid  /1添加购物车
 			},
-			
+
 			/**
 			 * 详情商品增减
 			 * @param {Object} item
@@ -513,36 +516,35 @@
 			 * @param {Object} a
 			 * @param {Object} b
 			 */
-			shopAdd (item, index, index1, a, b) {
+			shopAdd(item, index, index1, a, b) {
 				if ( a == "+" ){
-					if ( this.amountcartNumber <= 0) {
-						this.amountcartNumber = this.amountcartNumber + item.suit;
+					if ( this.skuNumber < this.skuSuit && this.amountcartNumber < this.skuSuit) {
+						this.amountcartNumber = this.amountcartNumber + (item.suit==0?1:item.suit);
 					}else {
 						this.amountcartNumber++;
 					}
 				} else {
-					
-					if ( this.amountcartNumber > 0 ) {
+
+					if (this.amountcartNumber > 0) {
 						console.log(item)
-						if ( this.amountcartNumber <= item.suit) {
-							this.amountcartNumber = this.amountcartNumber - item.suit
+						if ( this.skuNumber < this.skuSuit && this.amountcartNumber < this.skuSuit) {
+							this.amountcartNumber = this.amountcartNumber - (item.suit==0?1:item.suit);
 						} else {
 							this.amountcartNumber = this.amountcartNumber - 1;
 						}
 					}
 				}
 			},
-			
+
 			/**
 			 * 添加购物车
 			 */
-			addShopping ( item, index, index1, a, b ) {
-				console.log(item)
-				if ( this.amountcartNumber <= 0 ) {
+			addShopping(item, index, index1, a, b) {
+				if (this.amountcartNumber <= 0) {
 					return;
 				}
 				let num = 0;
-				if ( item.typeEnum == "normal") {
+				if (item.typeEnum == "normal") {
 					num = item.cartNumber + this.amountcartNumber;
 				} else {
 					num = this.skuNumber + this.amountcartNumber;
@@ -558,18 +560,18 @@
 				}
 				this.addCart(params)
 			},
-			
+
 			/**
 			 * 购物车加减
 			 * @param {Object} item
 			 * @param {Object} index
 			 * @param {Object} a
 			 */
-			async cartListadd(item, index, c) { 
+			async cartListadd(item, index, c) {
 				try {
 					let params = {
 						"skuId": item.skuId,
-						"num": c == '+' ? item.number + 1 : item.number -1, //数量
+						"num": c == '+' ? item.number + 1 : item.number - 1, //数量
 						"type": c == '+' ? 1 : 0,
 						"productId": item.productId, //商品id
 						"shopId": uni.cache.get('shopUser'),
@@ -581,34 +583,34 @@
 					//TODO handle the exception
 				}
 			},
-			
-			
+
+
 			/**
 			 * 添加到购物车
 			 */
-			async addCart ( data ) {
+			async addCart(data) {
 				let res = await this.api.cartAdd(data)
-				if ( res.code == 0) {
+				if (res.code == 0) {
 					this.showShopsku = false;
 					this.$set(this, 'amountcartNumber', 0)
 				}
 			},
-			
+
 			/**
 			 * 清空购物车
 			 */
-			async cartclear() { 
+			async cartclear() {
 				let res = await this.api.cleanCart({
 					"shopId": uni.cache.get('shopUser'),
 					"tableId": uni.cache.get('tableCode'),
 				})
 			},
-			
-			
+
+
 			/**
 			 * 商品数量\购物车数量处理
 			 */
-			setNumber () {
+			setNumber() {
 				// 处理购物车相同id的情况下  数量相加
 				var summedArray = this.cartLists.data.reduce((acc, current) => {
 					const existing = acc.find(item => item.productId === current.productId);
@@ -641,12 +643,10 @@
 						}
 					})
 				})
-				this.cartListsdatashow = this.cartLists.data.length == 0 ? false : true;
-				console.log(this.cartLists)
-				if ( this.cartLists.data.length > 0 ){
+				this.cartListsdatashow = this.cartLists.data.length == 0 ? false : true
+				if (this.cartLists.data.length > 0) {
 					this.cartLists_count = 0;
-					this.cartLists.data.forEach((v,e)=>{
-						console.log(v)
+					this.cartLists.data.forEach((v, e) => {
 						this.cartLists_count += v.number;
 					})
 				}
@@ -657,8 +657,7 @@
 			 * @param {Object} index
 			 * @param {Object} index1
 			 */
-			clickspecifications(item1, index, index1,type) {
-				console.log(item1)
+			clickspecifications(item1, index, index1, type) {
 				this.skuidname = []
 				this.specifications = item1
 				this.specifications.indexa = index
@@ -684,12 +683,12 @@
 						})
 						this.hodgepodge(this.specifications.tagSnap[0], 2) //获取skuid /2查找价格和数量
 					}
-			
+
 				} catch (e) {
 					//TODO handle the exception
 				}
 			},
-			
+
 			/**
 			 * 规格选择监听
 			 * @param {Object} e
@@ -702,7 +701,7 @@
 				this.skuidname.splice(index, 1, e) //替换skuidname的数据
 				this.hodgepodge(item, 2)
 			},
-			
+
 			/**
 			 * 获取规格信息
 			 * @param {Object} item
@@ -718,36 +717,29 @@
 						productId: item.id, //商品id
 						spec_tag: this.skuidname.join(",")
 					})
-					if (res.data.stockNumber == 0) {
-						uni.showToast({
-							title: '暂无库存',
-							icon: "none",
-						})
-					} else {
-						this.skuidsearch = res.data.id // 储存skuid   用于筛选数量
-						this.salePrice = res.data.salePrice // 价格
-						let data = null;
-						if (a == 1) { //1添加购物车  2是websocket返回这个商品的价格(应为不同的多规格商品返回不同的价格)
-							let params = {
-								"skuId": res.data.id,
-								"num": num, //数量
-								"type": c == '+' ? 1 : 0,
-								"productId": item.id, //商品id
-								"shopId": uni.cache.get('shopUser'),
-								"userId": uni.cache.get('userInfo').id,
-								"tableId": uni.cache.get('tableCode'),
-							}
-							this.addCart(params);
-						} else {
-							this.skuId = res.data.id;
-							this.skuNumber = res.data.number;
-							this.showShopsku = true //打开弹框
+					this.salePrice = res.data.salePrice // 价格
+					let data = null;
+					if (a == 1) { //1添加购物车  2是websocket返回这个商品的价格(应为不同的多规格商品返回不同的价格)
+						let params = {
+							"skuId": res.data.id,
+							"num": num, //数量
+							"type": c == '+' ? 1 : 0,
+							"productId": item.id, //商品id
+							"shopId": uni.cache.get('shopUser'),
+							"userId": uni.cache.get('userInfo').id,
+							"tableId": uni.cache.get('tableCode'),
 						}
-						this.$set(this, 'amountcartNumber', 0)
+						this.addCart(params);
+					} else {
+						this.skuId = res.data.id;
+						this.skuNumber = res.data.number;
+						this.skuSuit = res.data.suit;
+						this.showShopsku = true //打开弹框
 					}
+					this.$set(this, 'amountcartNumber', 0)
 				} catch (e) {}
 			},
-			
+
 			/**
 			 * 结算直接生成订单
 			 */
@@ -764,24 +756,23 @@
 				uni.navigateTo({
 					url: '/pages/order/confirm_order?storeInfo=' + JSON.stringify(this.shopInfo.storeInfo)
 				});
-	
+
 			},
-			
+
 			/**
 			 * 商家信息显示
 			 */
 			showShopClick() {
 				this.showShopInfo = true;
 			},
-			
-			
-			
+
+
+
 			/**
 			 * 获取消息
 			 * @param {Object} msg
 			 */
 			getMessage(msg) { //wss  回显数据
-				console.log(msg.type)
 				if (msg == 1) { // 网络在连接
 					this.fixedtrue = true
 					return false
@@ -807,9 +798,12 @@
 							case 'sku': // sku  数量 查询这个商品的价格和数量
 								break;
 							case 'order':
-								this.skuidname = []
-								this.showCart = false
-								this.cartLists = msg
+								this.cartLists_count = 0;
+								this.skuidname = [];
+								this.cartListsdatashow = false;
+								this.showCart = false;
+								this.cartLists = msg;
+								this.productqueryProduct() //list  数据
 								break;
 							case 'addCart': //初始化add
 								this.cartLists = msg
@@ -819,83 +813,96 @@
 								this.cartLists = msg
 								try {
 									//购物车为空的情况
-									if ( msg.data.length == 0) {
+									if (msg.data.length == 0) {
 										this.showCart = false;
 									}
 									this.setNumber()
 								} catch (e) {}
 								break;
 						}
-						
-			
+
+
 					}
 				} catch (e) {
 					//TODO handle the exception
 				}
 			},
-			
+
 			// 数据处理
 			socketSendMsg(data) {
 				if (this.socketTicket) {
 					this.socketTicket.send(data);
 				}
 			},
-			
-			
-			// 导航栏高度 去计算列表页的高度
-			Topdistance(e) {
-				this.heightnav = e ////导航栏高度
-			},
-		
+
 			/* 获取元素顶部信息 */
 			getElementTop() {
 				new Promise((resolve, reject) => {
 					let view = uni.createSelectorQuery().selectAll('.main-item');
-					view.boundingClientRect(data => {
+					view.boundingClientRect(async data => {
 						resolve(data);
 					}).exec();
 					this.$u.getRect('.scroll-panel').then(res => {
-						console.log(res)
-						this.scrollTopSize = res.top - this.heightnav; //元素距离顶部的距离
-						this.scrollHeight = this.scrollHeight - this.heightnav
+						this.scrollTopSize = res.top; //元素距离顶部的距离  
 					})
 				}).then((res) => {
 					let topArr = res.map((item) => {
-						return item.top - this.scrollTopSize; /* 减去滚动容器距离顶部的距离 */
+						return item.top; /* 减去滚动容器距离顶部的距离 加导航栏高度*/
 					});
+					this.scrollHeight = this.scrollHeight - this.HeighT
 					this.topArr = topArr;
-
 					/* 获取最后一项的高度，设置填充高度。判断和填充时做了 +-20 的操作，是为了滚动时更好的定位 */
 					let last = res[res.length - 1].height;
 					if (last - 20 < this.scrollHeight) {
-						this.fillHeight = this.scrollHeight - last + 20;
+						this.fillHeight = this.scrollHeight - last + 20; //这是吸到顶部的距离
+						// this.fillHeight = 200;
 					}
 				});
 			},
 			/* 主区域滚动监听 */
 			mainScroll(e) {
-			
+				console.log(e)
+				// 节流方法
+				clearTimeout(this.mainThrottle);
+				this.mainThrottle = setTimeout(() => {
+					scrollFn();
+				}, 10);
+
+				let scrollFn = () => {
+					let top = e.detail.scrollTop;
+					let index = 0;
+					/* 查找当前滚动距离 */
+					for (let i = (this.topArr.length - 1); i >= 0; i--) {
+						/* 在部分安卓设备上，因手机逻辑分辨率与rpx单位计算不是整数，滚动距离与有误差，增加2px来完善该问题 */
+						if ((top + 2) >= this.topArr[i] - this.scrollTopSize) {
+							index = i;
+							break;
+						}
+					}
+					this.leftIndex = (index < 0 ? 0 : index);
+				}
 			},
 			/* 左侧导航点击 */
-			leftTap(e,index) {
+			leftTap(e) {
+				let HeighTdata = null
+				if (this.opacity) {
+					HeighTdata = this.HeighT
+				} else {
+					HeighTdata = this.HeighT * 2
+				}
+				console.log(this.scrollTopSize + HeighTdata, 11)
 				try {
-					this.leftIndex = (index < 0 ? 0 : index);
-					if (this.isFixed) {
-						uni.pageScrollTo({
-							scrollTop: this.scrollTopSize, //滑动需要的距离  nav+列表距离的高度
-							duration: 100
-						});
-						this.isFixed = false
-					}
-
+					uni.pageScrollTo({
+						scrollTop: this.scrollTopSize + HeighTdata, //滑动需要的距离  nav+列表距离的高度
+						duration: 0
+					});
 				} catch (e) {
 					//TODO handle the exception
 				}
-	
 				setTimeout(() => {
 					let index = e.currentTarget.dataset.index;
 					this.scrollInto = `item-${index}`;
-				},)
+				}, 300)
 			}
 		}
 	}
@@ -906,7 +913,7 @@
 	$tabLeft: 200upx;
 	$itemH: 100upx;
 	$cartH: 90upx;
-	
+
 	/* 容器 */
 	.container {
 		display: flex;
@@ -915,9 +922,11 @@
 		justify-content: flex-start;
 		align-items: flex-start;
 		align-content: flex-start;
-		.navbarcontent .active{
+
+		.navbarcontent .active {
 			background-color: #fff;
 		}
+
 		&>view {
 			width: 100%;
 		}
@@ -925,6 +934,7 @@
 		.top--panel {
 			padding: 0 20rpx;
 			background-color: #fff;
+
 			.panelimgbackground {
 				width: 382rpx;
 				margin: 82rpx auto 0 auto;
@@ -981,15 +991,18 @@
 
 			.panelfive {
 				width: 100%;
-				.panelfive_list{
+
+				.panelfive_list {
 					display: flex;
 				}
+
 				.panelfiveitem {
 					margin-top: 16rpx;
 					width: 340rpx;
 					margin-right: 30rpx;
 					position: relative;
 					flex-shrink: 0;
+
 					.panelfiveitemimage {
 						border-radius: 20rpx 20rpx 0rpx 0rpx;
 						width: 100%;
@@ -1067,12 +1080,14 @@
 								font-size: 36rpx;
 								color: #333333;
 							}
+
 							text:nth-child(3) {
 								font-family: Source Han Sans CN, Source Han Sans CN;
 								font-weight: 400;
 								font-size: 36rpx;
 								color: #333333;
 							}
+
 							text:nth-child(4) {
 								font-family: Source Han Sans CN, Source Han Sans CN;
 								font-weight: 400;
@@ -1081,7 +1096,8 @@
 							}
 						}
 					}
-					.panelfiveitemNum{
+
+					.panelfiveitemNum {
 						// position: absolute;
 						// bottom: 82rpx;
 						// right: 0;
@@ -1089,17 +1105,20 @@
 						display: flex;
 						align-items: center;
 						justify-content: flex-end;
-						.sku-wrap{
+
+						.sku-wrap {
 							width: 138rpx;
 							height: 54rpx;
 							background: #E3AD7F;
 							border-radius: 32rpx;
 							position: relative;
 							align-items: center;
-							.t{
+
+							.t {
 								font-size: 28rpx;
 								color: #fff;
 							}
+
 							.dot {
 								position: absolute;
 								top: -15rpx;
@@ -1115,11 +1134,12 @@
 								font-size: 20rpx;
 							}
 						}
-						
-						.Controls{
+
+						.Controls {
 							display: flex;
 							align-items: center;
-							.num{
+
+							.num {
 								margin: 8rpx 8rpx 0 8rpx;
 							}
 						}
@@ -1135,39 +1155,42 @@
 
 		}
 
-		.bottom-panel {
-			padding-bottom: 0;
-			padding-bottom: constant(safe-area-inset-bottom);
-			padding-bottom: env(safe-area-inset-bottom);
-		}
-		.shop-info-wrap{
+
+		.shop-info-wrap {
 			padding: 0 30rpx 50rpx;
 			box-sizing: border-box;
-			.info-wrap{
+
+			.info-wrap {
 				padding: 30rpx 0;
 				box-sizing: border-box;
-				.shopName{
+
+				.shopName {
 					align-self: center;
 					font-size: 32rpx;
 					color: #333;
 					font-weight: bold;
 				}
 			}
-			.info-wrap-title{
+
+			.info-wrap-title {
 				font-size: 32rpx;
 				font-weight: bold;
 				color: #333;
 			}
-			.row{
-				.col{
+
+			.row {
+				.col {
 					margin-bottom: 10rpx;
 				}
-				.l,.t{
+
+				.l,
+				.t {
 					font-size: 24rpx;
 					color: #999;
 				}
 			}
 		}
+
 		.shop_sku {
 			width: 100%;
 			position: relative;
@@ -1176,18 +1199,19 @@
 			overflow-y: auto;
 			padding-bottom: 320rpx;
 			box-sizing: border-box;
+
 			.positionabsolute {
 				position: absolute;
 				top: 30rpx;
 				right: 30rpx;
 			}
-		
+
 			.shop_skucimage {
 				width: 100%;
-				height: 500rpx!important;
+				height: 500rpx !important;
 				border-radius: 20rpx 20rpx 0 0;
 			}
-		
+
 			.shop_sku_name {
 				padding: 0 $paddingSize;
 				margin-top: 20rpx;
@@ -1195,12 +1219,14 @@
 				font-size: 32upx;
 				margin-bottom: 16rpx;
 			}
+
 			.shop_sku_returned {
 				padding: 0 $paddingSize;
 				font-weight: 400;
 				font-size: 24rpx;
 				color: #FF534B;
 			}
+
 			.shop_sku_description {
 				padding: 0 $paddingSize;
 				font-weight: 400;
@@ -1211,18 +1237,18 @@
 				box-sizing: border-box;
 				border-bottom: 2rpx solid #F0F0F0;
 			}
-		
-		
+
+
 			.shop_sku_box {
 				padding: 0 $paddingSize;
-		
+
 				.shop_sku_box_name {
 					margin-top: 20rpx;
 					font-weight: 500;
 					font-size: 28upx;
 					color: #333;
 				}
-		
+
 				.flex-start {
 					.shop_sku_box_item {
 						margin-top: 16rpx;
@@ -1232,15 +1258,15 @@
 						margin-left: 56rpx;
 						background: #F5F5F5;
 					}
-		
+
 					.shop_sku_box_item:nth-child(1) {
 						margin-left: 0;
 					}
-		
+
 					.shop_sku_box_item_noselected {
 						color: #666;
 					}
-		
+
 					.shop_sku_box_item_selected {
 						background: #FEFAF7;
 						border-radius: 8rpx;
@@ -1248,35 +1274,36 @@
 						color: #E8AD7B;
 					}
 				}
-		
+
 			}
-		
+
 			.shop_skuselect {
 				margin-top: 16rpx;
 				width: 100%;
 				// background: #f7f7f7;
 				color: #999;
 				font-size: 24upx;
-		
+
 				.shop_skuselectname {
 					color: #000;
 					font-size: 26upx;
 				}
 			}
-		
+
 			.shop_bottom {
 				width: 100%;
 				box-sizing: border-box;
 				padding: 30rpx $paddingSize;
 				background-color: #fff;
-				box-shadow: 0rpx -6rpx 14rpx 2rpx rgba(0,0,0,0.1);
+				box-shadow: 0rpx -6rpx 14rpx 2rpx rgba(0, 0, 0, 0.1);
 				position: fixed;
 				left: 0;
 				bottom: 0;
+
 				.price {
 					display: flex;
 					align-items: flex-end;
-		
+
 					.i {
 						font-size: 28rpx;
 						color: #E8AD7B;
@@ -1284,7 +1311,7 @@
 						bottom: 4upx;
 						font-weight: bold;
 					}
-		
+
 					.num {
 						font-size: 42rpx;
 						color: #E8AD7B;
@@ -1293,19 +1320,20 @@
 						padding: 0 4upx;
 					}
 				}
-		
+
 				.operation-wrap {
 					display: flex;
 					align-items: center;
-		
+
 					.num {
 						font-size: 32upx;
 						padding: 0 16upx;
 					}
-		
-					
+
+
 				}
-				.addShopping{
+
+				.addShopping {
 					width: 100%;
 					height: 96rpx;
 					line-height: 96rpx;
@@ -1317,12 +1345,13 @@
 					color: #FFFFFF;
 					margin-top: 36rpx;
 				}
-				.addShopping.active{
+
+				.addShopping.active {
 					background: #E8AD7B;
 				}
 			}
 		}
-		
+
 		.cart-wrap {
 			width: 100%;
 			padding: 0 20rpx;
@@ -1331,62 +1360,66 @@
 			bottom: 40rpx;
 			left: 0;
 			z-index: 99;
-		
+
 			.cart-content {
 				display: flex;
 				align-items: center;
 				height: 128rpx;
 				background: #FFFFFF;
-				box-shadow: 0rpx 0rpx 20rpx 2rpx rgba(0,0,0,0.15);
+				box-shadow: 0rpx 0rpx 20rpx 2rpx rgba(0, 0, 0, 0.15);
 				border-radius: 58rpx;
 				padding: 0 36rpx;
 				box-sizing: border-box;
+
 				.left {
 					flex: 1;
 					display: flex;
 					align-items: center;
 					position: relative;
-					.iconBox{
+
+					.iconBox {
 						position: relative;
 					}
+
 					.icon {
 						width: 76rpx;
 						height: 88rpx;
 						margin-left: 22rpx;
 					}
-					.u-badge{
+
+					.u-badge {
 						position: absolute;
-					    top: -30rpx;
-					    right: -30rpx;
-					    background-color: #FF4B33;
-					    color: #fff;
-					    border-radius: 58rpx;
-					    padding: 5rpx 14rpx;
-					    box-sizing: border-box;
-					    display: flex;
-					    align-items: center;
-					    justify-content: center;
-					    font-size: 20rpx;
+						top: -30rpx;
+						right: -30rpx;
+						background-color: #FF4B33;
+						color: #fff;
+						border-radius: 58rpx;
+						padding: 5rpx 14rpx;
+						box-sizing: border-box;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						font-size: 20rpx;
 					}
-		
+
 					.i,
 					.num {
 						color: #333;
 					}
-		
+
 					.i {
 						font-size: 20upx;
 						position: relative;
 						top: 4upx;
 						margin-left: 64rpx;
 					}
-		
+
 					.num {
 						font-size: 42upx;
 						font-weight: bold;
 					}
 				}
-		
+
 				.btn {
 					width: 160rpx;
 					height: 64rpx;
@@ -1396,7 +1429,8 @@
 					display: flex;
 					align-items: center;
 					justify-content: center;
-					.t{
+
+					.t {
 						font-weight: bold;
 						font-size: 28rpx;
 						color: #FFFFFF;
@@ -1404,7 +1438,7 @@
 				}
 			}
 		}
-		
+
 		.cart-list-wrap {
 			.cart-header {
 				display: flex;
@@ -1414,15 +1448,17 @@
 				justify-content: space-between;
 				padding: 20upx $paddingSize;
 				border-radius: 20upx 20upx 0 0;
-				.num{
+
+				.num {
 					font-weight: 400;
 					font-size: 28rpx;
 					color: #333333;
 				}
+
 				.clear {
 					display: flex;
 					align-items: center;
-		
+
 					.t {
 						font-size: 24upx;
 						color: #999;
@@ -1430,23 +1466,24 @@
 					}
 				}
 			}
-		
+
 			.scroll-view {
 				max-height: 50vh;
 				margin-bottom: 190rpx;
 			}
-		
+
 			.list-wrap {
 				padding: $paddingSize 0 0 $paddingSize;
 			}
+
 			.shop-item {
 				display: flex;
 				padding-bottom: $paddingSize;
-			
+
 				.langcover {
 					position: relative;
 				}
-			
+
 				.langcover::after {
 					content: '加载中..';
 					position: absolute;
@@ -1461,50 +1498,50 @@
 					line-height: 180rpx;
 					z-index: 1;
 				}
-			
+
 				.info {
 					flex: 1;
 					padding-left: 20upx;
 					padding-right: $paddingSize;
-			
+
 					.name {
 						font-size: 28upx;
 						font-weight: bold;
 						color: #333;
 						margin-bottom: 5rpx;
 					}
-			
+
 					.select-sku-wrap {
 						font-weight: 400;
 						font-size: 24rpx;
 						color: #999999;
 					}
-			
+
 					.price-wrap {
 						margin-top: 16rpx;
 						display: flex;
 						align-items: center;
 						justify-content: space-between;
-			
+
 						.price {
 							display: flex;
 							align-items: flex-end;
-							
-							.i,.num{
+
+							.i,
+							.num {
 								font-weight: bold;
 								font-size: 32rpx;
 								color: #333333;
 							}
+
 							.i {
 								position: relative;
 								bottom: 4upx;
 							}
-			
-							.num {
-						
-							}
+
+							.num {}
 						}
-			
+
 						.sku-wrap {
 							padding: 6upx 16upx;
 							background-color: $color-priamry;
@@ -1513,12 +1550,12 @@
 							align-items: center;
 							justify-content: center;
 							position: relative;
-			
+
 							.t {
 								font-size: 24upx;
 								font-weight: bold;
 							}
-			
+
 							.dot {
 								display: flex;
 								align-items: center;
@@ -1533,34 +1570,34 @@
 								top: -14upx;
 								right: -8upx;
 							}
-					
+
 						}
-			
+
 						.operation-wrap {
 							display: flex;
 							align-items: center;
-			
+
 							.num {
 								font-size: 32upx;
 								padding: 0 16upx;
 							}
-			
+
 							.btn {
 								position: relative;
 								display: flex;
 								align-items: center;
 								justify-content: center;
-			
-								
+
+
 							}
 						}
 					}
 				}
 			}
-			
+
 		}
-		
-		
+
+
 	}
 
 
@@ -1581,6 +1618,7 @@
 			box-sizing: border-box;
 			font-size: 32rpx;
 
+			// padding-bottom: 200rpx;
 			.item {
 				padding: 0 30rpx;
 				height: 92rpx;
@@ -1592,6 +1630,7 @@
 				overflow: hidden;
 				text-overflow: ellipsis;
 				white-space: nowrap;
+
 				&+.item {
 					margin-top: 1px;
 
@@ -1624,6 +1663,7 @@
 						height: 100%;
 						width: 0;
 					}
+
 					&::after {
 						content: '';
 						display: block;
@@ -1640,6 +1680,14 @@
 				}
 			}
 
+			.items {
+				height: 180rpx;
+				position: relative;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #333333;
+			}
+
 			.fill-last {
 				height: 0;
 				width: 100%;
@@ -1680,6 +1728,7 @@
 				justify-content: flex-start;
 				align-content: center;
 				position: relative;
+
 				&+.goods {
 					margin-top: 16rpx;
 				}
@@ -1690,13 +1739,15 @@
 					margin-right: 18rpx;
 					margin-left: 2px;
 				}
-				.goodsImg{
+
+				.goodsImg {
 					width: 200rpx;
 					height: 200rpx;
 					border-radius: 18rpx;
 					flex-shrink: 0;
 				}
-				.topSort{
+
+				.topSort {
 					width: 92rpx;
 					height: 38rpx;
 					text-align: center;
@@ -1708,19 +1759,22 @@
 					font-size: 24rpx;
 					color: #FFFFFF;
 					border-radius: 20rpx 0rpx 20rpx 0rpx;
-					
+
 				}
-				.topSort.c1{
+
+				.topSort.c1 {
 					background: #FC5C2E;
 				}
-				.topSort.c2{
+
+				.topSort.c2 {
 					background: #EF994E;
 				}
-				.topSort.c3{
+
+				.topSort.c3 {
 					background: #F4B951;
 				}
-				
-				.goods_right{
+
+				.goods_right {
 					width: 100%;
 					display: flex;
 					flex-direction: column;
@@ -1728,47 +1782,55 @@
 					padding-top: 5rpx;
 					padding-right: 20rpx;
 					box-sizing: border-box;
-					.name{
+
+					.name {
 						font-size: 28rpx;
 						color: #333;
 						font-weight: bold;
 						margin-bottom: 8rpx;
 					}
-				
-					.describe,.monthlySale,.lookBack {
+
+					.describe,
+					.monthlySale,
+					.lookBack {
 						font-weight: 400;
 						font-size: 20rpx;
 						color: #999999;
 						margin-bottom: 8rpx;
 					}
-					.describe,.name{
+
+					.describe,
+					.name {
 						width: 270rpx;
 						overflow: hidden;
 						text-overflow: ellipsis;
-					    white-space: nowrap;
+						white-space: nowrap;
 					}
-					
-					.lookBack{
+
+
+					.lookBack {
 						color: #FF534B;
 					}
-					
+
 					.money {
 						font-weight: bold;
 						font-size: 24rpx;
 						color: #333;
-						.money_num{
+
+						.money_num {
 							font-size: 28rpx;
 							color: #333;
 							font-weight: bold;
 						}
 					}
-					.suit{
-						    font-weight: 400;
-						    font-size: 24rpx;
-						    color: #666666;
+
+					.suit {
+						font-weight: 400;
+						font-size: 24rpx;
+						color: #666666;
 					}
-					
-					.sku-wrap{
+
+					.sku-wrap {
 						width: 138rpx;
 						height: 54rpx;
 						background: #E3AD7F;
@@ -1778,10 +1840,12 @@
 						// right: 20rpx;
 						align-items: center;
 						position: relative;
-						.t{
+
+						.t {
 							font-size: 28rpx;
 							color: #fff;
 						}
+
 						.dot {
 							position: absolute;
 							top: -15rpx;
@@ -1797,21 +1861,22 @@
 							font-size: 20rpx;
 						}
 					}
-					
-					.Controls{
+
+					.Controls {
 						display: flex;
 						align-items: center;
 						justify-content: flex-end;
+
 						// position: absolute;
 						// bottom: 10rpx;
 						// right: 20rpx;
-						.num{
+						.num {
 							margin: auto 8rpx;
 						}
 					}
 				}
-				
-			
+
+
 			}
 		}
 	}
diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue
index fdec068..bcc6265 100644
--- a/pages/order_food/order_food.vue
+++ b/pages/order_food/order_food.vue
@@ -292,12 +292,12 @@
 
 							<view class="btn"
 								@click="shopAdd(specifications,specifications.indexa,specifications.indexb,'-',specifications.tagSnap == null ? '单规格':'')">
-								<u-icon name="minus-circle-fill" color="#E9AB7A" size="40"></u-icon>
+								<u-icon name="minus-circle-fill" color="#E9AB7A" size="50"></u-icon>
 							</view>
 							<text class="num">{{amountcartNumber}}</text>
 							<view class="btn"
 								@click="shopAdd(specifications,specifications.indexa,specifications.indexb,'+',specifications.tagSnap == null ? '单规格':'')">
-								<u-icon name="plus-circle-fill" color="#E9AB7A" size="40"></u-icon>
+								<u-icon name="plus-circle-fill" color="#E9AB7A" size="50"></u-icon>
 							</view>
 						</view>
 					</view>
@@ -404,6 +404,7 @@
 			this.fixedtrue = true
 		},
 		onShow() {
+			console.log(!uni.cache.get('token'))
 			if (!uni.cache.get('token')) {
 				uni.login({
 					provider: 'weixin',
@@ -518,8 +519,9 @@
 			 */
 			shopAdd(item, index, index1, a, b) {
 				if ( a == "+" ){
-					if ( this.skuNumber < this.skuSuit) {
-						this.amountcartNumber = this.amountcartNumber + (item.suit==0?1:item.suit);
+			
+					if ( this.skuNumber < this.skuSuit && this.amountcartNumber < this.skuSuit) {
+						this.amountcartNumber = this.amountcartNumber + (this.skuSuit==0?1:this.skuSuit);
 					}else {
 						this.amountcartNumber++;
 					}
@@ -527,8 +529,8 @@
 
 					if (this.amountcartNumber > 0) {
 						console.log(item)
-						if ( this.skuNumber < this.skuSuit) {
-							this.amountcartNumber = this.amountcartNumber - (item.suit==0?1:item.suit);
+						if ( this.skuNumber < this.skuSuit && this.amountcartNumber <= this.skuSuit) {
+							this.amountcartNumber = this.amountcartNumber - (this.skuSuit==0?1:this.skuSuit);
 						} else {
 							this.amountcartNumber = this.amountcartNumber - 1;
 						}
@@ -732,7 +734,7 @@
 						this.addCart(params);
 					} else {
 						this.skuId = res.data.id;
-						this.skuNumber = res.data.number;
+						this.skuNumber = res.data.number||0;
 						this.skuSuit = res.data.suit;
 						this.showShopsku = true //打开弹框
 					}