diff --git a/gold-system/.env.development b/gold-system/.env.development index e9f1785..8807842 100644 --- a/gold-system/.env.development +++ b/gold-system/.env.development @@ -1,5 +1,12 @@ +<<<<<<< HEAD # 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://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' +>>>>>>> a117177bbbe1dd3064874e0b27bedb0c3b15c3e3 # VITE_API_BASE='http://192.168.8.220:8080/' diff --git a/gold-system/.env.production b/gold-system/.env.production index a2ba8da..98834c3 100644 --- a/gold-system/.env.production +++ b/gold-system/.env.production @@ -1,7 +1,12 @@ # VITE_API_BASE='http://54.251.137.151:10702/' <<<<<<< HEAD +<<<<<<< HEAD VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' ======= VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' # VITE_API_BASE='http://192.168.8.220:8080/' >>>>>>> zry +======= +VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_prod' +# VITE_API_BASE='https://hwjb.homilychart.com/gold_htms_dev' +>>>>>>> a117177bbbe1dd3064874e0b27bedb0c3b15c3e3 diff --git a/gold-system/.env.test b/gold-system/.env.test index 37c921a..af5e5ed 100644 --- a/gold-system/.env.test +++ b/gold-system/.env.test @@ -1,4 +1,5 @@ <<<<<<< HEAD +<<<<<<< HEAD #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' @@ -11,3 +12,10 @@ 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.220:8080/' >>>>>>> zry +======= +# 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/' +>>>>>>> a117177bbbe1dd3064874e0b27bedb0c3b15c3e3 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 8acbcf7..6df931a 100644 --- a/gold-system/src/views/consume/allConsume.vue +++ b/gold-system/src/views/consume/allConsume.vue @@ -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..f2716df 100644 --- a/gold-system/src/views/goldBeen/goldenBeenBalance.vue +++ b/gold-system/src/views/goldBeen/goldenBeenBalance.vue @@ -2,14 +2,16 @@
- + + 精网号： - + + 地区： - 查询 - 重置 @@ -194,14 +196,23 @@ const getArea = async () => { } } const getCount = async () => { - const result = await API({ - url: '/dou/getYveTotal' - }) - if (result.code == 200) { - const { jinbiBuy, jinbiFree, jinbiCostTotal } = result.data - getObj.value.jinbiBuy = jinbiBuy - getObj.value.jinbiFree = jinbiFree - getObj.value.jinbiCostTotal = jinbiCostTotal + try { + const result = await API({ + url: '/dou/getYveTotal', + // 传递jwcode和ipAddress参数，可以让金币数随查询变化 + data: { + jwcode: detailY.jwcode, + ipAddress: detailY.area + } + }) + if (result.code === 200) { + const { jinbiBuy, jinbiFree, jinbiCostTotal } = result.data + getObj.value.jinbiBuy = jinbiBuy + getObj.value.jinbiFree = jinbiFree + getObj.value.jinbiCostTotal = jinbiCostTotal + } + } catch (error) { + console.log('获取统计数据失败', error) } } getArea() 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 cef3dc3..b57ad3f 100644 --- a/gold-system/src/views/goldBeen/goldenBeenDetail.vue +++ b/gold-system/src/views/goldBeen/goldenBeenDetail.vue @@ -2,14 +2,16 @@
- + + 精网号： - + + 地区： - + + 订单号： - + + 充值类型： --> - + + 充值时间：