From 5562c1db1f6955447a07413daca9bb63a7a38c2d Mon Sep 17 00:00:00 2001 From: donghaolin <17667510818@163.com> Date: Fri, 13 Dec 2024 19:13:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BF=99=E6=98=AF12.13=E7=9A=84=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=EF=BC=8C=E4=BB=8A=E5=A4=A9=E6=B4=AA=E9=94=A1=E6=9E=97?= =?UTF-8?q?=E6=B2=A1=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue/gold-system/src/views/consume/addConsume.vue | 63 ++++++----- vue/gold-system/src/views/recharge/addRecharge.vue | 118 ++++++++++++++------- vue/gold-system/src/views/refund/addRefund.vue | 56 +++++----- vue/gold-system/src/views/workspace/index.vue | 35 ++++-- 4 files changed, 179 insertions(+), 93 deletions(-) diff --git a/vue/gold-system/src/views/consume/addConsume.vue b/vue/gold-system/src/views/consume/addConsume.vue index 25ab3c6..ba1f7e9 100644 --- a/vue/gold-system/src/views/consume/addConsume.vue +++ b/vue/gold-system/src/views/consume/addConsume.vue @@ -38,10 +38,15 @@ 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) { + ElMessage.error(result.msg); + return; + } else { + ElMessage.success("添加成功"); + } //重置表单 addConsume.value = {}; addConsume.value.adminId = adminData.value.adminId; @@ -54,6 +59,8 @@ const add = async function () { user.value = {}; } catch (error) { console.log("请求失败", error); + ElMessage.error("添加失败，请检查输入内容是否正确"); + // 在这里可以处理错误逻辑，比如显示错误提示等 } }; @@ -327,65 +334,71 @@ function calculateCoins() { - - - 客户信息 - - + + + 客户信息 + +

{{ user.name }}

 - +

{{ user.totalRechargeGold }}

 - +

{{ user.jwcode }}

 - + -

{{ user.sumgold }}

+ {{ + user.buyJb + user.free6 + user.free12 + user.coreJb + }} + (充值金币:{{ user.buyJb }};免费金币:{{ + user.free6 + user.free12 + }};任务金币:{{ user.coreJb }}) - +

{{ moment(user.firstRechargeDate).format("YYYY-MM-DD HH:mm:ss") }}

- + -

{{ user.rechargeTimes }}

+

{{ user.rechargeTimes }}

 - +

{{ adminData.name }}

 - + -

{{ user.spendTimes }}

+

{{ user.spendTimes }}

 - +

{{ adminData.area }}

 - + -

+

{{ user.A }}

