From d1ac4b6d62e8b44161ade96b6cd134335438064e Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Mon, 3 Mar 2025 12:01:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index.vue                           | 53 ++++++++++---------
 .../accounts/accountDealAnalysis/index.vue    | 19 +++----
 2 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/src/pages/index.vue b/src/pages/index.vue
index ef779f8..e7d7111 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -143,6 +143,23 @@
         </div>
       </div>
     </div>
+    <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">{{ debitTotalBalance }}<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">{{ debitBalance }}<span>元</span></div>
+       </div>
+     </div>
+   </div>
     <div class="header-con" v-show="(debitOnlineCount>0||storedValueCardCount>0)&&auth.hasPermi('invest:debitCard')"  ref="searchHeightRef">
       <div class="item" v-show="debitOnlineCount>0&&auth.hasPermi('invest:debitCard')">
         <img src="./assets/one.png" alt="" />
@@ -151,13 +168,14 @@
           <div class="num">{{ debitOnlineCount }}<span>个</span></div>
         </div>
       </div>
-      <div class="item" v-show="storedValueCardCount>0&&auth.hasPermi('invest:debitCard')">
-        <img src="./assets/ticketSum.png" alt="" />
+      <div class="item" v-show="debitOnlineCount>0&&auth.hasPermi('invest:debitCard')">
+        <img src="./assets/one.png" alt="" />
         <div class="info-sum">
-          <div class="title">储值卡</div>
-          <div class="num">{{ storedValueCardCount }}<span>张</span></div>
+          <div class="title">网络账户余额</div>
+          <div class="num">{{ debitOnlineBalance }}<span>元</span></div>
         </div>
       </div>
+
    
       <!-- <div class="item" v-show="otherDebitCount>0&&auth.hasPermi('invest:debitCard')">
         <img src="./assets/one.png" alt="" />
@@ -167,29 +185,12 @@
         </div>
       </div> -->
     </div>
-    <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">{{ debitTotalBalance }}<span>元</span></div>
-        </div>
-      </div>
-      <div class="item">
+    <div class="header-con" v-show="(storedValueCardCount>0||storedValueCardBalance>0)&&auth.hasPermi('invest:debitCard')"  ref="searchHeightRef">
+      <div class="item" v-show="storedValueCardCount>0&&auth.hasPermi('invest:debitCard')">
         <img src="./assets/ticketSum.png" alt="" />
         <div class="info-sum">
-          <div class="title">储蓄卡余额</div>
-          <div class="num">{{ debitBalance }}<span>元</span></div>
-        </div>
-      </div>
-    </div>
-    <div class="header-con" v-show="(storedValueCardCount>0||debitOnlineCount>0)&&auth.hasPermi('invest:debitCard')"  ref="searchHeightRef">
-      <div class="item" v-show="debitOnlineCount>0&&auth.hasPermi('invest:debitCard')">
-        <img src="./assets/one.png" alt="" />
-        <div class="info-sum">
-          <div class="title">网络账户余额</div>
-          <div class="num">{{ debitOnlineBalance }}<span>元</span></div>
+          <div class="title">储值卡</div>
+          <div class="num">{{ storedValueCardCount }}<span>张</span></div>
         </div>
       </div>
       <div class="item" v-show="storedValueCardCount>0&&auth.hasPermi('invest:debitCard')">
@@ -200,6 +201,8 @@
         </div>
       </div>
     </div>
+
+
     <div class="header-con" v-show="(medicalBalance>0||housingFundBalance>0)&&auth.hasPermi('invest:debitCard')"   ref="searchHeightRef">
 
       <div class="item" v-show="housingFundBalance>0&&auth.hasPermi('invest:debitCard')">
diff --git a/src/pages/statistic/accounts/accountDealAnalysis/index.vue b/src/pages/statistic/accounts/accountDealAnalysis/index.vue
index 64bb5c4..65cfda7 100644
--- a/src/pages/statistic/accounts/accountDealAnalysis/index.vue
+++ b/src/pages/statistic/accounts/accountDealAnalysis/index.vue
@@ -114,15 +114,6 @@
           <div class="num">{{ account.notDailyExpenses}}<span>元</span></div>
         </div>
       </div>
-      <div class="item" v-show="auth.hasPermi('invest:posmachine:list')">
-        <img src="@/static/images/ticketSum.png" alt="" />
-        <div class="info-sum">
-          <div class="title">POS机手续费</div>
-          <div class="num">{{ account.posExpenses }}<span>元</span></div>
-        </div>
-      </div>
-    </div>
-    <div class="header-con" v-show="auth.hasPermi('invest:creditCard','invest:onlineLend')" ref="searchHeightRef">
       <div class="item" v-show="auth.hasPermi('invest:creditCard')">
         <img src="@/static/images/one.png" alt="" />
         <div class="info-sum">
@@ -130,6 +121,16 @@
           <div class="num">{{ account.creditInterest}}<span>元</span></div>
         </div>
       </div>
+
+    </div>
+    <div class="header-con" v-show="auth.hasPermi('invest:posmachine:list','invest:onlineLend')" ref="searchHeightRef">
+      <div class="item" v-show="auth.hasPermi('invest:posmachine:list')">
+        <img src="@/static/images/ticketSum.png" alt="" />
+        <div class="info-sum">
+          <div class="title">POS机手续费</div>
+          <div class="num">{{ account.posExpenses }}<span>元</span></div>
+        </div>
+      </div>
       <div class="item" v-show="auth.hasPermi('invest:onlineLend')">
         <img src="@/static/images/ticketSum.png" alt="" />
         <div class="info-sum">