From 3f5f96ec1d05022b42ea6401f1f4ed31ae246857 Mon Sep 17 00:00:00 2001
From: zhangrenyuan <18990852002@163.com>
Date: Sun, 9 Nov 2025 09:54:16 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20=E6=89=80=E6=9C=89=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E7=9A=84=E5=91=98=E5=B7=A5=E6=95=B0=E6=8D=AE=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                               |  1 -
 src/views/audit/bean/beanAudit.vue             | 24 ++++++++++++++++++++----
 src/views/audit/gold/rechargeAudit.vue         | 23 +++++++++++++++++++----
 src/views/audit/gold/refundAudit.vue           | 20 ++++++++++++++++----
 src/views/consume/bean/articleVideo.vue        | 17 +++++++++++++++--
 src/views/consume/bean/dieHardFan.vue          | 19 ++++++++++++++++---
 src/views/consume/bean/liveStream.vue          | 20 +++++++++++++++++---
 src/views/recharge/bean/beanSystemRecharge.vue | 19 ++++++++++++++++++-
 src/views/usergold/bean/userbean.vue           | 19 +++++++++++++++----
 9 files changed, 136 insertions(+), 26 deletions(-)

diff --git a/.env.development b/.env.development
index 8fa72ce..ac9ff08 100644
--- a/.env.development
+++ b/.env.development
@@ -4,7 +4,6 @@ VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
 # 正式环境
 #  VITE_API_BASE='http://54.255.212.181:10705/'
 VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
-#  VITE_API_BASE='http://192.168.9.28:8081/'
 # sunjiabei
 #  VITE_API_BASE='http://192.168.9.28:8081/'
 #  VITE_API_BASE='http://192.168.5.92:8081/'
diff --git a/src/views/audit/bean/beanAudit.vue b/src/views/audit/bean/beanAudit.vue
index fa421d2..e354c77 100644
--- a/src/views/audit/bean/beanAudit.vue
+++ b/src/views/audit/bean/beanAudit.vue
@@ -142,7 +142,7 @@
 
 </template>
 <script setup>
-import { onMounted, ref } from 'vue'
+import { onMounted, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import API from '@/util/http.js'
 import moment from 'moment'
@@ -157,7 +157,19 @@ const defaultTime = [
   new Date(2000, 2, 1, 23, 59, 59),
 ]
 const adminStore = useAdminStore();
-const { adminData, menuTree } = storeToRefs(adminStore);
+const { adminData, menuTree,flag } = storeToRefs(adminStore);
+
+// 监听全局flag状态变化
+ watch(flag, (newFlag, oldFlag) => {
+  // 当flag状态改变时，重新发送请求
+  if (newFlag !== oldFlag) {
+    // console.log('员工数据flag状态改变，重新加载数据', newFlag)
+    get()
+    getStats()
+    // console.log('flag2',flag)
+  }
+})
+
 import dayjs from "dayjs";
 
 const tableData = ref([])
@@ -292,7 +304,8 @@ const get = async function () {
         auditStartTime: searchForm.value.auditStartTime,
         auditEndTime: searchForm.value.auditEndTime,
         sortField: sortField.value,
-        sortOrder: sortOrder.value
+        sortOrder: sortOrder.value,
+        flag: flag.value
       }
     }
     console.log('看看传给后端的参数：', params)
@@ -319,7 +332,10 @@ const getStats = async () => {
     }
     const res = await API({
       url: '/beanAudit/statsBean',
-      data: params
+      data: {
+        ...params,
+        flag: flag.value
+      }
     })
 
     stats.value.num = res.data.num
diff --git a/src/views/audit/gold/rechargeAudit.vue b/src/views/audit/gold/rechargeAudit.vue
index 2262ce6..bf7624b 100644
--- a/src/views/audit/gold/rechargeAudit.vue
+++ b/src/views/audit/gold/rechargeAudit.vue
@@ -201,7 +201,7 @@
 
 
 <script setup>
