From f404b7962b8c46d7feae2ea0e2aa72344940ca44 Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Thu, 16 Feb 2023 17:51:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A4=E6=98=93=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E8=BF=9B=E5=85=A5=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/massif/mana/recovery.vue     | 22 ++++++++++++++++++----
 pages/massif/mana/transactions.vue |  2 +-
 uni.scss                           |  2 +-
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/pages/massif/mana/recovery.vue b/pages/massif/mana/recovery.vue
index dbb749d..cf900f3 100644
--- a/pages/massif/mana/recovery.vue
+++ b/pages/massif/mana/recovery.vue
@@ -73,8 +73,21 @@
 					.info{
 						font-size: 24rpx;
 						color:#999;
-						text:nth-child(2){
-							margin-left:20rpx;
+						display: flex;
+						align-items: center;
+						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;
+							}
 						}
 					}
 				}
@@ -103,8 +116,9 @@
 						<text class="over">{{v.plantName}}</text>
 						<text data-unit="kg">{{v.harvestNum}}</text></view>
 					<view class="info">
-						<text>负责人：{{v.principal}}</text>
-						<text>采收日期：{{v.harvestTime}}</text>
+						<text class="people">负责人:{{v.principal}}</text>
+						<text class="date">采收日期:{{v.harvestTime}}</text>
+						<text class="plant-jinrongjiaoyi" @click="$u.route({url:'/pages/massif/add_transaction'})">交易</text>
 					</view>
 				</view>
 			</view>
diff --git a/pages/massif/mana/transactions.vue b/pages/massif/mana/transactions.vue
index b3329ab..eebdd86 100644
--- a/pages/massif/mana/transactions.vue
+++ b/pages/massif/mana/transactions.vue
@@ -83,7 +83,7 @@
 		</view>
 
 		<scroll-view>
-			<view class="card" @click="$u.route({url:'/pages/massif/add_transaction'})">
+			<view class="card">
 				<u-image radius="20rpx" width="130rpx" height="118rpx" mode="aspectFill" :src="`${host}/${1}`">
 					<text slot="error" style="font-size:45rpx;" class="plant-xiaopangchetupianjiazaishibai"/>
 				</u-image>
diff --git a/uni.scss b/uni.scss
index a5aee7a..5e7bfa0 100644
--- a/uni.scss
+++ b/uni.scss
@@ -77,7 +77,7 @@ $uni-font-size-paragraph:15px;
 
 @import '@/common/main.css';
 @import 'uview-ui/theme.scss';
-@import url('https://at.alicdn.com/t/c/font_3852037_uelrk7bjj2.css');
+@import url('https://at.alicdn.com/t/c/font_3852037_x0ytzgg6if.css');
 [class*=plant-]{
 	font-family: "plantMana" !important;
 	font-size: 16px;