From 87ebe5331943502f85dc7339daa788a4c32fa445 Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Tue, 28 Feb 2023 17:11:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/massif/mana/recovery.vue | 23 ++++++++++++++++-------
 pages/massif/pestType.vue      |  4 ++--
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/pages/massif/mana/recovery.vue b/pages/massif/mana/recovery.vue
index 1ca9e37..64f8d3d 100644
--- a/pages/massif/mana/recovery.vue
+++ b/pages/massif/mana/recovery.vue
@@ -52,6 +52,7 @@
 					width:1rpx;
 					.name{
 						display: flex;
+						align-items: center;
 						justify-content: space-between;
 						margin-bottom:15rpx;
 						text{
@@ -59,19 +60,26 @@
 								font-weight: bold;
 								flex-grow: 1;
 							}
-							&:nth-child(2){
+							&.total{
 								flex-shrink: 0;
-								font-weight: bold;
-								font-size:32rpx;
+								color:#10C176;
+								font-size:24rpx;
+								margin-right:20rpx;
+								&:after{
+									content:'kg';
+								}
+							}
+							&.surplus{
+								flex-shrink: 0;
+								font-size:24rpx;
+								color:#FFC760;
 								&:before{
 									content:"剩余:";
 									font-weight: normal;
-									font-size:24rpx;
 								}
 								&:after{
-									content:attr(data-unit);
+									content:'kg';
 									font-weight: normal;
-									font-size:24rpx;
 								}
 							}
 						}
@@ -120,7 +128,8 @@
 				<view class="detail">
 					<view class="name">
 						<text class="over">{{v.plantName}}</text>
-						<text data-unit="kg">{{v.harvestNum}}</text></view>
+						<text class="total">200</text>
+						<text class="surplus">{{v.harvestNum}}</text></view>
 					<view class="info">
 						<text class="people">负责人:{{v.principal}}</text>
 						<text class="date">采收日期:{{v.harvestTime}}</text>
diff --git a/pages/massif/pestType.vue b/pages/massif/pestType.vue
index e5393c7..9e38bad 100644
--- a/pages/massif/pestType.vue
+++ b/pages/massif/pestType.vue
@@ -103,7 +103,7 @@
 			<view class="items">
 				<text :class="{active:select==v}" v-for="(v,k) in list" :key="k" @click="select=v">{{v}}</text>
 			</view>
-			<u-empty :show="list.length<=0" text=" " width="70%" icon="/static/noData.png"/>
+			<u-empty :show="list.length<=0" text="为查询到相关信息" width="70%" icon="/static/noData.png"/>
 		</scroll-view>
 	</view>
 </template>
@@ -139,7 +139,7 @@ export default {
 				params:{code:"B09"}
 			})
 			if(res.statu){
-				this.cropList=res.data.map(v=>({...v,children:v.children.length>0?v.children:[{label:"全部",value:'all'}]}))
+				this.cropList=res.data.map(v=>({...v,children:v?.children?.length>0?v.children:[{label:"全部",value:'all'}]}))
 				this.agrSearch(res.data[0]?.children?.[0]?.value||"")
 			}else{
 				uni.showModal({