Merge branch 'gaohao' of https://e.coding.net/g-cphe0354/xiaochengxusaomadiancan/cashier_weapp into wwz_x

pages/order_food/order_food.vue

@@ -49,9 +49,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>
@@ -256,7 +256,7 @@
 		<!-- 规格 -->
 		<u-popup :show="showShopsku" :round="20" mode="bottom" @close="showShopsku = false;pagemetashow=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;pagemetashow=false" color="#000" size="50"></u-icon>
 				</view>
@@ -639,6 +639,8 @@
 					this.cartLists.data.forEach((v, e) => {
 						this.cartLists_count += v.number;
 					})
+				} else {
+					this.cartLists_count = 0;
 				}
 			},
 			/**