bug修复

pagesGood/goodList.vue

@@ -88,6 +88,10 @@
 					text: '删除',
 					backgroundColor: '#52A63A',
 					color: '#fff'
+				},{
+					text: '全选',
+					backgroundColor: '#52A63A',
+					color: '#fff'
 				}],
 				buttonGroup3: [{
 					text: '取消',
@@ -208,6 +212,20 @@
 					url: '/pagesGood/goodForm?type=add&formType=' + type
 				});
 			},
+			//  检测所有商品选情况
+		 //   getAllCartType() {
+			// return this['list' + (this.tabIndex + 1)].filter(site => site.allCheck).length == this['list' + (this.tabIndex + 1)].length
+		 //   },
+		 //   //  设置所有品全选状态
+		 //   checkAllShop() {
+			// let type = this.getAllCartType()
+			// this['list' + (this.tabIndex + 1)].forEach(item => {
+			//  item.allCheck = !type
+			//  item.products.forEach(site => {
+			//   site.check = !type
+			//  })
+			// })
+		 //   },
 		}
 	}
 </script>

pagesMain/orderItem.vue

@@ -68,7 +68,9 @@
 						shoppingcartId: 0,
 						tenantCode: ''
 					}],
-					supplierName: ''
+					supplierName: '',
+					noPick: true
+					
 				}
 			},
 		},
@@ -132,16 +134,16 @@
 			},
 			//  跳转订单详情
 			goToOrderDetail() {
-				if (this.orderData.noPick) {
+				// if (this.orderData.noPick) {
 					uni.navigateTo({
 						url: '/pagesMain/orderDetail?orderId=' + this.orderData.orderId + '&orderStatus=' + this.orderData.orderStatus
 					});
-				} else {
-					//  自助采摘
-					uni.navigateTo({
-						url: '/pagesMedia/pickVideo?tenantCode=' + this.orderData.tenantCode + '&orderId=' + this.orderData.orderId
-					});
-				}
+				// } else {
+				// 	//  自助采摘
+				// 	uni.navigateTo({
+				// 		url: '/pagesMedia/pickVideo?tenantCode=' + this.orderData.tenantCode + '&orderId=' + this.orderData.orderId
+				// 	});
+				// }
 			},
 		}
 	}

pagesMain/orderList.vue

@@ -107,8 +107,8 @@
 					}
 					this['isOver' + type] = res.data.list.length != 10
 					this['orderList' + type] = this['orderList' + type].concat(res.data.list)
-					if (this.orderList2.length) {
-						this.orderList2.forEach(v => {
+					if (this['orderList' + type].length) {
+						this['orderList' + type].forEach(v => {
 							v.noPick = true
 							if (v.products.some(vv => {return vv.productType == 3} )) {
 							    v.noPick = false