From 3f1985ae841f564a4e32e0c806d000b2951f0184 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Wed, 28 Jan 2026 13:32:41 +0800
Subject: [PATCH 01/28] =?UTF-8?q?paysolution=E6=96=B9=E5=BC=8F=E5=85=B3?=
 =?UTF-8?q?=E8=81=94=E6=B3=B0=E5=9B=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/locales/lang/en.js                      | 1 +
 src/components/locales/lang/zh-CN.js                   | 1 +
 src/views/moneyManage/receiveDetail/receiveService.vue | 6 +++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js
index 4419fed..0d2d53d 100644
--- a/src/components/locales/lang/en.js
+++ b/src/components/locales/lang/en.js
@@ -1089,6 +1089,7 @@ export default {
       ipay88: "Ipay88",
       paymentAsia: "PaymentAsia",
       transfer: "E-Transfer",
+      paysolution:'paysolution'
     },
     statusList: {
       submitted: "Submitted",
diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js
index f285323..3f9b846 100644
--- a/src/components/locales/lang/zh-CN.js
+++ b/src/components/locales/lang/zh-CN.js
@@ -1101,6 +1101,7 @@ export default {
       ipay88: "Ipay88",
       paymentAsia: "PaymentAsia",
       transfer: "E-Transfer",
+      paysolution:'paysolution'
     },
     statusList: {
       submitted: "已提交",
diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue
index 9294fe4..9237515 100644
--- a/src/views/moneyManage/receiveDetail/receiveService.vue
+++ b/src/views/moneyManage/receiveDetail/receiveService.vue
@@ -659,6 +659,9 @@ const ifGroup = () => {
     } else if (addFormData.value.payType === t('cash.payMethods.grabpay') || addFormData.value.payType === t('cash.payMethods.nets') || addFormData.value.payType === t('cash.payMethods.paypal')) {
         isGroup.value = true
         addFormData.value.receivedMarket = t('cash.markets.Singapore')
+    }else if (addFormData.value.payType === t('cash.payMethods.paysolution')) {
+        isGroup.value = true
+        addFormData.value.receivedMarket = t('cash.markets.Thailand')
     } else {
         isGroup.value = false
     }
@@ -924,7 +927,8 @@ const paytypeOptions = ref([
   t('cash.payMethods.bankTransfer'),// 银行转账
   t('cash.payMethods.card'),        // 刷卡
   t('cash.payMethods.cash'),        // 现金
-  t('cash.payMethods.check')        // 支票
+  t('cash.payMethods.check'),        // 支票
+  t('cash.payMethods.paysolution'), // Paysolution
 ])
 const MoneyAddressOptions = ref([
   t('cash.markets.Malaysia'),   // 马来西亚

From e328ae72cea7d4b85006af6a5945ee2a53161ca8 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Thu, 29 Jan 2026 10:30:26 +0800
Subject: [PATCH 02/28] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/loadingFaild.png | Bin 0 -> 10613 bytes
 src/views/login.vue                |  67 +++++++++++++++++++++++++++++++------
 2 files changed, 57 insertions(+), 10 deletions(-)
 create mode 100644 src/assets/images/loadingFaild.png

diff --git a/src/assets/images/loadingFaild.png b/src/assets/images/loadingFaild.png
new file mode 100644
index 0000000000000000000000000000000000000000..ee52460c493972a123f688cc6db3b3354bb374da
GIT binary patch
literal 10613
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
IlyT7i0lc^yMF0Q*

literal 0
HcmV?d00001

diff --git a/src/views/login.vue b/src/views/login.vue
index 9942243..467745f 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -34,7 +34,24 @@ function getMachineId() {
   }
 }
 
-const form = ref({account: null, password: '', token: '', machineId: machineId1.value})
+const form = ref({account: null, password: '', token: '', machineId: machineId1.value, code: '', uuid: ''})
+const captchaUrl = ref('')
+
+// 获取验证码
+const getCaptcha = async () => {
+  try {
+    const res = await request({
+      url: '/admin/captchaImage',
+      method: 'get'
+    })
+    if (res.code === 200) {
+      captchaUrl.value = "data:image/gif;base64," + res.img
+      form.value.uuid = res.uuid
+    }
+  } catch (error) {
+    console.error('获取验证码失败', error)
+  }
+}
 
 const adminRoleId = ref(null)
 
@@ -64,7 +81,7 @@ const login = async function () {
 
       // 存储用户信息
       adminStore.setAdminData(result.data)
-
+    
       // 本页面使用 adminRoleId
       adminRoleId.value = result.data.roleId
 
@@ -97,13 +114,16 @@ const login = async function () {
     } else {
       form.value.password = ''
       form.value.account = ''
+      form.value.code = ''
       ElMessage.error(result.msg)
       loading.value = false //登录失败时重置loading状态
+      getCaptcha()
     }
   } catch (error) {
     console.log('请求失败', error)
     ElMessage.error('登录失败，请检查账号密码')
     loading.value = false // 发生异常时重置loading状态
+    getCaptcha()
   }
 }
 //获取菜单树
@@ -161,13 +181,15 @@ const selectMarket = async function () {
 
 onMounted(() => {
   getMachineId()
-
+  getCaptcha()
 })
 
 </script>
 <template>
   <el-row class="login-page">
-    <img :span="12" src="../assets/background.jpg" alt="logo" class="bg" fit="fit"/>
+    <el-col :span="12" class="bg-container">
+      <img  src="../assets/background.jpg" alt="logo" class="bg" fit="fit"/>
+    </el-col>
     <el-col :span="6" :offset="3" class="form">
       <!-- 登录表单 -->
       <el-form :model="form" size="large" autocomplete="off">
@@ -185,7 +207,20 @@ onMounted(() => {
               required
           />
         </el-form-item>
-        <el-form-item class="flex"></el-form-item>
+        <el-form-item prop="code" required>
+          <el-row :gutter="20" style="width: 100%">
+            <el-col :span="16">
+              <el-input v-model="form.code" placeholder="请输入验证码" @keyup.enter="login"></el-input>
+            </el-col>
+            <el-col :span="8" style="display: flex; align-items: center; justify-content: center;">
+              <img v-if="captchaUrl" :src="captchaUrl" @click="getCaptcha" style="width: 100%; height: 40px; cursor: pointer; border-radius: 4px;" alt="验证码" title="点击刷新验证码" />
+              <div v-else  class="failed">
+                <img src="@/assets/images/loadingFaild.png" @click="getCaptcha">
+                <text>点击刷新二维码</text>
+              </div>
+            </el-col>
+          </el-row>
+        </el-form-item>
         <!-- 登录按钮 -->
         <el-form-item>
           <button type="button" class="button" @click="login()">
@@ -205,7 +240,7 @@ onMounted(() => {
 .bg {
   border-radius: 0 20px 20px 0;
   height: 110vh;
-  width: 50%;
+  width: 100%;
   object-fit: cover;
 }
 
@@ -228,14 +263,26 @@ onMounted(() => {
 
   .button {
     width: 100%;
+    margin-top: 20px;
   }
-
-  .flex {
-    width: 100%;
+.failed{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  img{
+    height: 20px;
+  }
+  text{
+    color: #666666;
+    font-size: 10px;
+    white-space: nowrap;
+    height: 20px;
     display: flex;
-    justify-content: space-between;
+    align-items: center;
   }
 }
+ 
+}
 
 /* From Uiverse.io by kamehame-ha */
 .button {

From 0713b828cd82db43df1ec0b58a17130c910440f8 Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Thu, 29 Jan 2026 18:24:37 +0800
Subject: [PATCH 03/28] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86=E5=92=8C=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E9=80=BB=E8=BE=91=EF=BC=8C=E5=A2=9E=E5=BC=BA=E5=81=A5?=
 =?UTF-8?q?=E5=A3=AE=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在路由守卫和首页中统一处理消息数据，确保 data 字段为数组类型
- 新增 getMessageJumpTarget 工具函数，根据消息的 queryId、type 或 status 智能确定跳转目标
- 首页点击消息时优先尝试根据 queryId 查找路由，提高跳转准确性
---
 src/router/index.js    |  9 +++++----
 src/utils/goToCheck.js | 42 +++++++++++++++++++++++++++++++++++++++++-
 src/views/home.vue     | 19 +++++++++++++++++--
 3 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index b0a927a..1ad5f4b 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -579,11 +579,12 @@ router.afterEach(async (to) => { // 接收to参数获取当前路由信息
         // 存入全局状态，供所有页面访问
         const messageStore = useMessageStore();
         // 过滤 flag=1的消息
-        newMessageRes.data = newMessageRes.data.filter(item => item.flag !== 1);
-
-        messageStore.setMessages(newMessageRes.data);
+        const list = Array.isArray(newMessageRes.data)
+            ? newMessageRes.data
+            : (Array.isArray(newMessageRes.data?.list) ? newMessageRes.data.list : []);
+        messageStore.setMessages(list.filter(item => item.flag !== 1));
     } catch (error) {
         console.error('获取消息失败：', error);
     }
 });
-export default router;
\ No newline at end of file
+export default router;
diff --git a/src/utils/goToCheck.js b/src/utils/goToCheck.js
index c9d40b6..e67f6ef 100644
--- a/src/utils/goToCheck.js
+++ b/src/utils/goToCheck.js
@@ -33,4 +33,44 @@ export function getOrderPage(status) {
     }
     // 未知状态返回工作台
     return '/workbench';
-}
\ No newline at end of file
+}
+
+function toNumberOrNull(value) {
+    if (value === null || value === undefined) return null;
+    const num = typeof value === 'number' ? value : Number(String(value).trim());
+    return Number.isFinite(num) ? num : null;
+}
+
+const queryIdRouteNameMap = {
+    6: 'rechargeAudit',
+    7: 'rechargeAudit',
+    8: 'rechargeAudit',
+    9: 'rechargeAudit',
+    10: 'rechargeAudit',
+    11: 'rechargeAudit',
+    12: 'rechargeAudit',
+    13: 'refundAudit',
+    14: 'refundAudit',
+    15: 'refundAudit',
+    16: 'refundAudit',
+    17: 'refundAudit',
+    18: 'refundAudit',
+    19: 'refundAudit'
+};
+
+export function getMessageJumpTarget(message) {
+    const permissionId = toNumberOrNull(message?.queryId ?? message?.menuId ?? message?.permissionId);
+    if (permissionId !== null) {
+        const routeName = queryIdRouteNameMap[permissionId];
+        if (routeName) return { name: routeName };
+    }
+
+    const type = toNumberOrNull(message?.type);
+    if (type === 0) return { name: 'rechargeAudit' };
+    if (type === 1) return { name: 'refundAudit' };
+
+    const status = toNumberOrNull(message?.status);
+    if (status !== null) return getOrderPage(status);
+
+    return '/workbench';
+}
diff --git a/src/views/home.vue b/src/views/home.vue
index 650e8d6..99398d8 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -211,7 +211,8 @@ const getMessage = async () => {
     });
 
     if (res?.data) {
-      const cleanList = res.data.filter(i => i.flag !== 1)
+      const list = Array.isArray(res.data) ? res.data : (Array.isArray(res.data?.list) ? res.data.list : [])
+      const cleanList = list.filter(i => i.flag !== 1)
       messageStore.setMessages(cleanList)
     }
   } catch (e) {
@@ -282,6 +283,19 @@ const toggleShowAll = () => showAll.value = !showAll.value
 const scrollContainer = ref(null)
 const scrollToTop = () => scrollContainer.value?.scrollTo({top: 0, behavior: 'smooth'})
 
+const getPathByQueryId = (queryId) => {
+  const qid = Number(queryId)
+  if (!Number.isFinite(qid)) return null
+
+  const record = router.getRoutes().find(r => {
+    const pid = r.meta?.permissionId
+    if (Array.isArray(pid)) return pid.includes(qid)
+    return pid === qid
+  })
+
+  return record?.path || null
+}
+
 // 点击消息 → 已读 + 跳转
 const handleMessageClick = async (item) => {
   const res = await API({
@@ -292,7 +306,8 @@ const handleMessageClick = async (item) => {
 
   if (res.code === 200) {
     closeMessageDialog()
-    await router.push(getOrderPage(item.status))
+    const targetPath = item?.queryId ? getPathByQueryId(item.queryId) : null
+    await router.push(targetPath || getOrderPage(item.status) || '/noPermission')
     await getMessage()
     ElMessage.success(t('elmessage.jumpSuccess'))
   } else {

From 75c3b4da8ae3c0d1c29ee2618047f0716fc69d1c Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Fri, 30 Jan 2026 10:27:09 +0800
Subject: [PATCH 04/28] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/locales/lang/en.js    |   2 +
 src/components/locales/lang/zh-CN.js |   2 +
 src/util/http.js                     |   5 +-
 src/views/login.vue                  | 100 +++++++++++++++++++++++++++++------
 4 files changed, 90 insertions(+), 19 deletions(-)

diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js
index 4419fed..397c07a 100644
--- a/src/components/locales/lang/en.js
+++ b/src/components/locales/lang/en.js
@@ -185,6 +185,8 @@ export default {
   // Message Group
   elmessage: {
     // Common
+    accountEmpty: "Account cannot be empty",
+    passwordEmpty: "Password cannot be empty",
     checkRefundgolds: "Refund gold cannot be empty",
     checkPermanentGold: "Permanent gold cannot be empty",
     loginSuccess: "Login successful",
diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js
index f285323..b86ace0 100644
--- a/src/components/locales/lang/zh-CN.js
+++ b/src/components/locales/lang/zh-CN.js
@@ -185,6 +185,8 @@ export default {
   // 提示信息组
   elmessage: {
     // 通用
+    accountEmpty: "账号不能为空",
+    passwordEmpty: "密码不能为空",
     checkRefundgolds: "退款金币总数不能为0",
     checkPermanentGold: "永久金币不能为空",
     loginSuccess: "登录成功",
diff --git a/src/util/http.js b/src/util/http.js
index f5dc608..c3052fa 100644
--- a/src/util/http.js
+++ b/src/util/http.js
@@ -1,14 +1,15 @@
 import request from './request'
 
 export default function(options) {
-    const { method = 'post', url, data = {}, params = {}, headers = {} } = options
+    const { method = 'post', url, data = {}, params = {}, headers = {}, responseType } = options
 
     return request({
         method,
         url,
         data,
         params,
-        headers
+        headers,
+        responseType
     })
         .then(({ status, data, statusText }) => {
             if (status === 200) {
diff --git a/src/views/login.vue b/src/views/login.vue
index 467745f..ac141b1 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -1,5 +1,5 @@
 <script setup>
-import {onMounted, ref} from 'vue'
+import {onMounted, ref,onUnmounted} from 'vue'
 import {ElMessage} from 'element-plus'
 import request from '@/util/http'
 import {useRouter} from 'vue-router'
@@ -34,20 +34,74 @@ function getMachineId() {
   }
 }
 
-const form = ref({account: null, password: '', token: '', machineId: machineId1.value, code: '', uuid: ''})
+const form = ref({account: null, password: '', token: '', machineId: machineId1.value, captcha: '', uuid: ''})
+const formRef = ref(null)
+const rules = {
+  account: [
+    { required: true, message: '请输入账号', trigger: 'blur' }
+  ],
+  password: [
+    { required: true, message: '请输入密码', trigger: 'blur' }
+  ],
+  captcha: [
+    { required: true, message: '请输入验证码', trigger: 'blur' }
+  ]
+}
 const captchaUrl = ref('')
+const isCaptchaCooldown = ref(false)
+let captchaCooldownTimer = null
+let cooldownStartTime = 0           // 冷却开始时间（时间戳）
+const COOLDOWN_TOTAL = 5 * 1000    // 总冷却时长：5 秒（转毫秒）
+
+// 启动验证码冷却定时器
+const startCaptchaCooldown = () => {
+  isCaptchaCooldown.value = true
+  cooldownStartTime = Date.now()
+  captchaCooldownTimer = setTimeout(() => {
+    isCaptchaCooldown.value = false // 冷却结束
+    cooldownStartTime = 0           // 重置开始时间
+  }, COOLDOWN_TOTAL)
+}
+
+const getCaptchaRemainingSeconds = () => {
+  if (!isCaptchaCooldown.value || cooldownStartTime === 0) {
+    return 0
+  }
+  const elapsed = Date.now() - cooldownStartTime
+  const remainingMs = Math.max(COOLDOWN_TOTAL - elapsed, 0)
+  const remainingSeconds = Math.ceil(remainingMs / 1000)
+  return remainingSeconds
+}
 
+const clearCaptchaCooldown = () => {
+  if (captchaCooldownTimer) {
+    clearTimeout(captchaCooldownTimer)
+    captchaCooldownTimer = null
+  }
+  isCaptchaCooldown.value = false
+  cooldownStartTime = 0
+}
 // 获取验证码
 const getCaptcha = async () => {
+  if (isCaptchaCooldown.value) {
+    ElMessage.warning('验证码获取太频繁，请' + getCaptchaRemainingSeconds() + '秒后再试')
+    return
+  }
+
   try {
+    let uuid = Date.now()
+    localStorage.setItem('uuid', uuid)
     const res = await request({
-      url: '/admin/captchaImage',
-      method: 'get'
+      url: '/captcha' + '?uuid=' + uuid,
+      method: 'get',
+      responseType: 'blob',
     })
-    if (res.code === 200) {
-      captchaUrl.value = "data:image/gif;base64," + res.img
-      form.value.uuid = res.uuid
+     if (captchaUrl.value) {
+      URL.revokeObjectURL(captchaUrl.value);
     }
+    captchaUrl.value = URL.createObjectURL(res);
+
+    startCaptchaCooldown()
   } catch (error) {
     console.error('获取验证码失败', error)
   }
@@ -59,6 +113,12 @@ const adminRoleId = ref(null)
 const adminStore = useAdminStore()
 //调用方法
 const login = async function () {
+  if (!formRef.value) return
+  try {
+    await formRef.value.validate()
+  } catch (err) {
+    return
+  }
 
   if(loading.value) {
     console.log('正在登录，请稍后')
@@ -68,11 +128,15 @@ const login = async function () {
   loading.value = true
 
   try {
+    let params = {
+      ...form.value,
+      uuid: localStorage.getItem('uuid')
+    }
     const result = await request({
       url: '/admin/login',
-      data: form.value
+      data: params
     })
-    console.log('传给后端的参数', form.value)
+    console.log('传给后端的参数', params)
 
     if (result.code === 200) {
       // 本地存储token
@@ -114,16 +178,14 @@ const login = async function () {
     } else {
       form.value.password = ''
       form.value.account = ''
-      form.value.code = ''
+      form.value.captcha = ''
       ElMessage.error(result.msg)
       loading.value = false //登录失败时重置loading状态
-      getCaptcha()
     }
   } catch (error) {
     console.log('请求失败', error)
     ElMessage.error('登录失败，请检查账号密码')
     loading.value = false // 发生异常时重置loading状态
-    getCaptcha()
   }
 }
 //获取菜单树
@@ -184,6 +246,10 @@ onMounted(() => {
   getCaptcha()
 })
 
+onUnmounted(() => {
+  clearCaptchaCooldown()
+})
+
 </script>
 <template>
   <el-row class="login-page">
@@ -192,7 +258,7 @@ onMounted(() => {
     </el-col>
     <el-col :span="6" :offset="3" class="form">
       <!-- 登录表单 -->
-      <el-form :model="form" size="large" autocomplete="off">
+      <el-form :model="form" :rules="rules" ref="formRef" size="large" autocomplete="off">
         <el-form-item>
           <h1 style="color: #409eff">熵盾管理系统 V1.0</h1>
         </el-form-item>
@@ -207,15 +273,15 @@ onMounted(() => {
               required
           />
         </el-form-item>
-        <el-form-item prop="code" required>
+        <el-form-item prop="captcha" required>
           <el-row :gutter="20" style="width: 100%">
             <el-col :span="16">
-              <el-input v-model="form.code" placeholder="请输入验证码" @keyup.enter="login"></el-input>
+              <el-input v-model="form.captcha" placeholder="请输入验证码" @keyup.enter="login"></el-input>
             </el-col>
             <el-col :span="8" style="display: flex; align-items: center; justify-content: center;">
               <img v-if="captchaUrl" :src="captchaUrl" @click="getCaptcha" style="width: 100%; height: 40px; cursor: pointer; border-radius: 4px;" alt="验证码" title="点击刷新验证码" />
-              <div v-else  class="failed">
-                <img src="@/assets/images/loadingFaild.png" @click="getCaptcha">
+              <div v-else @click="getCaptcha"  class="failed">
+                <img src="@/assets/images/loadingFaild.png" >
                 <text>点击刷新二维码</text>
               </div>
             </el-col>

From aae33a5602afe9cd691de21790143fbf4ada0ea0 Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Fri, 30 Jan 2026 10:50:33 +0800
Subject: [PATCH 05/28] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E6=9D=83=E9=99=90ID=E5=92=8C=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.js | 18 +++++++++---------
 src/views/home.vue  | 12 ++++++++++--
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 1ad5f4b..d739a6f 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -307,27 +307,27 @@ const routes = [
                     {
                         path: 'receiveDetail',
                         name: "receiveDetail",
-                        meta: {permissionId: 74},
+                        meta: {permissionId: 59},
                         children: [
                             // 收款提交
                             {
                                 path: 'receiveService',
                                 name: "receiveService",
                                 component: () => import("../views/moneyManage/receiveDetail/receiveService.vue"),
-                                meta: {permissionId: 60}
+                                meta: {permissionId: [60, 61, 62, 63, 64, 65, 66]}
                             },
                             // 收款处理（负责人）
                             {
                                 path: 'receiveManager',
                                 name: "receiveManager",
                                 component: () => import("../views/moneyManage/receiveDetail/receiveManage.vue"),
-                                meta: {permissionId: [67, 79]}
+                                meta: {permissionId: [79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90]}
                             },
                             {//收款处理 
                                 path: 'receiveFinance',
                                 name: "receiveFinance",
                                 component: () => import("../views/moneyManage/receiveDetail/receiveFinance.vue"),
-                                meta: {permissionId: [67, 79]}
+                                meta: {permissionId: [67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78]}
                             },
                             //总部管理员及财务（移除）
                             // {
@@ -350,28 +350,28 @@ const routes = [
                                 path: 'refundService',
                                 name: "refundService",
                                 component: () => import("../views/moneyManage/refundDetail/refundService.vue"),
-                                meta: {permissionId: 99}
+                                meta: {permissionId: [99, 100, 101, 102]}
                             },
                             // 退款审批
                             {
                                 path: 'refundFinance',
                                 name: "refundFinance",
                                 component: () => import("../views/moneyManage/refundDetail/refundFinance.vue"),
-                                meta: {permissionId: 103}
+                                meta: {permissionId: [103, 104, 105, 106]}
                             },
                             // 退款审批（负责人）
                             {
                                 path: 'refundCharge',
                                 name: "refundCharge",
                                 component: () => import("../views/moneyManage/refundDetail/refundCharge.vue"),
-                                meta: {permissionId: 107}
+                                meta: {permissionId: [107, 108, 109, 110]}
                             },
                             // 退款审批（总部财务）
                             {
                                 path: 'refundHeader',
                                 name: "refundHeader",
                                 component: () => import("../views/moneyManage/refundDetail/refundHeader.vue"),
-                                meta: {permissionId: 111}
+                                meta: {permissionId: [111, 112, 113, 114]}
                             },
                         ]
                     },
@@ -380,7 +380,7 @@ const routes = [
                         path: 'executor',
                         name: "executor",
                         component: () => import("../views/moneyManage/executor/executor.vue"),
-                        meta: {permissionId: 115}
+                        meta: {permissionId: [115, 116, 117, 118]}
                     },
                     // 财务核算
                     {
diff --git a/src/views/home.vue b/src/views/home.vue
index 99398d8..299ead6 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -287,13 +287,21 @@ const getPathByQueryId = (queryId) => {
   const qid = Number(queryId)
   if (!Number.isFinite(qid)) return null
 
-  const record = router.getRoutes().find(r => {
+  const matchedRoutes = router.getRoutes().filter(r => {
     const pid = r.meta?.permissionId
     if (Array.isArray(pid)) return pid.includes(qid)
     return pid === qid
   })
 
-  return record?.path || null
+  if (!matchedRoutes.length) return null
+
+  matchedRoutes.sort((a, b) => {
+    const aDepth = typeof a.path === 'string' ? a.path.split('/').length : 0
+    const bDepth = typeof b.path === 'string' ? b.path.split('/').length : 0
+    return bDepth - aDepth
+  })
+
+  return matchedRoutes[0]?.path || null
 }
 
 // 点击消息 → 已读 + 跳转

From e3674904e5ed51f43532624d50ed73b11f9c5a63 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Fri, 30 Jan 2026 14:13:11 +0800
Subject: [PATCH 06/28] =?UTF-8?q?=E5=85=85=E5=80=BC=E9=A3=8E=E9=99=A9?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/locales/lang/en.js           |  1 +
 src/components/locales/lang/zh-CN.js        |  1 +
 src/views/recharge/gold/addCoinRecharge.vue | 84 +++++++++++++++++++++++------
 3 files changed, 69 insertions(+), 17 deletions(-)

diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js
index 397c07a..474f936 100644
--- a/src/components/locales/lang/en.js
+++ b/src/components/locales/lang/en.js
@@ -555,6 +555,7 @@ export default {
 
   // Add Form Fields
   common_add: {
+    orderStatus: "Order Status",
     jwcode: "Homily ID",
     jwcodePlaceholder: "Enter Homily ID",
     originalChinese: "Chinese",
diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js
index b86ace0..05777c5 100644
--- a/src/components/locales/lang/zh-CN.js
+++ b/src/components/locales/lang/zh-CN.js
@@ -626,6 +626,7 @@ export default {
     receiveArea: "到账地区",
     receiveAreaPlaceholder: "请选择到账地区",
     price: "原价",
+    orderStatus: "订单状态",
     goodsNamePlaceholder: "请选择商品",
     使用红包: "使用红包",
     不使用红包: "不使用红包",
diff --git a/src/views/recharge/gold/addCoinRecharge.vue b/src/views/recharge/gold/addCoinRecharge.vue
index b5faeed..9f4994e 100644
--- a/src/views/recharge/gold/addCoinRecharge.vue
+++ b/src/views/recharge/gold/addCoinRecharge.vue
@@ -77,11 +77,12 @@ const recharge = ref({
 // 用来写的 cookie 的 key
 const WriteCookies = ref(null)
 // 用来写的 cookie 的 value
-const WriteCookiesTime = ref(null)
+const WriteCookiesVale = ref(null)
 // 用来读的 cookie 的 key
 const ReadCookies = ref(null)
 // 用来读的 cookie 的 value
-const ReadCookiesTime = ref(null)
+const ReadCookiesValue = ref({})
+const orderStatus = ref('')
 // 这是添加充值信息的接口
 const add = async function () {
   try {
@@ -107,12 +108,7 @@ const add = async function () {
 
     console.log('开始添加充值信息', recharge.value)
     //存一下 用户的jwcode
-    // 拼接 jwcode:permanentGold:freeGold
-    WriteCookies.value = `coinRecharge:${recharge.value.jwcode}:${recharge.value.permanentGold}:${recharge.value.freeGold}`
-    //value 为充值时间
-    WriteCookiesTime.value = recharge.value.payTime
-    // 设置cookies,用户jwcode为key，value也是jwcode，过期时间为1天
-    Cookies.set(WriteCookies.value, WriteCookiesTime.value, {expires: 1, path: '/'});
+   
     // 发送POST请求
     addDisabled.value = true
     const result = await API({
@@ -120,6 +116,17 @@ const add = async function () {
       data: formattedRecharge
     })
     addDisabled.value = false
+    if(result.code == 200){
+       // 拼接 jwcode:permanentGold:freeGold
+    WriteCookies.value = `coinRecharge:${recharge.value.jwcode}:${recharge.value.permanentGold}:${recharge.value.freeGold}`
+    //value 为充值时间
+    WriteCookiesVale.value = JSON.stringify({
+    payTime: recharge.value.payTime, 
+    orderCode: result.data
+  });
+    // 设置cookies,用户jwcode为key，value也是jwcode，过期时间为1天
+    Cookies.set(WriteCookies.value, WriteCookiesVale.value, {expires: 1, path: '/'});
+    }
     if (result.code === 0) {
       ElMessage.error(result.msg)
       return
@@ -187,6 +194,25 @@ const FirstRechargeDialogVisibleCancel = () => {
   user.value = {}
 };
 
+const historyOrder = ref({})
+// 查询订单号对应的状态
+const selectByOrderCode = async function (data) {
+  try {
+    const result = await API({
+      url: '/recharge/selectByOrderCode',
+      data: data,
+       headers: {
+    'Content-Type': 'text/plain;charset=utf-8'
+  },
+    })
+    if(result.code == 200){
+      historyOrder.value = result.data
+    }
+  } catch (error) {
+    console.log('请求失败', error)
+    // 在这里可以处理错误逻辑，比如显示错误提示等
+  }
+}
 // 添加充值信息前的按钮点击事件，进行表单验证和用户确认操作
 const addBefore = () => {
   // 为未输入的金币字段设置默认值
@@ -251,14 +277,34 @@ const addBefore = () => {
     // 拼接 jwcode:permanentGold:freeGold
     ReadCookies.value = `coinRecharge:${recharge.value.jwcode}:${recharge.value.permanentGold}:${recharge.value.freeGold}`
 
+    console.log('ReadCookies',ReadCookies.value);
+    
     // 获取cookie
-    const cookie = Cookies.get(ReadCookies.value)
-    console.log("time", WriteCookiesTime.value)
-    // 格式化时间
-    ReadCookiesTime.value = moment(cookie).format('YYYY-MM-DD HH:mm:ss')
-    console.log('cookie', cookie)
-    // 如果存在cookie，显示确认对话框；否则直接进入充值确认
-    if (cookie) {
+    const cookieValue = Cookies.get(ReadCookies.value);
+    if (cookieValue) {
+    // 解析为对象
+    const rechargeInfo = JSON.parse(cookieValue);
+    console.log('充值时间：', rechargeInfo.payTime);
+    console.log('订单号：', rechargeInfo.orderCode);
+    ReadCookiesValue.value = {
+      ...rechargeInfo,
+    }
+    }
+    if (Object.keys(ReadCookiesValue.value).length > 0) {
+      await selectByOrderCode(ReadCookiesValue.value.orderCode)
+      if(historyOrder.value.type == 0 ){
+        if(historyOrder.value.auditStatus == 0){
+          orderStatus.value = '待审核'
+        }else if(historyOrder.value.auditStatus == 1){
+          if(historyOrder.value.isRefund == 1){
+            orderStatus.value = '已退款'
+          }else{
+            orderStatus.value = '已通过'
+          }
+        }else if(historyOrder.value.auditStatus == 2){
+          orderStatus.value = '已驳回'
+        }
+      }
       RechargeDialogVisible.value = true;
     } else {
       FirstRechargeDialogVisible.value = true;
@@ -845,6 +891,10 @@ onMounted(() => {
           <div class="field-label">{{ $t('common_add.activity') }}</div>
           <el-input v-model="recharge.activity" disabled/>
         </div>
+        <div class="field">
+          <div class="field-label">{{ $t('common_add.orderStatus') }}</div>
+          <el-input v-model="orderStatus" disabled/>
+        </div>
         <!-- 金币信息（同一行左右排列） -->
         <el-row :gutter="20" class="coins-row">
           <el-col :span="12">
@@ -871,8 +921,8 @@ onMounted(() => {
         <div>
           <el-divider border-style="dashed"/>
           <p>{{ $t('common_add.similarRechargeRecords') }}</p>
-          · {{ ReadCookiesTime }} {{ $t('common_add.rechargePermanentGold') }}: {{ recharge.permanentGold }}
-          {{ $t('common_add.freeGold') }}: {{ recharge.freeGold }}({{ $t('common_add.operator') }}：{{ adminData.adminName }})
+          · {{ moment(ReadCookiesValue.payTime).format('YYYY-MM-DD HH:mm:ss') }} {{ $t('common_add.rechargePermanentGold') }}: {{ recharge.permanentGold }}
+          {{ $t('common_add.freeGold') }}: {{ recharge.freeGold }} {{ $t('common_add.orderStatus')}}: {{ orderStatus }}({{ $t('common_add.operator') }}：{{ adminData.adminName }})
         </div>
         <div style="margin-top: 10px">
           <p>{{ $t('common_add.continueOperation') }}</p>

From 3352e2cddd366c16094c4db8bf83cf4b8d73ab0e Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Fri, 30 Jan 2026 14:28:21 +0800
Subject: [PATCH 07/28] =?UTF-8?q?fix:=20=E6=B3=A8=E9=87=8A=E6=8E=89?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=AE=A2=E5=8D=95=E5=AE=A1=E6=A0=B8=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=9B=E4=BD=BF=E7=94=A8=E5=90=8E=E7=AB=AF=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=9A=84=E6=96=87=E6=9C=AC=EF=BC=8C=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=8F=E8=BF=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/locales/lang/en.js    | 2 +-
 src/components/locales/lang/zh-CN.js | 2 +-
 src/views/home.vue                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js
index 4419fed..1fd0f87 100644
--- a/src/components/locales/lang/en.js
+++ b/src/components/locales/lang/en.js
@@ -1018,7 +1018,7 @@ export default {
       market: "Region",
       registerTime: "Registered at",
     },
-    orderNeedsReview: "A receipt order requires review",
+    // orderNeedsReview: "A receipt order requires review",
     messageGroups: {
       today: "Today",
       yesterday: "Yesterday",
diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js
index f285323..3f35ab6 100644
--- a/src/components/locales/lang/zh-CN.js
+++ b/src/components/locales/lang/zh-CN.js
@@ -1029,7 +1029,7 @@ export default {
       market: "地区",
       registerTime: "注册时间",
     },
-    orderNeedsReview: "用户有条收款订单需审核",
+    // orderNeedsReview: "用户有条收款订单需审核",
     messageGroups: {
       today: "今天",
       yesterday: "昨天",
diff --git a/src/views/home.vue b/src/views/home.vue
index 299ead6..e88d654 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -527,7 +527,7 @@ onMounted(() => getMessage())
 
           <div class="message-desc">
             <div v-if="findMenuById(menuTree, permissionMapping.refund_headquarters_finance)">[{{ item.marketName }}] </div>
-            <div>[{{item.name}}{{ item.jwcode }}]{{ t('home.orderNeedsReview') }}</div>
+            <div>[{{item.name}}{{ item.jwcode }}]{{ item.desc}}</div>
             </div>
             <el-button
                 type="primary"

From f6c6ba643af608b0a99862a5ba2a48fcf1504bf6 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Fri, 30 Jan 2026 17:08:59 +0800
Subject: [PATCH 08/28] =?UTF-8?q?=E6=B6=88=E8=B4=B9=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/locales/lang/en.js         |   3 +
 src/components/locales/lang/zh-CN.js      |   3 +
 src/views/consume/gold/addCoinConsume.vue | 120 +++++++++++++++++++++---------
 3 files changed, 89 insertions(+), 37 deletions(-)

diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js
index 474f936..77d8ab7 100644
--- a/src/components/locales/lang/en.js
+++ b/src/components/locales/lang/en.js
@@ -669,10 +669,13 @@ export default {
     operationConfirm: "Confirm",
     userInfo: "User Info",
     prompt: "Risk Alert",
+    promptConsume: "Risk Alert for Consume",
     similarRechargeRecords: "Similar recent records detected",
+    similarCosumeRecords: "Similar recent consume records detected",
     rechargePermanentGold: "Recharge Perm Coins",
     buy: "Buy",
     operator: "Operator",
+    orderStatus: "Order Status",
     submitter: "Submitter",
     continueOperation: "Continue?",
     // Gold Bean
diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js
index 05777c5..3fdee17 100644
--- a/src/components/locales/lang/zh-CN.js
+++ b/src/components/locales/lang/zh-CN.js
@@ -669,9 +669,12 @@ export default {
     operationConfirm: "操作确认",
     userInfo: "用户信息",
     prompt: "重复充值风险提示",
+    promptConsume: "重复消耗风险提示",
     similarRechargeRecords: "检测到该用户近期有相似充值记录",
+    similarCosumeRecords: "检测到该用户近期有相似消耗记录",
     rechargePermanentGold: "充值永久金币",
     buy: "购买",
+    orderStatus:'订单状态',
     operator: "操作人",
     submitter: "提交人",
     continueOperation: "是否继续操作？",
diff --git a/src/views/consume/gold/addCoinConsume.vue b/src/views/consume/gold/addCoinConsume.vue
index 6b9816d..f3ac31a 100644
--- a/src/views/consume/gold/addCoinConsume.vue
+++ b/src/views/consume/gold/addCoinConsume.vue
@@ -264,11 +264,12 @@ function calculateCoins(sumGold) {
 // 用来写的 cookie 的 key
 const WriteCookies = ref(null)
 // 用来写的 cookie 的 value
-const WriteCookiesTime = ref(null)
+const WriteCookiesVale = ref({})
 // 用来读的 cookie 的 key
 const ReadCookies = ref(null)
 // 用来读的 cookie 的 value
-const ReadCookiesTime = ref(null)
+const ReadCookiesValue = ref({})
+const orderStatus = ref('')
 
 
 // 这是添加消费信息的接口
@@ -298,7 +299,7 @@ const add = async function () {
         freeGold: addConsume.value.freeGold * 100,
         taskGold: addConsume.value.taskGold * 100,
         permanentGold: addConsume.value.permanentGold * 100,
-        goodsName: addConsume.value.goodsName.value,
+        goodsName: addConsume.value.goodsName,
         remark: addConsume.value.remark,
         adminName: adminData.value.adminName,
         redMoney: Number(addConsume.value.redMoney), // 1-使用红包，0-不使用红包
@@ -322,16 +323,13 @@ const add = async function () {
 function handleResponse(result) {
   console.log("响应结果", result)
   if (result.code === 200) {
-    //存一下 用户的jwcode
-    // 拼接 jwcode:permanentGold:freeGold
-    WriteCookies.value = `coinConsume:${addConsume.value.jwcode}:${addConsume.value.goodsName.value}`
-    //value 为当前消耗时间
-    WriteCookiesTime.value = dayjs().format("YYYY-MM-DD HH:mm:ss");
-    // 设置cookies,用户jwcode为key，value也是jwcode，过期时间为1天
-    Cookies.set(WriteCookies.value, WriteCookiesTime.value, {
-      expires:
-        1, path: '/'
-    });
+    WriteCookies.value = `coinConsume:${addConsume.value.jwcode}:${addConsume.value.goodsName}`
+    //value 为消耗时间
+    WriteCookiesVale.value = JSON.stringify({
+    payTime: dayjs().format("YYYY-MM-DD HH:mm:ss"), 
+    orderCode: result.data
+  });
+    Cookies.set(WriteCookies.value, WriteCookiesVale.value, {expires: 1, path: '/'});
     ElMessage.success(t('elmessage.addSuccess'));
     console.log("请求成功", result);
   } else {
@@ -448,6 +446,26 @@ const FirstConsumeDialogVisibleCancel = () => {
 //       });
 // };
 
+
+const historyOrder = ref({})
+// 查询订单号对应的状态
+const selectByOrderCode = async function (data) {
+  try {
+    const result = await request({
+      url: '/recharge/selectByOrderCode',
+      data: data,
+       headers: {
+    'Content-Type': 'text/plain;charset=utf-8'
+  },
+    })
+    if(result.code == 200){
+      historyOrder.value = result.data
+    }
+  } catch (error) {
+    console.log('请求失败', error)
+    // 在这里可以处理错误逻辑，比如显示错误提示等
+  }
+}
 // 添加前验证
 const addBefore = () => {
   Ref.value.validate(async (valid) => {
@@ -462,16 +480,32 @@ const addBefore = () => {
     if (!validateInput() || !validateRedLimit()) {
       return;
     }
-    ReadCookies.value = `coinConsume:${addConsume.value.jwcode}:${addConsume.value.goodsName.value}`
+    ReadCookies.value = `coinConsume:${addConsume.value.jwcode}:${addConsume.value.goodsName}`
+    console.log('ReadCookies',ReadCookies.value);
     // 获取cookie
-    const cookie = Cookies.get(ReadCookies.value)
-    console.log("time", WriteCookiesTime.value)
-    // 格式化时间
-    ReadCookiesTime.value = moment(cookie).format('YYYY-MM-DD HH:mm:ss')
-    console.log("cookie========", cookie)
-    if (cookie) {
+    const cookieValue = Cookies.get(ReadCookies.value);
+    if (cookieValue) {
+    // 解析为对象
+    const rechargeInfo = JSON.parse(cookieValue);
+    console.log('充值时间：', rechargeInfo.payTime);
+    console.log('订单号：', rechargeInfo.orderCode);
+    ReadCookiesValue.value = {
+      ...rechargeInfo,
+    }
+    }
+    if (Object.keys(ReadCookiesValue.value).length > 0) {
+      await selectByOrderCode(ReadCookiesValue.value.orderCode)
+      if(historyOrder.value.type == 1 ){
+        if(historyOrder.value.auditStatus == 1 ){
+          if(historyOrder.value.isRefund == 0){
+          orderStatus.value = '正常'
+        }else if(historyOrder.value.isRefund == 1){
+          orderStatus.value = '已退款'
+        }
+        }
+      }
       ConsumeDialogVisible.value = true;
-    } else {
+    }  else {
       FirstConsumeDialogVisible.value = true;
     }
   });
@@ -606,16 +640,24 @@ watch(
 );
 
 // 监听商品选择，自动展示原价
-watch(
-  () => addConsume.value.goodsName,
-  (newGoods) => {
-    if (newGoods && typeof newGoods === 'object') {
-      addConsume.value.price = Number(newGoods.price || 0) || null;
-    } else {
-      addConsume.value.price = null;
-    }
+const handleGoodsChange = (newGoods) => {
+  if (newGoods && typeof newGoods === 'object') {
+    addConsume.value.price = Number(newGoods.price || 0) || null;
+  } else {
+    addConsume.value.price = null;
   }
-);
+}
+// 监听商品选择，自动展示原价
+// watch(
+//   () => addConsume.value.goodsName,
+//   (newGoods) => {
+//     if (newGoods && typeof newGoods === 'object') {
+//       addConsume.value.price = Number(newGoods.price || 0) || null;
+//     } else {
+//       addConsume.value.price = null;
+//     }
+//   }
+// );
 
 /*
 ====================红包逻辑=================================
@@ -744,8 +786,8 @@ onMounted(async function () {
 
         <el-form-item prop="goodsName" :label="t('common_add.goodsName')">
           <el-select v-model="addConsume.goodsName" :placeholder="t('common_add.goodsNamePlaceholder')"
-            style="width: 200px" clearable filterable>
-            <el-option v-for="(item, index) in goods" :key="index" :label="item.label" :value="item" />
+            style="width: 200px" clearable filterable >
+            <el-option v-for="(item, index) in goods" :key="index" :label="item.label" :value="item.value" @click="handleGoodsChange(item)" />
 
           </el-select>
         </el-form-item>
@@ -914,7 +956,7 @@ onMounted(async function () {
           <!-- 商品名称 -->
           <div class="field">
             <div class="field-label">{{ $t('common_add.goodsName') }}</div>
-            <el-input v-model="addConsume.goodsName.value" disabled />
+            <el-input v-model="addConsume.goodsName" disabled />
           </div>
           <!--金币总数   -->
           <div class="field">
@@ -972,7 +1014,11 @@ onMounted(async function () {
           <!-- 商品名称 -->
           <div class="field">
             <div class="field-label">{{ $t('common_add.goodsName') }}</div>
-            <el-input v-model="addConsume.goodsName.value" disabled />
+            <el-input v-model="addConsume.goodsName" disabled />
+          </div>
+          <div class="field">
+            <div class="field-label">{{ $t('common_add.orderStatus') }}</div>
+            <el-input v-model="orderStatus" disabled />
           </div>
           <!--金币总数   -->
           <div class="field">
@@ -1006,13 +1052,13 @@ onMounted(async function () {
             <el-icon :size="24" color="#FFD700">
               <WarnTriangleFilled />
             </el-icon>
-            <p>{{ $t('common_add.prompt') }}</p>
+            <p>{{ $t('common_add.promptConsume') }}</p>
           </div>
           <!-- 记录 + 虚线分隔 -->
           <div>
             <el-divider border-style="dashed" />
-            <p>{{ $t('common_add.similarRechargeRecords') }}</p>
-            · {{ ReadCookiesTime }} {{ $t('common_add.buy') }} 【{{ addConsume.goodsName.value }}】({{
+            <p>{{ $t('common_add.similarCosumeRecords') }}</p>
+            · {{ ReadCookiesValue.payTime }} {{ $t('common_add.buy') }} 【{{ addConsume.goodsName }}】【{{ $t('common_add.orderStatus') }}: {{ orderStatus }}】({{
               $t('common_add.operator') }}: {{ adminData.adminName }})
           </div>
           <div style="margin-top: 10px">

From ab40a308ddda61e618804c8e26f03619a0fa3fc7 Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Fri, 30 Jan 2026 18:22:00 +0800
Subject: [PATCH 09/28] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=96=B0?=
 =?UTF-8?q?=E7=9A=84=E6=89=A7=E8=A1=8C=E4=BA=BA=E5=88=B0=E6=89=A7=E8=A1=8C?=
 =?UTF-8?q?=E4=BA=BA=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/moneyManage/refundDetail/refundHeader.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue
index df79d13..accec0e 100644
--- a/src/views/moneyManage/refundDetail/refundHeader.vue
+++ b/src/views/moneyManage/refundDetail/refundHeader.vue
@@ -470,6 +470,10 @@ const executorList = ref([
         value: '315915',
         label: '越:范秋霞'
     },
+    {
+        value: '200246',
+        label: '马:小汪执行人'
+    }
 ])
 // 查全部
 const getRefund = async function () {

From 7203c4be7c8e6eed21179169b7c34ea9ea658fd6 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Sun, 1 Feb 2026 09:37:34 +0800
Subject: [PATCH 10/28] =?UTF-8?q?=E5=88=A0=E6=8E=89=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/consume/gold/addCoinConsume.vue   | 4 ----
 src/views/recharge/gold/addCoinRecharge.vue | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/src/views/consume/gold/addCoinConsume.vue b/src/views/consume/gold/addCoinConsume.vue
index f3ac31a..2652d3e 100644
--- a/src/views/consume/gold/addCoinConsume.vue
+++ b/src/views/consume/gold/addCoinConsume.vue
@@ -1016,10 +1016,6 @@ onMounted(async function () {
             <div class="field-label">{{ $t('common_add.goodsName') }}</div>
             <el-input v-model="addConsume.goodsName" disabled />
           </div>
-          <div class="field">
-            <div class="field-label">{{ $t('common_add.orderStatus') }}</div>
-            <el-input v-model="orderStatus" disabled />
-          </div>
           <!--金币总数   -->
           <div class="field">
             <div class="field-label">{{ $t('common_add.totalGold') }}</div>
diff --git a/src/views/recharge/gold/addCoinRecharge.vue b/src/views/recharge/gold/addCoinRecharge.vue
index 9f4994e..502db19 100644
--- a/src/views/recharge/gold/addCoinRecharge.vue
+++ b/src/views/recharge/gold/addCoinRecharge.vue
@@ -891,10 +891,6 @@ onMounted(() => {
           <div class="field-label">{{ $t('common_add.activity') }}</div>
           <el-input v-model="recharge.activity" disabled/>
         </div>
-        <div class="field">
-          <div class="field-label">{{ $t('common_add.orderStatus') }}</div>
-          <el-input v-model="orderStatus" disabled/>
-        </div>
         <!-- 金币信息（同一行左右排列） -->
         <el-row :gutter="20" class="coins-row">
           <el-col :span="12">

From 11fe00bde915380e96a40e94dfafcb715646d4b8 Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Mon, 2 Feb 2026 11:31:56 +0800
Subject: [PATCH 11/28] =?UTF-8?q?fix:=20=E5=90=88=E5=B9=B6=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=8F=8F=E8=BF=B0=E4=B8=AD=E7=9A=84=E5=B8=82=E5=9C=BA?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=92=8C=E5=85=B6=E4=BB=96=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/views/home.vue b/src/views/home.vue
index e88d654..0e4fc48 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -526,8 +526,7 @@ onMounted(() => getMessage())
             </div>
 
           <div class="message-desc">
-            <div v-if="findMenuById(menuTree, permissionMapping.refund_headquarters_finance)">[{{ item.marketName }}] </div>
-            <div>[{{item.name}}{{ item.jwcode }}]{{ item.desc}}</div>
+            <div v-if="findMenuById(menuTree, permissionMapping.refund_headquarters_finance)">[{{ item.marketName }}] [{{item.name}}{{ item.jwcode }}]{{ item.desc}}</div>
             </div>
             <el-button
                 type="primary"

From 99ed8732c4070773a86ac6f151f8d03985159ab0 Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Mon, 2 Feb 2026 18:17:25 +0800
Subject: [PATCH 12/28] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E7=8A=B6=E6=80=81=E7=9A=84=E5=9B=BD=E9=99=85=E5=8C=96?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/locales/lang/en.js           | 4 ++++
 src/components/locales/lang/zh-CN.js        | 4 ++++
 src/views/recharge/gold/addCoinRecharge.vue | 8 ++++----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js
index dd6843e..7310e0a 100644
--- a/src/components/locales/lang/en.js
+++ b/src/components/locales/lang/en.js
@@ -800,6 +800,10 @@ export default {
     unknown: "Unknown",
     // 金币新增充值
     addCoinRecharge: "New Recharge",
+    waitAudit: "Pending",
+    refunded: "Refunded",
+    passed: "Passed",
+    rejected: "Rejected",
     // 
     // Pay Methods
     payMethods: {
diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js
index 17da0eb..6e6857c 100644
--- a/src/components/locales/lang/zh-CN.js
+++ b/src/components/locales/lang/zh-CN.js
@@ -800,6 +800,10 @@ export default {
     unknown: "未知状态",
     // 金币新增充值 ---------------------------------
     addCoinRecharge: "新增充值",
+    waitAudit: "待审核",
+    refunded: "已退款",
+    passed: "已通过",
+    rejected: "已驳回",
     // 支付方式
     // 添加支付方式
     payMethods: {
diff --git a/src/views/recharge/gold/addCoinRecharge.vue b/src/views/recharge/gold/addCoinRecharge.vue
index 9f4994e..1b81895 100644
--- a/src/views/recharge/gold/addCoinRecharge.vue
+++ b/src/views/recharge/gold/addCoinRecharge.vue
@@ -294,15 +294,15 @@ const addBefore = () => {
       await selectByOrderCode(ReadCookiesValue.value.orderCode)
       if(historyOrder.value.type == 0 ){
         if(historyOrder.value.auditStatus == 0){
-          orderStatus.value = '待审核'
+          orderStatus.value = t('recharge.waitAudit')
         }else if(historyOrder.value.auditStatus == 1){
           if(historyOrder.value.isRefund == 1){
-            orderStatus.value = '已退款'
+            orderStatus.value = t('recharge.refunded')
           }else{
-            orderStatus.value = '已通过'
+            orderStatus.value = t('recharge.passed')
           }
         }else if(historyOrder.value.auditStatus == 2){
-          orderStatus.value = '已驳回'
+          orderStatus.value = t('recharge.rejected')
         }
       }
       RechargeDialogVisible.value = true;

From fd656b03b2b1e75425c87c642002e79a38c3b28b Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Wed, 4 Feb 2026 09:54:25 +0800
Subject: [PATCH 13/28] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E5=9C=B0?=
 =?UTF-8?q?=E5=8C=BA=E8=B4=A2=E5=8A=A1=E5=AE=A1=E6=A0=B8=E5=92=8C=E5=9C=B0?=
 =?UTF-8?q?=E5=8C=BA=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=AE=A1=E6=A0=B8=E7=9A=84?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home.vue | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/views/home.vue b/src/views/home.vue
index 0e4fc48..16a264f 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -19,6 +19,7 @@ import {findMenuById,permissionMapping} from "@/utils/menuTreePermission.js"
 import {useMessageStore} from '@/store/index.js'
 // 国际化
 import { useI18n } from 'vue-i18n'
+import { has } from 'lodash'
 const {t} = useI18n();
 
 // ------------------ ICONS ------------------
@@ -158,15 +159,19 @@ const selectStatusById = () => {
     status.push(0);
   }
 
+  //地区财务审核
+   if (hasPermission(permissionMapping.area_finance_collection_approved)) {
+    status.push(1);
+  }
+  //和地区负责人审核
+   if (hasPermission(permissionMapping.area_manager_collection_approved)) {
+    status.push(7);
+  }
+
   //地区客服收款
    if (hasPermission(permissionMapping.collection_area_submit)) {
     status.push(2);
   }
-  // 地区负责人收款待审核
-  // else if (hasPermission(permissionMapping.area_manager_collection_pending)) {
-  //   status.push(0);
-  // }
-
  
   // ===== 退款流程状态 =====
   // 地区财务退款审核

From aaad5f088d0dac64c940edfcdc892cbcd579adb2 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Wed, 4 Feb 2026 10:49:02 +0800
Subject: [PATCH 14/28] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=8F=90=E7=A4=BA=E4=BB=A5=E5=8F=8A=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/login.vue b/src/views/login.vue
index ac141b1..af06552 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -181,6 +181,7 @@ const login = async function () {
       form.value.captcha = ''
       ElMessage.error(result.msg)
       loading.value = false //登录失败时重置loading状态
+      getCaptcha()
     }
   } catch (error) {
     console.log('请求失败', error)

From c4879107ba55f43a04dc348610fb61a7f4246f8a Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Wed, 4 Feb 2026 11:21:27 +0800
Subject: [PATCH 15/28] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=8F=8F=E8=BF=B0=E4=B8=AD=E7=9A=84=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93=EF=BC=8C=E5=A7=8B=E7=BB=88=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=B8=82=E5=9C=BA=E5=90=8D=E7=A7=B0=E5=92=8C=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/home.vue b/src/views/home.vue
index 16a264f..6487394 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -531,7 +531,7 @@ onMounted(() => getMessage())
             </div>
 
           <div class="message-desc">
-            <div v-if="findMenuById(menuTree, permissionMapping.refund_headquarters_finance)">[{{ item.marketName }}] [{{item.name}}{{ item.jwcode }}]{{ item.desc}}</div>
+            <div>[{{ item.marketName }}] [{{item.name}}{{ item.jwcode }}]{{ item.desc}}</div>
             </div>
             <el-button
                 type="primary"

From 88b2758228626fce9327de9b540b201992e3c753 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Wed, 4 Feb 2026 11:26:27 +0800
Subject: [PATCH 16/28] =?UTF-8?q?=E5=8A=A0=E6=89=A7=E8=A1=8C=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/moneyManage/refundDetail/refundHeader.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue
index accec0e..431ba26 100644
--- a/src/views/moneyManage/refundDetail/refundHeader.vue
+++ b/src/views/moneyManage/refundDetail/refundHeader.vue
@@ -473,6 +473,10 @@ const executorList = ref([
     {
         value: '200246',
         label: '马:小汪执行人'
+    },
+    {
+        value: '90047947',
+        label: '总部：测试'
     }
 ])
 // 查全部

From 5cb3ba4deb86221f5e5fecfd6758da25afa91891 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Wed, 4 Feb 2026 14:38:56 +0800
Subject: [PATCH 17/28] =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8Akey=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/consume/gold/addCoinConsume.vue   | 31 ++++++++++++++++++++---------
 src/views/recharge/gold/addCoinRecharge.vue |  4 ++--
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/views/consume/gold/addCoinConsume.vue b/src/views/consume/gold/addCoinConsume.vue
index 2652d3e..d4b20e5 100644
--- a/src/views/consume/gold/addCoinConsume.vue
+++ b/src/views/consume/gold/addCoinConsume.vue
@@ -105,6 +105,7 @@ const rules = reactive({
 });
 // 查询商品的表单
 const goods = ref([])
+const allGoods = ref([])
 
 // 输入验证函数
 function validateInput() {
@@ -323,7 +324,7 @@ const add = async function () {
 function handleResponse(result) {
   console.log("响应结果", result)
   if (result.code === 200) {
-    WriteCookies.value = `coinConsume:${addConsume.value.jwcode}:${addConsume.value.goodsName}`
+    WriteCookies.value = `coinConsume-${addConsume.value.jwcode}-${addConsume.value.goodsName}`
     //value 为消耗时间
     WriteCookiesVale.value = JSON.stringify({
     payTime: dayjs().format("YYYY-MM-DD HH:mm:ss"), 
@@ -480,7 +481,7 @@ const addBefore = () => {
     if (!validateInput() || !validateRedLimit()) {
       return;
     }
-    ReadCookies.value = `coinConsume:${addConsume.value.jwcode}:${addConsume.value.goodsName}`
+    ReadCookies.value = `coinConsume-${addConsume.value.jwcode}-${addConsume.value.goodsName}`
     console.log('ReadCookies',ReadCookies.value);
     // 获取cookie
     const cookieValue = Cookies.get(ReadCookies.value);
@@ -605,12 +606,13 @@ const getGoods = async function () {
     });
     // 将响应结果存储到响应式数据中
     console.log("请求成功", result);
-    goods.value = result.data.map(item => ({
+    allGoods.value = result.data.map(item => ({
       id: item.id,
       label: item.name,
       value: item.name,
       price: item.price
     }));
+    goods.value = allGoods.value;
   } catch (error) {
     console.log("请求失败", error);
     // 在这里可以处理错误逻辑，比如显示错误提示等
@@ -640,13 +642,25 @@ watch(
 );
 
 // 监听商品选择，自动展示原价
-const handleGoodsChange = (newGoods) => {
-  if (newGoods && typeof newGoods === 'object') {
-    addConsume.value.price = Number(newGoods.price || 0) || null;
+const handleGoodsChange = (val) => {
+  const selectedItem = goods.value.find(item => item.value === val);
+  if (selectedItem) {
+    addConsume.value.price = Number(selectedItem.price || 0) || null;
   } else {
     addConsume.value.price = null;
   }
 }
+
+// 自定义搜索方法
+const handleFilter = (query) => {
+  if (query) {
+    goods.value = allGoods.value.filter(item => {
+      return item.label.toLowerCase().includes(query.toLowerCase())
+    })
+  } else {
+    goods.value = allGoods.value
+  }
+}
 // 监听商品选择，自动展示原价
 // watch(
 //   () => addConsume.value.goodsName,
@@ -786,9 +800,8 @@ onMounted(async function () {
 
         <el-form-item prop="goodsName" :label="t('common_add.goodsName')">
           <el-select v-model="addConsume.goodsName" :placeholder="t('common_add.goodsNamePlaceholder')"
-            style="width: 200px" clearable filterable >
-            <el-option v-for="(item, index) in goods" :key="index" :label="item.label" :value="item.value" @click="handleGoodsChange(item)" />
-
+            style="width: 200px" clearable filterable :filter-method="handleFilter" @change="handleGoodsChange">
+            <el-option v-for="(item, index) in goods" :key="item.id" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item prop="price" :label="t('common_add.price')">
diff --git a/src/views/recharge/gold/addCoinRecharge.vue b/src/views/recharge/gold/addCoinRecharge.vue
index 4a1274a..79fc505 100644
--- a/src/views/recharge/gold/addCoinRecharge.vue
+++ b/src/views/recharge/gold/addCoinRecharge.vue
@@ -118,7 +118,7 @@ const add = async function () {
     addDisabled.value = false
     if(result.code == 200){
        // 拼接 jwcode:permanentGold:freeGold
-    WriteCookies.value = `coinRecharge:${recharge.value.jwcode}:${recharge.value.permanentGold}:${recharge.value.freeGold}`
+    WriteCookies.value = `coinRecharge-${recharge.value.jwcode}-${recharge.value.permanentGold}-${recharge.value.freeGold}`
     //value 为充值时间
     WriteCookiesVale.value = JSON.stringify({
     payTime: recharge.value.payTime, 
@@ -275,7 +275,7 @@ const addBefore = () => {
 
     // 检查cookie
     // 拼接 jwcode:permanentGold:freeGold
-    ReadCookies.value = `coinRecharge:${recharge.value.jwcode}:${recharge.value.permanentGold}:${recharge.value.freeGold}`
+    ReadCookies.value = `coinRecharge-${recharge.value.jwcode}-${recharge.value.permanentGold}-${recharge.value.freeGold}`
 
     console.log('ReadCookies',ReadCookies.value);
     

From e05e55858b35e906c0f07b93d14ff76c4d0edf81 Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Wed, 4 Feb 2026 14:58:53 +0800
Subject: [PATCH 18/28] =?UTF-8?q?fix:=20=E6=A0=B9=E6=8D=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E5=8A=A8=E6=80=81=E6=98=BE=E7=A4=BA=E5=B8=82=E5=9C=BA?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

当用户没有总部财务退款权限时，隐藏消息描述中的市场名称字段，避免显示不必要的信息
---
 src/views/home.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/home.vue b/src/views/home.vue
index 6487394..67a6c1d 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -531,7 +531,9 @@ onMounted(() => getMessage())
             </div>
 
           <div class="message-desc">
-            <div>[{{ item.marketName }}] [{{item.name}}{{ item.jwcode }}]{{ item.desc}}</div>
+            <div v-if="findMenuById(menuTree, permissionMapping.refund_headquarters_finance)">[{{ item.marketName }}]
+              </div>
+              <div>[{{item.name}}{{ item.jwcode }}]{{ item.desc}}</div>
             </div>
             <el-button
                 type="primary"

From ed40c861e1ad8b4e7b98f28c61e60f394bd5ed4c Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Wed, 4 Feb 2026 15:34:47 +0800
Subject: [PATCH 19/28] =?UTF-8?q?=E6=B6=88=E8=80=97=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/consume/gold/addCoinConsume.vue   | 44 +++++++++++------------------
 src/views/recharge/gold/addCoinRecharge.vue |  2 +-
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/src/views/consume/gold/addCoinConsume.vue b/src/views/consume/gold/addCoinConsume.vue
index d4b20e5..59d674c 100644
--- a/src/views/consume/gold/addCoinConsume.vue
+++ b/src/views/consume/gold/addCoinConsume.vue
@@ -105,7 +105,6 @@ const rules = reactive({
 });
 // 查询商品的表单
 const goods = ref([])
-const allGoods = ref([])
 
 // 输入验证函数
 function validateInput() {
@@ -300,7 +299,7 @@ const add = async function () {
         freeGold: addConsume.value.freeGold * 100,
         taskGold: addConsume.value.taskGold * 100,
         permanentGold: addConsume.value.permanentGold * 100,
-        goodsName: addConsume.value.goodsName,
+        goodsName: addConsume.value.goodsName?.value || addConsume.value.goodsName,
         remark: addConsume.value.remark,
         adminName: adminData.value.adminName,
         redMoney: Number(addConsume.value.redMoney), // 1-使用红包，0-不使用红包
@@ -324,11 +323,13 @@ const add = async function () {
 function handleResponse(result) {
   console.log("响应结果", result)
   if (result.code === 200) {
-    WriteCookies.value = `coinConsume-${addConsume.value.jwcode}-${addConsume.value.goodsName}`
+    const goodsNameStr = addConsume.value.goodsName?.value || addConsume.value.goodsName
+    WriteCookies.value = `coinConsume-${addConsume.value.jwcode}-${goodsNameStr}`
     //value 为消耗时间
+    console.log("goodsNameStr  add", goodsNameStr)
     WriteCookiesVale.value = JSON.stringify({
-    payTime: dayjs().format("YYYY-MM-DD HH:mm:ss"), 
-    orderCode: result.data
+    payTime: moment(result.data.createTime).format("YYYY-MM-DD HH:mm:ss"), 
+    orderCode: result.data.orderCoder,
   });
     Cookies.set(WriteCookies.value, WriteCookiesVale.value, {expires: 1, path: '/'});
     ElMessage.success(t('elmessage.addSuccess'));
@@ -481,14 +482,14 @@ const addBefore = () => {
     if (!validateInput() || !validateRedLimit()) {
       return;
     }
-    ReadCookies.value = `coinConsume-${addConsume.value.jwcode}-${addConsume.value.goodsName}`
+    ReadCookies.value = `coinConsume-${addConsume.value.jwcode}-${addConsume.value.goodsName.value}`
     console.log('ReadCookies',ReadCookies.value);
     // 获取cookie
     const cookieValue = Cookies.get(ReadCookies.value);
     if (cookieValue) {
     // 解析为对象
     const rechargeInfo = JSON.parse(cookieValue);
-    console.log('充值时间：', rechargeInfo.payTime);
+    console.log('提交时间：', rechargeInfo.payTime);
     console.log('订单号：', rechargeInfo.orderCode);
     ReadCookiesValue.value = {
       ...rechargeInfo,
@@ -606,13 +607,12 @@ const getGoods = async function () {
     });
     // 将响应结果存储到响应式数据中
     console.log("请求成功", result);
-    allGoods.value = result.data.map(item => ({
+    goods.value = result.data.map(item => ({
       id: item.id,
       label: item.name,
       value: item.name,
       price: item.price
     }));
-    goods.value = allGoods.value;
   } catch (error) {
     console.log("请求失败", error);
     // 在这里可以处理错误逻辑，比如显示错误提示等
@@ -643,24 +643,14 @@ watch(
 
 // 监听商品选择，自动展示原价
 const handleGoodsChange = (val) => {
-  const selectedItem = goods.value.find(item => item.value === val);
-  if (selectedItem) {
-    addConsume.value.price = Number(selectedItem.price || 0) || null;
+  // val 现在是整个对象
+  if (val) {
+    addConsume.value.price = Number(val.price || 0) || null;
   } else {
     addConsume.value.price = null;
   }
 }
 
-// 自定义搜索方法
-const handleFilter = (query) => {
-  if (query) {
-    goods.value = allGoods.value.filter(item => {
-      return item.label.toLowerCase().includes(query.toLowerCase())
-    })
-  } else {
-    goods.value = allGoods.value
-  }
-}
 // 监听商品选择，自动展示原价
 // watch(
 //   () => addConsume.value.goodsName,
@@ -800,8 +790,8 @@ onMounted(async function () {
 
         <el-form-item prop="goodsName" :label="t('common_add.goodsName')">
           <el-select v-model="addConsume.goodsName" :placeholder="t('common_add.goodsNamePlaceholder')"
-            style="width: 200px" clearable filterable :filter-method="handleFilter" @change="handleGoodsChange">
-            <el-option v-for="(item, index) in goods" :key="item.id" :label="item.label" :value="item.value" />
+            style="width: 200px" clearable filterable  @change="handleGoodsChange" value-key="id">
+            <el-option v-for="(item, index) in goods" :key="item.id" :label="item.label" :value="item" />
           </el-select>
         </el-form-item>
         <el-form-item prop="price" :label="t('common_add.price')">
@@ -969,7 +959,7 @@ onMounted(async function () {
           <!-- 商品名称 -->
           <div class="field">
             <div class="field-label">{{ $t('common_add.goodsName') }}</div>
-            <el-input v-model="addConsume.goodsName" disabled />
+            <el-input v-model="addConsume.goodsName.value" disabled />
           </div>
           <!--金币总数   -->
           <div class="field">
@@ -1027,7 +1017,7 @@ onMounted(async function () {
           <!-- 商品名称 -->
           <div class="field">
             <div class="field-label">{{ $t('common_add.goodsName') }}</div>
-            <el-input v-model="addConsume.goodsName" disabled />
+            <el-input v-model="addConsume.goodsName.value" disabled />
           </div>
           <!--金币总数   -->
           <div class="field">
@@ -1067,7 +1057,7 @@ onMounted(async function () {
           <div>
             <el-divider border-style="dashed" />
             <p>{{ $t('common_add.similarCosumeRecords') }}</p>
-            · {{ ReadCookiesValue.payTime }} {{ $t('common_add.buy') }} 【{{ addConsume.goodsName }}】【{{ $t('common_add.orderStatus') }}: {{ orderStatus }}】({{
+            · {{ ReadCookiesValue.payTime }} {{ $t('common_add.buy') }} 【{{ addConsume.goodsName.value }}】【{{ $t('common_add.orderStatus') }}: {{ orderStatus }}】({{
               $t('common_add.operator') }}: {{ adminData.adminName }})
           </div>
           <div style="margin-top: 10px">
diff --git a/src/views/recharge/gold/addCoinRecharge.vue b/src/views/recharge/gold/addCoinRecharge.vue
index 79fc505..dc25880 100644
--- a/src/views/recharge/gold/addCoinRecharge.vue
+++ b/src/views/recharge/gold/addCoinRecharge.vue
@@ -121,7 +121,7 @@ const add = async function () {
     WriteCookies.value = `coinRecharge-${recharge.value.jwcode}-${recharge.value.permanentGold}-${recharge.value.freeGold}`
     //value 为充值时间
     WriteCookiesVale.value = JSON.stringify({
-    payTime: recharge.value.payTime, 
+    payTime: moment(resultProps.data.createTime).format("YYYY-MM-DD HH:mm:ss"), 
     orderCode: result.data
   });
     // 设置cookies,用户jwcode为key，value也是jwcode，过期时间为1天

From 16076d582134919a0dc0b1a3949eada90bcfb999 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Wed, 4 Feb 2026 15:44:14 +0800
Subject: [PATCH 20/28] =?UTF-8?q?=E5=85=85=E5=80=BCbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/recharge/gold/addCoinRecharge.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/recharge/gold/addCoinRecharge.vue b/src/views/recharge/gold/addCoinRecharge.vue
index dc25880..6ca6a17 100644
--- a/src/views/recharge/gold/addCoinRecharge.vue
+++ b/src/views/recharge/gold/addCoinRecharge.vue
@@ -121,8 +121,8 @@ const add = async function () {
     WriteCookies.value = `coinRecharge-${recharge.value.jwcode}-${recharge.value.permanentGold}-${recharge.value.freeGold}`
     //value 为充值时间
     WriteCookiesVale.value = JSON.stringify({
-    payTime: moment(resultProps.data.createTime).format("YYYY-MM-DD HH:mm:ss"), 
-    orderCode: result.data
+    payTime: moment(result.data.createTime).format("YYYY-MM-DD HH:mm:ss"), 
+    orderCode: result.data.orderCoder,
   });
     // 设置cookies,用户jwcode为key，value也是jwcode，过期时间为1天
     Cookies.set(WriteCookies.value, WriteCookiesVale.value, {expires: 1, path: '/'});

From d32b2c0c7c35ad9498d680ca96a810e759f569c0 Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Wed, 4 Feb 2026 16:15:23 +0800
Subject: [PATCH 21/28] =?UTF-8?q?feat(=E6=B6=88=E6=81=AF=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?):=20=E6=94=AF=E6=8C=81=E4=BB=8E=E6=B6=88=E6=81=AF=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=88=B0=E6=94=B6=E6=AC=BE=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E6=97=B6=E8=87=AA=E5=8A=A8=E5=88=87=E6=8D=A2=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在消息点击处理中，根据消息状态决定目标标签页，并通过路由参数传递
在收款详情页组件中监听路由参数变化并应用对应的标签页状态
---
 src/views/home.vue                                    | 10 ++++++++--
 .../moneyManage/receiveDetail/receiveFinance.vue      | 18 ++++++++++++++++++
 src/views/moneyManage/receiveDetail/receiveManage.vue | 19 +++++++++++++++++++
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/src/views/home.vue b/src/views/home.vue
index 67a6c1d..04a8685 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -291,7 +291,7 @@ const scrollToTop = () => scrollContainer.value?.scrollTo({top: 0, behavior: 'sm
 const getPathByQueryId = (queryId) => {
   const qid = Number(queryId)
   if (!Number.isFinite(qid)) return null
-
+  // 获取所有路由
   const matchedRoutes = router.getRoutes().filter(r => {
     const pid = r.meta?.permissionId
     if (Array.isArray(pid)) return pid.includes(qid)
@@ -320,7 +320,13 @@ const handleMessageClick = async (item) => {
   if (res.code === 200) {
     closeMessageDialog()
     const targetPath = item?.queryId ? getPathByQueryId(item.queryId) : null
-    await router.push(targetPath || getOrderPage(item.status) || '/noPermission')
+    const messageStatus = Number(item?.status)
+    const tab = messageStatus === 7 ? 'pass' : (messageStatus === 1 ? 'wait' : null)
+    if (targetPath && tab && (targetPath.includes('/moneyManage/receiveDetail/receiveFinance') || targetPath.includes('/moneyManage/receiveDetail/receiveManager'))) {
+      await router.push({ path: targetPath, query: { tab } })
+    } else {
+      await router.push(targetPath || getOrderPage(item.status) || '/noPermission')
+    }
     await getMessage()
     ElMessage.success(t('elmessage.jumpSuccess'))
   } else {
diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue
index fe97ffe..97c0933 100644
--- a/src/views/moneyManage/receiveDetail/receiveFinance.vue
+++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue
@@ -658,6 +658,7 @@ import { editFormRule } from './utils/recriveFormRules.js';
 import { productList, MarketNameForId, CurrencyForId, marketList, normalizeSubmitterMarket } from './utils/staticData.js';
 import { useAdminStore } from '@/store/index.js';
 import { hasMenuPermission } from '@/utils/menuTreePermission.js';
+import { useRoute } from 'vue-router';
 
 // 国际化
 import { useI18n } from 'vue-i18n'
@@ -666,6 +667,7 @@ const { t } = useI18n()
 // ===================== 1. 核心状态管理（仅地区财务） =====================
 const adminStore = useAdminStore();
 const { menuTree } = storeToRefs(adminStore);
+const route = useRoute();
 
 // 角色固定：地区财务（caiwu=true，其他角色关闭）
 const kefu = ref(false);
@@ -689,6 +691,15 @@ const getTime = ref([]);
 // 标签页：默认“待审核”
 const activeTab = ref('wait');
 
+const applyTabFromRoute = (tabRaw) => {
+    const tab = typeof tabRaw === 'string' ? tabRaw : null;
+    if (tab !== 'wait' && tab !== 'pass' && tab !== 'reject' && tab !== 'done') return false;
+    if (tab === activeTab.value) return false;
+    activeTab.value = tab;
+    pageInfo.value.pageNum = 1;
+    return true;
+};
+
 // 审核弹窗状态
 const auditFormisible = ref(false);
 const auditFormData = ref({});
@@ -1082,6 +1093,12 @@ const navigateTo = async (tab) => {
     await getlist();
 };
 
+watch(() => route.query?.tab, async (tab) => {
+    if (applyTabFromRoute(tab)) {
+        await getlist();
+    }
+});
+
 // 2.4 审核功能
 // 打开审核弹窗
 const openAuditForm = (row) => {
@@ -1361,6 +1378,7 @@ const throttledsubmitRefund = _.throttle(submitRefund, 5000, {
 onMounted(async () => {
     await getAdminData();
     await getActivitys();
+    applyTabFromRoute(route.query?.tab);
     // 初始化加载地区财务订单数据
     await getlist();
 
diff --git a/src/views/moneyManage/receiveDetail/receiveManage.vue b/src/views/moneyManage/receiveDetail/receiveManage.vue
index fe97ffe..77e16df 100644
--- a/src/views/moneyManage/receiveDetail/receiveManage.vue
+++ b/src/views/moneyManage/receiveDetail/receiveManage.vue
@@ -658,6 +658,7 @@ import { editFormRule } from './utils/recriveFormRules.js';
 import { productList, MarketNameForId, CurrencyForId, marketList, normalizeSubmitterMarket } from './utils/staticData.js';
 import { useAdminStore } from '@/store/index.js';
 import { hasMenuPermission } from '@/utils/menuTreePermission.js';
+import { useRoute } from 'vue-router';
 
 // 国际化
 import { useI18n } from 'vue-i18n'
@@ -666,6 +667,7 @@ const { t } = useI18n()
 // ===================== 1. 核心状态管理（仅地区财务） =====================
 const adminStore = useAdminStore();
 const { menuTree } = storeToRefs(adminStore);
+const route = useRoute();
 
 // 角色固定：地区财务（caiwu=true，其他角色关闭）
 const kefu = ref(false);
@@ -689,6 +691,15 @@ const getTime = ref([]);
 // 标签页：默认“待审核”
 const activeTab = ref('wait');
 
+const applyTabFromRoute = (tabRaw) => {
+    const tab = typeof tabRaw === 'string' ? tabRaw : null;
+    if (tab !== 'wait' && tab !== 'pass' && tab !== 'reject' && tab !== 'done') return false;
+    if (tab === activeTab.value) return false;
+    activeTab.value = tab;
+    pageInfo.value.pageNum = 1;
+    return true;
+};
+
 // 审核弹窗状态
 const auditFormisible = ref(false);
 const auditFormData = ref({});
@@ -1079,9 +1090,16 @@ const reset = () => {
 // 2.3 标签页切换
 const navigateTo = async (tab) => {
     activeTab.value = tab;
+    pageInfo.value.pageNum = 1;
     await getlist();
 };
 
+watch(() => route.query?.tab, async (tab) => {
+    if (applyTabFromRoute(tab)) {
+        await getlist();
+    }
+});
+
 // 2.4 审核功能
 // 打开审核弹窗
 const openAuditForm = (row) => {
@@ -1361,6 +1379,7 @@ const throttledsubmitRefund = _.throttle(submitRefund, 5000, {
 onMounted(async () => {
     await getAdminData();
     await getActivitys();
+    applyTabFromRoute(route.query?.tab);
     // 初始化加载地区财务订单数据
     await getlist();
 

From a7b67a31daf58bce6ba6564f243dc979858c258b Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Wed, 4 Feb 2026 16:56:39 +0800
Subject: [PATCH 22/28] =?UTF-8?q?fix(=E9=A6=96=E9=A1=B5=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC):=20=E4=BF=AE=E5=A4=8D=E6=94=B6=E6=AC=BE?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E6=B6=88=E6=81=AF=E8=B7=B3=E8=BD=AC=E6=97=B6?=
 =?UTF-8?q?tab=E5=8F=82=E6=95=B0=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复消息状态与目标路径匹配逻辑，确保只有对应角色的收款处理消息才设置tab为'pass'。避免非相关消息跳转时携带错误的查询参数。
---
 src/views/home.vue | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/views/home.vue b/src/views/home.vue
index 04a8685..5de3201 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -321,8 +321,16 @@ const handleMessageClick = async (item) => {
     closeMessageDialog()
     const targetPath = item?.queryId ? getPathByQueryId(item.queryId) : null
     const messageStatus = Number(item?.status)
-    const tab = messageStatus === 7 ? 'pass' : (messageStatus === 1 ? 'wait' : null)
-    if (targetPath && tab && (targetPath.includes('/moneyManage/receiveDetail/receiveFinance') || targetPath.includes('/moneyManage/receiveDetail/receiveManager'))) {
+    
+    // 1是代表收款处理的已通过，7是代表的收款处理（负责人）的已通过
+    let tab = null
+    if (messageStatus === 1 && targetPath?.includes('/moneyManage/receiveDetail/receiveFinance')) {
+      tab = 'pass'
+    } else if (messageStatus === 7 && targetPath?.includes('/moneyManage/receiveDetail/receiveManager')) {
+      tab = 'pass'
+    }
+
+    if (targetPath && tab) {
       await router.push({ path: targetPath, query: { tab } })
     } else {
       await router.push(targetPath || getOrderPage(item.status) || '/noPermission')

From 0ce82524c4d01e75a13626548e9f38122cd583e0 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Wed, 4 Feb 2026 17:04:51 +0800
Subject: [PATCH 23/28] =?UTF-8?q?=E5=88=A0=E6=8E=89=E4=B8=8A=E4=B8=80?=
 =?UTF-8?q?=E6=AC=A1=E5=AD=98=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/consume/gold/addCoinConsume.vue   | 3 +++
 src/views/recharge/gold/addCoinRecharge.vue | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/views/consume/gold/addCoinConsume.vue b/src/views/consume/gold/addCoinConsume.vue
index 59d674c..2509d43 100644
--- a/src/views/consume/gold/addCoinConsume.vue
+++ b/src/views/consume/gold/addCoinConsume.vue
@@ -494,7 +494,10 @@ const addBefore = () => {
     ReadCookiesValue.value = {
       ...rechargeInfo,
     }
+    }else{
+      ReadCookiesValue.value = {}
     }
+        console.log('ReadCookies',ReadCookiesValue.value);
     if (Object.keys(ReadCookiesValue.value).length > 0) {
       await selectByOrderCode(ReadCookiesValue.value.orderCode)
       if(historyOrder.value.type == 1 ){
diff --git a/src/views/recharge/gold/addCoinRecharge.vue b/src/views/recharge/gold/addCoinRecharge.vue
index 6ca6a17..e34f22b 100644
--- a/src/views/recharge/gold/addCoinRecharge.vue
+++ b/src/views/recharge/gold/addCoinRecharge.vue
@@ -289,6 +289,8 @@ const addBefore = () => {
     ReadCookiesValue.value = {
       ...rechargeInfo,
     }
+    }else{
+      ReadCookiesValue.value = {}
     }
     if (Object.keys(ReadCookiesValue.value).length > 0) {
       await selectByOrderCode(ReadCookiesValue.value.orderCode)

From baf220cabdea63fd28e933f5311d0a24a5f3b800 Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Wed, 4 Feb 2026 17:11:49 +0800
Subject: [PATCH 24/28] =?UTF-8?q?fix(home):=20=E8=B0=83=E6=95=B4=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E5=BC=B9=E7=AA=97=E5=AE=BD=E5=BA=A6=E4=BB=A5=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=E5=86=85=E5=AE=B9=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将消息推送弹窗的宽度从500px调整为550px，避免内容显示不全或布局拥挤的问题。
---
 src/views/home.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/home.vue b/src/views/home.vue
index 5de3201..d6421b6 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -291,7 +291,7 @@ const scrollToTop = () => scrollContainer.value?.scrollTo({top: 0, behavior: 'sm
 const getPathByQueryId = (queryId) => {
   const qid = Number(queryId)
   if (!Number.isFinite(qid)) return null
-  // 获取所有路由
+
   const matchedRoutes = router.getRoutes().filter(r => {
     const pid = r.meta?.permissionId
     if (Array.isArray(pid)) return pid.includes(qid)
@@ -498,7 +498,7 @@ onMounted(() => getMessage())
     </el-dialog>
 
     <!--消息推送的弹窗-->
-    <el-dialog style="background: #F3FAFE" v-model="showMessageDialog" title="" width="500px">
+    <el-dialog style="background: #F3FAFE" v-model="showMessageDialog" title="" width="550px">
       <div class="message-title">
         <el-divider
             class="divider"

From 4c1ebf8c79175434a2e4c2535215f93ff3badf05 Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Fri, 6 Feb 2026 14:58:33 +0800
Subject: [PATCH 25/28] =?UTF-8?q?fix(addCoinConsume):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E5=A4=84=E7=90=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E7=AE=80=E5=8C=96=E9=80=80=E6=AC=BE=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/consume/gold/addCoinConsume.vue | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/views/consume/gold/addCoinConsume.vue b/src/views/consume/gold/addCoinConsume.vue
index 2509d43..d6474c6 100644
--- a/src/views/consume/gold/addCoinConsume.vue
+++ b/src/views/consume/gold/addCoinConsume.vue
@@ -500,15 +500,8 @@ const addBefore = () => {
         console.log('ReadCookies',ReadCookiesValue.value);
     if (Object.keys(ReadCookiesValue.value).length > 0) {
       await selectByOrderCode(ReadCookiesValue.value.orderCode)
-      if(historyOrder.value.type == 1 ){
-        if(historyOrder.value.auditStatus == 1 ){
-          if(historyOrder.value.isRefund == 0){
-          orderStatus.value = '正常'
-        }else if(historyOrder.value.isRefund == 1){
-          orderStatus.value = '已退款'
-        }
-        }
-      }
+    orderStatus.value = historyOrder.value.isRefundDesc
+    ReadCookiesValue.value.goodsName = historyOrder.value.goodsName
       ConsumeDialogVisible.value = true;
     }  else {
       FirstConsumeDialogVisible.value = true;
@@ -1060,7 +1053,7 @@ onMounted(async function () {
           <div>
             <el-divider border-style="dashed" />
             <p>{{ $t('common_add.similarCosumeRecords') }}</p>
-            · {{ ReadCookiesValue.payTime }} {{ $t('common_add.buy') }} 【{{ addConsume.goodsName.value }}】【{{ $t('common_add.orderStatus') }}: {{ orderStatus }}】({{
+            · {{ ReadCookiesValue.payTime }} {{ $t('common_add.buy') }} 【{{ ReadCookiesValue.goodsName }}】【{{ $t('common_add.orderStatus') }}: {{ orderStatus }}】({{
               $t('common_add.operator') }}: {{ adminData.adminName }})
           </div>
           <div style="margin-top: 10px">

From 1798d3d49d65196ae5bce840006d5ee4186f3009 Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Sun, 8 Feb 2026 13:21:32 +0800
Subject: [PATCH 26/28] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=9C=AA?=
 =?UTF-8?q?=E6=9D=A5=E6=97=B6=E9=97=B4=E5=AF=BC=E8=87=B4=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E5=B7=AE=E8=AE=A1=E7=AE=97=E8=B4=9F=E5=80=BC=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

当消息时间戳为未来时间时，now - msgTime 会得到负值，导致后续时间计算异常。通过将负差值强制设为0，确保时间差始终为非负数。
---
 src/utils/getMessage.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/utils/getMessage.js b/src/utils/getMessage.js
index 576d845..839a85c 100644
--- a/src/utils/getMessage.js
+++ b/src/utils/getMessage.js
@@ -15,7 +15,10 @@ function formatTime(timeStr) {
     // 函数逻辑不变...
     const now = new Date();
     const msgTime = new Date(timeStr);
-    const diffMs = now - msgTime;
+    let diffMs = now - msgTime;
+    if (diffMs < 0) {
+        diffMs = 0
+    }
     const diffMins = Math.floor(diffMs / (1000 * 60));
     const diffHours = Math.floor(diffMins / 60);
     const diffDays = Math.floor(diffHours / 24);

From 700c6f34e1ab323e453e1e7757b37196bbe49792 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Tue, 10 Feb 2026 15:08:31 +0800
Subject: [PATCH 27/28] =?UTF-8?q?=E5=8A=A0=E4=B8=80=E4=B8=AA=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/locales/lang/en.js                      | 3 ++-
 src/components/locales/lang/zh-CN.js                   | 3 ++-
 src/views/moneyManage/receiveDetail/receiveFinance.vue | 2 ++
 src/views/moneyManage/receiveDetail/receiveManage.vue  | 3 ++-
 src/views/moneyManage/receiveDetail/receiveService.vue | 8 +++++++-
 src/views/moneyManage/refundDetail/refundService.vue   | 4 +++-
 6 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js
index 7310e0a..4f8bafa 100644
--- a/src/components/locales/lang/en.js
+++ b/src/components/locales/lang/en.js
@@ -1099,7 +1099,8 @@ export default {
       ipay88: "Ipay88",
       paymentAsia: "PaymentAsia",
       transfer: "E-Transfer",
-      paysolution:'paysolution'
+      paysolution:'paysolution',
+      stripe2:'Stripe2',
     },
     statusList: {
       submitted: "Submitted",
diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js
index 6e6857c..fd2eba9 100644
--- a/src/components/locales/lang/zh-CN.js
+++ b/src/components/locales/lang/zh-CN.js
@@ -1111,7 +1111,8 @@ export default {
       ipay88: "Ipay88",
       paymentAsia: "PaymentAsia",
       transfer: "E-Transfer",
-      paysolution:'paysolution'
+      paysolution:'paysolution',
+      stripe2:'Stripe2',
     },
     statusList: {
       submitted: "已提交",
diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue
index 97c0933..127958a 100644
--- a/src/views/moneyManage/receiveDetail/receiveFinance.vue
+++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue
@@ -779,6 +779,8 @@ const paytypeList = [
     t('cash.payMethods.nets'),
     t('cash.payMethods.transfer'),
     t('cash.payMethods.paypal'),
+    t('cash.payMethods.stripe2'),
+    t('cash.payMethods.paysolution'),   
 ];
 const paytypeOptions = ref([...paytypeList]);
 
diff --git a/src/views/moneyManage/receiveDetail/receiveManage.vue b/src/views/moneyManage/receiveDetail/receiveManage.vue
index 77e16df..127958a 100644
--- a/src/views/moneyManage/receiveDetail/receiveManage.vue
+++ b/src/views/moneyManage/receiveDetail/receiveManage.vue
@@ -779,6 +779,8 @@ const paytypeList = [
     t('cash.payMethods.nets'),
     t('cash.payMethods.transfer'),
     t('cash.payMethods.paypal'),
+    t('cash.payMethods.stripe2'),
+    t('cash.payMethods.paysolution'),   
 ];
 const paytypeOptions = ref([...paytypeList]);
 
@@ -1090,7 +1092,6 @@ const reset = () => {
 // 2.3 标签页切换
 const navigateTo = async (tab) => {
     activeTab.value = tab;
-    pageInfo.value.pageNum = 1;
     await getlist();
 };
 
diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue
index bc1fac9..d6a2468 100644
--- a/src/views/moneyManage/receiveDetail/receiveService.vue
+++ b/src/views/moneyManage/receiveDetail/receiveService.vue
@@ -662,6 +662,9 @@ const ifGroup = () => {
     }else if (addFormData.value.payType === t('cash.payMethods.paysolution')) {
         isGroup.value = true
         addFormData.value.receivedMarket = t('cash.markets.Thailand')
+    } else if (addFormData.value.payType === t('cash.payMethods.stripe2')) {
+        isGroup.value = true
+        addFormData.value.receivedMarket = t('cash.markets.Singapore')
     } else {
         isGroup.value = false
     }
@@ -929,6 +932,7 @@ const paytypeOptions = ref([
   t('cash.payMethods.cash'),        // 现金
   t('cash.payMethods.check'),        // 支票
   t('cash.payMethods.paysolution'), // Paysolution
+  t('cash.payMethods.stripe2'),    // Stripe2
 ])
 const MoneyAddressOptions = ref([
   t('cash.markets.Malaysia'),   // 马来西亚
@@ -1196,7 +1200,9 @@ const paytypeList = ref([
   t('cash.payMethods.grabpay'),     // Grabpay
   t('cash.payMethods.nets'),        // Nets
   t('cash.payMethods.transfer'),    // E-Transfer
-  t('cash.payMethods.paypal')       // PayPal
+  t('cash.payMethods.paypal'),       // PayPal
+  t('cash.payMethods.stripe2'),    // Stripe2
+  t('cash.payMethods.paysolution'), // Paysolution
 ])
 const getMarket = async function () {
     try {
diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue
index ba534bc..2287d7a 100644
--- a/src/views/moneyManage/refundDetail/refundService.vue
+++ b/src/views/moneyManage/refundDetail/refundService.vue
@@ -577,7 +577,9 @@ const channelOptions = computed(() => [
     t('cash.payMethods.grabpay'),
     t('cash.payMethods.nets'),
     t('cash.payMethods.transfer'),
-    t('cash.payMethods.paypal')
+    t('cash.payMethods.paypal'),
+    t('cash.payMethods.stripe2'),
+    t('cash.payMethods.paysolution'),   
 ])
 
 const reset = function () {

From b54b4b701ce401122bd3c83b27645b3c2394d57a Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Wed, 11 Feb 2026 09:22:17 +0800
Subject: [PATCH 28/28] =?UTF-8?q?=E8=B5=84=E9=87=91=E6=B5=81=E6=B0=B4?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E7=AD=9B=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/moneyManage/financialAccount/cashFlow.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/moneyManage/financialAccount/cashFlow.vue b/src/views/moneyManage/financialAccount/cashFlow.vue
index 435ede2..30e5a16 100644
--- a/src/views/moneyManage/financialAccount/cashFlow.vue
+++ b/src/views/moneyManage/financialAccount/cashFlow.vue
@@ -29,6 +29,8 @@ const paytypeList = [
   t('cash.payMethods.nets'),
   t('cash.payMethods.transfer'),
   t('cash.payMethods.paypal'),
+  t('cash.payMethods.stripe2'),
+  t('cash.payMethods.paysolution'),   
 ]
 
 const payPlatformOptions = ref([...paytypeList])