0512前端提测

gold-system/.env.test

@@ -1,21 +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'
-# VITE_API_BASE='http://54.251.137.151:10704/'
-# VITE_API_BASE='http://192.168.8.232:8080/'
-=======
 # 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.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

gold-system/src/views/audit/refundAudit.vue

@@ -582,7 +582,7 @@ const trimJwCode = () => {
         <el-row>
           <el-col :span="21">
             <div class="head-card-element">
-              <el-text class="mx-1" size="large">充值时间：</el-text>
+              <el-text class="mx-1" size="large">时间：</el-text>
               <el-date-picker
                 v-model="getTime"
                 type="datetimerange"

gold-system/src/views/consume/addConsume.vue

@@ -360,6 +360,9 @@ onMounted(async function () {
         placeholder="请选择"
         style="width: 300px"
         @change="handleProductSelect(addConsume.productName)"
+        filterable
+	      allow-create
+	      default-first-option
       >
         <el-option
           v-for="item in goods"
@@ -375,6 +378,9 @@ onMounted(async function () {
         placeholder="请选择"
         style="width: 100px"
         @change="handleIndexSelect(indexs.name)"
+        filterable
+	      allow-create
+	      default-first-option
       >
         <el-option
           v-for="item in index"

gold-system/src/views/index.vue

@@ -280,7 +280,7 @@ const changeDataByArea = (item) => {
             top: 0;
             left: 15%;
             right: 0;
-            z-index: 101;
+            z-index: 80;
             background: white;
           "
         >

gold-system/src/views/recharge/addRecharge.vue

@@ -238,7 +238,7 @@ const getCurrency = async function () {
 const handleAvatarSuccess = (response, uploadFile) => {
   imageUrl.value = URL.createObjectURL(uploadFile.raw)
   console.log('图片上传成功', response, uploadFile)
-  addRecharge.value.rechargeVoucher = `http://54.251.137.151:10702/upload/${response.data}`
+  addRecharge.value.rechargeVoucher = `http://54.251.137.151:10702/home/java/haiwaiyanfa/gold1/${response.data}`
   console.log('图片名称', addRecharge.value.rechargeVoucher)
 }
 
@@ -680,7 +680,7 @@ const changeVoucher = function (row) {
 const handleBatchAvatarSuccess = (response, uploadFile) => {
   imageUrl.value = URL.createObjectURL(uploadFile.raw)
   console.log('图片上传成功', response, uploadFile)
-  rechargeVoucher.value = `http://54.251.137.151:10702/upload/${response.data}`
+  rechargeVoucher.value = `http://54.251.137.151:10702/home/java/haiwaiyanfa/gold1/${response.data}`
   console.log('图片名称', rechargeVoucher.value)
 }
 //批量充值确认按钮
@@ -812,7 +812,7 @@ const batchSettingInit = function () {
 const batchSettingHandleAvatarSuccess = (response, uploadFile) => {
   batchSettingObj.value.imageUrl = URL.createObjectURL(uploadFile.raw)
   console.log('图片上传成功', response, uploadFile)
-  batchSettingObj.value.rechargeVoucher = `http://54.251.137.151:10702/upload/${response.data}`
+  batchSettingObj.value.rechargeVoucher = `http://54.251.137.151:10702/home/java/haiwaiyanfa/gold1/${response.data}`
   console.log('图片名称', batchSettingObj.value.rechargeVoucher)
 }
 // 批量设置取消按钮
@@ -1001,7 +1001,7 @@ onMounted(async function () {
       style="margin-bottom: 5px"
     >
       <el-upload
-        action="http://54.251.137.151:10702/upload"
+        action="http://54.251.137.151:10702/home/java/haiwaiyanfa/gold1"
         class="avatar-uploader"
         :show-file-list="false"
         :on-success="handleAvatarSuccess"
@@ -1333,7 +1333,7 @@ onMounted(async function () {
         <el-table-column property="rechargeVoucher" label="充值凭证">
           <template #default="scope">
             <el-upload
-              action="http://54.251.137.151:10702/upload"
+              action="http://54.251.137.151:10702/home/java/haiwaiyanfa/gold1"
               class="avatar-uploader"
               :show-file-list="false"
               :on-success="handleBatchAvatarSuccess"
@@ -1498,7 +1498,7 @@ onMounted(async function () {
       </el-form-item>
       <el-form-item prop="rechargeVoucher" label="交款凭证">
         <el-upload
-          action="http://54.251.137.151:10702/upload"
+          action="http://54.251.137.151:10702/home/java/haiwaiyanfa/gold1"
           class="avatar-uploader"
           :show-file-list="false"
           :on-success="batchSettingHandleAvatarSuccess"

gold-system/src/views/usergold/index.vue

@@ -426,9 +426,11 @@ const handleSortChange = (column) => {
     sortField.value = 'gold'
   }
   sortOrder.value = column.order === 'ascending' ? 'ASC' : 'DESC'
+  //get（）要写在handleSortChange方法里面，不然会导致排序失效
+  get()
 }
 
-get()
+
 
 const handlePageSizeChange = function (val) {
   getObj.value.pageSize = val