From e92fda4bb58a2bd5760c339ef9c3909401081e4c Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Tue, 1 Aug 2023 16:20:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E6=94=B6=E8=AE=B0=E5=BD=95=E3=80=81?=
 =?UTF-8?q?=E4=BA=A4=E6=98=93=E8=AE=B0=E5=BD=95=20=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=B9=E6=AC=A1=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/massif/mana/recovery.vue     | 140 ++++++++++++++++-------------
 pages/massif/mana/transactions.vue |  88 ++++++++++--------
 2 files changed, 128 insertions(+), 100 deletions(-)

diff --git a/pages/massif/mana/recovery.vue b/pages/massif/mana/recovery.vue
index 07e1177..c93e1a6 100644
--- a/pages/massif/mana/recovery.vue
+++ b/pages/massif/mana/recovery.vue
@@ -42,65 +42,76 @@
 
 			.card{
 				margin-top:0;
-				display:flex;
-				.u-transition{
-					flex-shrink: 0;
-					margin-right:20rpx;
+				&>.batch{
+					color:#10C176;
+					border-bottom:2rpx solid rgba(216, 216, 216, 0.3);
+					margin-bottom:24rpx;
+					padding-bottom:10rpx;
+					&:before{
+						margin-right:10rpx;
+					}
 				}
-				.detail{
-					flex-grow: 1;
-					width:1rpx;
-					.name{
-						display: flex;
-						align-items: center;
-						justify-content: space-between;
-						margin-bottom:15rpx;
-						text{
-							&:first-child{
-								font-weight: bold;
-								flex-grow: 1;
-							}
-							&.total{
-								flex-shrink: 0;
-								color:#10C176;
-								font-size:24rpx;
-								margin-right:20rpx;
-								&:after{
-									content:'kg';
+				&>.content{
+					display:flex;
+					.u-transition{
+						flex-shrink: 0;
+						margin-right:20rpx;
+					}
+					.detail{
+						flex-grow: 1;
+						width:1rpx;
+						.name{
+							display: flex;
+							align-items: center;
+							justify-content: space-between;
+							margin-bottom:15rpx;
+							text{
+								&:first-child{
+									font-weight: bold;
+									flex-grow: 1;
 								}
-							}
-							&.surplus{
-								flex-shrink: 0;
-								font-size:24rpx;
-								color:#FFC760;
-								&:before{
-									content:"剩余:";
-									font-weight: normal;
+								&.total{
+									flex-shrink: 0;
+									color:#10C176;
+									font-size:24rpx;
+									margin-right:20rpx;
+									&:after{
+										content:'kg';
+									}
 								}
-								&:after{
-									content:'kg';
-									font-weight: normal;
+								&.surplus{
+									flex-shrink: 0;
+									font-size:24rpx;
+									color:#FFC760;
+									&:before{
+										content:"剩余:";
+										font-weight: normal;
+									}
+									&:after{
+										content:'kg';
+										font-weight: normal;
+									}
 								}
 							}
 						}
-					}
-					.info{
-						font-size: 24rpx;
-						color:#999;
-						display: flex;
-						align-items: center;
-						justify-content: space-between;
-						text.plant-jinrongjiaoyi{
+						.info{
+							font-size: 24rpx;
+							color:#999;
 							display: flex;
 							align-items: center;
-							color:#10C176;
-							font-size:24rpx;
-							background:#EEFBF5;
-							height:48rpx;
-							line-height: 48rpx;
-							padding:0 10rpx;
-							&:before{
-								font-size:35rpx;
+							justify-content: space-between;
+							text.plant-jinrongjiaoyi{
+								display: flex;
+								align-items: center;
+								color:#10C176;
+								font-size:24rpx;
+								background:#EEFBF5;
+								height:48rpx;
+								line-height: 48rpx;
+								padding:0 10rpx;
+								&:before{
+									font-size:35rpx;
+								}
 							}
 						}
 					}
@@ -118,18 +129,21 @@
 
 		<scroll-view scroll-y @scrolltolower="search">
 			<view class="card" v-for="(v,k) in list" :key="k">
-				<u-image width="90rpx" height="90rpx" radius="6rpx" mode="aspectFill" :src="`${host}/${v.images}`">
-					<text slot="error" style="font-size:45rpx;" class="plant-xiaopangchetupianjiazaishibai"/>
-				</u-image>
-				<view class="detail">
-					<view class="name">
-						<text class="over">{{v.plantName}}</text>
-						<text class="total">{{v.totalNum}}</text>
-						<text class="surplus">{{v.harvestNum}}</text></view>
-					<view class="info">
-						<text class="people">负责人:{{v.principal}}</text>
-						<text class="date">采收日期:{{v.harvestTime}}</text>
-						<text class="plant-jinrongjiaoyi" v-if="v.harvestNum>0" @click="toAddTransaction(v)">交易</text>
+				<view class="batch plant-a-zu224211">{{v.harvestBatch}}</view>
+				<view class="content">
+					<u-image width="90rpx" height="90rpx" radius="6rpx" mode="aspectFill" :src="`${host}/${v.images}`">
+						<text slot="error" style="font-size:45rpx;" class="plant-xiaopangchetupianjiazaishibai"/>
+					</u-image>
+					<view class="detail">
+						<view class="name">
+							<text class="over">{{v.plantName}}</text>
+							<text class="total">{{v.totalNum}}</text>
+							<text class="surplus">{{v.harvestNum}}</text></view>
+						<view class="info">
+							<text class="people">负责人:{{v.principal}}</text>
+							<text class="date">采收日期:{{v.harvestTime}}</text>
+							<text class="plant-jinrongjiaoyi" v-if="v.harvestNum>0" @click="toAddTransaction(v)">交易</text>
+						</view>
 					</view>
 				</view>
 			</view>
diff --git a/pages/massif/mana/transactions.vue b/pages/massif/mana/transactions.vue
index 77a853a..a1743b6 100644
--- a/pages/massif/mana/transactions.vue
+++ b/pages/massif/mana/transactions.vue
@@ -42,34 +42,45 @@
 
 			.card{
 				margin-top:0;
-				display: flex;
-				.u-transition{
-					margin-right:20rpx;
-				}
-				&>.info{
-					flex-grow: 1;
-					width:1rpx;
-					.title{
-						font-weight: bold;
-						margin-bottom:6rpx;
+				&>.batch{
+					color:#10C176;
+					border-bottom:2rpx solid rgba(216, 216, 216, 0.3);
+					margin-bottom:24rpx;
+					padding-bottom:10rpx;
+					&:before{
+						margin-right:10rpx;
 					}
-					.spec,.total{
-						font-size:24rpx;
-						color:#999;
-						margin-top:10rpx;
-						display:flex;
-						align-items: center;
-						text:first-child{
-							min-width:180rpx;
-						}
+				}
+				&>.content{
+					display: flex;
+					.u-transition{
+						margin-right:20rpx;
 					}
-					.total{
-						text:first-child{
-							color:#10C176;
+					&>.info{
+						flex-grow: 1;
+						width:1rpx;
+						.title{
 							font-weight: bold;
-							&:after{
-								content:"("attr(data-unit)")";
-								font-weight: normal;
+							margin-bottom:6rpx;
+						}
+						.spec,.total{
+							font-size:24rpx;
+							color:#999;
+							margin-top:10rpx;
+							display:flex;
+							align-items: center;
+							text:first-child{
+								min-width:180rpx;
+							}
+						}
+						.total{
+							text:first-child{
+								color:#10C176;
+								font-weight: bold;
+								&:after{
+									content:"("attr(data-unit)")";
+									font-weight: normal;
+								}
 							}
 						}
 					}
@@ -87,18 +98,21 @@
 
 		<scroll-view scroll-y @scrolltolower="search">
 			<view class="card" v-for="(v,k) in list" :key="k">
-				<u-image radius="20rpx" width="130rpx" height="118rpx" mode="aspectFill" :src="`${host}/${v.images[0]}`">
-					<text slot="error" style="font-size:45rpx;" class="plant-xiaopangchetupianjiazaishibai"/>
-				</u-image>
-				<view class="info">
-					<view class="title">{{v.productName}}</view>
-					<view class="spec">
-						<text>规格：{{v.specification}}</text>
-						<text class="over">{{v.buyerName}}</text>
-					</view>
-					<view class="total">
-						<text :data-unit="`${(parseFloat(v.tradeNum)||0)*(parseFloat(v.specification)||0)}${v.weightUnit}`">{{v.tradeNum}}{{v.packUnit_dictText}}</text>
-						<text>交易日期：{{v.tradeTime}}</text>
+				<view class="batch plant-a-zu224211">{{v.harvestBatch}}</view>
+				<view class="content">
+					<u-image radius="20rpx" width="130rpx" height="118rpx" mode="aspectFill" :src="`${host}/${v.images[0]}`">
+						<text slot="error" style="font-size:45rpx;" class="plant-xiaopangchetupianjiazaishibai"/>
+					</u-image>
+					<view class="info">
+						<view class="title">{{v.productName}}</view>
+						<view class="spec">
+							<text>规格：{{v.specification}}</text>
+							<text class="over">{{v.buyerName}}</text>
+						</view>
+						<view class="total">
+							<text :data-unit="`${(parseFloat(v.tradeNum)||0)*(parseFloat(v.specification)||0)}${v.weightUnit}`">{{v.tradeNum}}{{v.packUnit_dictText}}</text>
+							<text>交易日期：{{v.tradeTime}}</text>
+						</view>
 					</view>
 				</view>
 			</view>