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

pages/order_food/order_food.vue

@@ -279,8 +279,7 @@
 					</view>
 					<view class="flex-start">
 						<view class="shop_sku_box_item" v-for="(item1,index1) in item.children" :key="index1"
-							@click="morloe(item1,index,index1,item)"
-							:style="{color:!item1.isGrounding?'#999':''}"
+							@click="morloe(item1,index,index1,item)" :style="{color:!item1.isGrounding?'#999':''}"
 							:class=" item.start == index1 ?'shop_sku_box_item_selected':''">
 							{{item1.info}}
 						</view>
@@ -312,7 +311,8 @@
 					</view>
 					<view class="addShopping" :class="(amountcartNumber>0&&isSpec)?'active':''"
 						@click="addShopping(specifications,specifications.indexa,specifications.indexb,'+',specifications.tagSnap == null ? '单规格':'')">
-						{{skuBtnText}}</view>
+						{{skuBtnText}}
+					</view>
 				</view>
 			</view>
 		</u-popup>
@@ -346,8 +346,7 @@
 				cartLists_count: 0,
 				shopInfo: {}, //店铺信息
 				shopProductList: {}, //商品信息
-				specifications: {
-				}, // 规格信息
+				specifications: {}, // 规格信息
 				socketTicket: null,
 				amountcartNumber: 0,
 				isSpec: false,
@@ -358,7 +357,7 @@
 				cartListsdatashow: false, //是否显示购物车
 				showCart: false,
 				lastbottom: '', //元素最低端的距离
-				scrollxleft: false,
+				scrollxleft: true,
 				orderdetailFlag: true,
 			}
 		},
@@ -368,6 +367,11 @@
 			} else {
 				this.opacity = true
 			}
+			// if (e.scrollTop > this.topArr[0]) {
+			// 	this.scrollxleft = true
+			// } else {
+			// 	this.scrollxleft = false
+			// }
 			this.mainScroll(e)
 		},
 		computed: {
@@ -1025,11 +1029,7 @@
 					let top = e.scrollTop;
 					let index = 0;
 					// 判断左边是否可以滑动
-					if (top + 2 > this.topArr[0]) {
-						this.scrollxleft = true
-					} else {
-						this.scrollxleft = false
-					}
+
 					for (let i = (this.topArr.length - 1); i >= 0; i--) {
 						/* 在部分安卓设备上，因手机逻辑分辨率与rpx单位计算不是整数，滚动距离与有误差，增加2px来完善该问题 */
 						if ((top + 2) >= this.topArr[i] - this.HeighT) {