From 653532717bdce5d4d6141c68a02a01019a41c1c2 Mon Sep 17 00:00:00 2001 From: lihuilin Date: Mon, 28 Apr 2025 11:17:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=89=E6=9C=9Fbug=E7=BB=93=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gold-system/.env.development | 6 +- gold-system/.env.production | 3 +- gold-system/.env.test | 6 +- gold-system/src/api/index.js | 2 +- gold-system/src/store/area.js | 2 +- gold-system/src/util/request.js | 4 +- gold-system/src/views/audit/rechargeAudit.vue | 3 +- gold-system/src/views/audit/refundAudit.vue | 2 +- gold-system/src/views/consume/addConsume.vue | 2 +- gold-system/src/views/consume/allConsume.vue | 20 ++--- gold-system/src/views/goldBeen/addGoldenBeen.vue | 2 +- .../src/views/goldBeen/goldenBeenBalance.vue | 10 ++- .../src/views/goldBeen/goldenBeenConsum.vue | 20 +++-- .../src/views/goldBeen/goldenBeenDetail.vue | 54 ++++++------ gold-system/src/views/goldBeen/onLineDetail.vue | 27 ++++-- gold-system/src/views/index.vue | 2 + gold-system/src/views/login.vue | 2 +- gold-system/src/views/managerecharge/activity.vue | 63 +++++++++++++- gold-system/src/views/managerecharge/rate.vue | 1 + gold-system/src/views/permissions/index.vue | 9 +- gold-system/src/views/recharge/addRecharge.vue | 4 +- gold-system/src/views/recharge/adminRecharge.vue | 2 +- gold-system/src/views/recharge/allRecharge.vue | 2 +- gold-system/src/views/refund/addRefund.vue | 2 +- gold-system/src/views/refund/allRefund.vue | 3 +- gold-system/src/views/usergold/index.vue | 97 +++++++++++++++------- gold-system/src/views/usergoldInfo/index.vue | 2 +- gold-system/src/views/workspace/index.vue | 2 +- gold-system/stats.html | 2 +- 29 files changed, 245 insertions(+), 111 deletions(-) diff --git a/gold-system/.env.development b/gold-system/.env.development index 440e0c0..c2ddd03 100644 --- a/gold-system/.env.development +++ b/gold-system/.env.development @@ -1,3 +1,5 @@ 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 +#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_dev' +# VITE_API_BASE='http://192.168.8.220:8080/' diff --git a/gold-system/.env.production b/gold-system/.env.production index fbdcae2..a3afc42 100644 --- a/gold-system/.env.production +++ b/gold-system/.env.production @@ -1,2 +1,3 @@ # 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_prod' +# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' diff --git a/gold-system/.env.test b/gold-system/.env.test index d6f6fa0..66c9422 100644 --- a/gold-system/.env.test +++ b/gold-system/.env.test @@ -1,3 +1,5 @@ -# VITE_API_BASE='http://54.251.137.151:10704/' +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.94:8080/' +# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' # VITE_API_BASE='http://192.168.8.232:8080/' -VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' \ No newline at end of file diff --git a/gold-system/src/api/index.js b/gold-system/src/api/index.js index a7a9bf1..f47fedc 100644 --- a/gold-system/src/api/index.js +++ b/gold-system/src/api/index.js @@ -1,6 +1,6 @@ import { pa } from 'element-plus/es/locales.mjs'; import http from '../util/http.js'; - +// 这个是不知道有啥用 const API={ post: function(url,data){ return http({url:url,method:'post',data:data}) diff --git a/gold-system/src/store/area.js b/gold-system/src/store/area.js index 3d8c79e..fb6a7ea 100644 --- a/gold-system/src/store/area.js +++ b/gold-system/src/store/area.js @@ -1,5 +1,5 @@ import { defineStore } from 'pinia' - +// 这个也是不知道有啥用，谁给在index.vue里注了 export const useAreaStore = defineStore('area', { state: () => ({ currentArea: '全部', diff --git a/gold-system/src/util/request.js b/gold-system/src/util/request.js index 5f9567b..15579ed 100644 --- a/gold-system/src/util/request.js +++ b/gold-system/src/util/request.js @@ -1,11 +1,13 @@ import axios from 'axios' +// 创建axios实例 const service = axios.create({ baseURL: import.meta.env.VITE_API_BASE, timeout: 10000, headers: { 'Content-Type': 'application/json' }, - // 设置默认请求方法为 POST + // 设置请求头，指定请求体的格式为 JSON + // 设置默认请求方法为 POST 这行对应的代码搁哪呢？ }) // 请求拦截器 diff --git a/gold-system/src/views/audit/rechargeAudit.vue b/gold-system/src/views/audit/rechargeAudit.vue index c058caf..9365a8e 100644 --- a/gold-system/src/views/audit/rechargeAudit.vue +++ b/gold-system/src/views/audit/rechargeAudit.vue @@ -553,7 +553,6 @@ const handleSortChange = (column) => { // 精网号去空格 const trimJwCode = () => { if (rechargeVo.value.jwcode) { - // 去除字符串两端的空格 rechargeVo.value.jwcode = rechargeVo.value.jwcode.replace(/\s/g, ''); } } @@ -654,7 +653,7 @@ const trimJwCode = () => {
- 重置 + 重置 查询
diff --git a/gold-system/src/views/audit/refundAudit.vue b/gold-system/src/views/audit/refundAudit.vue index 3ecb31c..4141fef 100644 --- a/gold-system/src/views/audit/refundAudit.vue +++ b/gold-system/src/views/audit/refundAudit.vue @@ -599,7 +599,7 @@ const trimJwCode = () => {
- 重置 + 重置 查询
diff --git a/gold-system/src/views/consume/addConsume.vue b/gold-system/src/views/consume/addConsume.vue index 1e7bc3c..9b1bad1 100644 --- a/gold-system/src/views/consume/addConsume.vue +++ b/gold-system/src/views/consume/addConsume.vue @@ -443,7 +443,7 @@ onMounted(async function () { placeholder="提交人姓名" /> - 重置 + 重置 提交 diff --git a/gold-system/src/views/consume/allConsume.vue b/gold-system/src/views/consume/allConsume.vue index 87f3084..6df931a 100644 --- a/gold-system/src/views/consume/allConsume.vue +++ b/gold-system/src/views/consume/allConsume.vue @@ -63,7 +63,7 @@ const consumePlatform = [ }, { value: '3', - label: 'Homily ERP系统' + label: 'ERP系统' } ] @@ -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 > + @@ -412,7 +412,7 @@ const handleCurrentChange = function (val) {
- 重置 + 重置 查询
diff --git a/gold-system/src/views/goldBeen/addGoldenBeen.vue b/gold-system/src/views/goldBeen/addGoldenBeen.vue index 8fa5e32..feb6973 100644 --- a/gold-system/src/views/goldBeen/addGoldenBeen.vue +++ b/gold-system/src/views/goldBeen/addGoldenBeen.vue @@ -62,7 +62,7 @@ -->
- 重置 + 重置 提交 diff --git a/gold-system/src/views/goldBeen/goldenBeenBalance.vue b/gold-system/src/views/goldBeen/goldenBeenBalance.vue index c31b7fc..f4c8572 100644 --- a/gold-system/src/views/goldBeen/goldenBeenBalance.vue +++ b/gold-system/src/views/goldBeen/goldenBeenBalance.vue @@ -2,14 +2,16 @@
- + + 精网号： - + + 地区： - 查询 - 重置 diff --git a/gold-system/src/views/goldBeen/goldenBeenConsum.vue b/gold-system/src/views/goldBeen/goldenBeenConsum.vue index 5e691a4..a9e505a 100644 --- a/gold-system/src/views/goldBeen/goldenBeenConsum.vue +++ b/gold-system/src/views/goldBeen/goldenBeenConsum.vue @@ -2,14 +2,16 @@
- + + 精网号： - + + 地区： - + + 消费类型： --> - + + 直播间： - + + 消费时间： { if (detailY.value.jwcode) { detailY.value.jwcode = detailY.value.jwcode.replace(/\s/g, ''); } + if (detailY.value.sourceName) { + detailY.value.sourceName = detailY.value.sourceName.replace(/\s/g, ''); + } } // 搜索 const search = function () { diff --git a/gold-system/src/views/goldBeen/goldenBeenDetail.vue b/gold-system/src/views/goldBeen/goldenBeenDetail.vue index 00e7d6a..050acb1 100644 --- a/gold-system/src/views/goldBeen/goldenBeenDetail.vue +++ b/gold-system/src/views/goldBeen/goldenBeenDetail.vue @@ -2,14 +2,16 @@
- + + 精网号： - + + 地区： - + + 订单号： - + + 充值类型： --> - + + 充值时间：