From b0fb71ba17004456020eb5134d327d2d06bf6ef5 Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Sat, 13 Sep 2025 11:40:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/consume/gold/coinConsume.vue     | 10 +++++-----
 src/views/recharge/gold/coinRecharge.vue   | 12 ++++++------
 src/views/refund/gold/coinRefund.vue       | 10 +++++-----
 src/views/refund/gold/coinRefundDetail.vue | 24 +++++-------------------
 4 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/src/views/consume/gold/coinConsume.vue b/src/views/consume/gold/coinConsume.vue
index 1fa3197..3cc587f 100644
--- a/src/views/consume/gold/coinConsume.vue
+++ b/src/views/consume/gold/coinConsume.vue
@@ -2,14 +2,14 @@
 
   <div class="fatherTop">
     <el-button-group>
-      <el-button :type="activeTab === 'addCoinConsume' ? 'primary' : 'default'" @click="navigateTo('addCoinConsume')"
-        :disabled="!hasAdd">
-        新增消耗
-      </el-button>
       <el-button :type="activeTab === 'coinConsumeDetail' ? 'primary' : 'default'"
         @click="navigateTo('coinConsumeDetail')" :disabled="!hasDetail">
         金币消耗明细
       </el-button>
+      <el-button :type="activeTab === 'addCoinConsume' ? 'primary' : 'default'" @click="navigateTo('addCoinConsume')"
+        :disabled="!hasAdd">
+        新增消耗
+      </el-button>
     </el-button-group>
   </div>
   <div class="fatherBottom">
@@ -50,8 +50,8 @@ const initPermissions = () => {
 // 默认跳转逻辑
 const getDefaultAuditRoute = () => {
   initPermissions();
-  if (hasAdd.value) return 'addCoinConsume';
   if (hasDetail.value) return 'coinConsumeDetail';
+  if (hasAdd.value) return 'addCoinConsume';
   return 'addCoinConsume';
 };
 
diff --git a/src/views/recharge/gold/coinRecharge.vue b/src/views/recharge/gold/coinRecharge.vue
index 6bebbb2..2cfd260 100644
--- a/src/views/recharge/gold/coinRecharge.vue
+++ b/src/views/recharge/gold/coinRecharge.vue
@@ -1,14 +1,14 @@
 <template>
   <div style="height:4vh;">
     <el-button-group>
-      <el-button :type="activeTab === 'addCoinRecharge' ? 'primary' : 'default'" @click="navigateTo('addCoinRecharge')"
-        :disabled="!hasAdd">
-        新增充值
-      </el-button>
       <el-button :type="activeTab === 'coinRechargeDetail' ? 'primary' : 'default'"
         @click="navigateTo('coinRechargeDetail')" :disabled="!hasDetail">
         金币充值明细
       </el-button>
+      <el-button :type="activeTab === 'addCoinRecharge' ? 'primary' : 'default'" @click="navigateTo('addCoinRecharge')"
+        :disabled="!hasAdd">
+        新增充值
+      </el-button>
     </el-button-group>
   </div>
     <router-view></router-view>
@@ -47,9 +47,9 @@ const initPermissions = () => {
 // 默认跳转逻辑
 const getDefaultAuditRoute = () => {
   initPermissions();
-  if (hasAdd.value) return 'addCoinRecharge';
   if (hasDetail.value) return 'coinRechargeDetail';
-  return 'addCoinRecharge';
+  if (hasAdd.value) return 'addCoinRecharge';
+  return 'coinRechargeDetail';
 };
 
 // 监听路由变化更新标签状态
diff --git a/src/views/refund/gold/coinRefund.vue b/src/views/refund/gold/coinRefund.vue
index f4c1b9e..5823b87 100644
--- a/src/views/refund/gold/coinRefund.vue
+++ b/src/views/refund/gold/coinRefund.vue
@@ -2,15 +2,15 @@
   <div class="father">
     <!-- 这里放置标签切换的按钮 -->
     <el-button-group>
+            <el-button :type="activeTab === 'coinRefundDetail' ? 'primary' : 'default'"
+                 @click="navigateTo('coinRefundDetail')" :disabled="!hasDetail">
+        金币退款明细
+      </el-button>
       <!-- 切换后状态显示 primary 样式否则是默认样式 -->
       <el-button :type="activeTab === 'addCoinRefund' ? 'primary' : 'default'" @click="navigateTo('addCoinRefund')"
                  :disabled="!hasAdd">
         新增退款
       </el-button>
-      <el-button :type="activeTab === 'coinRefundDetail' ? 'primary' : 'default'"
-                 @click="navigateTo('coinRefundDetail')" :disabled="!hasDetail">
-        金币退款明细
-      </el-button>
     </el-button-group>
     <!-- 渲染子路由组件 -->
   </div>
@@ -52,8 +52,8 @@ const initPermissions = () => {
 // 默认跳转逻辑
 const getDefaultAuditRoute = () => {
   initPermissions();
-  if (hasAdd.value) return 'addCoinRefund';
   if (hasDetail.value) return 'coinRefundDetail';
+  if (hasAdd.value) return 'addCoinRefund';
   return 'addCoinRefund';
 };
 
diff --git a/src/views/refund/gold/coinRefundDetail.vue b/src/views/refund/gold/coinRefundDetail.vue
index 6a785dd..1dd91da 100644
--- a/src/views/refund/gold/coinRefundDetail.vue
+++ b/src/views/refund/gold/coinRefundDetail.vue
@@ -65,7 +65,8 @@ const tableData = ref([])
 // 搜索======================================
 // 搜索detail
 const refundUser = ref({
-  market: ""
+  market: "",
+  refundType: ""
 })
 // 搜索对象
 const getObj = ref({
@@ -163,6 +164,7 @@ const getSelectBy = async function (val) {
         refundUser: { ...refundUser.value, flag: showEmployeeData.value ? 0 : 1 }
       }
     })
+    console.log('===============================',refundUser.value)
     // 复制一份 refundUser.value 并移除排序字段和排序方式
     const detailWithoutSort = {
       ...refundUser.value,
@@ -203,8 +205,6 @@ const getSelectBy = async function (val) {
     // 存储分页总数
     total.value = result.data.total
     console.log('total', total.value)
-    // 调用分类的方法
-    handleClick()
   } catch (error) {
     console.log('请求失败', error)
     // 在这里可以处理错误逻辑，比如显示错误提示等
@@ -260,21 +260,6 @@ const get7Days = function () {
   getSelectBy()
 }
 
-//点击标签页
-// 设置tab.props.name默认为all
-const tabName = ref('all')
-const handleClick = function (tab, event) {
-  if (tab.props.name === 'all') {
-    adminAll()
-  } else if (tab.props.name === 'wait') {
-    adminWait()
-  } else if (tab.props.name === 'pass') {
-    adminPass()
-  } else if (tab.props.name === 'reject') {
-    adminReject()
-  }
-}
-
 const delObj = ref({})
 const del = function (row) {
   delObj.value.detailId = row.detailId
@@ -374,7 +359,8 @@ const exportExcel = async function () {
       startTime: refundUser.value.startTime || '',
       endTime: refundUser.value.endTime || '',
       goodsName: refundUser.value.goodsName || '',
-      flag: showEmployeeData.value ? 0 : 1
+      flag: showEmployeeData.value ? 0 : 1,
+      refundType: refundUser.value.refundType || '',
     },
     page: getObj.pageNum,
     size: total.value