From a93d662ce5ed140dfada02b41b632fd0b555f0e5 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Tue, 8 Aug 2023 09:40:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=85=85=E5=80=BC=E5=92=8C?=
 =?UTF-8?q?=E6=8F=90=E7=8E=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/companyFinance/companyFinance.vue |  6 +++---
 subpkg/topUp/topUp.vue                       |  5 ++++-
 subpkg/withdrawDeposit/withdrawDeposit.vue   | 20 ++++++++++++++++----
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/components/companyFinance/companyFinance.vue b/components/companyFinance/companyFinance.vue
index b8271b4..b341599 100644
--- a/components/companyFinance/companyFinance.vue
+++ b/components/companyFinance/companyFinance.vue
@@ -1,12 +1,12 @@
 <template>
   <view class="c_card">
-    <view class="f_card" @click="naviTo('/subpkg/topUp/topUp')">
-      <view class="item">
+    <view class="f_card">
+      <view class="item" @click="naviTo('/subpkg/topUp/topUp')">
         <view>公司账户余额(元)</view>
         <view class="price" v-if="company.deposit">{{cCount(company.deposit)}}</view>
         <view class="price" v-else>0.00</view>
       </view>
-      <view class="item">
+      <view class="item" @click="naviTo(`/subpkg/withdrawDeposit/withdrawDeposit?balance=${cCount(company.company_money)||-1}&company=${true}`)">
         <view>公司收益金额(元)</view>
         <view class="price" v-if="company.company_money">{{cCount(company.company_money)}}</view>
         <view class="price" v-else>0.00</view>
diff --git a/subpkg/topUp/topUp.vue b/subpkg/topUp/topUp.vue
index b1ae53e..180a03e 100644
--- a/subpkg/topUp/topUp.vue
+++ b/subpkg/topUp/topUp.vue
@@ -187,7 +187,6 @@
 
     .card {
       width: 694rpx;
-      height: 180rpx;
       background: #FFFFFF;
       margin-top: 38.55rpx;
       box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(50, 116, 249, 0.1);
@@ -213,6 +212,10 @@
         font-size: 32rpx;
         font-weight: 400;
         color: #333333;
+        text:nth-child(1){
+          flex-shrink: 0;
+          margin-right: 28rpx;
+        }
       }
     }
   }
diff --git a/subpkg/withdrawDeposit/withdrawDeposit.vue b/subpkg/withdrawDeposit/withdrawDeposit.vue
index a7ab3df..97b601b 100644
--- a/subpkg/withdrawDeposit/withdrawDeposit.vue
+++ b/subpkg/withdrawDeposit/withdrawDeposit.vue
@@ -6,11 +6,13 @@
         <view class="title">提现信息</view>
         <view class="item">
           <text>提现账户</text>
-          <text>{{$store.state.app.userInfo.account||''}}</text>
+          <text v-if="company && balance!=-1">{{$store.state.app.userInfo.company.company_name||''}}</text>
+          <text v-else>{{$store.state.app.userInfo.account||''}}</text>
         </view>
         <view class="item">
           <text>可用余额</text>
-          <text>{{$store.state.app.userInfo.user_money||'0.00'}}元</text>
+          <text v-if="company && balance!=-1">{{balance.toFixed(2)||'0.00'}}元</text>
+          <text v-else>{{$store.state.app.userInfo.user_money||'0.00'}}元</text>
         </view>
       </view>
     </view>
@@ -40,6 +42,8 @@
   export default {
     data() {
       return {
+        company: false,
+        balance: -1,
         priceList: ['10元','50元','100元','500元','1000元','5000元','全部', '自定义'],
         changeMoney: -1,
         payMoney: {
@@ -57,7 +61,12 @@
         })
       }
     },
-    onLoad() {},
+    onLoad(options) {
+      if(options.company&&options.balance>=0){
+        this.company = options.company;
+        this.balance = +options.balance;
+      }
+    },
     onShow() {},
     methods: {
       copyPhone(str = "") {
@@ -141,7 +150,6 @@
 
     .card {
       width: 694rpx;
-      height: 180rpx;
       background: #FFFFFF;
       margin-top: 38.55rpx;
       box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(50, 116, 249, 0.1);
@@ -167,6 +175,10 @@
         font-size: 32rpx;
         font-weight: 400;
         color: #333333;
+        text:nth-child(1){
+          flex-shrink: 0;
+          margin-right: 28rpx;
+        }
       }
     }
   }