From 21fde0c627db376fbd118c19815c13b64cb0c673 Mon Sep 17 00:00:00 2001 From: zry <18990852002@163.com> Date: Sat, 26 Apr 2025 15:08:33 +0800 Subject: [PATCH 1/4] =?UTF-8?q?1.=E4=B8=8A=E6=AD=A3=E5=BC=8F=E5=9C=B0?= =?UTF-8?q?=E5=9D=80=EF=BC=8C2.=E4=BF=AE=E5=A4=8D=E9=87=91=E8=B1=86?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=9C=B0=E5=8C=BA=E6=97=A0=E6=B3=95=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=87=91=E8=B1=86=E6=80=BB=E9=A2=9D=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gold-system/.env.development | 7 +++++-- gold-system/.env.test | 7 +++++-- gold-system/src/views/goldBeen/goldenBeenDetail.vue | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/gold-system/.env.development b/gold-system/.env.development index 04270cc..cc08b56 100644 --- a/gold-system/.env.development +++ b/gold-system/.env.development @@ -1,2 +1,5 @@ -VITE_API_BASE='http://54.251.137.151:10704/' -# VITE_API_BASE='http://192.168.8.94:8080/' \ No newline at end of file +#VITE_API_BASE='http://54.251.137.151:10704/' +# VITE_API_BASE='http://192.168.8.94:8080/' +VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' +# VITE_API_BASE='http://54.251.137.151:10704/' +# VITE_API_BASE='http://192.168.8.232:8080/' \ No newline at end of file diff --git a/gold-system/.env.test b/gold-system/.env.test index 04270cc..cc08b56 100644 --- a/gold-system/.env.test +++ b/gold-system/.env.test @@ -1,2 +1,5 @@ -VITE_API_BASE='http://54.251.137.151:10704/' -# VITE_API_BASE='http://192.168.8.94:8080/' \ No newline at end of file +#VITE_API_BASE='http://54.251.137.151:10704/' +# VITE_API_BASE='http://192.168.8.94:8080/' +VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' +# VITE_API_BASE='http://54.251.137.151:10704/' +# VITE_API_BASE='http://192.168.8.232:8080/' \ No newline at end of file diff --git a/gold-system/src/views/goldBeen/goldenBeenDetail.vue b/gold-system/src/views/goldBeen/goldenBeenDetail.vue index 00e7d6a..cef3dc3 100644 --- a/gold-system/src/views/goldBeen/goldenBeenDetail.vue +++ b/gold-system/src/views/goldBeen/goldenBeenDetail.vue @@ -434,7 +434,7 @@ const getCount = async () => { url: '/dou/getTotal', data: { jwcode: detailY.value.jwcode, - //deptName: detailY.value.deptName, + deptName: detailY.value.deptName, startTime: detailY.value.createTime[0], endTime: detailY.value.createTime[1], orderNo: detailY.value.orderNo, From 83a81b0ecaae940099e7d9c9cb36ea8b3197bd38 Mon Sep 17 00:00:00 2001 From: zry <18990852002@163.com> Date: Sat, 26 Apr 2025 15:13:24 +0800 Subject: [PATCH 2/4] =?UTF-8?q?.env.production=E7=9A=84=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gold-system/.env.production | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gold-system/.env.production b/gold-system/.env.production index 70913ad..fbdcae2 100644 --- a/gold-system/.env.production +++ b/gold-system/.env.production @@ -1 +1,2 @@ -VITE_API_BASE='http://54.251.137.151:10702/' +# VITE_API_BASE='http://54.251.137.151:10702/' +VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' \ No newline at end of file From 6736959de20ff2e55ec5c9bfcfbde96ffd0ac883 Mon Sep 17 00:00:00 2001 From: zry <18990852002@163.com> Date: Sat, 26 Apr 2025 18:38:01 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=A4=B1=E6=95=88bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9B=E5=95=86=E5=93=81=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=94=B9=E6=AD=A3...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gold-system/.env.development | 2 +- gold-system/.env.production | 2 +- gold-system/.env.test | 2 +- gold-system/src/views/consume/allConsume.vue | 16 +++---- gold-system/src/views/managerecharge/activity.vue | 52 ++++++++++++++++++++++- gold-system/stats.html | 2 +- 6 files changed, 63 insertions(+), 13 deletions(-) diff --git a/gold-system/.env.development b/gold-system/.env.development index cc08b56..f7cc6fc 100644 --- a/gold-system/.env.development +++ b/gold-system/.env.development @@ -1,5 +1,5 @@ #VITE_API_BASE='http://54.251.137.151:10704/' # VITE_API_BASE='http://192.168.8.94:8080/' -VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' +VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' # VITE_API_BASE='http://54.251.137.151:10704/' # VITE_API_BASE='http://192.168.8.232:8080/' \ No newline at end of file diff --git a/gold-system/.env.production b/gold-system/.env.production index fbdcae2..9362454 100644 --- a/gold-system/.env.production +++ b/gold-system/.env.production @@ -1,2 +1,2 @@ # VITE_API_BASE='http://54.251.137.151:10702/' -VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' \ No newline at end of file +VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' \ No newline at end of file diff --git a/gold-system/.env.test b/gold-system/.env.test index cc08b56..f7cc6fc 100644 --- a/gold-system/.env.test +++ b/gold-system/.env.test @@ -1,5 +1,5 @@ #VITE_API_BASE='http://54.251.137.151:10704/' # VITE_API_BASE='http://192.168.8.94:8080/' -VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' +VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' # VITE_API_BASE='http://54.251.137.151:10704/' # VITE_API_BASE='http://192.168.8.232:8080/' \ No newline at end of file diff --git a/gold-system/src/views/consume/allConsume.vue b/gold-system/src/views/consume/allConsume.vue index a102473..8acbcf7 100644 --- a/gold-system/src/views/consume/allConsume.vue +++ b/gold-system/src/views/consume/allConsume.vue @@ -284,15 +284,14 @@ const getGoods = async function () { try { // 发送POST请求 const result = await request({ - url: '/product', + url: '/product/findProductName', data: {} }) // 将响应结果存储到响应式数据中 - console.log('请求成功', result) + console.log('请求成功product', result) // 存储全部数据 goods.value = result.data - console.log('allData', allData.value) - console.log('地区', area.value) + console.log('goods 数据', goods.value) // 修改日志输出 } catch (error) { console.log('请求失败', error) // 在这里可以处理错误逻辑，比如显示错误提示等 @@ -344,11 +343,12 @@ const handleCurrentChange = function (val) { style="width: 240px" clearable > + diff --git a/gold-system/src/views/managerecharge/activity.vue b/gold-system/src/views/managerecharge/activity.vue index ca9dce1..21254c4 100644 --- a/gold-system/src/views/managerecharge/activity.vue +++ b/gold-system/src/views/managerecharge/activity.vue @@ -110,6 +110,56 @@ onMounted(async function () { await getAdminData() get() }) +// 定义控制对话框显示的变量，并初始化为 false +const addActivityVisible = ref(false) + +// 定义 addActivity 方法 +const addActivity = () => { + console.log('点击了新增活动按钮'); + // 更新 addActivityVisible 的值为 true，显示对话框 + addActivityVisible.value = true; +}; + +// 关闭对话框的方法 +const closeAddActivityVisible = () => { + addActivityVisible.value = false; +}; + +// 处理每页显示数量变化 +const handlePageSizeChange = function (val) { + getObj.value.pageSize = val + get() +} + +// 处理当前页码变化 +const handleCurrentChange = function (val) { + getObj.value.pageNum = val + get() +} + +// 定义提交方法 +const throttledAdd = async () => { + try { + // 过滤掉 'add' 字段 + const { add, ...validData } = addObj.value; + + // 发送 POST 请求提交表单数据 + const result = await request({ + url: '/recharge/activity/add', // 假设这是新增活动的接口 + method: 'post', + data: validData + }) + console.log('新增活动成功', result) + ElMessage.success('新增活动成功') + // 关闭对话框 + closeAddActivityVisible() + // 重新获取数据 + get() + } catch (error) { + console.log('新增活动失败', error) + ElMessage.error('新增活动失败') + } +}