From 425575c1f8e213fea53f8d6f97bfa4ebd8300ea0 Mon Sep 17 00:00:00 2001 From: ZhangYong Date: Mon, 11 Aug 2025 18:27:55 +0800 Subject: [PATCH 01/19] =?UTF-8?q?=E9=87=91=E8=B1=86=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/consume/bean/addBeanConsume.vue | 14 ++++++++++---- src/views/recharge/addBeanRecharge.vue | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/views/consume/bean/addBeanConsume.vue b/src/views/consume/bean/addBeanConsume.vue index d764a79..5cc5870 100644 --- a/src/views/consume/bean/addBeanConsume.vue +++ b/src/views/consume/bean/addBeanConsume.vue @@ -71,9 +71,12 @@ const rules = reactive({ }, trigger: 'blur' }], permanentBean: [ - { required: true, message: '请输入付费金豆数', trigger: 'blur' }, + { required: true, message: '请输入付费金豆数', trigger: 'change' }, { validator: (rule, value, callback) => { + if(!value){ + value = 0 + } // 检查是否为非负整数 if (!/^\d+$/.test(value)) { callback(new Error('请输入非负整数')); @@ -92,9 +95,12 @@ const rules = reactive({ } ], freeBean: [ - { required: true, message: '请输入免费金豆数', trigger: 'blur' }, + { required: true, message: '请输入免费金豆数', trigger: 'change' }, { validator: (rule, value, callback) => { + if(!value){ + value = 0 + } // 检查是否为非负整数 if (!/^\d+$/.test(value)) { callback(new Error('请输入非负整数')); @@ -211,10 +217,10 @@ const throttledHandleConsumeFormt = _.throttle(handleConsumeForm, 5000, { 查询 - + - + { + if(!value){ + value = 0 + } // 检查是否为非负整数 if (!/^\d+$/.test(value)) { callback(new Error('请输入非负整数')); @@ -91,9 +94,12 @@ const rules = reactive({ } ], freeBean: [ - { required: true, message: '请输入免费金豆数', trigger: 'blur' }, + { required: true, message: '请输入免费金豆数', trigger: 'change' }, { validator: (rule, value, callback) => { + if(!value){ + value = 0 + } // 检查是否为非负整数 if (!/^\d+$/.test(value)) { callback(new Error('请输入非负整数')); @@ -197,10 +203,10 @@ const throttledHandleAddFormt = _.throttle(handleAddForm, 5000, { 查询 - + - + Date: Mon, 11 Aug 2025 18:53:13 +0800 Subject: [PATCH 02/19] =?UTF-8?q?=E9=87=91=E5=B8=81=E5=85=85=E5=80=BC?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/recharge/gold/addCoinRecharge.vue | 34 +++++++++++++++++++---------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/src/views/recharge/gold/addCoinRecharge.vue b/src/views/recharge/gold/addCoinRecharge.vue index c7f8199..64e9281 100644 --- a/src/views/recharge/gold/addCoinRecharge.vue +++ b/src/views/recharge/gold/addCoinRecharge.vue @@ -63,9 +63,9 @@ const recharge = ref({ activity: '', // activity 字段 voucher: '', rechargeWay: '客服充值', - freeGold: "0", + freeGold: "", money: null, - permanentGold: "0", + permanentGold: "", rateName: null, rateId: null, payModel: '', // payModel 字段 @@ -83,6 +83,7 @@ const add = async function () { if (formattedRecharge.permanentGold) { formattedRecharge.permanentGold = Number(formattedRecharge.permanentGold) * 100; } + if (formattedRecharge.freeGold) { formattedRecharge.freeGold = Number(formattedRecharge.freeGold) * 100; } @@ -115,9 +116,9 @@ const add = async function () { recharge.value.market = adminData.value.market recharge.value.voucher = '' recharge.value.rechargeWay = '客服充值' - recharge.value.freeGold = '0' + recharge.value.freeGold = '' recharge.value.money = null - recharge.value.permanentGold = '0' + recharge.value.permanentGold = '' recharge.value.rateId = null imageUrl.value = '' recharge.value.rateName = null @@ -130,9 +131,14 @@ const add = async function () { //添加充值信息前的按钮点击事件，进行表单验证和用户确认操作 const addBefore = () => { + if(!recharge.value.permanentGold){ + recharge.value.permanentGold ='0' + } + if(!recharge.value.freeGold){ + recharge.value.freeGold ='0' + } Ref.value.validate(async (valid) => { if (valid) { - if (Number(recharge.value.permanentGold) === 0 && Number(recharge.value.freeGold) === 0) { ElMessage({ type: 'error', @@ -197,9 +203,12 @@ const rules = reactive({ }], activity: [{ required: true, message: '请选择活动名称', trigger: 'blur' }], permanentGold: [ - { required: true, message: '请输入永久金币数', trigger: 'blur' }, + { required: true, message: '请输入永久金币数', trigger: 'change' }, { validator: (rule, value, callback) => { + if(!value){ + value = '0' + } // 检查是否包含特殊符号 if (/[^0-9.]/.test(value)) { callback(new Error('不能包含特殊符号或负数')); @@ -235,9 +244,12 @@ const rules = reactive({ } ], freeGold: [ - { required: true, message: '请输入免费金币数', trigger: 'blur' }, + { required: true, message: '请输入免费金币数', trigger: 'change' }, { validator: (rule, value, callback) => { + if(!value){ + value = '0' + } // 检查是否包含特殊符号 if (/[^0-9.]/.test(value)) { callback(new Error('不能包含特殊符号或负数')); @@ -520,9 +532,9 @@ const deleteRecharge = function () { market: adminData.value.market, voucher: '', rechargeWay: '客服充值', - freeGold: Number(), + freeGold: '', money: null, - permanentGold: Number(), + permanentGold: '', rateId: null } imageUrl.value = '' @@ -568,13 +580,13 @@ onMounted(() => { - +

个

 - +

个
diff --git a/src/views/usergold/gold/clientCountDetail.vue b/src/views/usergold/gold/clientCountDetail.vue index ee1c17e..8a69e92 100644 --- a/src/views/usergold/gold/clientCountDetail.vue +++ b/src/views/usergold/gold/clientCountDetail.vue @@ -554,10 +554,10 @@ const format3 = (num) => {
- 金币总数：{{ format3(totalGoldTotal || 0) }}     - 永久金币：{{ format3(totalPermanentGold || 0) }}     - 免费金币：{{ format3(totalFreeGold || 0) }}     - 任务金币：{{ format3(totalTaskGold || 0) }} + 金币总数：{{ format3(totalGoldTotal || 0)/ 100 }}     + 永久金币：{{ format3(totalPermanentGold || 0)/ 100 }}     + 免费金币：{{ format3(totalFreeGold || 0)/ 100 }}     + 任务金币：{{ format3(totalTaskGold || 0)/ 100 }}
From 661f209703d7e77146165aa1fe19779b61f62a38 Mon Sep 17 00:00:00 2001 From: lihui Date: Tue, 12 Aug 2025 13:07:08 +0800 Subject: [PATCH 05/19] =?UTF-8?q?fix(usergold):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=87=91=E5=B8=81=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA=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/views/usergold/gold/clientCountBalance.vue | 8 ++++---- src/views/usergold/gold/clientCountDetail.vue | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/views/usergold/gold/clientCountBalance.vue b/src/views/usergold/gold/clientCountBalance.vue index 72d2aef..c76e86f 100644 --- a/src/views/usergold/gold/clientCountBalance.vue +++ b/src/views/usergold/gold/clientCountBalance.vue @@ -403,10 +403,10 @@ const format3 = (num) => {
- 金币总数：{{ format3(goldtotal || 0) / 100}}     - 永久金币：{{ format3(permanentGold || 0)/ 100 }}     - 免费金币：{{ format3(freeGold || 0)/ 100 }}     - 任务金币：{{ format3(taskGold || 0) / 100}} + 金币总数：{{ format3(goldtotal/100 || 0) }}     + 永久金币：{{ format3(permanentGold/100 || 0) }}     + 免费金币：{{ format3(freeGold/100 || 0) }}     + 任务金币：{{ format3(taskGold /100 || 0) }}
diff --git a/src/views/usergold/gold/clientCountDetail.vue b/src/views/usergold/gold/clientCountDetail.vue index 8a69e92..b2286be 100644 --- a/src/views/usergold/gold/clientCountDetail.vue +++ b/src/views/usergold/gold/clientCountDetail.vue @@ -554,10 +554,10 @@ const format3 = (num) => {
- 金币总数：{{ format3(totalGoldTotal || 0)/ 100 }}     - 永久金币：{{ format3(totalPermanentGold || 0)/ 100 }}     - 免费金币：{{ format3(totalFreeGold || 0)/ 100 }}     - 任务金币：{{ format3(totalTaskGold || 0)/ 100 }} + 金币总数：{{ format3(totalGoldTotal/100 || 0) }}     + 永久金币：{{ format3(totalPermanentGold/100 || 0) }}     + 免费金币：{{ format3(totalFreeGold/100 || 0) }}     + 任务金币：{{ format3(totalTaskGold /100|| 0) }}
From 795651239c086a559ebfe29b0301d400b021ac76 Mon Sep 17 00:00:00 2001 From: lihui Date: Tue, 12 Aug 2025 16:30:50 +0800 Subject: [PATCH 06/19] =?UTF-8?q?fix:=20=E7=A9=BA=E5=80=BC=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=80=BB=E8=AE=A1=E4=B8=BA=E7=A9=BA=20fix:=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E5=AE=A1=E6=A0=B8=E6=8F=90=E4=BA=A4=E4=BA=BAid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/audit/gold/refundAudit.vue | 3 ++- src/views/usergold/gold/clientCountBalance.vue | 15 ++++++++++++++- src/views/usergold/gold/clientCountDetail.vue | 25 ++++++++++++++++--------- 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/src/views/audit/gold/refundAudit.vue b/src/views/audit/gold/refundAudit.vue index 4472628..7235552 100644 --- a/src/views/audit/gold/refundAudit.vue +++ b/src/views/audit/gold/refundAudit.vue @@ -177,6 +177,7 @@ const tableData = ref([]) const marketOptions = ref([]) const refundGoodsOptions = ref([]) const adminInfo = ref({}) + // 统计合计数 const stats = ref({ totalNum: 0, @@ -284,7 +285,7 @@ const handleApprove = async (row) => { try { const params = { orderCode: row.orderCode, - auditId: adminInfo.value.id, + auditId: adminData.value.id, action: 1,// action的1是通过,2是驳回 rejectReason: '' } diff --git a/src/views/usergold/gold/clientCountBalance.vue b/src/views/usergold/gold/clientCountBalance.vue index c76e86f..639ac40 100644 --- a/src/views/usergold/gold/clientCountBalance.vue +++ b/src/views/usergold/gold/clientCountBalance.vue @@ -137,7 +137,20 @@ const get = async function (val) { // 分页总数设置为 0 total.value = 0 // ElMessage.warning('精网号不存在，请检查输入') - } else { + } + // 判断合计数是否存在,不存在时 result.data.list 为空数组 + if(resultGoldTotal.data===0){ + // 将表格数据设置为空数组 + tableData.value = [] + // 将合计数设置为 0 + permanentGold.value = 0 + freeJuneGold.value = 0 + freeDecemberGold.value = 0 + taskGold.value = 0 + goldtotal.value = 0 + freeGold.value = 0 + } + else { // 将响应结果存储到响应式数据中 console.log('总数据请求成功', result) // 存储表格数据 diff --git a/src/views/usergold/gold/clientCountDetail.vue b/src/views/usergold/gold/clientCountDetail.vue index b2286be..1fd2daa 100644 --- a/src/views/usergold/gold/clientCountDetail.vue +++ b/src/views/usergold/gold/clientCountDetail.vue @@ -203,6 +203,15 @@ const get = async function (val) { totalFreeGold.value = data.freeGolds totalTaskGold.value = data.taskGolds totalGoldTotal.value = data.sumGolds + } + if (totalResult.code === 0) { + // 将表格数据设置为空数组 + tableData.value = [] + totalPermanentGold.value = 0 + totalFreeGold.value = 0 + totalTaskGold.value = 0 + totalGoldTotal.value = 0 + } else { ElMessage.error('获取合计数据失败') } @@ -216,9 +225,7 @@ const get = async function (val) { // 重置 const reset = function () { - goldDetail.value ={ - - } + goldDetail.value = {} goldDetail.value.markets = [] selectedMarketPath.value = [] delete sortField.value @@ -478,8 +485,8 @@ const getMarket = async function () { } } const format3 = (num) => { - // 每三位添加逗号 - return num.toLocaleString('en-US') + // 每三位添加逗号 + return num.toLocaleString('en-US') }