6 Commits

  1. 4
      .env.development
  2. 16
      src/views/consume/gold/coinConsumeDetail.vue
  3. 12
      src/views/recharge/gold/coinRechargeDetail.vue
  4. 18
      src/views/refund/gold/coinRefundDetail.vue
  5. 46
      src/views/usergold/gold/clientCountBalance.vue
  6. 16
      src/views/usergold/gold/clientCountDetail.vue

4
.env.development

@ -1,4 +1,4 @@
# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
# 测试环境 # 测试环境
# VITE_API_BASE='http://54.255.212.181:10704/' # VITE_API_BASE='http://54.255.212.181:10704/'
# 正式环境 # 正式环境
@ -11,6 +11,6 @@ VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
# zhangyong # zhangyong
# VITE_API_BASE='http://192.168.3.83:8081/' # VITE_API_BASE='http://192.168.3.83:8081/'
# 本地 # 本地
VITE_API_BASE='http://localhost:8081/'
# VITE_API_BASE='http://localhost:8081/'
# sunjiabei # sunjiabei
# VITE_API_BASE='http://192.168.0.113:8081/' # VITE_API_BASE='http://192.168.0.113:8081/'

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

@ -633,10 +633,10 @@ const getMarket = async function () {
<el-col> <el-col>
<el-card> <el-card>
<div> <div>
消耗新币{{ format3(Math.abs(permanentGolds) / 100) }}新币&nbsp;&nbsp;&nbsp;&nbsp;
永久金币{{ format3(Math.abs(permanentGolds) / 100) }}&nbsp;&nbsp;&nbsp;&nbsp;
免费金币{{ format3(Math.abs(freeGolds) / 100) }}&nbsp;&nbsp;&nbsp;&nbsp;
任务金币{{ format3(Math.abs(taskGolds) / 100) }}
消耗新币{{ format3(Math.abs(permanentGolds) ) }}新币&nbsp;&nbsp;&nbsp;&nbsp;
永久金币{{ format3(Math.abs(permanentGolds) ) }}&nbsp;&nbsp;&nbsp;&nbsp;
免费金币{{ format3(Math.abs(freeGolds) ) }}&nbsp;&nbsp;&nbsp;&nbsp;
任务金币{{ format3(Math.abs(taskGolds) ) }}
</div> </div>
<!-- 设置表格容器的高度和滚动样式 --> <!-- 设置表格容器的高度和滚动样式 -->
<div style="height: 576px; overflow-y: auto"> <div style="height: 576px; overflow-y: auto">
@ -672,24 +672,24 @@ const getMarket = async function () {
{{ {{
(scope.row.taskGold + (scope.row.taskGold +
scope.row.freeGold + scope.row.freeGold +
scope.row.permanentGold) / 100
scope.row.permanentGold)
}} }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="permanentGold" label="永久金币" sortable="“custom”" width="110px"> <el-table-column prop="permanentGold" label="永久金币" sortable="“custom”" width="110px">
<template #default="scope"> <template #default="scope">
{{ scope.row.permanentGold / 100 }}
{{ scope.row.permanentGold}}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="freeGold" label="免费金币" sortable="“custom”" width="110px"> <el-table-column prop="freeGold" label="免费金币" sortable="“custom”" width="110px">
<template #default="scope"> <template #default="scope">
{{ scope.row.freeGold / 100 }}
{{ scope.row.freeGold }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="taskGold" label="任务金币" sortable="“custom”" width="110px"> <el-table-column prop="taskGold" label="任务金币" sortable="“custom”" width="110px">
<template #default="scope"> <template #default="scope">
{{ scope.row.taskGold / 100 }}
{{ scope.row.taskGold }}
</template> </template>
</el-table-column> </el-table-column>

12
src/views/recharge/gold/coinRechargeDetail.vue

@ -367,11 +367,11 @@ const get = async function (val) {
tableData.value = tableData.value.map(item => ({ tableData.value = tableData.value.map(item => ({
...item, ...item,
// //
permanentGold: (Number(item.permanentGold) || 0) / 100,
permanentGold: (Number(item.permanentGold) || 0) ,
// //
freeGold: (Number(item.freeGold) || 0) / 100,
freeGold: (Number(item.freeGold) || 0) ,
// //
money: (Number(item.money) || 0) / 100
money: (Number(item.money) || 0)
})) }))
console.log('tableData', tableData.value) console.log('tableData', tableData.value)
// //
@ -652,9 +652,9 @@ const getTagText = (state) => {
<el-col> <el-col>
<el-card> <el-card>
<div> <div>
充值新币{{ format3(permanentGolds / 100) }}新币&nbsp;&nbsp;&nbsp;&nbsp;
永久金币{{ format3(permanentGolds / 100) }}金币&nbsp;&nbsp;&nbsp;&nbsp;
免费金币{{ format3(freeGolds / 100) }}金币
充值新币{{ format3(permanentGolds) }}新币&nbsp;&nbsp;&nbsp;&nbsp;
永久金币{{ format3(permanentGolds) }}金币&nbsp;&nbsp;&nbsp;&nbsp;
免费金币{{ format3(freeGolds ) }}金币
</div> </div>
<!-- 设置表格容器的高度和滚动样式 --> <!-- 设置表格容器的高度和滚动样式 -->

18
src/views/refund/gold/coinRefundDetail.vue

@ -180,13 +180,13 @@ const getSelectBy = async function (val) {
// //
tableData.value = result.data.list tableData.value = result.data.list
// 100
tableData.value = tableData.value.map(item => ({ tableData.value = tableData.value.map(item => ({
...item, ...item,
sumGold: (Number(item.sumGold) || 0) / 100,
permanentGold: (Number(item.permanentGold) || 0) / 100,
freeGold: (Number(item.freeGold) || 0) / 100,
taskGold: (Number(item.taskGold) || 0) / 100
sumGold: (Number(item.sumGold) || 0) ,
permanentGold: (Number(item.permanentGold) || 0) ,
freeGold: (Number(item.freeGold) || 0) ,
taskGold: (Number(item.taskGold) || 0)
})) }))
console.log('tableData', tableData.value) console.log('tableData', tableData.value)
// //
@ -569,10 +569,10 @@ const getMarket = async function () {
<el-col> <el-col>
<el-card> <el-card>
<div> <div>
退款金币总数{{ format3(Math.abs(sumGolds) / 100) }}&nbsp;&nbsp;&nbsp;&nbsp;
永久金币{{ format3(Math.abs(permanentGolds) / 100) }}&nbsp;&nbsp;&nbsp;&nbsp;
免费金币{{ format3(Math.abs(freeGolds) / 100) }}&nbsp;&nbsp;&nbsp;&nbsp;
任务金币{{ format3(Math.abs(taskGolds) / 100) }}
退款金币总数{{ format3(Math.abs(sumGolds)) }}&nbsp;&nbsp;&nbsp;&nbsp;
永久金币{{ format3(Math.abs(permanentGolds) ) }}&nbsp;&nbsp;&nbsp;&nbsp;
免费金币{{ format3(Math.abs(freeGolds) ) }}&nbsp;&nbsp;&nbsp;&nbsp;
任务金币{{ format3(Math.abs(taskGolds) ) }}
</div> </div>
<!-- 设置表格容器的高度和滚动样式 --> <!-- 设置表格容器的高度和滚动样式 -->
<div style="height: 520px; overflow-y: auto;margin-top:10px"> <div style="height: 520px; overflow-y: auto;margin-top:10px">

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

@ -416,10 +416,10 @@ const format3 = (num) => {
<el-col> <el-col>
<el-card> <el-card>
<div> <div>
金币总数{{ format3(goldtotal/100 || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
永久金币{{ format3(permanentGold/100 || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
免费金币{{ format3(freeGold/100 || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
任务金币{{ format3(taskGold /100 || 0) }}
金币总数{{ format3(goldtotal || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
永久金币{{ format3(permanentGold || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
免费金币{{ format3(freeGold || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
任务金币{{ format3(taskGold || 0) }}
</div> </div>
<!-- 设置表格容器的高度和滚动样式 --> <!-- 设置表格容器的高度和滚动样式 -->
<div style="height: 626px; overflow-y: auto"> <div style="height: 626px; overflow-y: auto">
@ -441,28 +441,28 @@ const format3 = (num) => {
((scope.row.currentPermanentGold || 0) + ((scope.row.currentPermanentGold || 0) +
(scope.row.currentFreeJune || 0) + (scope.row.currentFreeJune || 0) +
(scope.row.currentFreeDecember || 0) + (scope.row.currentFreeDecember || 0) +
(scope.row.currentTaskGold || 0)) / 100
(scope.row.currentTaskGold || 0))
}}</span> }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="currentPermanentGold" label="永久金币" sortable="custom" width="110"> <el-table-column prop="currentPermanentGold" label="永久金币" sortable="custom" width="110">
<template #default="scope"> <template #default="scope">
<span>{{ (scope.row.currentPermanentGold || 0) / 100 }}</span>
<span>{{ (scope.row.currentPermanentGold || 0) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="currentFreeJune" label="6月份到期免费金币" sortable="custom" width="110"> <el-table-column prop="currentFreeJune" label="6月份到期免费金币" sortable="custom" width="110">
<template #default="scope"> <template #default="scope">
<span>{{ (scope.row.currentFreeJune || 0) / 100 }}</span>
<span>{{ (scope.row.currentFreeJune || 0) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="currentFreeDecember" label="12月份到期免费金币" sortable="custom" width="110"> <el-table-column prop="currentFreeDecember" label="12月份到期免费金币" sortable="custom" width="110">
<template #default="scope"> <template #default="scope">
<span>{{ (scope.row.currentFreeDecember || 0) / 100 }}</span>
<span>{{ (scope.row.currentFreeDecember || 0) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="currentTaskGold" label="任务金币" sortable="custom" width="130"> <el-table-column prop="currentTaskGold" label="任务金币" sortable="custom" width="130">
<template #default="scope"> <template #default="scope">
<span>{{ (scope.row.currentTaskGold || 0) / 100 }}</span>
<span>{{ (scope.row.currentTaskGold || 0) }}</span>
</template> </template>
</el-table-column> </el-table-column>
@ -471,18 +471,18 @@ const format3 = (num) => {
<el-popover trigger="hover" placement="left" width="150"> <el-popover trigger="hover" placement="left" width="150">
<template #default> <template #default>
<div> <div>
<div>永久金币{{ (scope.row.sumPermanentGold || 0) / 100 }}</div>
<div>免费金币{{ ((scope.row.sumFreeJune || 0) + (scope.row.sumFreeDecember || 0)) / 100 }}</div>
<div>任务金币{{ (scope.row.sumTaskGold || 0) / 100 }}</div>
<div>永久金币{{ (scope.row.sumPermanentGold || 0) }}</div>
<div>免费金币{{ ((scope.row.sumFreeJune || 0) + (scope.row.sumFreeDecember || 0)) }}</div>
<div>任务金币{{ (scope.row.sumTaskGold || 0) }}</div>
</div> </div>
</template> </template>
<template #reference> <template #reference>
<span> <span>
{{ {{
(scope.row.sumPermanentGold || 0) / 100 +
(scope.row.sumFreeJune || 0) / 100 +
(scope.row.sumFreeDecember || 0) / 100 +
(scope.row.sumTaskGold || 0) / 100
(scope.row.sumPermanentGold || 0) +
(scope.row.sumFreeJune || 0) +
(scope.row.sumFreeDecember || 0) +
(scope.row.sumTaskGold || 0)
}}</span> }}</span>
</template> </template>
</el-popover> </el-popover>
@ -493,21 +493,21 @@ const format3 = (num) => {
<el-popover trigger="hover" placement="left" width="150"> <el-popover trigger="hover" placement="left" width="150">
<template #default> <template #default>
<div> <div>
<div>永久金币{{ (scope.row.sumConsumeGold || 0) / 100 }}</div>
<div>永久金币{{ (scope.row.sumConsumeGold || 0) }}</div>
<div>免费金币{{ <div>免费金币{{
((scope.row.sumConsumeJune || 0) + (scope.row.sumConsumeDecember || 0)) / 100
((scope.row.sumConsumeJune || 0) + (scope.row.sumConsumeDecember || 0))
}} }}
</div> </div>
<div>任务金币{{ (scope.row.sumConsumeJune || 0) / 100 }}</div>
<div>任务金币{{ (scope.row.sumConsumeJune || 0) }}</div>
</div> </div>
</template> </template>
<template #reference> <template #reference>
<span> <span>
{{ {{
(scope.row.sumConsumeGold || 0) / 100 +
(scope.row.sumConsumeTaskGold || 0) / 100 +
(scope.row.sumConsumeJune || 0) / 100 +
(scope.row.sumConsumeDecember || 0) / 100
(scope.row.sumConsumeGold || 0) +
(scope.row.sumConsumeTaskGold || 0) +
(scope.row.sumConsumeJune || 0) +
(scope.row.sumConsumeDecember || 0)
}}</span> }}</span>
</template> </template>
</el-popover> </el-popover>

16
src/views/usergold/gold/clientCountDetail.vue

@ -559,10 +559,10 @@ const format3 = (num) => {
<el-col> <el-col>
<el-card> <el-card>
<div> <div>
金币总数{{ format3(totalGoldTotal / 100 || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
永久金币{{ format3(totalPermanentGold / 100 || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
免费金币{{ format3(totalFreeGold / 100 || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
任务金币{{ format3(totalTaskGold / 100 || 0) }}
金币总数{{ format3(totalGoldTotal || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
永久金币{{ format3(totalPermanentGold || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
免费金币{{ format3(totalFreeGold || 0) }}&nbsp;&nbsp;&nbsp;&nbsp;
任务金币{{ format3(totalTaskGold || 0) }}
</div> </div>
<div style="height: 584px; overflow-y: auto"> <div style="height: 584px; overflow-y: auto">
<el-table :data="tableData" style="width: 100%" @sort-change="handleSortChange" height="584px"> <el-table :data="tableData" style="width: 100%" @sort-change="handleSortChange" height="584px">
@ -599,23 +599,23 @@ const format3 = (num) => {
: scope.row.sumGold / 100 : scope.row.sumGold / 100
}} }}
</span> --> </span> -->
<span>{{ (scope.row.sumGold || 0) / 100 }}</span>
<span>{{ (scope.row.sumGold || 0) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="permanentGold" sortable="custom" label="永久金币" width="110"> <el-table-column prop="permanentGold" sortable="custom" label="永久金币" width="110">
<template #default="scope"> <template #default="scope">
<span>{{ (scope.row.permanentGold || 0) / 100 }}</span>
<span>{{ (scope.row.permanentGold || 0) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="freeGold" sortable="custom" label="免费金币" width="110"> <el-table-column prop="freeGold" sortable="custom" label="免费金币" width="110">
<template #default="scope"> <template #default="scope">
<span>{{ (calculateFreeGold(scope.row) || 0) / 100 }}</span>
<span>{{ (calculateFreeGold(scope.row) || 0) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="taskGold" sortable="custom" label="任务金币" width="110"> <el-table-column prop="taskGold" sortable="custom" label="任务金币" width="110">
<template #default="scope"> <template #default="scope">
<span>{{ (scope.row.taskGold || 0) / 100 }}</span>
<span>{{ (scope.row.taskGold || 0) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="adminName" label="提交人" width="110"/> <el-table-column prop="adminName" label="提交人" width="110"/>

Loading…
Cancel
Save