From dfbb94c0298403ab7c1ec8981df6a16762ea9f41 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 9 Aug 2023 11:18:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=85=E5=80=BC,=E4=BD=99?=
 =?UTF-8?q?=E9=A2=9D=E6=8F=90=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/companyFinance/companyFinance.vue | 6 +++---
 subpkg/companyInfo/companyInfo.vue           | 3 +++
 subpkg/topUp/topUp.vue                       | 5 +++++
 subpkg/withdrawDeposit/withdrawDeposit.vue   | 9 +++++++--
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/components/companyFinance/companyFinance.vue b/components/companyFinance/companyFinance.vue
index b8271b4..098a5b8 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')">
         <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/companyInfo/companyInfo.vue b/subpkg/companyInfo/companyInfo.vue
index 69ff0bd..8628aea 100644
--- a/subpkg/companyInfo/companyInfo.vue
+++ b/subpkg/companyInfo/companyInfo.vue
@@ -145,6 +145,9 @@
 </script>
 
 <style lang="scss">
+  page{
+    
+  }
   .fixed_box {
     width: 100%;
     position: fixed;
diff --git a/subpkg/topUp/topUp.vue b/subpkg/topUp/topUp.vue
index 392d1f2..066cb18 100644
--- a/subpkg/topUp/topUp.vue
+++ b/subpkg/topUp/topUp.vue
@@ -213,6 +213,10 @@
         font-size: 32rpx;
         font-weight: 400;
         color: #333333;
+        text:nth-child(1){
+          flex-shrink: 0;
+          margin-right: 18rpx;
+        }
       }
     }
   }
@@ -221,6 +225,7 @@
     display: flex;
     flex-direction: column;
     padding: 0 28rpx;
+    margin-top: 50rpx;
 
     .title {
       font-size: 32rpx;
diff --git a/subpkg/withdrawDeposit/withdrawDeposit.vue b/subpkg/withdrawDeposit/withdrawDeposit.vue
index 40dfb43..93374d0 100644
--- a/subpkg/withdrawDeposit/withdrawDeposit.vue
+++ b/subpkg/withdrawDeposit/withdrawDeposit.vue
@@ -6,7 +6,8 @@
         <view class="title">提现信息</view>
         <view class="item">
           <text>提现账户</text>
-          <text>{{$store.state.app.userInfo.account||''}}</text>
+          <text v-if="$store.state.app.userInfo.admin_id">{{$store.state.app.userInfo.company.company_name||''}}</text>
+          <text v-else>{{$store.state.app.userInfo.account||''}}</text>
         </view>
         <view class="item">
           <text>可用余额</text>
@@ -141,7 +142,7 @@
 
     .card {
       width: 694rpx;
-      height: 180rpx;
+      min-height: 180rpx;
       background: #FFFFFF;
       margin-top: 38.55rpx;
       box-shadow: 0rpx 0rpx 18rpx 2rpx rgba(50, 116, 249, 0.1);
@@ -167,6 +168,10 @@
         font-size: 32rpx;
         font-weight: 400;
         color: #333333;
+        text:nth-child(1){
+          flex-shrink: 0;
+          margin-right: 18rpx;
+        }
       }
     }
   }