diff --git a/gold-system/.env.development b/gold-system/.env.development index 04270cc..7b92bd0 100644 --- a/gold-system/.env.development +++ b/gold-system/.env.development @@ -1,2 +1,2 @@ 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://192.168.8.94:8080/' 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 diff --git a/gold-system/.env.test b/gold-system/.env.test index 04270cc..7b92bd0 100644 --- a/gold-system/.env.test +++ b/gold-system/.env.test @@ -1,2 +1,2 @@ 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://192.168.8.94:8080/' diff --git a/gold-system/src/views/audit/rechargeAudit.vue b/gold-system/src/views/audit/rechargeAudit.vue index 1b74d17..27ab247 100644 --- a/gold-system/src/views/audit/rechargeAudit.vue +++ b/gold-system/src/views/audit/rechargeAudit.vue @@ -553,6 +553,10 @@ const handleSortChange = (column) => { // 精网号去空格 const trimJwCode = () => { if (rechargeVo.value.jwcode) { +<<<<<<< HEAD +======= + // 去除字符串两端的空格 +>>>>>>> 3ffaf69421c1702f88dc3c7f947def06c9cc99c5 rechargeVo.value.jwcode = rechargeVo.value.jwcode.replace(/\s/g, ''); } } diff --git a/gold-system/src/views/goldBeen/goldenBeenBalance.vue b/gold-system/src/views/goldBeen/goldenBeenBalance.vue index 677a949..60bedad 100644 --- a/gold-system/src/views/goldBeen/goldenBeenBalance.vue +++ b/gold-system/src/views/goldBeen/goldenBeenBalance.vue @@ -35,11 +35,19 @@
+<<<<<<< HEAD

现有金豆:  付费金豆:{{ getObj.jinbiBuy }}  免费金豆:{{ getObj.jinbiFree }}  历史消费:{{ getObj.jinbiCostTotal }}

+======= +
+ 现有金豆:  付费金豆:{{ getObj.jinbiBuy }}  免费金豆:{{ + getObj.jinbiFree + }}  历史消费:{{ getObj.jinbiCostTotal }} +
+>>>>>>> 3ffaf69421c1702f88dc3c7f947def06c9cc99c5