From 3a9b8ca4f0ada4560ab616b2a13bd5973c57865f Mon Sep 17 00:00:00 2001
From: shengchanzhe <179998674@qq.com>
Date: Wed, 13 Sep 2023 16:20:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/task/taskItem.vue                 |  4 ++--
 subpkg/blockTransaction/blockTransaction.vue | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue
index e0c6e11..3fab1ca 100644
--- a/components/task/taskItem.vue
+++ b/components/task/taskItem.vue
@@ -20,8 +20,8 @@
 									</block>
 									<block
 										v-else-if="datas.extend&&datas.extend.transaction&&datas.extend.transaction.arr">
-										{{(datas.extend.transaction.arr.total_price?datas.extend.transaction.arr.total_price:0)+'元/'+(datas.extend.transaction.arr.day_money?datas.extend.transaction.arr.day_money:0)+'元'}}
-                    <text style="color: #488F00;margin-left: 26rpx;">{{(datas.extend.transaction.arr.transaction_pool?datas.extend.transaction.arr.transaction_pool:1)+'元'}}</text>
+										{{(datas.extend.transaction.arr.transaction_pool?datas.extend.transaction.arr.transaction_pool:0)+'元/'+(datas.extend.transaction.arr.day_money?datas.extend.transaction.arr.day_money:0)+'元'}}
+                    <!-- <text style="color: #488F00;margin-left: 26rpx;">{{(datas.extend.transaction.arr.transaction_pool?datas.extend.transaction.arr.transaction_pool:1)+'元'}}</text> -->
 									</block>
 									<block v-else-if="datas.extend&&datas.extend.update">
                     <text v-if="datas.extend.update.transfer&&datas.extend.update.transfer.lnglat[0]||datas.status==3" style="color: #488f00;">抵达终点</text>
diff --git a/subpkg/blockTransaction/blockTransaction.vue b/subpkg/blockTransaction/blockTransaction.vue
index 5ef9ac8..1e730a5 100644
--- a/subpkg/blockTransaction/blockTransaction.vue
+++ b/subpkg/blockTransaction/blockTransaction.vue
@@ -1,11 +1,11 @@
 <template>
   <view class="">
     <view class="card">
-      <view class="item">
-        <view>当日完成金额</view>
+      <view class="item" v-if="card.is_show==true">
+        <view>交易金额剩余池</view>
         <!-- <view class="price" v-if="company.deposit">{{cCount(company.deposit)}}</view>
         <view class="price" v-else>0.00</view> -->
-        <view class="price">{{c_money(card.total_price)}}</view>
+        <view class="price">{{c_money(card.transaction_pool)}}</view>
       </view>
       <view class="item">
         <view>目标完成金额</view>
@@ -13,10 +13,10 @@
         <view class="price" v-else>0.00</view> -->
         <view class="price">{{c_money(card.day_money)}}</view>
       </view>
-      <view class="item">
+<!--      <view class="item">
         <view>交易金额剩余池</view>
         <view class="price">{{c_money(card.transaction_pool)}}</view>
-      </view>
+      </view> -->
     </view>
 
 
@@ -77,7 +77,8 @@
           total_price: "0.00",
           status: 1,
           day_money: "0.00",
-          transaction_pool: "0.00"
+          transaction_pool: "0.00",
+		  is_show:true
         },
         list: [],
         task_id: '',