-import { onMounted, reactive, ref } from 'vue'
+import { onMounted, reactive, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import request from '@/util/http.js'
 import API from '@/util/http.js'
@@ -212,10 +212,21 @@ import { storeToRefs } from "pinia";
 import ConfirmDialog from '@/components/dialogs/ConfirmDialog.vue'
 
 const adminStore = useAdminStore();
-const { adminData, menuTree } = storeToRefs(adminStore);
+const { adminData, menuTree, flag } = storeToRefs(adminStore);
 import { permissionMapping, hasMenuPermission } from "@/utils/menuTreePermission.js"
 import dayjs from "dayjs";
 
+// 监听全局flag状态变化
+ watch(flag, (newFlag, oldFlag) => {
+  // 当flag状态改变时，重新发送请求
+  if (newFlag !== oldFlag) {
+    // console.log('员工数据flag状态改变，重新加载数据', newFlag)
+    getRecharge()
+    console.log('flag10',flag.value)
+    getStats()
+    console.log('flag2',flag)
+  }
+})
 
 //操作权限
 const hasrechargeThrough = ref(false)  // 充值审核已通过
@@ -381,7 +392,8 @@ const getRecharge = async function (val) {
         rechargeAudit: {
           ...rechargeAudit.value,
           sortField: sortField.value,
-          sortOrder: sortOrder.value
+          sortOrder: sortOrder.value,
+          flag: flag.value
         }
       }
     })
