From c20791122081f7583cdbeea5e33239da5b15a123 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=B8=B9?= <>
Date: Fri, 24 Jan 2025 12:02:45 +0800
Subject: [PATCH] .

---
 pages/batch-control/share.vue    | 21 +++++--
 pages/work/land/index-detail.vue | 99 +++++++++++++++-----------------
 pages/work/user/create-user.vue  |  5 +-
 pages/work/user/index.vue        |  1 +
 4 files changed, 67 insertions(+), 59 deletions(-)

diff --git a/pages/batch-control/share.vue b/pages/batch-control/share.vue
index c2c0ec3..c608271 100644
--- a/pages/batch-control/share.vue
+++ b/pages/batch-control/share.vue
@@ -3,17 +3,23 @@
 		empty-view-text="抱歉，暂时还没有相关数据！" :pull-refresh="false">
 		<template #top>
 			<!-- 顶部导航栏 -->
-			<custom-nav-bar :left="true" @leftClick="" title="分享" />
+			<custom-nav-bar :left="true" @leftClick="" title="分享" >
+			<template v-slot:right>
+				<view class="fixed">
+					<view style=" font-size: 0.9rem;">全选</view>
+				</view>
+			</template>
+			</custom-nav-bar>
 		</template>
-		<view class="card">
+		<view class="card-zd">
 			<uni-collapse>
 				<uni-collapse-item title-border="none" :border="false" :show-arrow="false" :open="true"
 					v-for="item in dataList">
 					<template v-slot:title>
 						<view class="cards-title">
 							<view>
+								<view><u-checkbox name="reading1" /></view>
 								<view class="text">{{ item.groupName }}</view>
-								<view></view>
 								<view>已选：{{item.wos.length}}</view>
 							</view>
 						</view>
@@ -40,6 +46,10 @@
 				</uni-collapse-item>
 			</uni-collapse>
 		</view>
+		<view class="form-btn">
+			<u-button size="large"  type="success" @click="submit">确认</u-button>
+			<u-button size="large"  @click="cancel">取消</u-button>
+		</view>
 	</z-paging>
 </template>
 <script>
