From ce94fdd732181bc43d5cf7118b349cc1be33d1fd Mon Sep 17 00:00:00 2001 From: donghaolin <17667510818@163.com> Date: Sat, 21 Dec 2024 13:56:36 +0800 Subject: [PATCH 1/2] 123 --- vue/gold-system/src/views/recharge/addRecharge.vue | 18 ++++++++---- vue/gold-system/src/views/usergold/index.vue | 32 ++++++++++++++++------ 2 files changed, 35 insertions(+), 15 deletions(-) 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/usergold/index.vue b/vue/gold-system/src/views/usergold/index.vue index 02a1f6e..ff4466a 100644 --- a/vue/gold-system/src/views/usergold/index.vue +++ b/vue/gold-system/src/views/usergold/index.vue @@ -33,15 +33,15 @@ const getObj = ref({ // 支付方式选项 const updateType = [ { - value: "充值", + value: "0", label: "充值", }, { - value: "消费", + value: "1", label: "消费", }, { - value: "退款", + value: "2", label: "退款", }, ]; @@ -277,9 +277,11 @@ onMounted(async function () { @@ -297,9 +299,21 @@ onMounted(async function () { - - - + + + + + + + + + Date: Mon, 23 Dec 2024 16:06:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A5=9E=E5=A5=87=E7=9A=84=E7=BA=A2?= =?UTF-8?q?=E8=A5=BF=E6=9E=97=E5=A5=B3=E5=A3=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/gold-system/src/views/audit/rechargeAudit.vue | 2 +- vue/gold-system/src/views/audit/refundAudit.vue | 2 +- vue/gold-system/src/views/consume/allConsume.vue | 2 +- vue/gold-system/src/views/recharge/adminRecharge.vue | 2 +- vue/gold-system/src/views/recharge/allRecharge.vue | 2 +- vue/gold-system/src/views/refund/allRefund.vue | 2 +- vue/gold-system/src/views/usergold/index.vue | 6 +++--- 7 files changed, 9 insertions(+), 9 deletions(-) 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/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 ff4466a..2f89a59 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, }); // 支付方式选项 @@ -72,11 +72,11 @@ const get = async function (val) { } console.log("搜索参数", getObj.value); // 发送POST请求 - const result = await API.post("http://192.168.8.93:10010/detail", { + const result = await API.post("http://192.168.8.93:10010/detailY", { ...getObj.value, detail: { ...detail.value }, }); - const result2 = await API.post("http://192.168.8.93:10010/detail", { + const result2 = await API.post("http://192.168.8.93:10010/detailY", { ...getAllObj.value, detail: { ...detail.value }, });