Browse Source

fix: 修改bug

wuguojie 2 tháng trước cách đây
mục cha
commit
fd3e67610f

+ 34 - 11
pages/groupMeal/orders/order-alist.vue

@@ -204,18 +204,24 @@ export default {
 			});
 		},
 		onSelect(e) {
-			let allOrders = this.$refs.listScroll.dataList;
-			const result = allOrders.filter(item => e.includes(item.hostOrderId))
-			let arr = []
-			if(result && result.length > 0){
-				result.forEach(item => {
-					item.merchantPackageOrderDTOS.forEach(sub => {
-						arr.push(sub.merchantOrderIds)
+			console.log('选择的是', e)
+			if(e.length > 0) {
+				let allOrders = this.$refs.listScroll.dataList;
+				const result = allOrders.filter(item => e.includes(item.hostOrderId))
+				let arr = []
+				if(result && result.length > 0){
+					result.forEach(item => {
+						item.merchantPackageOrderDTOS.forEach(sub => {
+							arr.push(sub.merchantOrderIds)
+						})
 					})
-				})
-				this.selectedOrders = arr;
-				// 控制全选
-				this.isAllSelected = result.length === this.$refs.listScroll.dataList.length;
+					this.selectedOrders = arr;
+					// 控制全选
+					this.isAllSelected = result.length === this.$refs.listScroll.dataList.length?true: false
+				}
+			} else {
+				this.selectedOrders = []
+				this.isAllSelected = false
 			}
 		},
 		onSelectAll(e) {
@@ -235,6 +241,23 @@ export default {
 				item.checked = e.value;
 			});
 		},
+		itemSelected(e, item) {
+			item.checked = !item.checked
+			console.log(123123, this.$refs.listScroll.dataList)
+			// let allOrders = this.$refs.listScroll.dataList;
+			// const result = allOrders.filter(item => e.checked)
+			// let arr = []
+			// if(result && result.length > 0){
+			// 	result.forEach(item => {
+			// 		item.merchantPackageOrderDTOS.forEach(sub => {
+			// 			arr.push(sub.merchantOrderIds)
+			// 		})
+			// 	})
+			// 	this.selectedOrders = arr;
+			// 	// 控制全选
+			// 	this.isAllSelected = result.length === this.$refs.listScroll.dataList.length?true: false
+			// }
+		},
 		// 完成某种操作后,清空数据
 		onClearSel() {
 			this.selectedOrders = []; 

+ 3 - 1
pages/store/advertising.vue

@@ -54,7 +54,7 @@
 						</view>
 						
 					</view> -->
-					<shmily-drag-image v-model="form.photo" :addImage="ChooseImage" :delImage="delImage"></shmily-drag-image>
+					<shmily-drag-image v-model="form.photo" :number="20" :addImage="ChooseImage" :delImage="delImage"></shmily-drag-image>
 					<view class="business-prompt">
 						最多上传20张,每张大小不超过5M,建议宽高比9:16
 					</view>
@@ -179,6 +179,7 @@
 					sourceType: ['album'], //从相册选择
 					success: (res) => {
 						if (res) {
+							console.log('上传图片', res)
 							// this[type + 'Img'] = chooseImageRes.tempFilePaths[0];
 							uni.uploadFile({
 								url: configService.apiUrl + '/sys/common/upload',
@@ -409,6 +410,7 @@
 		bottom: 0;
 		background: #FFFFFF;
 		border-top: 1px solid #EEEEEE;
+		z-index: 99;
 	}
 
 	.uni-uploader__img {

+ 6 - 10
pages/store/headPhoto.vue

@@ -15,19 +15,16 @@
 						</view>
 					</view>
 					<view class="grid col-4 grid-square flex-sub booder-top">
-						<view class="bg-img" v-for="(item, index) in form.headPhoto.split(',')" :key="index" @tap="ViewImage"
+						<view class="bg-img" v-for="(item, index) in form.photo" :key="index" @tap="ViewImage"
 							:data-url="form.headPhoto[index]">
 							<image :src="item" mode="aspectFill"></image>
 							<view class="cu-tag bg-red" @tap.stop="DelImg" :data-index="index">
 								<text class='cuIcon-close'></text>
 							</view>
 						</view>
-						<view class="grid col-4 grid-square flex-sub booder-top" >
-							<view class="solids" @tap="ChooseImage" >
-								<text class='cuIcon-cameraadd'></text>
-							</view>
+						<view class="solids" @tap="ChooseImage" >
+							<text class='cuIcon-cameraadd'></text>
 						</view>
-						
 					</view>
 					
 					
@@ -109,7 +106,6 @@
 
 			},
 			DelImg(e) {
-				
 				uni.showModal({
 					title: '提示',
 					content: '确定要删除?',
@@ -117,10 +113,10 @@
 					confirmText: '确定',
 					success: res => {
 						if (res.confirm) {
-							console.log(this.form)
+							console.log('删除前的图片', this.form.headPhoto)
 							// this.photoList.splice(e.currentTarget.dataset.index, 1)
 							this.form.photo.splice(e.currentTarget.dataset.index, 1)
-
+							console.log('删除后的图片', this.form.photo)
 						}
 					}
 				})
@@ -150,7 +146,7 @@
 											this.form.headPhoto+(configService.apiUrl + '/' + data.message)
 											temp.push(configService.apiUrl + '/' + data.message)
 											 this.form.headPhoto = temp.join(',')
-											console.log(this.form.headPhoto)
+											console.log('上传后的图片', this.form.headPhoto)
 										} else {
 												console.log('22222')
 											// this.photoList =res.tempFilePaths