Browse Source

Merge branch 'milestone-20250623-金币前端' of http://39.101.133.168:8807/huangqizhen/gold-vue into lihuilin/feature-20250623164044-金币前端

lihuilin/feature-20250715112412-金币二期
lihuilin 4 weeks ago
parent
commit
6915f2aa4a
  1. 10
      src/views/recharge/addCoinRecharge.vue
  2. 2
      src/views/refund/addCoinRefund.vue
  3. 6
      src/views/usergold/clientCountBalance.vue

10
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 {
// //
@ -329,7 +329,7 @@ const getUser = async function (jwcode) {
} }
} catch (error) { } catch (error) {
console.log("请求失败", error); console.log("请求失败", error);
ElMessage.error("查询失败,请检查精网号是否正确");
ElMessage.error("精网号错误");
recharge.value.jwcode = '' recharge.value.jwcode = ''
} }
} }
@ -528,7 +528,7 @@ onMounted(() => {
<el-input v-model="recharge.jwcode" style="width: 220px" @blur="getUser(recharge.jwcode)" /> <el-input v-model="recharge.jwcode" style="width: 220px" @blur="getUser(recharge.jwcode)" />
<el-button <el-button
type="primary" type="primary"
@click="getUser(recharge.jwcode)"
style="margin-left: 20px" style="margin-left: 20px"
>查询</el-button >查询</el-button

2
src/views/refund/addCoinRefund.vue

@ -422,7 +422,7 @@ onMounted(async function () {
/> />
<el-button <el-button
type="primary" type="primary"
@click="getUser(addRefund.jwcode)"
style="margin-left: 20px" style="margin-left: 20px"
>查询</el-button >查询</el-button
> >

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