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

pages/order_food/order_food.vue

@@ -278,9 +278,8 @@
 						{{item.name}}
 					</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':''}"
+						<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':''}"
 							: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: {
@@ -402,7 +406,7 @@
 
 		},
 		onUnload() {
-			if ( this.socketTicket ) {
+			if (this.socketTicket) {
 				this.socketTicket.Close()
 				uni.$off('message')
 			}
@@ -734,9 +738,9 @@
 						this.isSpec = false;
 						let res = await this.api.productquerySpec({
 							productId: item1.id, //商品id
-							querySpecList:[],
+							querySpecList: [],
 						})
-						if( res.code == 0 ){
+						if (res.code == 0) {
 							this.specifications.tagSnap = res.data.map((item) => {
 								console.log(item)
 								let data = {
@@ -755,7 +759,7 @@
 							})
 						}
 						this.skuBtnText = `您还没选择${this.specifications.tagSnap[0].name}哦`
-					
+
 						// this.specifications.tagSnap.forEach((val, index, arr) => { //初始化skuidname的数据  选择第一个
 						// 	console.log(val)
 						// 	this.skuidname.push(val.children[0].info)
@@ -780,11 +784,11 @@
 				if ( !e.isGrounding ) {
 					return;
 				}
-			
+
 				let querySpecList = [];
 				this.skuBtnText = "添加到购物车";
 				this.isSpec = true;
-				if ( this.specifications.tagSnap[index].start != index1) {
+				if (this.specifications.tagSnap[index].start != index1) {
 					this.$set(this.specifications.tagSnap[index], 'start', index1)
 				} else {
 					this.$set(this.specifications.tagSnap[index], 'start', -1)
@@ -797,10 +801,10 @@
 							value: v.children[v.start].info
 						})
 					}
-					
+
 				})
 				for (let i = 0; i < this.specifications.tagSnap.length; i++) {
-					if ( this.specifications.tagSnap[i].start < 0) {
+					if (this.specifications.tagSnap[i].start < 0) {
 						this.isSpec = false;
 						this.skuBtnText = `您还没选择${this.specifications.tagSnap[i].name}哦`
 						break; // 终止循环
@@ -872,7 +876,7 @@
 			 * 结算直接生成订单
 			 */
 			orderdetail() {
-				if ( !this.orderdetailFlag ) {
+				if (!this.orderdetailFlag) {
 					return;
 				}
 				this.orderdetailFlag = false;
@@ -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) {