diff --git a/src/router/index.js b/src/router/index.js index 8f1d852..01af865 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -72,6 +72,7 @@ const router = createRouter({ ] }, + ] }); diff --git a/src/views/consume/coinConsumeDetail.vue b/src/views/consume/coinConsumeDetail.vue index 763b955..f57383c 100644 --- a/src/views/consume/coinConsumeDetail.vue +++ b/src/views/consume/coinConsumeDetail.vue @@ -376,15 +376,15 @@ const handleSortChange = (column) => { sortOrder.value = column.order === 'ascending' ? 'DESC' : 'ASC' ConsumeSelectBy() } -const exportExcel = async function () { +const exportExcel = async function () { const params = { 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 || '' + jwcode:consumeUser.value.jwcode || '', + payPlatform:consumeUser.value.payPlatform || '', + market:consumeUser.value.market || '', + startTime:consumeUser.value.startTime || '', + endTime:consumeUser.value.endTime || '', + goodsName:consumeUser.value.goodsName || '' }, page:getObj.pageNum, size:getObj.pageSize diff --git a/src/views/home.vue b/src/views/home.vue index c543fbf..16fb0f2 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -1,16 +1,13 @@ @@ -255,6 +253,7 @@ const openExportList = () => { 查看导出列表 + @@ -262,7 +261,6 @@ const openExportList = () => { 查看个人信息 退出登录 - 查看下载列表 @@ -274,6 +272,7 @@ const openExportList = () => { + @@ -329,6 +328,8 @@ const openExportList = () => { + + diff --git a/src/views/usergold/clientCountDetail.vue b/src/views/usergold/clientCountDetail.vue index cbdd8f9..6e7d356 100644 --- a/src/views/usergold/clientCountDetail.vue +++ b/src/views/usergold/clientCountDetail.vue @@ -424,6 +424,7 @@ onMounted(async function () { 充值 消耗 退款 + 其他 diff --git a/src/views/workspace/index.vue b/src/views/workspace/index.vue index 4c9f1c6..802d044 100644 --- a/src/views/workspace/index.vue +++ b/src/views/workspace/index.vue @@ -1,7 +1,15 @@ - - 数据总览 - + + + + + 数据总览 + + + + + + @@ -9,21 +17,23 @@ 当前金币余量 - {{ currentGold / 100 }} 较前一日 {{ - dailyChange / 100 }} + {{ currentGold / 100 }} 较前一日 + {{ + dailyChange / 100 + }} - + - + - + @@ -33,8 +43,10 @@ 永久金币:{{ currentPermanent / 100 }} 免费金币:{{ currentFree / 100 }} [六月到期|{{ currentFreeJune / 100 }}] [12月到期|{{ - currentFreeDecember / - 100 }}] + currentFreeDecember / + 100 + }}] + 任务金币:{{ currentTask / 100 }} @@ -57,14 +69,14 @@ - 全年累计消耗金币数 + 全年累计消费金币数 {{ yearlyReduce / 100 }} 消费:{{ yearlyConsume / 100 }} 退款:{{ yearlyRefund / 100 }} - 昨日新增消耗:{{ dailyReduce / 100 }} 昨日新增消费:{{ dailyConsume / 100 }} + 昨日新增消耗:{{ dailyReduce / 100 }} 昨日新增退款:{{ dailyRefund / 100 }} @@ -78,34 +90,34 @@ 周同比:{{ sumWow }}% - + - + - + 日环比:{{ sumDaily }}% - + - + - + @@ -130,11 +142,14 @@ 合计 - 永久金币 {{ activeTab === 'recharge' ? sumRechargePermanent / 100 : sumConsumePermanent / 100 + 永久金币 {{ + activeTab === 'recharge' ? sumRechargePermanent / 100 : sumConsumePermanent / 100 }} - 免费金币 {{ activeTab === 'recharge' ? sumRechargeFree / 100 : sumConsumeFree / 100 + 免费金币 {{ + activeTab === 'recharge' ? sumRechargeFree / 100 : sumConsumeFree / 100 }} - 任务金币 {{ activeTab === 'recharge' ? sumRechargeTask / 100 : sumConsumeTask / 100 + 任务金币 {{ + activeTab === 'recharge' ? sumRechargeTask / 100 : sumConsumeTask / 100 }} @@ -144,15 +159,15 @@ 本年 - 查询 @@ -193,13 +208,14 @@