From 03401938c37ab385b67db95f939778929fab8e4f Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Thu, 22 Jan 2026 10:10:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/common/common.js                           | 10 +++++++++
 src/views/consume/gold/coinConsumeDetail.vue       |  5 ++---
 .../moneyManage/financialAccount/cashFlow.vue      |  1 -
 .../financialAccount/performanceAttribution.vue    | 26 +++++++++++++++++-----
 4 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 src/api/common/common.js

diff --git a/src/api/common/common.js b/src/api/common/common.js
new file mode 100644
index 0000000..f4b8334
--- /dev/null
+++ b/src/api/common/common.js
@@ -0,0 +1,10 @@
+import http from '@/util/http.js'
+
+//查询资金流水
+export const getUserInfo = (data) => {
+  return http({
+    method: 'POST',
+    url: '/admin/userinfo',
+    data
+  })
+}
\ No newline at end of file
diff --git a/src/views/consume/gold/coinConsumeDetail.vue b/src/views/consume/gold/coinConsumeDetail.vue
index c7b3791..6b1826b 100644
--- a/src/views/consume/gold/coinConsumeDetail.vue
+++ b/src/views/consume/gold/coinConsumeDetail.vue
@@ -705,12 +705,11 @@ const getMarket = async function () {
         </el-table-column>
 
         <el-table-column prop="remark" :label="$t('common_list.remark')" width="200px" show-overflow-tooltip />
-        <el-table-column prop="isRefund" :label="$t('common_list.orderStatus')" width="120px" show-overflow-tooltip fixed="right" align="center">
+        <el-table-column prop="isRefund" :label="$t('common_list.orderStatus')" width="120px" fixed="right" align="center">
           <template #default="scope">
             <div v-if="scope.row.isRefund == 0">{{ $t('consume.normal') }}</div>
             <div v-else-if="scope.row.isRefund == 1" style="display: flex; justify-content: center; align-items: center;">{{ $t('consume.refunded') }} 
                 <el-popover
-               v-model:visible="scope.row.popoverVisible" 
                trigger="hover"                            
                placement="left"                            
                popper-class="refund-popover"
@@ -718,7 +717,7 @@ const getMarket = async function () {
                
        >
         <div class="popover-content">
-          <div class="popover-title" v-if="scope.row.refundModel">{{ scope.row.refundModel == 0 ? $t('common_list.refundModelAll') : $t('common_list.refundModelPart') }}</div>
+          <div class="popover-title" v-if="scope.row.refundModel != null">{{ scope.row.refundModel == 0 ? $t('common_list.refundModelAll') : $t('common_list.refundModelPart') }}</div>
           <div class="popover-title" v-else>{{ $t('common_list.refundStatusPending') }}</div>
           <div class="popover-item">
             <span class="label">{{ $t('common.totalGoldCoin') }}：</span>
diff --git a/src/views/moneyManage/financialAccount/cashFlow.vue b/src/views/moneyManage/financialAccount/cashFlow.vue
index 583f695..9414d2d 100644
--- a/src/views/moneyManage/financialAccount/cashFlow.vue
+++ b/src/views/moneyManage/financialAccount/cashFlow.vue
@@ -455,7 +455,6 @@ onMounted(async () => {
               {{ row.status === 4 ? t('common_list.received') : t('common_list.refunded') }}
             </el-tag>
             <el-popover
-              v-model:visible="row.popoverVisible"
               trigger="hover"
               placement="top"
               popper-class="refund-popover"
diff --git a/src/views/moneyManage/financialAccount/performanceAttribution.vue b/src/views/moneyManage/financialAccount/performanceAttribution.vue
index d188cb6..be8761f 100644
--- a/src/views/moneyManage/financialAccount/performanceAttribution.vue
+++ b/src/views/moneyManage/financialAccount/performanceAttribution.vue
@@ -5,11 +5,11 @@ import request from '@/util/http.js'
 import dayjs from 'dayjs'
 import { useI18n } from 'vue-i18n'
 import { refundOnline,performanceSelect,exportPerformance } from '@/api/cash/financialAccount.js'
-import {useAdminStore} from '@/store/index.js'
-import { storeToRefs } from 'pinia'
+import { getUserInfo } from '@/api/common/common.js'
+
+
+const adminData = ref({})
 
-const adminStore = useAdminStore()
-const {adminData} = storeToRefs(adminStore)
 
 const { t } = useI18n()
 
@@ -84,6 +84,7 @@ const fetchData = async () => {
   loading.value = true
   try {
     // 构建请求参数
+    console.log('adminData.value.markets:', adminData.value.markets)
     const params = {
       pageNum: queryParams.pageNum,
       pageSize: queryParams.pageSize,
@@ -113,6 +114,18 @@ const fetchData = async () => {
   }
 }
 
+const handleAdminInfo = async () => {
+  try {
+    const res = await getUserInfo()
+      adminData.value = res || {}
+      console.log('adminData.value:', adminData.value);
+      
+  } catch (error) {
+    console.error(error)
+    ElMessage.error(t('elmessage.getDataFailed'))
+  }
+}
+
 const handleSearch = () => {
   queryParams.pageNum = 1
   fetchData()
@@ -243,9 +256,10 @@ const getTagText = (state) => {
   }
 }
 
-onMounted(() => {
+onMounted( async() => {
+   await handleAdminInfo()
   getMarket()
-  fetchData()
+  await fetchData()
 })
 </script>