From 74b52628e062b732866a2ed36fa3ec63544d5d0f Mon Sep 17 00:00:00 2001
From: zry <18990852002@163.com>
Date: Sat, 26 Apr 2025 14:58:05 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BA=86=E5=9C=A8=E9=87=91?=
 =?UTF-8?q?=E8=B1=86=E6=98=8E=E7=BB=86=E5=9C=B0=E5=8C=BA=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=97=B6=E7=9A=84=E9=87=91=E8=B1=86=E6=80=BB?=
 =?UTF-8?q?=E9=A2=9D=E6=9B=B4=E6=96=B0=EF=BC=8C2.=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E4=BA=86lhl=E5=88=86=E6=94=AF3.=E4=B8=8A=E6=AD=A3=E5=BC=8F?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 gold-system/.env.development                         | 5 ++++-
 gold-system/.env.test                                | 5 ++++-
 gold-system/src/views/audit/rechargeAudit.vue        | 3 ---
 gold-system/src/views/goldBeen/goldenBeenBalance.vue | 8 --------
 gold-system/src/views/goldBeen/goldenBeenDetail.vue  | 2 +-
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/gold-system/.env.development b/gold-system/.env.development
index 7b92bd0..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://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 7b92bd0..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://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/audit/rechargeAudit.vue b/gold-system/src/views/audit/rechargeAudit.vue
index 27ab247..c058caf 100644
--- a/gold-system/src/views/audit/rechargeAudit.vue
+++ b/gold-system/src/views/audit/rechargeAudit.vue
@@ -553,10 +553,7 @@ 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 60bedad..c31b7fc 100644
--- a/gold-system/src/views/goldBeen/goldenBeenBalance.vue
+++ b/gold-system/src/views/goldBeen/goldenBeenBalance.vue
@@ -35,19 +35,11 @@
     </el-form>
   </div>
   <div class="table-box">
-<<<<<<< HEAD
-    <p>
-      现有金豆：&nbsp;&nbsp;付费金豆：{{ getObj.jinbiBuy }}&nbsp;&nbsp;免费金豆：{{
-        getObj.jinbiFree
-      }}&nbsp;&nbsp;历史消费：{{ getObj.jinbiCostTotal }}
-    </p>
-=======
     <div>
       现有金豆：&nbsp;&nbsp;付费金豆：{{ getObj.jinbiBuy }}&nbsp;&nbsp;免费金豆：{{
         getObj.jinbiFree
       }}&nbsp;&nbsp;历史消费：{{ getObj.jinbiCostTotal }}
     </div>
->>>>>>> 3ffaf69421c1702f88dc3c7f947def06c9cc99c5
     <el-table
       :data="tableData"
       style="width: 100%"
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,