From 9e6d06469d712b5a28a75d59645fc5d3d3dfa235 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 24 十月 2023 08:46:01 +0800
Subject: [PATCH] 羚羊配置问卷

---
 minipro_standard/pages_adjust/components/multipleMaterial.vue |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/minipro_standard/pages_adjust/components/multipleMaterial.vue b/minipro_standard/pages_adjust/components/multipleMaterial.vue
index 39b921a..c8187aa 100644
--- a/minipro_standard/pages_adjust/components/multipleMaterial.vue
+++ b/minipro_standard/pages_adjust/components/multipleMaterial.vue
@@ -5,20 +5,12 @@
 			<v-Search @searchInput="searchInput" @submit="submit" :isShow="false" placeholder="鎼滅储鐗╂枡鍚嶇О/缂栫爜" />
 			<div class="content_total">鍏眥{form.total}}鏉℃暟鎹�</div>
 			<view class="scroll-content">
-				<!-- refresher-enabled="true"
-				:refresher-triggered="refreshing"
-				@refresherrefresh="onRefresh" -->
 				<scroll-view
 				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>

--
Gitblit v1.9.3