From 6dc7272bee3af0d11a142e51d2881f9ce4106a1c Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Wed, 9 Jul 2025 10:42:21 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=E5=85=85=E5=80=BC=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BB=8E=E5=85=B6=E4=BB=96=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=BF=9B=E5=85=A5=E8=AF=A5=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=97=B6=E9=BB=98=E8=AE=A4=E5=8A=A0=E8=BD=BD=E7=9A=84=E5=BE=85?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=95=B0=E6=8D=AE=E6=98=AF=E5=85=A8=E9=83=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E5=86=8D=E6=AC=A1=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=A0=B8=E9=80=89=E9=A1=B9=E6=A1=86=E5=90=8E?=
 =?UTF-8?q?=E6=89=8D=E4=BC=9A=E8=BF=94=E5=9B=9E=E6=AD=A3=E7=A1=AE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/audit/rechargeAudit.vue b/src/views/audit/rechargeAudit.vue
index 9bc24fb..d536478 100644
--- a/src/views/audit/rechargeAudit.vue
+++ b/src/views/audit/rechargeAudit.vue
@@ -194,6 +194,7 @@ const rechargeAudit = ref({
   startTime: "", // 充值时间开始
   endTime: "", // 充值时间结束
   market: "", // 地区
+  auditStatus : "0",
 })
 
 // 搜索对象

From d85fc0dc9b4a208e0399d1c550922920672107bb Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Wed, 9 Jul 2025 13:07:59 +0800
Subject: [PATCH 2/4] =?UTF-8?q?refactor:=20=E7=BB=9F=E4=B8=80=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E4=B8=8D=E5=A4=9F=E6=82=AC=E5=81=9C=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=20=E6=B6=88=E8=80=97=E6=98=8E=E7=BB=86=EF=BC=8C=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E6=98=8E=E7=BB=86=EF=BC=8C=E9=80=80=E6=AC=BE=E6=98=8E?=
 =?UTF-8?q?=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/audit/rechargeAudit.vue         | 2 +-
 src/views/recharge/coinRechargeDetail.vue | 2 +-
 src/views/refund/coinRefundDetail.vue     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/audit/rechargeAudit.vue b/src/views/audit/rechargeAudit.vue
index d536478..6f9353a 100644
--- a/src/views/audit/rechargeAudit.vue
+++ b/src/views/audit/rechargeAudit.vue
@@ -92,7 +92,7 @@
             </el-table-column>
             <el-table-column prop="remark" label="备注" width="200px" show-overflow-tooltip/>
 
-            <el-table-column prop="payModel" label="支付方式" width="110px"/>
+            <el-table-column prop="payModel" label="充值方式" width="110px"/>
             <el-table-column prop="voucher" label="支付凭证" width="110px">
               <template #default="scope">
                 <div v-if="scope.row.voucher" style="display: flex; justify-content: center; align-items: center; cursor: pointer;" @click="previewImage(scope.row.voucher)">
