From e80c83c9b06c225ba27a06d987cec0503d5b3851 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Wed, 14 May 2025 11:24:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=B0=E8=B4=A6=E8=B4=A6=E6=88=B7?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=EF=BC=8C=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accounts/accountsBalance/index.vue        | 161 +++++++++++-------
 1 file changed, 102 insertions(+), 59 deletions(-)

diff --git a/src/pages/statistic/accounts/accountsBalance/index.vue b/src/pages/statistic/accounts/accountsBalance/index.vue
index b3665e6..2759c27 100644
--- a/src/pages/statistic/accounts/accountsBalance/index.vue
+++ b/src/pages/statistic/accounts/accountsBalance/index.vue
@@ -12,26 +12,61 @@
       <div class="item">
         <img src="@/static/images/one.png" alt="" />
         <div class="info-sum">
-          <div class="title">储蓄卡可用余额</div>
+          <div class="title">储蓄账户余额</div>
+          <div class="num">{{ accountsBalance.debitAllBalance }}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">储蓄卡余额</div>
           <div class="num">{{ accountsBalance.debitBalance }}<span>元</span></div>
         </div>
       </div>
-      <div class="item" v-show="auth.hasPermi('invest:creditCard')">
-        <img src="@/static/images/ticketSum.png" alt="" />
-        <div class="info-sum">
-          <div class="title">信用卡可用额度</div>
-          <div class="num">{{ accountsBalance.creditAvailableLimit }}<span>元</span></div>
-        </div>
-      </div>
+
     </div>
-    <div class="header-con" v-show="auth.hasPermi('invest:futureStocks:list','invest:creditCard')" ref="searchHeightRef">
-      <div class="item" v-show="auth.hasPermi('invest:creditCard')">
-        <img src="@/static/images/one.png" alt="" />
+          <div class="header-con" ref="searchHeightRef">
+            <div class="item">
+              <img src="@/static/images/one.png" alt="" />
+              <div class="info-sum">
+                <div class="title">I类储蓄卡余额</div>
+                <div class="num">{{ accountsBalance.idebitBalance }}<span>元</span></div>
+              </div>
+            </div>
+            <div class="item">
+              <img src="@/static/images/ticketSum.png" alt="" />
+              <div class="info-sum">
+                <div class="title">II类储蓄卡余额</div>
+                <div class="num">{{ accountsBalance.iidebitBalance }}<span>元</span></div>
+              </div>
+            </div>
+
+          </div>
+          <div class="header-con" v-show="auth.hasPermi('invest:onlineLend')" ref="searchHeightRef">
+          
+            <div class="item" v-show="auth.hasPermi('invest:creditCard')">
+              <img src="@/static/images/one.png" alt="" />
+              <div class="info-sum">
+                <div class="title">信用卡可用额度</div>
+                <div class="num">{{ accountsBalance.creditAvailableLimit }}<span>元</span></div>
+              </div>
+            </div>
+            <div class="item" v-show="auth.hasPermi('invest:creditCard')">
+        <img src="@/static/images/ticketSum.png" alt="" />
         <div class="info-sum">
           <div class="title">信用卡已用额度</div>
           <div class="num">{{ accountsBalance.creditBalance }}<span>元</span></div>
         </div>
       </div>
+          </div>
+    <div class="header-con" v-show="auth.hasPermi('invest:futureStocks:list','invest:creditCard')" ref="searchHeightRef">
+      <div class="item">
+              <img src="@/static/images/one.png" alt="" />
+              <div class="info-sum">
+                <div class="title">借贷账户余额</div>
+                <div class="num">{{ accountsBalance.lendAccountBalance }}<span>元</span></div>
+              </div>
+            </div>
       <div class="item" v-show="auth.hasPermi('invest:futureStocks:list')">
         <img src="@/static/images/ticketSum.png" alt="" />
         <div class="info-sum">
@@ -40,17 +75,25 @@
         </div>
       </div>
     </div>
-    <div class="header-con" v-show="auth.hasPermi('invest:onlineLend')" ref="searchHeightRef">
-      <div class="item">
-        <img src="@/static/images/one.png" alt="" />
-        <div class="info-sum">
-          <div class="title">借贷账户余额</div>
-          <div class="num">{{ accountsBalance.lendAccountBalance }}<span>元</span></div>
-        </div>
-      </div>
-    </div>
+          <div class="header-con" v-show="auth.hasPermi('invest:futureStocks:list','invest:creditCard')" ref="searchHeightRef">
+            <div class="item" v-show="auth.hasPermi('invest:creditCard')">
+              <img src="@/static/images/one.png" alt="" />
+              <div class="info-sum">
+                <div class="title">期货账户余额</div>
+                <div class="num">{{ accountsBalance.futuresBalance }}<span>元</span></div>
+              </div>
+            </div>
+            <div class="item" v-show="auth.hasPermi('invest:futureStocks:list')">
+              <img src="@/static/images/ticketSum.png" alt="" />
+              <div class="info-sum">
+                <div class="title">股票账户余额</div>
+                <div class="num">{{ accountsBalance.stocksBalance }}<span>元</span></div>
+              </div>
+            </div>
+          </div>
+
+
 
-    
   </div>
   <div style="margin:8px" v-show="listData.length>0">
     <button :type="firstType" style="margin-right:5px" size=mini @click="btFirstClick">账户余额</button>
@@ -60,7 +103,7 @@
         <u-list-item v-for="(item, index) in listData" :key="index">
           <view class="list-item">
             <view class="item-header">
