diff --git a/vue/gold-system/src/views/audit/rechargeAudit.vue b/vue/gold-system/src/views/audit/rechargeAudit.vue index f339503..95376fb 100644 --- a/vue/gold-system/src/views/audit/rechargeAudit.vue +++ b/vue/gold-system/src/views/audit/rechargeAudit.vue @@ -22,7 +22,7 @@ const rechargeVo = ref({}); // 搜索对象 const getObj = ref({ pageNum: 1, - pageSize: 10, + pageSize: 50, }); //分页总条目 const total = ref(100); diff --git a/vue/gold-system/src/views/audit/refundAudit.vue b/vue/gold-system/src/views/audit/refundAudit.vue index 69fe3c4..df76693 100644 --- a/vue/gold-system/src/views/audit/refundAudit.vue +++ b/vue/gold-system/src/views/audit/refundAudit.vue @@ -22,7 +22,7 @@ const consumeDetail = ref({}); // 搜索对象 const getObj = ref({ pageNum: 1, - pageSize: 10, + pageSize: 50, }); //分页总条目 const total = ref(100); diff --git a/vue/gold-system/src/views/consume/allConsume.vue b/vue/gold-system/src/views/consume/allConsume.vue index d3c20bc..2a569b8 100644 --- a/vue/gold-system/src/views/consume/allConsume.vue +++ b/vue/gold-system/src/views/consume/allConsume.vue @@ -14,7 +14,7 @@ const detailVo = ref({}); // 搜索对象 const getObj = ref({ pageNum: 1, - pageSize: 10, + pageSize: 50, }); //分页总条目 const total = ref(100); diff --git a/vue/gold-system/src/views/recharge/addRecharge.vue b/vue/gold-system/src/views/recharge/addRecharge.vue index 1980aaf..b71a006 100644 --- a/vue/gold-system/src/views/recharge/addRecharge.vue +++ b/vue/gold-system/src/views/recharge/addRecharge.vue @@ -35,7 +35,7 @@ const addRecharge = ref({ rechargeWay: "客服充值", freeGold: 0, rechargeGold: 0, - paidGold: "", + paidGold: 0, }); // 这是添加充值信息的接口 const add = async function () { @@ -411,8 +411,13 @@ const calculatedFreeGold = computed(() => { if (!addRecharge.value.rechargeRatio == 0) { const paidGold = Number(addRecharge.value.paidGold) || 0; const activityId = Number(addRecharge.value.rechargeRatio) || 1; // 避免除以0 - console.log("看看有没拿到", addRecharge.value); - return Math.ceil(paidGold / activityId); + const number = Number(paidGold / activityId); //计算总数 + console.log("看看", number); + if (number < 1) { + return 0; + } else { + return Number(Math.ceil(number)); + } } if (addRecharge.value.rechargeRatio == 0) { const paidGold = Number(addRecharge.value.paidGold) || 0; @@ -423,7 +428,7 @@ const calculatedRechargeGold = computed(() => { if (!Rate.value == 0) { const paidGold = Number(addRecharge.value.paidGold) || 0; const rate = Number(Rate.value) || 1; // 避免乘以0 - return Math.ceil(paidGold * rate); + return Number(Math.ceil(paidGold * rate)); } }); @@ -444,9 +449,10 @@ const deleteRecharge = function () { rechargeWay: "客服充值", freeGold: Number(0), rechargeGold: 0, - paidGold: "", + paidGold: Number(0), }; imageUrl.value = ""; + Rate.value = ""; }; // 批量充值 @@ -589,7 +595,7 @@ const calculatedRowRechargeGold = computed(() => { if (!Rate.value == 0) { const paidGold = Number(addRecharge.value.paidGold) || 0; const rate = Number(Rate.value) || 1; // 避免乘以0 - return Math.ceil(paidGold * rate); + return Number(Math.ceil(paidGold * rate)); } }); diff --git a/vue/gold-system/src/views/recharge/adminRecharge.vue b/vue/gold-system/src/views/recharge/adminRecharge.vue index 32992eb..1d26d69 100644 --- a/vue/gold-system/src/views/recharge/adminRecharge.vue +++ b/vue/gold-system/src/views/recharge/adminRecharge.vue @@ -33,7 +33,7 @@ const rechargeVo = ref({ // 搜索对象 const getObj = ref({ pageNum: 1, - pageSize: 10, + pageSize: 50, }); //分页总条目 const total = ref(100); diff --git a/vue/gold-system/src/views/recharge/allRecharge.vue b/vue/gold-system/src/views/recharge/allRecharge.vue index e3bdb9e..2a8736e 100644 --- a/vue/gold-system/src/views/recharge/allRecharge.vue +++ b/vue/gold-system/src/views/recharge/allRecharge.vue @@ -15,7 +15,7 @@ const rechargeVo = ref({}); // 搜索对象 const getObj = ref({ pageNum: 1, - pageSize: 10, + pageSize: 50, }); //分页总条目 const total = ref(100); diff --git a/vue/gold-system/src/views/refund/allRefund.vue b/vue/gold-system/src/views/refund/allRefund.vue index 157622f..49f68e0 100644 --- a/vue/gold-system/src/views/refund/allRefund.vue +++ b/vue/gold-system/src/views/refund/allRefund.vue @@ -15,7 +15,7 @@ const detail = ref({}); // 搜索对象 const getObj = ref({ pageNum: 1, - pageSize: 10, + pageSize: 50, }); //分页总条目 const total = ref(100); diff --git a/vue/gold-system/src/views/usergold/index.vue b/vue/gold-system/src/views/usergold/index.vue index db7712c..0962e83 100644 --- a/vue/gold-system/src/views/usergold/index.vue +++ b/vue/gold-system/src/views/usergold/index.vue @@ -27,7 +27,7 @@ const getAllObj = ref({}); // 搜索对象 const getObj = ref({ pageNum: 1, - pageSize: 10, + pageSize: 50, }); // 支付方式选项 @@ -256,9 +256,11 @@ onMounted(async function () { @@ -278,23 +280,17 @@ onMounted(async function () {