diff --git a/src/views/recharge/coinRechargeDetail.vue b/src/views/recharge/coinRechargeDetail.vue
index 3392830..3f927d9 100644
--- a/src/views/recharge/coinRechargeDetail.vue
+++ b/src/views/recharge/coinRechargeDetail.vue
@@ -435,7 +435,7 @@ const handleSortChange = (column) => {
             <el-table-column fixed="left" prop="name" label="姓名" width="80px" />
             <el-table-column fixed="left" prop="jwcode" label="精网号" width="110px" />
             <el-table-column prop="market" label="所属地区" width="100px" />
-            <el-table-column prop="activity" label="活动名称" width="100px" />
+            <el-table-column prop="activity" label="活动名称" width="110px" show-overflow-tooltip/>
             <el-table-column prop="rateName" label="货币名称" width="110px" />
             <el-table-column prop="money" sortable="custom" label="充值金额" width="110px" />
             <el-table-column prop="permanentGold" label="永久金币" sortable="custom" width="110px" />
diff --git a/src/views/refund/coinRefundDetail.vue b/src/views/refund/coinRefundDetail.vue
index d1f58ea..1260e8c 100644
--- a/src/views/refund/coinRefundDetail.vue
+++ b/src/views/refund/coinRefundDetail.vue
@@ -522,7 +522,7 @@ const handleCurrentChange = function (val) {
                 width="110px"
             />
             <el-table-column prop="market" label="所属地区" width="110px" />
-            <el-table-column prop="goodsName" label="商品名称" width="100px" />
+            <el-table-column prop="goodsName" label="商品名称" width="110px" show-overflow-tooltip />
             <el-table-column prop="refundType" label="退款类型" width="100px" />
 
             <!-- <el-table-column label="金额总数" width="110px">

From c160b9e9b86e3c26d24be41534e81d79199a563f Mon Sep 17 00:00:00 2001
From: lihui <lihui030304@163.com>
Date: Wed, 9 Jul 2025 13:48:34 +0800
Subject: [PATCH 3/4] =?UTF-8?q?refactor:=E5=85=85=E5=80=BC=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=EF=BC=8C=E5=85=85=E5=80=BC=20=E5=B0=86"=E5=85=85?=
 =?UTF-8?q?=E5=80=BC=E6=96=B9=E5=BC=8F"=E7=BB=9F=E4=B8=80=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA"=E6=94=AF=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/views/audit/rechargeAudit.vue      | 6 +++---
 src/views/recharge/addCoinRecharge.vue | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/audit/rechargeAudit.vue b/src/views/audit/rechargeAudit.vue
index 6f9353a..9783f56 100644
--- a/src/views/audit/rechargeAudit.vue
+++ b/src/views/audit/rechargeAudit.vue
@@ -15,8 +15,8 @@
             </el-select>
           </el-col>
           <el-col :span="6">
-            <el-text size="large">充值方式：</el-text>
-            <el-select v-model="rechargeAudit.payModel" placeholder="请选择充值方式" style="width: 240px" clearable>
+            <el-text size="large">支付方式：</el-text>
+            <el-select v-model="rechargeAudit.payModel" placeholder="请选择支付方式" style="width: 240px" clearable>
               <el-option v-for="item in payModel" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
           </el-col>
@@ -92,7 +92,7 @@
             </el-table-column>
             <el-table-column prop="remark" label="备注" width="200px" show-overflow-tooltip/>
 
-            <el-table-column prop="payModel" label="充值方式" width="110px"/>
+            <el-table-column prop="payModel" label="支付方式" width="110px"/>
             <el-table-column prop="voucher" label="支付凭证" width="110px">
               <template #default="scope">
                 <div v-if="scope.row.voucher" style="display: flex; justify-content: center; align-items: center; cursor: pointer;" @click="previewImage(scope.row.voucher)">
diff --git a/src/views/recharge/addCoinRecharge.vue b/src/views/recharge/addCoinRecharge.vue
index 4829d3a..b3b7047 100644
--- a/src/views/recharge/addCoinRecharge.vue
+++ b/src/views/recharge/addCoinRecharge.vue
@@ -455,7 +455,7 @@ const handleAvatarSuccess = (response, file) => {
   }
 }
 
-//充值方式条目
+//支付方式条目
 const payModel = [
   {
     value: '现金',

From 823e798a5e39f8ce885a47b27990fa582e6151e9 Mon Sep 17 00:00:00 2001
From: zry <18990852002@163.com>
Date: Wed, 9 Jul 2025 14:11:28 +0800
Subject: [PATCH 4/4] export modified, include it's state

---
 src/views/consume/coinConsumeDetail.vue   | 12 ++++++----
 src/views/home.vue                        | 37 +++++++++++++++++++++++++++++--
 src/views/recharge/addCoinRecharge.vue    | 10 ++++-----
 src/views/recharge/coinRechargeDetail.vue | 30 +++++++++++++++++--------
 src/views/refund/coinRefundDetail.vue     | 25 ++++++++++++++++-----
 src/views/usergold/clientCountDetail.vue  | 12 ++++++----
 6 files changed, 96 insertions(+), 30 deletions(-)

diff --git a/src/views/consume/coinConsumeDetail.vue b/src/views/consume/coinConsumeDetail.vue
index 18200db..763b955 100644
--- a/src/views/consume/coinConsumeDetail.vue
+++ b/src/views/consume/coinConsumeDetail.vue
@@ -378,10 +378,14 @@ const handleSortChange = (column) => {
 }
 const exportExcel = async function () { 
   const params = {
-    text:'',
-    deptid:'',
-    sort:1,
-    field:'',
+    consumUser :{
+      jwcode:consumerUser.value.jwcode || '',
+      payPlatform:consumerUser.value.payPlatform || '',
+      market:consumerUser.value.market || '',
+      startTime:consumerUser.value.startTime || '',
+      endTime:consumerUser.value.endTime || '',
+      goodsName:consumerUser.value.goodsName || ''
+    },
     page:getObj.pageNum,
     size:getObj.pageSize
   }
diff --git a/src/views/home.vue b/src/views/home.vue
index cd4a36a..c543fbf 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -10,6 +10,7 @@ import API from '@/util/http'
 import dmmn from '../assets/link.png'
 import { useRoute } from 'vue-router'
 import moment from 'moment'
+import { ca } from 'element-plus/es/locales.mjs'
 
 const router = useRouter()
 const imgrule1 = dmmn
@@ -78,6 +79,37 @@ const getExportList = async () => {
   }
 }
 
+//根据状态返回对应的标签类型
+const getTagType = (state) => {
+  switch (state) {
+    case 0:
+      return 'info';
+    case 1:
+      return 'primary';
+      case 2:
+      return'success';
+    case 3:
+      return 'danger';
+    default:
+      return 'info';
+  }
+}
+//根据状态返回对应的标签文案
+const getTagText = (state) => {
+  switch (state) {
+    case 0:
+      return '待执行';
+    case 1:
+      return '执行中';
+      case 2:
+      return'执行完成';
+    case 3:
+      return '执行出错';
+    default:
+      return '未知状态';
+  }
+}
+
 // 下载导出文件
 const downloadExportFile = (item) => {
   if (item.state === 2) {
@@ -271,8 +303,9 @@ const openExportList = () => {
         <el-table-column prop="fileName" label="文件名" />
         <el-table-column prop="state" label="状态">
           <template #default="scope">
-            <el-tag :type="scope.row.state === 2 ? 'success' : 'warning'">
-              {{ scope.row.state === 2 ? '已完成' : '导出失败' }}
+            <el-tag :type="getTagType(scope.row.state)"
+                    :effect="scope.row.state === 3 ? 'light' : 'plain'">
+              {{ getTagText(scope.row.state) }}
             </el-tag>
           </template>
         </el-table-column>
diff --git a/src/views/recharge/addCoinRecharge.vue b/src/views/recharge/addCoinRecharge.vue
index 4829d3a..701e1b4 100644
--- a/src/views/recharge/addCoinRecharge.vue
+++ b/src/views/recharge/addCoinRecharge.vue
@@ -206,8 +206,8 @@ const rules = reactive({
         const numValue = Number(value);
         if (isNaN(numValue)) {
           callback(new Error('请输入有效的数字'));
-        } else if (numValue < 0) {
-          callback(new Error('输入金额不能小于0'));
+        } else if (numValue <= 0) {
+          callback(new Error('输入金额必须大于0'));
         } else {
           callback();
         }
@@ -245,7 +245,7 @@ const rules = reactive({
         if (isNaN(numValue)) {
           callback(new Error('请输入有效的数字'));
         } else if (numValue < 0) {
-          callback(new Error('输入金额必须大于0'));
+          callback(new Error('输入金额不能小于0'));
         } else {
           callback();
         }
@@ -288,8 +288,8 @@ const rules = reactive({
         const numValue = Number(value);
         if (isNaN(numValue)) {
           callback(new Error('请输入有效的数字'));
-        } else if (numValue < 0) {
-          callback(new Error('输入金额不能小于0'));
+        } else if (numValue <= 0) {
+          callback(new Error('输入金额必须大于0'));
         } else {
           callback();
         }
diff --git a/src/views/recharge/coinRechargeDetail.vue b/src/views/recharge/coinRechargeDetail.vue
index 1221c00..6effa24 100644
--- a/src/views/recharge/coinRechargeDetail.vue
+++ b/src/views/recharge/coinRechargeDetail.vue
@@ -187,6 +187,7 @@ const get = async function (val) {
     // 复制一份 rechargeUser.value 并移除排序字段和排序方式
     const detailWithoutSort = ref({
       market: rechargeUser.value.market,
+      activity: rechargeUser.value.activity,
       adminId: rechargeUser.value.adminId,
       startTime: rechargeUser.value.startTime,
       endTime: rechargeUser.value.endTime,
@@ -313,16 +314,27 @@ const get7Days = function () {
 }
 const exportExcel = async function () { 
   const params = {
-    text:'',
-    deptid:'',
-    sort:1,
-    field:'',
-    page:getObj.pageNum,
-    size:getObj.pageSize
+    rechargeUser: {
+      jwcode: rechargeUser.value.jwcode || '',
+      market: rechargeUser.value.market || '',
+      payPlatform: rechargeUser.value.payPlatform || '',
+      activity: rechargeUser.value.activity || '',
+      startTime: rechargeUser.value.startTime || '',
+      endTime: rechargeUser.value.endTime || ''
+    },
+    page: getObj.value.pageNum,
+    size: getObj.value.pageSize
   }
-  const res = await API({ url: '/export/exportRecharge', data: params })
-  if (res.code === 200) { 
-    ElMessage.success('导出成功')
+  try {
+    const res = await API({ url: '/export/exportRecharge', data: params })
+    if (res.code === 200) { 
+      ElMessage.success('导出成功')
+    } else {
+      ElMessage.error(res.message || '导出失败，请稍后重试')
+    }
+  } catch (error) {
+    console.log('请求失败', error)
+    ElMessage.error('导出失败，请稍后重试')
   }
 }
 
diff --git a/src/views/refund/coinRefundDetail.vue b/src/views/refund/coinRefundDetail.vue
index d1f58ea..d6f75b4 100644
--- a/src/views/refund/coinRefundDetail.vue
+++ b/src/views/refund/coinRefundDetail.vue
@@ -319,17 +319,30 @@ const getGoods = async function () {
 }
 const exportExcel = async function () { 
   const params = {
-    text:'',
-    deptid:'',
-    sort:1,
-    field:'',
+    refundUser: { 
+      jwcode: refundUser.value.jwcode || '', 
+      refundModel : refundUser.value.refundModel || '',
+      market: refundUser.value.market || '',
+      startTime: refundUser.value.startTime || '',
+      endTime: refundUser.value.endTime || '',
+      goodsName: refundUser.value.goodsName || '',
+     },
     page:getObj.pageNum,
     size:getObj.pageSize
   }
-  const res = await API({ url: '/export/exportRefund', data: params })
+
+  try{
+    const res = await API({ url: '/export/exportRefund', data: params })
   if (res.code === 200) { 
-    ElMessage.success('导出成功')
+      ElMessage.success('导出成功')
+    } else {
+      ElMessage.error(res.message || '导出失败，请稍后重试')
+    }
+  } catch (error) {
+    console.log('请求失败', error)
+    ElMessage.error('导出失败，请稍后重试')
   }
+  
 }
 // 挂载
 onMounted(async function () {
diff --git a/src/views/usergold/clientCountDetail.vue b/src/views/usergold/clientCountDetail.vue
index 268fb6e..cbdd8f9 100644
--- a/src/views/usergold/clientCountDetail.vue
+++ b/src/views/usergold/clientCountDetail.vue
@@ -32,10 +32,14 @@ const getAdminData = async function () {
 }
 const exportExcel = async function () { 
   const params = {
-    text:'',
-    deptid:'',
-    sort:1,
-    field:'',
+    goldDetail:{
+      jwcode: goldDetail.value.jwcode || '',
+      payPlatform: goldDetail.value.payPlatform || '',
+      type: goldDetail.value.type || '',
+      market: goldDetail.value.market || '',
+      startTime: goldDetail.value.startTime || '',
+      endTime: goldDetail.value.endTime || '',
+    },
     page:getObj.pageNum,
     size:getObj.pageSize
   }