diff --git a/vue/gold-system/src/views/recharge/addRecharge.vue b/vue/gold-system/src/views/recharge/addRecharge.vue index 4b514b4..24a0523 100644 --- a/vue/gold-system/src/views/recharge/addRecharge.vue +++ b/vue/gold-system/src/views/recharge/addRecharge.vue @@ -141,9 +141,9 @@ const getUser = async function (jwcode) { console.log("用户信息", user.value); console.log("用户信息", user.value.firstRechargeDate); if (result.data.code === 0) { - ElMessage.error(result.data.msg); + ElMessage.error(result.msg); } else { - ElMessage.success(result.data.msg); + ElMessage.success(result.msg); } } catch (error) { console.log("请求失败", error); @@ -361,27 +361,55 @@ const handleAvatarSuccess = (response, uploadFile) => { //充值方式条目 const options = [ { - value: "现金充值", - label: "现金充值", + value: "微信", + label: "微信", + }, + { + value: "支付宝", + label: "支付宝", + }, + { + value: "银联", + label: "银联", }, { - value: "龙鳞卡", - label: "龙鳞卡", + value: "信用卡", + label: "信用卡", }, { - value: "弘粉卡", - label: "弘粉卡", + value: "借记卡", + label: "借记卡", + }, + { + value: "现金充值", + label: "现金充值", }, ]; +//根据活动id获取汇率 +const getActivityById = async function (row) { + try { + // 发送POST请求 + const result = await API.post( + "http://192.168.8.93:10010/recharge/activity/select", + { activity: { activityId: row } } + ); + addRecharge.value.rechargeRatio = result.data[0].rechargeRatio; + console.log("看看有了吗", result.value); + } catch (error) { + console.log("请求失败", error); + } +}; +const handleSelectionChange = (row) => { + getActivityById(row); +}; const calculatedFreeGold = computed(() => { if (!addRecharge.value.activityId == 0) { const paidGold = Number(addRecharge.value.paidGold) || 0; - const activityId = Number(addRecharge.value.activityId) || 1; // 避免除以0 + const activityId = Number(addRecharge.value.rechargeRatio) || 1; // 避免除以0 return Math.ceil(paidGold / activityId); } }); - const calculatedRechargeGold = computed(() => { if (!addRecharge.value.rateId == 0) { const paidGold = Number(addRecharge.value.paidGold) || 0; @@ -438,12 +466,13 @@ const deleteRecharge = function () { v-model="addRecharge.activityId" placeholder="请选择" style="width: 300px" + @change="handleSelectionChange" > @@ -501,14 +530,25 @@ const deleteRecharge = function () { style="margin-bottom: 5px" > - - + +

仅支持.jpg .png格式，文件≤1MB @@ -539,65 +579,71 @@ const deleteRecharge = function () { - - - 客户信息 - - + + + 客户信息 + +

{{ user.name }}

 - +

{{ user.totalRechargeGold }}

 - +

{{ user.jwcode }}

 - + -

{{ user.sumgold }}

+ {{ + user.buyJb + user.free6 + user.free12 + user.coreJb + }} + (充值金币:{{ user.buyJb }};免费金币:{{ + user.free6 + user.free12 + }};任务金币:{{ user.coreJb }}) - +

{{ moment(user.firstRechargeDate).format("YYYY-MM-DD HH:mm:ss") }}

- + -

{{ user.rechargeTimes }}

+

{{ user.rechargeTimes }}

 - +

{{ adminData.name }}

 - + -

{{ user.spendTimes }}

+

{{ user.spendTimes }}

 - +

{{ adminData.area }}

 - + -

+

{{ user.A }}

diff --git a/vue/gold-system/src/views/refund/addRefund.vue b/vue/gold-system/src/views/refund/addRefund.vue index 344f473..90b5bf8 100644 --- a/vue/gold-system/src/views/refund/addRefund.vue +++ b/vue/gold-system/src/views/refund/addRefund.vue @@ -148,9 +148,9 @@ const getUser = async function (jwcode) { Number(user.value.pendingSpendTimes); console.log("用户信息", user.value); if (result.data.code === 0) { - ElMessage.error(result.data.msg); + ElMessage.error(result.msg); } else { - ElMessage.success(result.data.msg); + ElMessage.success(result.msg); } } catch (error) { console.log("请求失败", error); @@ -379,65 +379,71 @@ const handleSelectionChange = (value) => { - - - 客户信息 - - + + + 客户信息 + +

{{ user.name }}

 - +

{{ user.totalRechargeGold }}

 - +

{{ user.jwcode }}

 - + -

{{ user.sumgold }}

+ {{ + user.buyJb + user.free6 + user.free12 + user.coreJb + }} + (充值金币:{{ user.buyJb }};免费金币:{{ + user.free6 + user.free12 + }};任务金币:{{ user.coreJb }}) - +

{{ moment(user.firstRechargeDate).format("YYYY-MM-DD HH:mm:ss") }}

- + -

{{ user.rechargeTimes }}

+

{{ user.rechargeTimes }}

 - +

{{ adminData.name }}

 - + -

{{ user.spendTimes }}

+

{{ user.spendTimes }}

 - +

{{ adminData.area }}

 - + -

+

{{ user.A }}

diff --git a/vue/gold-system/src/views/workspace/index.vue b/vue/gold-system/src/views/workspace/index.vue index ffc0c72..e447c60 100644 --- a/vue/gold-system/src/views/workspace/index.vue +++ b/vue/gold-system/src/views/workspace/index.vue @@ -123,11 +123,11 @@ const get = async function () { {} ); const result5 = await API.post( - "http://192.168.8.93:10010/statistics/getMediumAreaPay", + "http://192.168.8.147:10010/statistics/getMediumAreaPay", {} ); const result6 = await API.post( - "http://192.168.8.93:10010/statistics/getMediumAreaConsume", + "http://192.168.8.147:10010/statistics/getMediumAreaConsume", {} ); const result7 = await API.post( @@ -429,7 +429,12 @@ const get = async function () { Number(HCData.value[0].value) + Number(LinkData.value[0].value) + Number(goldData.value[0].value), - name: "第1学科", + name: + "第一学科" + + (Number(ERPData.value[0].value) + + Number(HCData.value[0].value) + + Number(LinkData.value[0].value) + + Number(goldData.value[0].value)), }, { value: @@ -437,7 +442,12 @@ const get = async function () { Number(HCData.value[1].value) + Number(LinkData.value[1].value) + Number(goldData.value[1].value), - name: "第2学科", + name: + "第二学科" + + (Number(ERPData.value[1].value) + + Number(HCData.value[1].value) + + Number(LinkData.value[1].value) + + Number(goldData.value[1].value)), }, { value: @@ -445,7 +455,12 @@ const get = async function () { Number(HCData.value[2].value) + Number(LinkData.value[2].value) + Number(goldData.value[2].value), - name: "第3学科", + name: + "第三学科" + + (Number(ERPData.value[2].value) + + Number(HCData.value[2].value) + + Number(LinkData.value[2].value) + + Number(goldData.value[2].value)), }, { value: @@ -453,7 +468,12 @@ const get = async function () { Number(HCData.value[3].value) + Number(LinkData.value[3].value) + Number(goldData.value[3].value), - name: "第4学科", + name: + "第四学科" + + (Number(ERPData.value[3].value) + + Number(HCData.value[3].value) + + Number(LinkData.value[3].value) + + Number(goldData.value[3].value)), }, ]; @@ -473,6 +493,7 @@ const changeGoldTypePay = function () { payRank.value = {}; if (goldTypePay.value == "全部类型") { payRank.value = areaTotalPay.value; + console.log("这是中国过过过过", payRank.value); } else if (goldTypePay.value == "充值金币") { payRank.value = areaRechargePay.value; } else if (goldTypePay.value == "免费金币") { @@ -958,7 +979,7 @@ onMounted(async function () { -

全年累计消费金币数

+

全年累计消耗金币数

{{ formatNum(Math.abs(getYearConsumeCoin.yearsumCoin)) }}