@@ -75,8 +85,7 @@
 		mounted() {},
 		methods: {
 			queryList() {
-				isApi.getBatchControlShareList(this.landId).then(res => {
-					console.error(res);
+				isApi.getBatchControlList(this.landId).then(res => {
 					if (res.data) {
 						this.$refs.paging.completeByTotal(res.data.groups || []);
 					} else {
@@ -96,7 +105,7 @@
 	uni-page-body {
 		padding-bottom: 38px !important;
 	}
-
+.form-btn{width: 100%;position: fixed;bottom: 0;gap: 0px;}
 	::v-deep .uni-forms {
 		margin-right: 10px;
 		padding: 0 !important;
diff --git a/pages/work/land/index-detail.vue b/pages/work/land/index-detail.vue
index 5128aaf..315c1cb 100644
--- a/pages/work/land/index-detail.vue
+++ b/pages/work/land/index-detail.vue
@@ -4,60 +4,42 @@
 	</custom-nav-bar>
 	<view class="item-container" :style="{ height: `${windowHeight}px` }" @touchmove.stop.prevent="() => {}">
 		<u-gap height="10" bgColor="#F3F3F3"></u-gap>
-		<view class="info">
-			<view class="title">
-				<view class="flex">
-					<view style="font-size: 16px; font-weight: bold">地块编号：</view>
-					<view style="font-size: 16px; margin-right: 10px">{{ item.landNum }}</view>
-					<u-tag :text="item.status == 0 ? '启用' : '禁用'" :type="item.status == 0 ? 'success' : 'error'"
-						size="mini" plain plainFill></u-tag>
+		<view class="card">
+			<view class="cards-title">
+				<view>
+					<view class="text">地块编号：{{ item.landNum }}</view>
+
+				</view>
+				<view class="title-r">
+					<uni-tag :text="item.status == 0 ? '启用' : '禁用'" :circle="true"
+						:type="item.status == 0 ? 'success' : 'error'" ></uni-tag>
 				</view>
 			</view>
-			<view class="info-item">
-				<view class="flex item">
-					<view style="color: #939393">地块名称：</view>
-					<view>{{ item.landName }}</view>
-				</view>
-				<view class="flex item">
-					<view style="color: #939393">地块地址：</view>
-					<view>{{ item.landAddress || "-" }}</view>
-				</view>
-				<view class="flex item">
-					<view style="color: #939393">地块面积：</view>
-					<view>{{ item.landArea != null ? item.landArea : "" }}</view>
-				</view>
-				<view class="flex item">
-					<view style="color: #939393">土壤类型：</view>
-					<view>{{ getDictName(1, item.soilType) }}</view>
-				</view>
-				<view class="flex item">
-					<view style="color: #939393">水源类型：</view>
-					<view>{{ getDictName(2, item.waterSourceType) }}</view>
-				</view>
-				<view class="flex item">
-					<view style="color: #939393">是否分组：</view>
-					<view v-if="item.landConfig.enableGroup === 0">是</view>
-					<view v-if="item.landConfig.enableGroup === 1">否</view>
-				</view>
-				<view class="flex item">
-					<view style="color: #939393">启用蝶阀：</view>
-					<view v-if="item.landConfig.enableButterflyValve === 0">启用</view>
-					<view v-if="item.landConfig.enableButterflyValve === 1">禁用</view>
-				</view>
-				<view class="flex item">
-					<view style="color: #939393">启用批量控制：</view>
-					<view v-if="item.landConfig.enableBatchControl === 0">是</view>
-					<view v-if="item.landConfig.enableBatchControl === 1">否</view>
-				</view>
-				<view class="flex item">
-					<view style="color: #939393">启用自动刷新：</view>
-					<view v-if="item.landConfig.enableAutoRefresh === 0">是</view>
-					<view v-if="item.landConfig.enableAutoRefresh === 1">否</view>
-				</view>
-				<view class="flex item">
-					<view style="color: #939393">所属公司：</view>
-					<view v-if="item.companyGroup && item.companyGroup.companyFullName">
-						{{item.companyGroup.companyFullName}}
+			<view class="cards-content">
+				<view class="txt-list">
+					<view class="list1">
+						<view>地块名称：{{ item.landName }}</view>
+						<view>地块地址：{{ item.landAddress || "-" }}</view>
+						<view>地块面积：{{ item.landArea != null ? item.landArea : "" }}</view>
+						<view>土壤类型：{{ getDictName(1, item.soilType) }}</view>
+						<view>水源类型：{{ getDictName(2, item.waterSourceType) }}</view>
+						<view>是否分组：<text v-if="item.landConfig.enableGroup === 0">是</text>
+							<text v-if="item.landConfig.enableGroup === 1">否</text>
+						</view>
+						<view>启用蝶阀：<text v-if="item.landConfig.enableButterflyValve === 0">启用</text>
+							<text v-if="item.landConfig.enableButterflyValve === 1">禁用</text>
+						</view>
+						<view>启用批量控制：<text v-if="item.landConfig.enableBatchControl === 0">是</text>
+							<text v-if="item.landConfig.enableBatchControl === 1">否</text>
+						</view>
+						<view>启用自动刷新：<text v-if="item.landConfig.enableAutoRefresh === 0">是</text>
+							<text v-if="item.landConfig.enableAutoRefresh === 1">否</text>
+						</view>
+						<view>所属公司：<text v-if="item.companyGroup && item.companyGroup.companyFullName">
+								{{item.companyGroup.companyFullName}}
+							</text>
+						</view>
+
 					</view>
 				</view>
 			</view>
@@ -200,29 +182,35 @@
 	.item-container {
 		background: #f3f3f3;
 	}
+
 	.flex {
 		display: flex;
 		align-items: center;
 	}
+
 	.item {
 		margin-bottom: 5px;
 	}
+
 	.info {
 		background: white;
 		margin: 10px 10px;
 		padding: 10px;
 		border-radius: 10px;
 		box-shadow: 1px 1px 2px 2px rgba(0, 0, 0, 0.05);
+
 		.title {
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
 			margin: 10px 10px;
 		}
+
 		.info-item {
 			margin-left: 20px;
 		}
 	}
+
 	.charge {
 		background: white;
 		margin: 10px 10px;
@@ -230,9 +218,11 @@
 		border-radius: 10px;
 		box-shadow: 1px 1px 2px 2px rgba(0, 0, 0, 0.05);
 		position: relative;
+
 		.charge-item {
 			margin-left: 20px;
 		}
+
 		.call {
 			position: absolute;
 			top: 20px;
@@ -251,11 +241,13 @@
 		bottom: 0%;
 		transition: all 0.1s;
 		box-sizing: border-box;
+
 		.row1 {
 			margin-bottom: 20px;
 			width: 100%;
 			display: flex;
 			align-items: center;
+
 			&>view {
 				width: 25%;
 				white-space: nowrap;
@@ -266,10 +258,12 @@
 				align-items: center;
 			}
 		}
+
 		.row2 {
 			width: 100%;
 			display: flex;
 			align-items: center;
+
 			&>view {
 				width: 25%;
 				white-space: nowrap;
@@ -281,6 +275,7 @@
 			}
 		}
 	}
+
 	.font {
 		margin-top: 5px;
 		font-size: 12px;
diff --git a/pages/work/user/create-user.vue b/pages/work/user/create-user.vue
index 187ddde..a625d53 100644
--- a/pages/work/user/create-user.vue
+++ b/pages/work/user/create-user.vue
@@ -322,7 +322,10 @@
 		}
 	}
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
+	body{background-color: #FFF;}
+	
+	
 	.create-container {
 		background-color: #FFF;
 		.custom-input {
diff --git a/pages/work/user/index.vue b/pages/work/user/index.vue
index 9b90eb5..ca2d0b4 100644
--- a/pages/work/user/index.vue
+++ b/pages/work/user/index.vue
@@ -384,6 +384,7 @@
 </script>
 
 <style lang="scss" scoped>
+	body{background-color: #f3f3f3;}
 .list1>view{display: flex;}
 ::v-deep .u-image__error{border-radius: 50px!important;}
 ::v-deep .u-text__value{font-size: 13px !important;}