-              <u--text  lines="2" 
+              <u--text  lines="2"
                 :text="item.account+'：'+item.availableLimit+' 元'" size="30rpx" color="#333333" ></u--text>
             </view>
 
@@ -73,7 +116,7 @@
         <u-list-item v-for="(item, index) in secondListData" :key="index">
           <view class="list-item">
             <view class="item-header">
-              <u--text  lines="2" 
+              <u--text  lines="2"
                 :text="item.account+'：'+item.availableLimit+' 元'" size="30rpx" color="#333333" ></u--text>
             </view>
 
@@ -91,7 +134,7 @@
       <suspend></suspend>
       <refresh></refresh>
   </template>
-  
+
   <script setup>
   import { getAccountsAnalysis } from '@/api/invest/statisticAnalysis'
   import { getDicts } from '@/api/system/dict/data.js'
@@ -128,17 +171,17 @@
     time: null,
     dataType: null,
     id: null
-     } 
+     }
   })
   const { filterPanel, queryParams} = toRefs(data)
   const windowHeight = computed(() => {
               uni.getSystemInfoSync().windowHeight - 50
-          })	
+          })
   onLoad(() => {
       getDict()
       getList()
     });
-  
+
    onShow(() => {
       if (isShow.value) {
       listData.value=[]
@@ -160,9 +203,9 @@
       function   getDict() {
         // 记账类型类型
         getDicts('account_type').then(res => {
-          accountTypeList.value =[res.data]  
+          accountTypeList.value =[res.data]
         })
-        
+
       }
 
   function   btFirstClick() {
@@ -175,7 +218,7 @@
         secondType.value="primary"
          firstType.value="default"
         tabShow.value=true
-        
+
     }
   function settingConfirm(e) {
         queryParams.value.settingId = e.value[0].settingId
@@ -212,7 +255,7 @@
     }
 
   </script>
-  
+
   <style lang="scss" scoped>
 
 .app-container {
@@ -222,7 +265,7 @@
     background-color: #f0f0f0;
     color: #333;
 }
- 
+
 .btn-selected {
     background-color: #007AFF;
     color: #fff;
@@ -279,7 +322,7 @@
         display:float;
         text-align: center;
       }
-  
+
   .search-view {
     padding: 12rpx 32rpx;
     background-color: #ffffff;
@@ -287,36 +330,36 @@
     justify-content: space-between;
     align-items: center;
     position: relative;
-  
+
     .search-input {
       background: #F5F5F5;
       color: #333333;
       margin-right: 36rpx;
     }
-  
+
     .filter-panel {
       width: 100%;
       position: absolute;
       left: 0;
       top: 96rpx;
       background-color: rgba(0, 0, 0, 0.5);
-  
+
       .filter-panel-content {
         background-color: #ffff;
         padding: 0 30rpx 30rpx;
-  
+
         .filter-title {
           color: #000000;
           font-size: 30rpx;
           font-weight: 500;
           padding: 30rpx 0;
         }
-  
+
         .state-list {
           display: flex;
           flex-wrap: wrap;
           justify-content: flex-start;
-  
+
           .state-item {
             width: 210rpx;
             height: 72rpx;
@@ -328,14 +371,14 @@
             font-size: 28rpx;
             color: #000000;
           }
-  
+
           .active {
             background-color: rgba(222, 241, 255, 1);
             border: 1rpx solid rgba(22, 119, 255, 1);
           }
         }
       }
-  
+
       .btn-box {
         display: flex;
         padding: 24rpx 30rpx;
@@ -344,18 +387,18 @@
       }
     }
   }
-  
+
   .list-item {
     margin: 0 24rpx 24rpx;
     padding: 32rpx;
     background-color: #fff;
-  
+
     .item-header {
       display: flex;
       justify-content: space-between;
       align-items: center;
       padding-bottom: 16rpx;
-  
+
       .status {
         .status-item {
           width: 120rpx;
@@ -365,60 +408,60 @@
           border-radius: 4rpx;
           font-size: 24rpx;
         }
-  
+
         .status1 {
           background: #F0F0F0;
           color: #8C8C8C;
         }
-  
+
         .status2 {
           background: rgba(38, 129, 255, 0.2);
           color: #2681FF;
         }
-  
+
         .status3 {
           background: #F7F7F7;
           color: #2681FF;
         }
-  
+
         .status4 {
           background: rgba(255, 85, 51, 0.2);
           color: #FF5533;
         }
-  
+
         .status5 {
           background: #F7F7F7;
           color: rgba(0, 0, 0, 0.85);
         }
-  
+
         .status7 {
           background: rgba(255, 129, 51, 0.2);
           color: #FF8133;
         }
-  
+
         .status8 {
           background: rgba(65, 217, 165, 0.2);
           color: #41D9A5;
         }
       }
     }
-  
+
     .item-row {
       padding: 16rpx 0;
-  
+
       .row-label {
         color: rgba(0, 0, 0, 0.55);
       }
-  
+
       .row-value {
         color: rgba(0, 0, 0, 0.85)
       }
     }
-  
+
     .operate {
       display: flex;
       justify-content: flex-end;
-  
+
       .btn {
         width: 146rpx;
         height: 56rpx;
@@ -427,13 +470,13 @@
         margin-left: 5rpx;
         text-align: center;
       }
-  
+
       .circulation {
         background: rgba(0, 0, 0, 0.04);
         margin-right: 24rpx;
         color: rgba(0, 0, 0, 0.85);
       }
-  
+
       .filling {
         background: #2681FF;
         border-radius: 8rpx;
@@ -441,4 +484,4 @@
       }
     }
   }
-  </style>
\ No newline at end of file
+  </style>