From ead807ae1ea3c0983534cc028711a4efd132681f Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 26 Aug 2023 15:16:42 +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

---
 manifest.json              |  4 ++--
 subpkg/finance/finance.vue | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/manifest.json b/manifest.json
index 532934d..e4db749 100644
--- a/manifest.json
+++ b/manifest.json
@@ -71,8 +71,8 @@
                     }
                 }
             },
-            "apple":{
-              "urlschemewhitelist":["iosamap"]
+            "apple" : {
+                "urlschemewhitelist" : [ "iosamap" ]
             },
             "splashscreen" : {
                 "useOriginalMsgbox" : true
diff --git a/subpkg/finance/finance.vue b/subpkg/finance/finance.vue
index 113de91..6c19d0e 100644
--- a/subpkg/finance/finance.vue
+++ b/subpkg/finance/finance.vue
@@ -41,7 +41,7 @@
           ></uni-icons>
         </view>
         <view class="price" v-show="eyeType"
-          >{{ userInfo.user_money ? userInfo.user_money : "0.00" }}元</view
+          >{{ all_money }}元</view
         >
         <view class="price" v-show="!eyeType">****元</view>
         <view class="bubble">
@@ -56,7 +56,7 @@
         <view class="item">
           <view>保证金额(元)</view>
           <view class="num" v-show="eyeType">{{
-            userInfo.user_money || 0.0
+            userInfo.deposit || 0.0
           }}</view>
           <view class="num" v-show="!eyeType">****</view>
         </view>
@@ -64,7 +64,7 @@
         <view class="item">
           <view>收益金额(元)</view>
           <view class="num" v-show="eyeType">{{
-            userInfo.deposit || 0.0
+            userInfo.income || 0.0
           }}</view>
           <view class="num" v-show="!eyeType">****</view>
         </view>
@@ -263,8 +263,16 @@ export default {
     eyeType () {
       return this.$store.state.config.eyeType;
     },
-    totalMoney(){
-      return this.userInfo;
+    all_money(){
+      let str = '0.00';
+      try{
+        this.userInfo.user_money?str=parseFloat(str)+this.userInfo.user_money:null;
+        this.userInfo.deposit?str=parseFloat(str)+this.userInfo.deposit:null;
+        str = str.toFixed(2);
+      }catch(e){
+        str = "0.00";
+      }
+      return str;
     }
   },
   onBackPress () {