From ca73a173f008c8d7a9d700bad897ca24fe2d2203 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 16 十月 2023 09:29:57 +0800
Subject: [PATCH] 111

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

diff --git a/minipro_standard/pages_adjust/components/multipleMaterial.vue b/minipro_standard/pages_adjust/components/multipleMaterial.vue
index 39b921a..2336949 100644
--- a/minipro_standard/pages_adjust/components/multipleMaterial.vue
+++ b/minipro_standard/pages_adjust/components/multipleMaterial.vue
@@ -1,24 +1,16 @@
 <template>
 	<u-popup :show="show" :round="10" closeable @close="show = false">
 		<view class="material-content bbox p30 rp">
-			<view class="tc b f24 c2 mb20">閫夋嫨鐗╂枡</view>
+			<view class="tc b f32 c2 mb20">閫夋嫨鐗╂枡</view>
 			<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