From ab5f7063c61c1a9dff2e17ab1ba511b2989ddf49 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com>
Date: Mon, 26 Feb 2024 13:32:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=AE=E5=8A=A9=20=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                      |  15 ++-
 pages/helpPeople/formTable.vue  | 166 +++++++++++++++-----------------
 pages/helpPeople/helpPeople.vue |  40 ++++----
 pages/user/index.vue            |   7 --
 4 files changed, 100 insertions(+), 128 deletions(-)

diff --git a/pages.json b/pages.json
index b9e166d..c85fbbe 100644
--- a/pages.json
+++ b/pages.json
@@ -1,7 +1,4 @@
 {
-	"easycom": {
-		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
-	},
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
 			"path": "pages/guide/index",
@@ -1361,12 +1358,12 @@
 			// 	"selectedIconPath": "static/images/5-002.png",
 			// 	"text": "逛逛"
 			// },
-      {
-      	"pagePath": "pages/gather/gather",
-      	"iconPath": "static/images/5-001.png",
-      	"selectedIconPath": "static/images/5-002.png",
-      	"text": "工作台"
-      },
+			{
+				"pagePath": "pages/gather/gather",
+				"iconPath": "static/images/5-001.png",
+				"selectedIconPath": "static/images/5-002.png",
+				"text": "工作台"
+			},
 			{
 				"pagePath": "pages/order_addcart/order_addcart",
 				"iconPath": "static/images/3-001.png",
diff --git a/pages/helpPeople/formTable.vue b/pages/helpPeople/formTable.vue
index bc1f985..c25c60e 100644
--- a/pages/helpPeople/formTable.vue
+++ b/pages/helpPeople/formTable.vue
@@ -9,7 +9,8 @@
 						户主姓名
 					</view>
 					<view class="value">
-						<u--input v-model="formData.name" color='#7A7A7A' border="none"></u--input>
+						<u--input placeholder="请输入户主姓名" v-model="formData.name" color='#7A7A7A'
+							border="none"></u--input>
 					</view>
 				</view>
 				<view class="item">
@@ -17,7 +18,8 @@
 						联系方式
 					</view>
 					<view class="value">
-						<u--input v-model="formData.contact" color='#7A7A7A' border="none"></u--input>
+						<u--input placeholder="请输入联系方式" v-model="formData.contact" color='#7A7A7A'
+							border="none"></u--input>
 					</view>
 				</view>
 				<view class="item">
@@ -25,7 +27,8 @@
 						家庭人数
 					</view>
 					<view class="value">
-						<u--input v-model="formData.family_count" color='#7A7A7A' border="none"></u--input>
+						<u--input placeholder="请输入家庭人数" v-model="formData.family_count" color='#7A7A7A'
+							border="none"></u--input>
 					</view>
 				</view>
 				<view class="item">
@@ -33,14 +36,15 @@
 						家庭地址
 					</view>
 					<view class="value" style="width: 400rpx;">
-						<u--input v-model="formData.address" color='#7A7A7A' border="none"></u--input>
+						<u--input placeholder="请输入家庭地址" v-model="formData.address" color='#7A7A7A'
+							border="none"></u--input>
 					</view>
 				</view>
 			</view>
 		</view>
 
 		<view class="tit">
-			<view class="">
+			<view class="help_people">
 				助民惠农
 			</view>
 			<view class="">
@@ -52,8 +56,8 @@
 		<view class="">
 			<view class="card">
 				<view class="card-tit">
-					<view class="" style="font-size: 32rpx;color: #7A7A7A;display: flex;align-items: center;">
-						<view class="" :style="{color:SaveList[0]?'#FF5E0C':'' }">
+					<view class="" style="font-size: 32rpx;color: #20A162;display: flex;align-items: center;">
+						<view class="" :style="{color:SaveList[0]?'#20A162':'' }">
 							房子出租需求
 						</view>
 						<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/52556202401271437309444.png"
@@ -61,12 +65,11 @@
 							@click='showFn(0)' />
 					</view>
 					<view class="" style="display: flex;align-items: center;color: #7A7A7A;" @click='open(0)'>
-						展开
+						<text :style="{color:SaveList[0]?'#20A162':'' }">{{SaveList[0]?'已完成':'展开'}}</text>
 						<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/bceaf202401271439428345.png"
 							width="24rpx" height="24rpx" class='icon'
 							:style=" {transform:isOpen[0]? 'rotate(180deg)' :'rotate(0)'} " />
 					</view>
-
 				</view>
 			</view>
 			<!-- :style="{height:isOpen[0]?'0':getFormHeight('#formheight')+'px',padding: isOpen[0]?'0':'20rpx'  } " -->
@@ -74,13 +77,13 @@
 				style="height: 0;padding: 0;">
 				<view id="formheight1">
 					<view class="form-tit">
-						<view class="" :style="{color:SaveList[0]?'#FF5E0C':'' }">
+						<view class="" :style="{color:SaveList[0]?'#20A162':'' }">
 							房子出租需求
 						</view>
 						<view class="submit" v-if='!SaveList[0]' @click="sava(0,'house_rent_info')">
 							保存
 						</view>
-						<view class="edit-btn" v-if='SaveList[0]' @click="edit(0)">
+						<view class="edit-btn edit-btn" v-if='SaveList[0]' @click="edit(0)">
 							编辑
 						</view>
 					</view>
@@ -131,19 +134,16 @@
 							</view>
 						</view>
 					</view>
-
 				</view>
-
-
 			</view>
 		</view>
-		<!-- content -->
 
+		<!-- content -->
 		<view class="">
 			<view class="card">
 				<view class="card-tit">
 					<view class="" style="font-size: 32rpx;color: #7A7A7A;display: flex;align-items: center;">
-						<view class="" :style="{color:SaveList[1]?'#FF5E0C':'' }">
+						<view class="" :style="{color:SaveList[1]?'#20A162':'' }">
 							空闲土地出租需求
 						</view>
 						<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/52556202401271437309444.png"
@@ -151,7 +151,7 @@
 							@click='showFn(1)' />
 					</view>
 					<view class="" style="display: flex;align-items: center;color: #7A7A7A;" @click='open(1)'>
-						展开
+						<text :style="{color:SaveList[1]?'#20A162':'' }">{{SaveList[1]?'已完成':'展开'}}</text>
 						<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/bceaf202401271439428345.png"
 							width="24rpx" height="24rpx" class='icon'
 							:style=" {transform:isOpen[1]? 'rotate(180deg)' :'rotate(0)'} " />
@@ -170,7 +170,7 @@
 						<view class="submit" v-if='!SaveList[1]' @click="sava(1,'land_rent_info')">
 							保存
 						</view>
-						<view class="submit" v-if='SaveList[1]' @click="edit(1)">
+						<view class="submit edit-btn" v-if='SaveList[1]' @click="edit(1)">
 							编辑
 						</view>
 					</view>
@@ -248,9 +248,7 @@
 							</view>
 						</view>
 					</view>
-
 				</view>
-
 			</view>
 		</view>
 		<!-- content -->
@@ -258,7 +256,7 @@
 			<view class="card">
 				<view class="card-tit">
 					<view class="" style="font-size: 32rpx;color: #7A7A7A;display: flex;align-items: center;">
-						<view class="" :style="{color:SaveList[2]?'#FF5E0C':'' }">
+						<view class="" :style="{color:SaveList[2]?'#20A162':'' }">
 							农副产品出售需求
 						</view>
 						<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/52556202401271437309444.png"
@@ -266,12 +264,11 @@
 							@click='showFn(2)' />
 					</view>
 					<view class="" style="display: flex;align-items: center;color: #7A7A7A;" @click='open(2)'>
-						展开
+						<text :style="{color:SaveList[2]?'#20A162':'' }">{{SaveList[2]?'已完成':'展开'}}</text>
 						<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/bceaf202401271439428345.png"
 							width="24rpx" height="24rpx" class='icon'
 							:style=" {transform:isOpen[2]? 'rotate(180deg)' :'rotate(0)'} " />
 					</view>
-
 				</view>
 			</view>
 
@@ -285,7 +282,7 @@
 						<view class="submit" v-if='!SaveList[2]' @click="sava(2,'product_info')">
 							保存
 						</view>
-						<view class="submit" v-if='SaveList[2]' @click="edit(2)">
+						<view class="submit edit-btn" v-if='SaveList[2]' @click="edit(2)">
 							编辑
 						</view>
 					</view>
@@ -435,9 +432,7 @@
 							</view>
 						</view>
 					</view>
-
 				</view>
-
 			</view>
 		</view>
 		<!-- content -->
@@ -446,7 +441,7 @@
 			<view class="card">
 				<view class="card-tit">
 					<view class="" style="font-size: 32rpx;color: #7A7A7A;display: flex;align-items: center;">
-						<view class="" :style="{color:SaveList[3]?'#FF5E0C':'' }">
+						<view class="" :style="{color:SaveList[3]?'#20A162':'' }">
 							空闲资产出租/出售需求
 						</view>
 						<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/52556202401271437309444.png"
@@ -454,12 +449,11 @@
 							@click='showFn(3)' />
 					</view>
 					<view class="" style="display: flex;align-items: center;color: #7A7A7A;" @click='open(3)'>
-						展开
+						<text :style="{color:SaveList[3]?'#20A162':'' }">{{SaveList[3]?'已完成':'展开'}}</text>
 						<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/bceaf202401271439428345.png"
 							width="24rpx" height="24rpx" class='icon'
 							:style=" {transform:isOpen[3]? 'rotate(180deg)' :'rotate(0)'} " />
 					</view>
-
 				</view>
 			</view>
 
@@ -473,7 +467,7 @@
 						<view class="submit" v-if='!SaveList[3]' @click="sava(3,'idle_asset_rent_info')">
 							保存
 						</view>
-						<view class="submit" v-if='SaveList[3]' @click="edit(3)">
+						<view class="submit edit-btn" v-if='SaveList[3]' @click="edit(3)">
 							编辑
 						</view>
 					</view>
@@ -524,10 +518,7 @@
 							</view>
 						</view>
 					</view>
-
 				</view>
-
-
 			</view>
 		</view>
 		<!-- content -->
@@ -536,7 +527,7 @@
 			<view class="card">
 				<view class="card-tit">
 					<view class="" style="font-size: 32rpx;color: #7A7A7A;display: flex;align-items: center;">
-						<view class="" :style="{color:SaveList[4]?'#FF5E0C':'' }">
+						<view class="" :style="{color:SaveList[4]?'#20A162':'' }">
 							房屋装饰建设
 						</view>
 						<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/52556202401271437309444.png"
@@ -544,7 +535,7 @@
 							@click='showFn(4)' />
 					</view>
 					<view class="" style="display: flex;align-items: center;color: #7A7A7A;" @click='open(4)'>
-						展开
+						<text :style="{color:SaveList[4]?'#20A162':'' }">{{SaveList[4]?'已完成':'展开'}}</text>
 						<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/bceaf202401271439428345.png"
 							width="24rpx" height="24rpx" class='icon'
 							:style=" {transform:isOpen[4]? 'rotate(180deg)' :'rotate(0)'} " />
@@ -563,7 +554,7 @@
 						<view class="submit" v-if='!SaveList[4]' @click="sava(4,'house_decoration_construction')">
 							保存
 						</view>
-						<view class="submit" v-if='SaveList[4]' @click="edit(4)">
+						<view class="submit edit-btn" v-if='SaveList[4]' @click="edit(4)">
 							编辑
 						</view>
 					</view>
@@ -623,14 +614,12 @@
 							</view>
 						</view>
 					</view>
-
 				</view>
-
 			</view>
 		</view>
+
 		<!-- content -->
-		<view class="login-btn" @click="submit"
-			:style="{background:saveNum<2 ? '#F5F5F5':'',color:saveNum<2 ? '#ADADAD':'' }">
+		<view class="login-btn" @click="submit" :class="{'login-btn-no':saveNum < 2 ?true:false}">
 			确认提交
 		</view>
 
@@ -650,7 +639,6 @@
 				</view>
 			</view>
 		</u-overlay>
-
 	</view>
 </template>
 
@@ -890,7 +878,7 @@
 </script>
 <style lang="scss" scoped>
 	.box {
-		background: linear-gradient(to bottom, #FFF4DB, #FFEAC3);
+		background: #F5F5F5;
 		min-height: 100vh;
 		font-size: 28rpx;
 		padding-bottom: 5vh;
@@ -899,16 +887,15 @@
 	.bg {
 		width: 750rpx;
 		height: 660rpx;
-		background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/44f25202401271436185198.png');
+		background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/c7e26202402261051094476.webp');
 		background-size: 100% 100%;
 		position: relative;
-
 	}
 
 	.user-info {
-		width: 750rpx;
+		width: 686rpx;
 		margin: 0 auto;
-		height: 550rpx;
+		// height: 550rpx;
 		background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/549b3202401271438211224.png');
 		background-size: 100% 100%;
 		position: absolute;
@@ -916,29 +903,34 @@
 		left: 50%;
 		transform: translateX(-50%);
 		box-sizing: border-box;
-		padding: 70rpx;
+		padding: 36rpx 40rpx;
 		display: flex;
 		flex-direction: column;
 		justify-content: space-between;
+
+
+		box-shadow: 0rpx 3rpx 12rpx 1rpx #D6D6D6;
+		background: #FFFFFF;
+		box-shadow: 0rpx 3rpx 12rpx 1rpx #D6D6D6;
+		border-radius: 40rpx 40rpx 40rpx 40rpx;
+
 	}
 
 	.item {
 		display: flex;
 		align-items: center;
-		padding-bottom: 30rpx;
-		border-bottom: 1px solid #FFF2D9;
-		padding-top: 10rpx;
-		// background-color: red;
-		margin-bottom: 10rpx;
-
+		margin-bottom: 56rpx;
 
+		&:nth-last-child(1) {
+			margin-bottom: 0;
+		}
 
 		.lable {
-			font-size: 28rpx;
-			color: #2E2E2E;
-			font-weight: 700;
-			width: 112rpx;
+			font-weight: 600;
+			font-size: 26rpx;
+			color: #262626;
 			text-align: center;
+			white-space: nowrap;
 		}
 
 		.value {
@@ -951,10 +943,11 @@
 	.tit {
 		display: flex;
 		width: 638rpx;
-		margin: 230rpx auto 30rpx;
+		margin: 180rpx auto 30rpx;
 		justify-content: space-between;
 		font-size: 28rpx;
 		color: #2E2E2E;
+		font-weight: 600;
 	}
 
 	.card {
@@ -996,23 +989,17 @@
 				color: white;
 
 			}
-
-			// right: 0;
-
-
 		}
 	}
 
 	.card-content {
-		background-color: #FFE7B9;
 		border-radius: 20rpx;
 		padding: 20rpx;
 		overflow: hidden;
 		transition: 300ms;
 		width: 690rpx;
 		margin: 30rpx auto;
-
-
+		background: #DFF6E0;
 
 		.form {
 			background-color: #fff;
@@ -1023,7 +1010,7 @@
 
 		.form-tit {
 			font-size: 32rpx;
-			color: #FF5E0C;
+			color: #20A162;
 			display: flex;
 			align-items: center;
 			display: flex;
@@ -1032,33 +1019,31 @@
 			.submit {
 				width: 162rpx;
 				height: 58rpx;
-				background: #FD7F4A;
-				border-radius: 48rpx 48rpx 48rpx 48rpx;
+				line-height: 58rpx;
+				border-radius: 48rpx;
 				opacity: 1;
 				color: white;
 				text-align: center;
-				line-height: 58rpx;
+				background: linear-gradient(158deg, #20A162 0%, #41B745 100%);
+				box-shadow: 0rpx 1rpx 2rpx 1rpx #127A19, inset 0rpx 3rpx 4rpx 1rpx #7CDF80;
 			}
 
 			.edit-btn {
-				width: 162rpx;
+				width: 132rpx;
 				height: 58rpx;
-				// background: #FD7F4A;
-				color: #FD7F4A !important;
-				border: 1px solid #FD7F4A;
-				border-radius: 48rpx 48rpx 48rpx 48rpx;
-				opacity: 1;
-				color: white;
+				line-height: 58rpx;
+				border-radius: 48rpx;
+				color: #20A162 !important;
 				text-align: center;
-				line-height: 50rpx;
+				box-shadow: 0rpx 1rpx 2rpx 1rpx #2B8131;
+				border: 1rpx solid #20A162;
+				background: transparent;
 			}
 
 			.submit:active {
 				background-color: grey;
 			}
 		}
-
-
 	}
 
 	.icon {
@@ -1074,10 +1059,9 @@
 		top: 50%;
 		left: 50%;
 		transform: translate(-50%, -50%);
-		background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/56970202401271438059755.png');
+		background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/025fc202402261139275710.webp');
 		background-size: 100% 100%;
 
-
 		.toast-tit {
 			text-align: center;
 			font-size: 32rpx;
@@ -1092,7 +1076,6 @@
 			font-size: 28rpx;
 			color: #7A7A7A;
 			line-height: 42rpx;
-
 		}
 
 		.off {
@@ -1105,18 +1088,23 @@
 	.login-btn {
 		width: 690rpx;
 		height: 88rpx;
-		background: #FF8056;
-		border-radius: 44rpx 44rpx 44rpx 44rpx;
-		opacity: 1;
-		text-align: center;
 		line-height: 88rpx;
+		background: linear-gradient(323deg, #52C973 0%, #20A162 100%);
+		border-radius: 44rpx;
+		color: #FFFFFF;
+		font-weight: 600;
 		font-size: 30rpx;
-		color: white;
-		margin: 50rpx auto;
+		text-align: center;
+		margin: 0 auto;
+	}
+
+	.login-btn-no {
+		background: transparent;
+		color: #ADADAD;
 	}
 
 	.login-btn:active {
-		background-color: grey;
+		opacity: .9;
 	}
 
 	.bg_back {
diff --git a/pages/helpPeople/helpPeople.vue b/pages/helpPeople/helpPeople.vue
index 9735f99..836f6a4 100644
--- a/pages/helpPeople/helpPeople.vue
+++ b/pages/helpPeople/helpPeople.vue
@@ -3,25 +3,21 @@
 	<view class="box" style="position: relative;">
 		<image @click="back" class="bg_back"
 			src="https://lihai001.oss-cn-chengdu.aliyuncs.com/public/uploads/new_activity/back.png"></image>
+
 		<view class="li" @click="navSw('/pages/index/index')">
-			<u-image src="/static/temp/1.webp" width="690rpx" height="200rpx" style="position: absolute;"></u-image>
+			<u--image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/3b48a202402260945419661.webp" width="690rpx"
+				height="200rpx" style="position: absolute;"></u--image>
 			<view class="btn">
 				我是居民用户
 			</view>
 		</view>
 		<view class="li" style="margin-top: 50rpx;" @click="navgo('/pages/helpPeople/formTable')">
-			<u-image src="/static/temp/2.webp" width="690rpx" height="200rpx" style="position: absolute;"></u-image>
+			<u-image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/48aed202402260946123969.webp" width="690rpx"
+				height="200rpx" style="position: absolute;"></u-image>
 			<view class="btn">
 				我是农民用户
 			</view>
 		</view>
-
-		<u-steps :current="0">
-			<u-steps-item title="已下单" desc="10:30">
-			</u-steps-item>
-			<u-steps-item title="已出库" desc="10:35"></u-steps-item>
-			<u-steps-item title="运输中" desc="11:40"></u-steps-item>
-		</u-steps>
 	</view>
 </template>
 
@@ -51,21 +47,20 @@
 </script>
 
 <style lang='scss' scoped>
-	.box {
-		width: 750rpx;
-		height: 1624rpx;
-		background: linear-gradient(180deg, #20A162 0%, #EFFAEF 39%, #EFFCEA 68%, #EFFFE5 100%);
-		border-radius: 0rpx 0rpx 0rpx 0rpx;
-		border: 1rpx solid #707070;
-
-
-		/* 	width: 750rpx;
-		height: 1624rpx;
-		background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/9c4b4202401271437449183.png');
-		background-size: 100% 100%; */
-		padding-top: 500rpx;
+	page {
+		height: 100%;
+		overflow: hidden;
+		background-image: linear-gradient(180deg, #20A162 0%, #EFFAEF 39%, #EFFCEA 68%, #EFFFE5 100%);
 	}
 
+	.box {
+		width: 750rpx;
+		height: 100vh;
+		background-image: url(https://lihai001.oss-cn-chengdu.aliyuncs.com/def/1333d202402261025145680.webp);
+		background-repeat: no-repeat;
+		background-size: 100% auto;
+		padding-top: 500rpx;
+	}
 
 	.li {
 		margin: 0rpx auto;
@@ -88,7 +83,6 @@
 			font-size: 34rpx;
 			right: 50rpx;
 			bottom: 50rpx;
-
 		}
 	}
 
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 56c6cbb..54f6b6f 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -172,13 +172,6 @@
 								</view>
 							</view>
 						</block>
-						<view class="item">
-							<view @click="tempClick" class="item-count">
-								<image v-if="showSkeleton" class="skeleton_image skeleton-radius"></image>
-								<image v-else></image>
-								<text>惠农助农</text>
-							</view>
-						</view>
 					</view>
 				</view>
 				<view class="menus-list-item" v-if="!userInfo.topService && userInfo.service" @click="toService(0)">