@@ -401,7 +413,10 @@ const getStats = async () => {
     const params = {
       pageNum: getObj.value.pageNum,
       pageSize: getObj.value.pageSize,
-      rechargeAudit: rechargeAudit.value
+      rechargeAudit: {
+        ...rechargeAudit.value,
+        flag: flag.value
+      }
     }
     // 校验精网号（数字格式）
     if (rechargeAudit.value.jwcode) {
diff --git a/src/views/audit/gold/refundAudit.vue b/src/views/audit/gold/refundAudit.vue
index 73f5a2c..605329d 100644
--- a/src/views/audit/gold/refundAudit.vue
+++ b/src/views/audit/gold/refundAudit.vue
@@ -189,7 +189,7 @@
 </template>
 
 <script setup>
-import { onMounted, reactive, ref } from 'vue'
+import { onMounted, reactive, ref, watch } from 'vue'
 import { ElMessage } from 'element-plus'
 import API from '@/util/http.js'
 import moment from 'moment'
@@ -200,7 +200,17 @@ import { permissionMapping, hasMenuPermission } from "@/utils/menuTreePermission
 import ConfirmDialog from '@/components/dialogs/ConfirmDialog.vue';
 
 const adminStore = useAdminStore();
-const { adminData, menuTree } = storeToRefs(adminStore);
+const { adminData, menuTree, flag } = storeToRefs(adminStore);
+// 监听全局flag状态变化
+ watch(flag, (newFlag, oldFlag) => {
+  // 当flag状态改变时，重新发送请求
+  if (newFlag !== oldFlag) {
+    get()
+    getStats()
+    
+  }
+})
+
 const defaultTime = [
   new Date(2000, 1, 1, 0, 0, 0),
   new Date(2000, 2, 1, 23, 59, 59),
@@ -343,7 +353,8 @@ const get = async function (val) {
       refundAudit: {
         ...searchForm.value,
         sortField: sortField.value,
-        sortOrder: sortOrder.value
+        sortOrder: sortOrder.value,
+        flag: flag.value
       }
     }
     console.log('看看传给后端的参数：', params)
@@ -472,7 +483,8 @@ const getStats = async () => {
       pageNum: pagination.value.pageNum,
       pageSize: pagination.value.pageSize,
       refundAudit: {
-        ...searchForm.value
+        ...searchForm.value,
+        flag: flag.value
       }
     }
     if (searchForm.value.jwcode) {
diff --git a/src/views/consume/bean/articleVideo.vue b/src/views/consume/bean/articleVideo.vue
index d2fec45..979baae 100644
--- a/src/views/consume/bean/articleVideo.vue
+++ b/src/views/consume/bean/articleVideo.vue
@@ -1,10 +1,22 @@
 <script setup>
-import { computed, onMounted, ref } from 'vue'
+import { computed, onMounted, ref, watch } from 'vue'
 import { dayjs, ElMessage } from 'element-plus'
 import request from '@/util/http.js'
 import API from '@/util/http.js'
 import moment from 'moment'
 import { ar } from 'element-plus/es/locales.mjs'
+import { useAdminStore } from "@/store/index.js";
+import { storeToRefs } from "pinia";
+const adminStore = useAdminStore();
+const { flag } = storeToRefs(adminStore);
+// 监听全局flag状态变化
+ watch(flag, (newFlag, oldFlag) => {
+  // 当flag状态改变时，重新发送请求
+  if (newFlag !== oldFlag) {
+    ConsumeSelectBy()
+  }
+})
+
 // 之后整理一下
 const defaultTime = [
   new Date(2000, 1, 1, 0, 0, 0),
@@ -183,6 +195,7 @@ const ConsumeSelectBy = async function (val) {
           endTime: beanConsumeArticle.value.endTime,
           sortField: beanConsumeArticle.value.sortField,
           sortOrder: beanConsumeArticle.value.sortOrder,
+          flag: flag.value 
         }
       }
     })
@@ -209,7 +222,7 @@ const ConsumeSelectBy = async function (val) {
       payType: 8, // 固定传入 payType 值 8
       beanConsumeArticle: {
         ...beanConsumeArticle.value,
-
+        flag: flag.value 
       }
     };
 
diff --git a/src/views/consume/bean/dieHardFan.vue b/src/views/consume/bean/dieHardFan.vue
index 1aaefad..b9acfed 100644
--- a/src/views/consume/bean/dieHardFan.vue
+++ b/src/views/consume/bean/dieHardFan.vue
@@ -1,9 +1,21 @@
 <script setup>
-import { computed, onMounted, ref } from 'vue'
+import { computed, onMounted, ref, watch } from 'vue'
 import { dayjs, ElMessage } from 'element-plus'
 import request from '@/util/http.js'
 import API from '@/util/http.js'
 import moment from 'moment'
+import { useAdminStore } from "@/store/index.js";
+import { storeToRefs } from "pinia";
+const adminStore = useAdminStore();
+const { flag } = storeToRefs(adminStore);
+// 监听全局flag状态变化
+ watch(flag, (newFlag, oldFlag) => {
+  // 当flag状态改变时，重新发送请求
+  if (newFlag !== oldFlag) {
+    ConsumeSelectBy()
+  }
+})
+
 // 之后整理一下
 
 /*
@@ -183,7 +195,8 @@ const ConsumeSelectBy = async function (val) {
           startTime: beanConsumeFan.value.startTime || '',
           endTime: beanConsumeFan.value.endTime || '',
           sortField: beanConsumeFan.value.sortField || 'consumeTime',
-          sortOrder: beanConsumeFan.value.sortOrder || 'desc'
+          sortOrder: beanConsumeFan.value.sortOrder || 'desc',
+          flag: flag.value 
         }
       }
     })
@@ -201,7 +214,7 @@ const ConsumeSelectBy = async function (val) {
       payType: 7, // 固定传入 payType 值 7
       beanConsumeFan: {
         ...beanConsumeFan.value,
-
+        flag: flag.value 
       }
     };
     // 发送 POST 请求获取合计数
diff --git a/src/views/consume/bean/liveStream.vue b/src/views/consume/bean/liveStream.vue
index 0e46f17..70bc17c 100644
--- a/src/views/consume/bean/liveStream.vue
+++ b/src/views/consume/bean/liveStream.vue
@@ -1,9 +1,22 @@
 <script setup>
-import { computed, onMounted, ref } from 'vue'
+import { computed, onMounted, ref, watch } from 'vue'
 import { dayjs, ElMessage } from 'element-plus'
 import request from '@/util/http.js'
 import API from '@/util/http.js'
 import moment from 'moment'
+import { useAdminStore } from "@/store/index.js";
+import { storeToRefs } from "pinia";
+const adminStore = useAdminStore();
+const { flag } = storeToRefs(adminStore);
+
+// 监听全局flag状态变化
+ watch(flag, (newFlag, oldFlag) => {
+  // 当flag状态改变时，重新发送请求
+  if (newFlag !== oldFlag) {
+    selectLiveBy()
+  }
+})
+
 // 之后整理一下
 
 /*
@@ -223,7 +236,8 @@ const selectLiveBy = async function (val) {
           startTime: beanConsumeLive.value.startTime || '',
           endTime: beanConsumeLive.value.endTime || '',
           sortField: beanConsumeLive.value.sortField || 'consumeTime',
-          sortOrder: beanConsumeLive.value.sortOrder || 'desc'
+          sortOrder: beanConsumeLive.value.sortOrder || 'desc',
+          flag: flag.value 
         }
       }
     })
@@ -239,7 +253,7 @@ const selectLiveBy = async function (val) {
       payType: 1, // 固定传入 payType 值 1 是直播
       beanConsumeLive: {
         ...beanConsumeLive.value,
-
+        flag: flag.value 
       }
     };
 
diff --git a/src/views/recharge/bean/beanSystemRecharge.vue b/src/views/recharge/bean/beanSystemRecharge.vue
index 1d985a8..7f4de02 100644
--- a/src/views/recharge/bean/beanSystemRecharge.vue
+++ b/src/views/recharge/bean/beanSystemRecharge.vue
@@ -1,11 +1,26 @@
 <script setup>
-import { ref, onMounted, reactive, computed } from 'vue'
+import { ref, onMounted, reactive, computed, watch } from 'vue'
 import ElementPlus from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { AiFillRead } from 'vue-icons-plus/ai'
 import axios from 'axios'
 import moment from 'moment'
 import API from '@/util/http.js'
+import { useAdminStore } from "@/store/index.js";
+import { storeToRefs } from "pinia";
+const adminStore = useAdminStore();
+const { adminData, menuTree,flag } = storeToRefs(adminStore);
+
+// 监听全局flag状态变化
+ watch(flag, (newFlag, oldFlag) => {
+  // 当flag状态改变时，重新发送请求
+  if (newFlag !== oldFlag) {
+    getTotalBeans()
+    get()
+  }
+})
+
+
 
 const selectData = ref({
   jwcode: '',
@@ -39,6 +54,7 @@ const getTotalBeans = async () => {
       url: '/beanRecharge/statsSystemBean',
       data: {
         ...selectData.value,
+        flag: flag.value
       }
     })
     if (result.code == 200) {
@@ -174,6 +190,7 @@ const get = async () => {
         ...selectData.value,
         sortField: sortField.value,
         sortOrder: sortOrder.value,
+        flag: flag.value
       },
     }
     console.log('请求参数：', data);
diff --git a/src/views/usergold/bean/userbean.vue b/src/views/usergold/bean/userbean.vue
index d33c9c9..6774878 100644
--- a/src/views/usergold/bean/userbean.vue
+++ b/src/views/usergold/bean/userbean.vue
@@ -48,15 +48,24 @@
 
 </template>
 <script setup>
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, watch } from 'vue'
 import API from '@/util/http.js'
 import { useAdminStore } from "@/store/index.js";
 import { storeToRefs } from "pinia";
 const adminStore = useAdminStore();
-const { adminData, menuTree } = storeToRefs(adminStore);
+const { adminData, menuTree, flag } = storeToRefs(adminStore);
 import { permissionMapping, findMenuById } from "@/utils/menuTreePermission.js"
 import { ElMessage } from 'element-plus';
 
+// 监听全局flag状态变化
+ watch(flag, (newFlag, oldFlag) => {
+  // 当flag状态改变时，重新发送请求
+  if (newFlag !== oldFlag) {
+    getStats()
+    get()
+  }
+})
+
 const canLook = ref(findMenuById(menuTree.value, permissionMapping.gold_bean_customer_details))
 const tableData = ref([])
 const marketOptions = ref([])
@@ -96,7 +105,8 @@ const get = async function () {
                 jwcode: searchObj.value.jwcode,   //精网号
                 dept: searchObj.value.dept,  //地区
                 sortField: searchObj.value.sortField,//排序字段
-                sortOrder: searchObj.value.sortOrder//正序倒序
+                sortOrder: searchObj.value.sortOrder,//正序倒序
+                flag: flag.value
             },
             pageNum: pagination.value.pageNum,
             pageSize: pagination.value.pageSize
@@ -119,7 +129,8 @@ const getStats = async () => {
         const params = {
             beanUser: {
                 jwcode: searchObj.value.jwcode,
-                dept: searchObj.value.dept
+                dept: searchObj.value.dept,
+                flag: flag.value
             }
         }
         const res = await API({