From b187b4e35679142c66cce7676ec5237fff2b176b Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Wed, 2 Jul 2025 18:40:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=87=AA=E6=B5=8B=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/statistic/index.vue             | 42 +++++++++++------------
 src/pages/work/accounts/accounts/list.vue |  4 +++
 src/pages/work/base/lend/list.vue         | 11 +++---
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/pages/statistic/index.vue b/src/pages/statistic/index.vue
index f21ac4b..9515715 100644
--- a/src/pages/statistic/index.vue
+++ b/src/pages/statistic/index.vue
@@ -37,6 +37,18 @@
           </view>
       </uni-grid-item>
       </uni-grid>
+    </view>
+                 <!-- 宫格组件 -->
+                 <uni-section title="投资统计分析" v-show="auth.hasPermi('invest:accountsBalance:list')"  type="line"></uni-section>
+    <view class="grid-body">
+      <uni-grid :column="4" :showBorder="false" >
+        <uni-grid-item v-for="(item, index) in investGridList" :key="index" v-show="auth.hasPermi(item.permission)" @click="navigateTo(item.path)">
+        <view class="grid-item-box">
+            <uni-icons :type="item.icon" size="30"></uni-icons>
+            <text class="text">{{ item.text }}</text>
+          </view>
+      </uni-grid-item>
+      </uni-grid>
     </view>
   </view>
 </template>
@@ -44,20 +56,6 @@
 <script setup>
 	import { ref } from "vue";
   import auth from "@/plugins/auth"; // 建议使用auth进行鉴权操作
-  const commonGridList=ref([
-        { path: '/pages/statistic/accounts/accountsBalance/index', text: '记账账户统计', icon: 'staff-filled' , permission: 'invest:accountsBalance:list' },
-        { path: '/pages/statistic/accounts/dailyExpensesAnalysis/index', text: '日常支出统计', icon: 'wallet' , permission: 'invest:dailyExpensesAnalysis:list' },
-        { path: '/pages/statistic/accounts/posAnalysis/index', text: 'POS机刷卡统计', icon: 'shop-filled' , permission: 'invest:posAnalysis:list' },
-        { path: '/pages/statistic/bill/creditBillAnalysis/index', text: '信用卡账单统计', icon: 'map', permission: 'invest:creditAnalysis:list'  },
-        { path: '/pages/statistic/accounts/creditCardDealAnalysis/index', text: '信用卡收支统计', icon: 'wallet' , permission: 'invest:creditCard' },
-        { path: '/pages/statistic/accounts/accountDealAnalysis/index', text: '账户收支统计', icon: 'person', permission: 'invest:accountDealAnalysis:list'  },
-        { path: '/pages/statistic/accounts/investDealAnalysis/index', text: '投资收益统计', icon: 'arrow-down', permission: 'invest:investDealAnalysis:list'  },
-        { path: '/pages/statistic/bill/onlineLendAnalysis/index', text: '贷款待还统计', icon: 'cloud-upload', permission: 'invest:onlineLendAnalysis:list'  },
-        { path: '/pages/statistic/bill/creditInstallmentAnalysis/index', text: '信用卡分期待还', icon: 'map-filled', permission: 'invest:creditInstallment:list'  },
-        { path: '/pages/statistic/bill/creditRecordAnalysis/index', text: '征信查询统计', icon: 'search', permission: 'invest:creditRecordAnalysis:list'  },
-        { path: '/pages/statistic/accounts/debitCardAnalysis/index', text: '结算卡统计', icon: 'shop-filled' , permission: 'invest:debitCardAnalysis:list' },
-        { path: '/pages/statistic/accounts/posStatics/index', text: 'POS机统计', icon: 'shop-filled' , permission: 'invest:posStatics:list' },
-      ])
   const billGridList=ref([
         // { path: '/pages/page1/page1', text: '账户总览', icon: 'person-filled', permission: 'invest:accountAnalysis:list'  },
         { path: '/pages/statistic/bill/creditBillAnalysis/index', text: '信用卡账单统计', icon: 'map', permission: 'invest:creditAnalysis:list'  },
@@ -65,25 +63,25 @@
         { path: '/pages/statistic/bill/creditInstallmentSettledAnalysis/index', text: '信用卡分期已还', icon: 'map-pin-ellipse', permission: 'invest:creditInstallmentSettledAnalysis:list'  },
         { path: '/pages/statistic/bill/onlineLendAnalysis/index', text: '贷款待还统计', icon: 'cloud-upload', permission: 'invest:onlineLendAnalysis:list'  },
         { path: '/pages/statistic/bill/onlineLendSettledAnalysis/index', text: '贷款已还统计', icon: 'download', permission: 'invest:onlineLendSettledAnalysis:list'  },
-        { path: '/pages/statistic/bill/investAnalysis/index', text: '收益统计分析', icon: 'arrow-down', permission: 'invest:investAnalysis:list'  },
-        { path: '/pages/statistic/bill/futuresAnalysis/index', text: '期货统计分析', icon: 'settings', permission: 'invest:futuresAnalysis:list'  },
-        { path: '/pages/statistic/bill/stocksAnalysis/index', text: '股票统计分析', icon: 'left', permission: 'invest:stocksAnalysis:list'  },
         { path: '/pages/statistic/bill/creditRecordAnalysis/index', text: '征信查询统计', icon: 'search', permission: 'invest:creditRecordAnalysis:list'  }
       ])
       const accountGridList=ref([
         { path: '/pages/statistic/accounts/accountsBalance/index', text: '记账账户统计', icon: 'staff-filled' , permission: 'invest:accountsBalance:list' },
-        { path: '/pages/statistic/accounts/posAnalysis/index', text: 'POS机刷卡统计', icon: 'shop-filled' , permission: 'invest:posAnalysis:list' },
-        { path: '/pages/statistic/accounts/debitDealAnalysis/index', text: '储蓄账户统计', icon: 'wallet-filled', permission: 'invest:debitCard'  },
-        { path: '/pages/statistic/accounts/creditCardDealAnalysis/index', text: '信用卡收支统计', icon: 'wallet' , permission: 'invest:creditCard' },
-        { path: '/pages/statistic/accounts/investDealAnalysis/index', text: '投资收益统计', icon: 'arrow-down', permission: 'invest:investDealAnalysis:list'  },
         { path: '/pages/statistic/accounts/accountDealAnalysis/index', text: '账户收支统计', icon: 'person', permission: 'invest:accountDealAnalysis:list'  },
         { path: '/pages/statistic/accounts/dailyExpensesAnalysis/index', text: '日常支出统计', icon: 'wallet' , permission: 'invest:dailyExpensesAnalysis:list' },
+        { path: '/pages/statistic/accounts/creditCardDealAnalysis/index', text: '信用卡收支统计', icon: 'wallet' , permission: 'invest:creditCard' },
+        { path: '/pages/statistic/accounts/debitDealAnalysis/index', text: '储蓄账户统计', icon: 'wallet-filled', permission: 'invest:debitCard'  },
         { path: '/pages/statistic/accounts/debitCardAnalysis/index', text: '结算卡统计', icon: 'shop-filled' , permission: 'invest:debitCardAnalysis:list' },
         { path: '/pages/statistic/accounts/posStatics/index', text: 'POS机统计', icon: 'shop-filled' , permission: 'invest:posStatics:list' },
         { path: '/pages/statistic/accounts/sleepAccounts/index', text: '睡眠账户统计', icon: 'cloud-upload' , permission: 'invest:debitCard' },
         { path: '/pages/statistic/accounts/openCardStatics/index', text: '储蓄卡开卡统计', icon: 'map' , permission: 'invest:debitCard' },
       ])
