From 46b0b4d41a260e44e5e648d79cac60e97fe17789 Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期三, 13 九月 2023 14:45:59 +0800
Subject: [PATCH] 小程序

---
 minipro_standard/pages_adjust/components/multipleMaterial.vue |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/minipro_standard/pages_adjust/components/multipleMaterial.vue b/minipro_standard/pages_adjust/components/multipleMaterial.vue
index 1903c2f..39b921a 100644
--- a/minipro_standard/pages_adjust/components/multipleMaterial.vue
+++ b/minipro_standard/pages_adjust/components/multipleMaterial.vue
@@ -12,10 +12,16 @@
 				scroll-y="true"
 				@scrolltolower="loadMore">
 					<view v-for="(item1, index) in list" :key="index" class="flex mb20" @click="jump(index)">
+<<<<<<< HEAD
+						<view class="img36 mr20 pt10" style="position: relative;">
+							<u-checkbox-group style="display: block;" name="">
+=======
 						<view class="img36 mr20 pt10">
 							<u-checkbox-group style="display: block;" name="" @change="jump(index)">
+>>>>>>> 041c81a20c93a6b8238e810fe9a1adfee9c9d86f
 								<u-checkbox :checked="item1.isActive"></u-checkbox>
 							</u-checkbox-group>
+							<view style="width: 18px; height: 18px; position: absolute; top: 0; left: 0; z-index: 99;"></view>
 						</view>
 						<view class="fx1">
 							<div class="page_content_title_top">
@@ -151,6 +157,13 @@
 						item.isActive = !item.isActive
 					}
 				})
+				for (let i = 0; i < this.list.length; i++) {
+					if (!this.list[i].isActive) {
+						this.isAll = []
+						return
+					}
+				}
+				this.isAll = ['all']
 			},
 			// 鎼滅储鎻愪氦
 			submit() {
@@ -216,8 +229,6 @@
 				this.loadData()
 			},
 			selectAll(e) {
-				console.log(e)
-				console.log(this.isAll)
 				this.list.forEach(element => {
 					element.isActive = e.length > 0 ? true : false
 				})

--
Gitblit v1.9.3