success merge branch 'zhangrenyuan/feature-20250623164058-金币前端' into milestone-20250623-金币前端

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
   }

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>

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();
         }

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
   }
+  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('导出失败，请稍后重试')
   }
 }
 

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
   }
+
+  try{
     const res = await API({ url: '/export/exportRefund', data: params })
   if (res.code === 200) { 
       ElMessage.success('导出成功')
+    } else {
+      ElMessage.error(res.message || '导出失败，请稍后重试')
+    }
+  } catch (error) {
+    console.log('请求失败', error)
+    ElMessage.error('导出失败，请稍后重试')
   }
+  
 }
 // 挂载
 onMounted(async function () {

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
   }