Browse Source

Merge branch 'zhangrenyuan/feature-20250817091555-金币优化' into milestone-20250815-金币优化

zhangyong/feature-20250815160302-金币优化
zhangrenyuan 2 months ago
parent
commit
fa794b2238
  1. 20
      src/views/consume/gold/addCoinConsume.vue
  2. 8
      src/views/consume/gold/coinConsumeDetail.vue
  3. 16
      src/views/refund/gold/addCoinRefund.vue
  4. 6
      src/views/usergold/gold/clientCountBalance.vue

20
src/views/consume/gold/addCoinConsume.vue

@ -429,16 +429,16 @@ const getUser = async function (jwcode) {
user.value = {
...result.data,
// 100
nowPermanentGold: result.data.nowPermanentGold / 100,
nowFreeGold: result.data.nowFreeGold / 100,
nowSumGold: result.data.nowSumGold / 100,
nowTaskGold: result.data.nowTaskGold / 100,
nowFreeJune: result.data.nowFreeJune / 100,
nowFreeDecember: result.data.nowFreeDecember / 100,
historySumGold: result.data.historySumGold / 100,
historyPermanentGold: result.data.historyPermanentGold / 100,
historyFreeGold: result.data.historyFreeGold / 100,
historyTaskGold: result.data.historyTaskGold / 100
nowPermanentGold: result.data.nowPermanentGold ,
nowFreeGold: result.data.nowFreeGold ,
nowSumGold: result.data.nowSumGold ,
nowTaskGold: result.data.nowTaskGold ,
nowFreeJune: result.data.nowFreeJune ,
nowFreeDecember: result.data.nowFreeDecember ,
historySumGold: result.data.historySumGold ,
historyPermanentGold: result.data.historyPermanentGold ,
historyFreeGold: result.data.historyFreeGold ,
historyTaskGold: result.data.historyTaskGold
};
ElMessage.success("查询成功");

8
src/views/consume/gold/coinConsumeDetail.vue

@ -259,16 +259,16 @@ const ConsumeSelectBy = async function (val) {
// //
// permanentGold.value = parseFloat(
// (tableDataTotal.value.list.sumGold / 100).toFixed(2)
// (tableDataTotal.value.list.sumGold ).toFixed(2)
// )
// freeGold.value = parseFloat(
// (tableDataTotal.value.sumFcion / 100).toFixed(2)
// (tableDataTotal.value.sumFcion ).toFixed(2)
// )
// taskGold.value = parseFloat(
// (tableDataTotal.value.sumTcion / 100).toFixed(2)
// (tableDataTotal.value.sumTcion ).toFixed(2)
// )
// totalGold.value = parseFloat(
// (tableDataTotal.value.sumcion / 100).toFixed(2)
// (tableDataTotal.value.sumcion ).toFixed(2)
// )
console.log('tableData', tableData.value)

16
src/views/refund/gold/addCoinRefund.vue

@ -235,11 +235,11 @@ const getUser = async function (jwcode) {
// 100
const processedData = {
...result.data,
historySumGold: (Number(result.data.historySumGold) || 0) / 100,
nowSumGold: (Number(result.data.nowSumGold) || 0) / 100,
nowPermanentGold: (Number(result.data.nowPermanentGold) || 0) / 100,
nowFreeGold: (Number(result.data.nowFreeGold) || 0) / 100,
nowTaskGold: (Number(result.data.nowTaskGold) || 0) / 100
historySumGold: (Number(result.data.historySumGold) || 0) ,
nowSumGold: (Number(result.data.nowSumGold) || 0) ,
nowPermanentGold: (Number(result.data.nowPermanentGold) || 0) ,
nowFreeGold: (Number(result.data.nowFreeGold) || 0) ,
nowTaskGold: (Number(result.data.nowTaskGold) || 0)
}
user.value = processedData;
console.log("用户信息", user.value);
@ -307,9 +307,9 @@ const getGoods = async function (jwcode) {
goodsName.value = result.data.map(item => ({
orderCode: item.orderCode,
goodsName: item.goodsName,
permanentGold: Math.abs(Number(item.permanentGold) || 0) / 100,
freeGold: Math.abs(Number(item.freeGold) || 0) / 100,
taskGold: Math.abs(Number(item.taskGold) || 0) / 100,
permanentGold: Math.abs(Number(item.permanentGold) || 0) ,
freeGold: Math.abs(Number(item.freeGold) || 0) ,
taskGold: Math.abs(Number(item.taskGold) || 0) ,
}))
// [{label, value}]

6
src/views/usergold/gold/clientCountBalance.vue

@ -440,15 +440,15 @@ const format3 = (num) => {
<el-table-column prop="name" label="姓名" width="140"/>
<el-table-column prop="jwcode" label="精网号" width="160"/>
<el-table-column prop="market" label="所属地区" width="140"/>
<el-table-column prop="allJb" label="金币总数" width="140" aligh="center">
<template #default="scope">
<el-table-column prop="sumGold" label="金币总数" width="140" aligh="center">
<!-- <template #default="scope">
<span>{{
((scope.row.currentPermanentGold || 0) +
(scope.row.currentFreeJune || 0) +
(scope.row.currentFreeDecember || 0) +
(scope.row.currentTaskGold || 0))
}}</span>
</template>
</template> -->
</el-table-column>
<el-table-column prop="currentPermanentGold" label="永久金币" sortable="custom" width="160">
<template #default="scope">

Loading…
Cancel
Save