From 153b0df16c826bd801262ea610cae26d985144bc Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Thu, 9 Jan 2025 10:33:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A6=96=E9=A1=B5=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96=E8=B0=83=E6=95=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index.vue                           | 111 ++++++++++++++----
 .../accounts/accountsBalance/index.vue        |   4 +-
 .../accounts/investDealAnalysis/index.vue     |   2 +-
 3 files changed, 90 insertions(+), 27 deletions(-)

diff --git a/src/pages/index.vue b/src/pages/index.vue
index 610f4ee..ecc24f7 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -21,48 +21,111 @@
         </div>
       </div>
     </div>
-    <div class="header-con" v-show="auth.hasPermi('invest:debitCard','invest:futureStocks:list')" ref="searchHeightRef">
-
-      <div class="item" v-show="auth.hasPermi('invest:debitCard')">
-        <img src="./assets/one.png" alt="" />
-        <div class="info-sum">
-          <div class="title">储蓄账户余额</div>
-          <div class="num">{{ debitTotalBalance }}<span>元</span></div>
-        </div>
-      </div>
-      <div class="item" v-show="auth.hasPermi('invest:futureStocks:list')" >
-        <img src="./assets/ticketSum.png" alt="" />
-        <div class="info-sum">
-          <div class="title">投资账户余额</div>
-          <div class="num">{{ investBalance }}<span>元</span></div>
-        </div>
-      </div>
-    </div>
     <div class="header-con" v-show="auth.hasPermi('invest:onlineLend')" ref="searchHeightRef">
-      <div class="item">
+      <div class="item" >
         <img src="./assets/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">人情欠款</div>
+          <div class="num">{{ peopleLendHistory  }}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="./assets/ticketSum.png" alt="" />
         <div class="info-sum">
           <div class="title">未结清贷款本息</div>
           <div class="num">{{ unClearedOnlineDebt }}<span>元</span></div>
         </div>
       </div>
+
+</div>
+    <div class="header-con" v-show="auth.hasPermi('invest:creditCard')" ref="searchHeightRef">
+      <div class="item">
+        <img src="./assets/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">信用卡已用额度</div>
+          <div class="num">{{ creditBalance}}<span>元</span></div>
+        </div>
+      </div>
       <div class="item">
         <img src="./assets/ticketSum.png" alt="" />
         <div class="info-sum">
-          <div class="title">人情欠款</div>
-          <div class="num">{{  peopleLendHistory}}<span>元</span></div>
+          <div class="title">未结清分期本息</div>
+          <div class="num">{{ unclearedCreditInstallment }}<span>元</span></div>
         </div>
       </div>
+      
     </div>
-    <div class="header-con" v-show="auth.hasPermi('invest:creditCard')"  ref="searchHeightRef">
-      <div class="item" >
+
+<div class="header-con" v-show="auth.hasPermi('invest:debitCard')"  ref="searchHeightRef">
+
+  <div class="item" >
+
+  <img src="./assets/one.png" alt="" />
+  <div class="info-sum">
+    <div class="title">储蓄卡余额</div>
+    <div class="num">{{ debitBalance }}<span>元</span></div>
+  </div>
+</div>
+<div class="item" >
+  <img src="./assets/ticketSum.png" alt="" />
+  <div class="info-sum">
+    <div class="title">储蓄账户余额</div>
+    <div class="num">{{ debitTotalBalance }}<span>元</span></div>
+  </div>
+</div>
+
+    </div>
+    <div class="header-con" v-show="auth.hasPermi('invest:creditCard','invest:creditQueryRecord:list')"  ref="searchHeightRef">
+      <div class="item" v-show="auth.hasPermi('invest:creditCard')">
         <img src="./assets/one.png" alt="" />
         <div class="info-sum">
-          <div class="title">信用卡已使用额度</div>
-          <div class="num">{{ creditBalance }}<span>元</span></div>
+          <div class="title">信用卡可用额度</div>
+          <div class="num">{{ creditAvailableLimit }}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item" v-show="auth.hasPermi('invest:creditQueryRecord:list')">
+        <img src="./assets/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">近6月硬查询</div>
+          <div class="num">{{ lastSixMonths }}<span>次</span></div>
+        </div>
+      </div>
+ 
+    </div>
+<div class="header-con" v-show="auth.hasPermi('invest:futureStocks:list')"  ref="searchHeightRef">
+  <div class="item"  >
+        <img src="./assets/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">投资账户余额</div>
+          <div class="num">{{ investBalance }}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="./assets/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">本月投资收益</div>
+          <div class="num">{{ currentMonthInvest }}<span>元</span></div>
         </div>
       </div>
     </div>
+    <div class="header-con" v-show="auth.hasPermi('invest:onlineLend')"  ref="searchHeightRef">
+     
+      <div class="item">
+        <img src="./assets/one.png" alt="" />
+        <div class="info-sum">
+          <div class="title">当月应还款</div>
+          <div class="num">{{ dueOnlineDebt }}<span>元</span></div>
+        </div>
+      </div>
+      <div class="item">
+        <img src="./assets/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">当月待还款</div>
+          <div class="num">{{ leftOnlineDebt }}<span>元</span></div>
+        </div>
+      </div>
+    </div>
+
     <div class="header-title" v-show="auth.hasPermi('invest:debitCard')" ref="searchHeightRef">&nbsp;&nbsp;&nbsp;&nbsp;储蓄账户信息</div>
     <div class="header-con" v-show="auth.hasPermi('invest:debitCard')" ref="searchHeightRef">
       <div class="item" >
diff --git a/src/pages/statistic/accounts/accountsBalance/index.vue b/src/pages/statistic/accounts/accountsBalance/index.vue
index b304abc..c3bdebc 100644
--- a/src/pages/statistic/accounts/accountsBalance/index.vue
+++ b/src/pages/statistic/accounts/accountsBalance/index.vue
@@ -12,7 +12,7 @@
       <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.debitBalance }}<span>元</span></div>
         </div>
       </div>
@@ -28,7 +28,7 @@
       <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="title">信用卡已用额度</div>
           <div class="num">{{ accountsBalance.creditBalance }}<span>元</span></div>
         </div>
       </div>
diff --git a/src/pages/statistic/accounts/investDealAnalysis/index.vue b/src/pages/statistic/accounts/investDealAnalysis/index.vue
index bce5873..ae8e69b 100644
--- a/src/pages/statistic/accounts/investDealAnalysis/index.vue
+++ b/src/pages/statistic/accounts/investDealAnalysis/index.vue
@@ -127,7 +127,7 @@
         <img src="@/static/images/ticketSum.png" alt="" />
         <div class="info-sum">
           <div class="title">亏损笔数</div>
-          <div class="num">{{ account.expensesCount}}<span>元</span></div>
+          <div class="num">{{ account.expensesCount}}<span>笔</span></div>
         </div>
       </div>