From 81c590d39248e1aa01d2f580b731035f444d66f3 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 13 Sep 2023 11:43:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E4=BA=A4=E6=98=93?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E6=B1=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/task/taskItem.vue                 | 16 ++++++++++++++--
 subpkg/blockTransaction/blockTransaction.vue | 15 ++++++---------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/components/task/taskItem.vue b/components/task/taskItem.vue
index e0c6e11..5837881 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>
+										{{total_price+'元/'+(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:0)+'元'}}</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>
@@ -121,6 +121,18 @@
 
 			};
 		},
+    created() {
+      try{
+        
+      }catch(e){
+        //TODO handle the exception
+      }
+    },
+    computed:{
+      total_price(){
+        return this.datas?.extend?.transaction?.arr?.transaction_pool?this.datas.extend.transaction.arr.total_price += +this.datas.extend.transaction.arr.transaction_pool: this.datas.extend.transaction.arr.total_price
+      }
+    },
 		methods: {
 			navTo(url) {
 				if(url){
diff --git a/subpkg/blockTransaction/blockTransaction.vue b/subpkg/blockTransaction/blockTransaction.vue
index 5ef9ac8..9aab7ff 100644
--- a/subpkg/blockTransaction/blockTransaction.vue
+++ b/subpkg/blockTransaction/blockTransaction.vue
@@ -1,11 +1,12 @@
 <template>
   <view class="">
     <view class="card">
-      <view class="item">
-        <view>当日完成金额</view>
-        <!-- <view class="price" v-if="company.deposit">{{cCount(company.deposit)}}</view>
-        <view class="price" v-else>0.00</view> -->
+      <!-- <view class="item">
         <view class="price">{{c_money(card.total_price)}}</view>
+      </view> -->
+      <view class="item">
+        <view>交易金额剩余池</view>
+        <view class="price">{{c_money(card.transaction_pool)}}</view>
       </view>
       <view class="item">
         <view>目标完成金额</view>
@@ -13,10 +14,6 @@
         <view class="price" v-else>0.00</view> -->
         <view class="price">{{c_money(card.day_money)}}</view>
       </view>
-      <view class="item">
-        <view>交易金额剩余池</view>
-        <view class="price">{{c_money(card.transaction_pool)}}</view>
-      </view>
     </view>
 
 
@@ -134,7 +131,7 @@
           Object.keys(this.card).forEach((key)=>{
             if(extend?.transaction?.arr[key]!=null&&extend?.transaction?.arr[key]!=undefined)this.card[key] = extend?.transaction?.arr[key];
           })
-          // this.card.transaction_pool = extend?.transaction.transaction_pool;
+          this.card.transaction_pool += this.card.total_price;
           this.list = [...this.list, ...res.data?.list]
         } catch (e) {
           this.loadConfig.status = "nomore"