Browse Source

succes Merge branch 'zhangrenyuan/feature-20250623164058-金币前端' into milestone-20250623-金币前端

zhangrenyuan/feature-20250623164058-金币前端
zry 4 weeks ago
parent
commit
7dbccd50db
  1. 6
      src/views/recharge/addCoinRecharge.vue
  2. 6
      src/views/usergold/clientCountBalance.vue

6
src/views/recharge/addCoinRecharge.vue

@ -151,13 +151,13 @@ const addBefore = () => {
if (selectedRate) { if (selectedRate) {
recharge.value.rateId = selectedRate.rateId recharge.value.rateId = selectedRate.rateId
} }
ElMessageBox.confirm('确认添加?')
ElMessageBox.confirm('确认充值?')
.then(() => { .then(() => {
add() add()
console.log('添加成功')
console.log('充值成功')
}) })
.catch(() => { .catch(() => {
console.log('取消添加')
console.log('取消充值')
}) })
} else { } else {
// //

6
src/views/usergold/clientCountBalance.vue

@ -323,9 +323,9 @@ const exportExcel = async function () {
<template #default="scope"> <template #default="scope">
<!-- 计算四个字段的和并显示 --> <!-- 计算四个字段的和并显示 -->
<span>{{ <span>{{
(scope.row.sumPermanentGold || 0) +
(scope.row.sumFreeJune || 0) +
(scope.row.sumFreeDecember || 0) +
(scope.row.sumPermanentGold || 0) /100 +
(scope.row.sumFreeJune || 0) /100 +
(scope.row.sumFreeDecember || 0) /100 +
(scope.row.sumTaskGold || 0) / 100 (scope.row.sumTaskGold || 0) / 100
}}</span> }}</span>
</template> </template>

Loading…
Cancel
Save