Browse Source

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

milestone-20250623-金币前端
lihuilin 20 hours ago
parent
commit
c49daed7e2
  1. 4
      src/views/audit/rechargeAudit.vue
  2. 12
      src/views/consume/addCoinConsume.vue

4
src/views/audit/rechargeAudit.vue

@ -327,7 +327,7 @@ const getRecharge = async function (val) {
console.log('搜索参数', getObj.value)
const result = await request({
url: 'http://192.168.8.94:8081/audit/selectRecharge',
url: '/audit/selectRecharge',
data: {
pageNum: getObj.value.pageNum,
pageSize: getObj.value.pageSize,
@ -354,7 +354,7 @@ const getStats = async () => {
rechargeAudit: rechargeAudit.value
}
const res = await API({
url: 'http://192.168.8.94:8081/audit/sumRechargeGold',
url: '/audit/sumRechargeGold',
data: params
})

12
src/views/consume/addCoinConsume.vue

@ -138,19 +138,19 @@ function calculateCoins(sumGold) {
//
if (nowFreeGold > 0) {
freeUsed = Math.min(nowFreeGold, remaining);
remaining -= freeUsed;
freeUsed = Math.min(parseFloat(nowFreeGold.toFixed(2)), remaining);
remaining = parseFloat((remaining - freeUsed).toFixed(2));
}
//
if (remaining > 0 && nowPermanentGold > 0) {
permanentUsed = Math.min(nowPermanentGold, remaining);
remaining -= permanentUsed;
permanentUsed = Math.min(parseFloat(nowPermanentGold.toFixed(2)), remaining);
remaining = parseFloat((remaining - permanentUsed).toFixed(2));
}
//
if (remaining > 0 && nowTaskGold > 0) {
taskUsed = remaining;
taskUsed = parseFloat(remaining.toFixed(2));
}
//
@ -491,7 +491,7 @@ onMounted(async function () {
</el-form>
<!-- 客户信息栏 -->
<el-card v-if="user.jwcode" style="width: 850px; float: right" class="customer-info">
<el-card v-if="user.jwcode" style="width: 950px; float: right" class="customer-info">
<el-form
:model="user"
label-width="auto"

Loading…
Cancel
Save