Merge branch 'lhl' of http://39.101.133.168:8807/yanjiaqing/gold_vue into lhl

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/'
+# VITE_API_BASE='http://192.168.8.94:8080/'

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'

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/'
+# VITE_API_BASE='http://192.168.8.94:8080/'

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, ''); 
   }
 }

gold-system/src/views/goldBeen/goldenBeenBalance.vue

@@ -35,11 +35,19 @@
     </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%"