From 5463fa88f00c688fa07c22dbbf45f888764e137a Mon Sep 17 00:00:00 2001 From: donghaolin <17667510818@163.com> Date: Tue, 17 Dec 2024 17:54:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=95=8A=E6=AC=A1=E5=84=BF=E8=BF=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/gold-system/src/views/consume/addConsume.vue | 4 +- vue/gold-system/src/views/managerecharge/rate.vue | 49 +++++++++++++--------- vue/gold-system/src/views/recharge/addRecharge.vue | 2 +- vue/gold-system/src/views/refund/addRefund.vue | 8 +--- 4 files changed, 34 insertions(+), 29 deletions(-) diff --git a/vue/gold-system/src/views/consume/addConsume.vue b/vue/gold-system/src/views/consume/addConsume.vue index 94fbe67..95afa62 100644 --- a/vue/gold-system/src/views/consume/addConsume.vue +++ b/vue/gold-system/src/views/consume/addConsume.vue @@ -298,7 +298,7 @@ function calculateCoins() {

个

@@ -318,7 +318,7 @@ function calculateCoins() {

个

diff --git a/vue/gold-system/src/views/managerecharge/rate.vue b/vue/gold-system/src/views/managerecharge/rate.vue index 77bf067..440632e 100644 --- a/vue/gold-system/src/views/managerecharge/rate.vue +++ b/vue/gold-system/src/views/managerecharge/rate.vue @@ -39,7 +39,32 @@ const getObj = ref({ }); const total = ref(0); //分页总条目 + +//时间选择器 +const value1 = ref({ + startTime: "", + endTime: "", +}); // 时间数组 +function handleDateChange(value) { + if (value && value.length === 2) { + value1.value.startTime = value[0]; // 开始日期 + value1.value.endTime = value[1]; // 结束日期 + } + console.log(value1); +} + +const time = ref({}); const get = async function (val) { + // 搜索参数时间赋值 + if (value1.value != null) { + if (value1.value.startDate != "" && value1.value.endDate != "") { + time.value.startTime = value1.value[0]; + time.value.endTime = value1.value[1]; + } + } else { + time.value.startTime = ""; + time.value.endTime = ""; + } try { // 搜索参数页码赋值 if (typeof val === "number") { @@ -50,7 +75,7 @@ const get = async function (val) { // 发送POST请求 const result = await API.post("http://192.168.8.93:10010/rates/search", { ...getObj.value, - rate: { ...value1.value }, + rate: { ...time.value }, }); // 将响应结果存储到响应式数据中 @@ -128,17 +153,15 @@ const getEditData = async function (row) { console.log("搜索参数", getObj.value); // 发送POST请求 const result = await API.post( - "http://192.168.8.93:10010/rates/searchById", - { - rate: { rateId: row.rateId }, - } + "http://192.168.8.93:10010/rates/searchById?rateId=" + row.rateId, + {} ); // 将响应结果存储到响应式数据中 console.log("请求成功", result); // 存储表格数据 - rateEdit.value = result.data[0]; + rateEdit.value = result.data; console.log("这是编辑的数值", rateEdit.value); } catch (error) { console.log("请求失败", error); @@ -221,19 +244,6 @@ const options = [ }, ]; -//时间选择器 -const value1 = ref({ - startTime: "", - endTime: "", -}); // 时间数组 -function handleDateChange(value) { - if (value && value.length === 2) { - value1.value.startTime = value[0]; // 开始日期 - value1.value.endTime = value[1]; // 结束日期 - } - console.log(value1); -} - function formatDate(value) { if (!value) return ""; const date = new Date(value); @@ -353,7 +363,6 @@ const checkNumber = function () { range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间" - @change="handleDateChange" :size="size" value-format="YYYY-MM-DD" /> diff --git a/vue/gold-system/src/views/recharge/addRecharge.vue b/vue/gold-system/src/views/recharge/addRecharge.vue index 70f4279..22f16dd 100644 --- a/vue/gold-system/src/views/recharge/addRecharge.vue +++ b/vue/gold-system/src/views/recharge/addRecharge.vue @@ -114,7 +114,7 @@ const checkFreeGoldRadio = function (rule, value, callback) { }; const rules = reactive({ jwcode: [{ required: true, message: "请输入精网号", trigger: "blur" }], - activityId: [{ required: true, message: "请选择活动名称", trigger: "blur" }], + // activityId: [{ required: true, message: "请选择活动名称", trigger: "blur" }], paidGold: [{ validator: checkFreeGoldRadio, trigger: "blur" }], rechargeGold: [ { required: true, message: "请输入充值金额", trigger: "blur" }, diff --git a/vue/gold-system/src/views/refund/addRefund.vue b/vue/gold-system/src/views/refund/addRefund.vue index f83c580..2d8da97 100644 --- a/vue/gold-system/src/views/refund/addRefund.vue +++ b/vue/gold-system/src/views/refund/addRefund.vue @@ -323,7 +323,7 @@ const handleSelectionChange = (value) => {
- + { />

个

 - + Date: Wed, 18 Dec 2024 10:19:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=88=91=E7=9A=84=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/gold-system/src/views/consume/addConsume.vue | 2 +- vue/gold-system/src/views/recharge/addRecharge.vue | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/vue/gold-system/src/views/consume/addConsume.vue b/vue/gold-system/src/views/consume/addConsume.vue index 95afa62..fa696db 100644 --- a/vue/gold-system/src/views/consume/addConsume.vue +++ b/vue/gold-system/src/views/consume/addConsume.vue @@ -38,7 +38,7 @@ const add = async function () { try { // 发送POST请求 const result = await API.post( - "http://192.168.8.147:10010/consume/add", + "http://192.168.8.93:10010/consume/add", addConsume.value ); if (result.code === 0) { diff --git a/vue/gold-system/src/views/recharge/addRecharge.vue b/vue/gold-system/src/views/recharge/addRecharge.vue index 22f16dd..f3ceb9c 100644 --- a/vue/gold-system/src/views/recharge/addRecharge.vue +++ b/vue/gold-system/src/views/recharge/addRecharge.vue @@ -408,12 +408,16 @@ function handleActivityChange(value) { console.log("看看", addRecharge.value); } const calculatedFreeGold = computed(() => { - if (!addRecharge.value.activityId == 0) { + 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); } + if (addRecharge.value.rechargeRatio == 0) { + const paidGold = Number(addRecharge.value.paidGold) || 0; + return 0; + } }); const calculatedRechargeGold = computed(() => { if (!Rate.value == 0) { From dbdca32f51722160323a4aa68ccbdd3c205ed7f7 Mon Sep 17 00:00:00 2001 From: donghaolin <17667510818@163.com> Date: Wed, 18 Dec 2024 15:35:14 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=B8=BA=E4=BA=86=E5=BF=83=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=A2=A6=20=E6=B5=B4=E8=A1=80=E5=A5=8B=E6=88=98?= =?UTF-8?q?=E5=83=8F=E4=B8=80=E9=98=B5=E7=8B=82=E9=A3=8E=20=E9=BB=91?= =?UTF-8?q?=E6=9A=97=E4=BC=9A=E9=87=8A=E6=94=BE=E5=85=89=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/gold-system/src/views/managerecharge/rate.vue | 22 ++++++++++++++++++++++ vue/gold-system/src/views/recharge/addRecharge.vue | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/vue/gold-system/src/views/managerecharge/rate.vue b/vue/gold-system/src/views/managerecharge/rate.vue index 440632e..cbc23aa 100644 --- a/vue/gold-system/src/views/managerecharge/rate.vue +++ b/vue/gold-system/src/views/managerecharge/rate.vue @@ -422,6 +422,28 @@ const checkNumber = function () { --> + + + @@ -698,4 +735,7 @@ p { .pagination { display: flex; } +.status { + display: flex; +}