-
+      const investGridList=ref([
+      { path: '/pages/statistic/accounts/investDealAnalysis/index', text: '投资收益统计', icon: 'arrow-down', permission: 'invest:investDealAnalysis:list'  },
+      { path: '/pages/statistic/bill/investAnalysis/index', text: '收益统计分析', icon: 'arrow-down', permission: 'invest:investAnalysis:list'},
+      { path: '/pages/statistic/bill/futuresAnalysis/index', text: '期货统计分析', icon: 'settings', permission: 'invest:futuresAnalysis:list'},
+      { path: '/pages/statistic/bill/stocksAnalysis/index', text: '股票统计分析', icon: 'left', permission: 'invest:stocksAnalysis:list'  }
+      ])
 	function navigateTo(path) {
     uni.navigateTo({
         url: path
diff --git a/src/pages/work/accounts/accounts/list.vue b/src/pages/work/accounts/accounts/list.vue
index 1aa75a3..1070a77 100644
--- a/src/pages/work/accounts/accounts/list.vue
+++ b/src/pages/work/accounts/accounts/list.vue
@@ -259,6 +259,10 @@ function selectType(item) {
       queryParams.value.accountId = ''
         queryParams.value.accountName = ''
         queryParams.value.name = '',
+        queryParams.value.status = '',
+        accountStatus.value.map(ele => {
+        Reflect.set(ele, 'selected', false)
+      })
         queryParams.value.type = ''
       accountType.value.map(ele => {
         Reflect.set(ele, 'selected', false)
diff --git a/src/pages/work/base/lend/list.vue b/src/pages/work/base/lend/list.vue
index 636923c..6ee4cf7 100644
--- a/src/pages/work/base/lend/list.vue
+++ b/src/pages/work/base/lend/list.vue
@@ -87,12 +87,12 @@ const data = reactive({
   queryParams: {
     name: null,
     type: '3'
-   } 
+   }
 })
 const { filterPanel, queryParams} = toRefs(data)
 const windowHeight = computed(() => {
 			uni.getSystemInfoSync().windowHeight - 50
-		})	
+		})
 onLoad(() => {
     getDict()
     getList()
@@ -153,7 +153,7 @@ function dictStr(val, arr) {
       return str
     }
 function selectStatus(item) {
-      queryParams.value.debitType = item.dictValue
+      queryParams.value.lendType = item.dictValue
       lendTypeList.value.map(ele => {
         if (ele.dictValue == item.dictValue) {
           ele.selected = true
@@ -177,6 +177,7 @@ function selectStatus(item) {
     function resetQuery() {
         queryParams.value.name = '',
         queryParams.value.type = '3'
+      queryParams.value.lendType = ''
       lendTypeList.value.map(ele => {
         Reflect.set(ele, 'selected', false)
       })
@@ -206,7 +207,7 @@ function selectStatus(item) {
         	}
         });
     }
-	
+
 </script>
 
 <style lang="scss" scoped>
@@ -381,4 +382,4 @@ function selectStatus(item) {
     }
   }
 }
-</style>
\ No newline at end of file
+</style>