Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/admin into dev

config/index.js

@@ -12,9 +12,9 @@ module.exports = {
     proxyTable: {
       '/api': {
         // target: 'https://dp.huiju360.com.cn/hj_operations',
-        target: 'http://192.168.0.62:8080', //wf
+        // target: 'http://192.168.0.62:8080', //wf
         // target: 'http://127.0.0.1:8080', 
-        // target: 'http://192.168.0.11:8080', //ys
+        target: 'http://192.168.0.11:8080', //ys
         // target: 'http://192.168.0.125:8080', //hyq
         // target: 'http://dev.ycjcjy.com/', //frp
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置

src/pages/system/cardAndCouponManager/cardManager/edit.vue

@@ -22,7 +22,6 @@
           <div class="flex-item">
             <div>
               <el-upload
-                :disabled="isEdit"
                 class="avatar-uploader"
                 action='string'
                 :http-request="toolClass.upload"

src/pages/system/cardAndCouponManager/couponManager/edit.vue

@@ -23,7 +23,6 @@
           <div class="flex-item">
             <div>
               <el-upload
-                :disabled="isEdit"
                 class="avatar-uploader"
                 action='string'
                 :http-request="toolClass.upload"

src/pages/system/caseManager/signinManager/index.vue

@@ -180,7 +180,7 @@ export default {
       return this.toolClass.dateFormat(date, 'yyyy-MM-dd hh:mm:ss')
     },
     excelSignin () { // 导出Excel
-      window.open(`${this.toolClass.ReplaceOrg(this.$api.caseManager.getExcelSignin.url)}?token=${localStorage.getItem('JWT')}&selectType=${this.$data.valueTime}&caseid=${this.$data.valueCase}`, '_blank')
+      window.open(`${this.toolClass.ReplaceOrg(this.$api.caseManager.getExcelSignin.url)}?token=${localStorage.getItem('JWT')}&selectType=${this.valueTime}&caseid=${this.postData.caseid}`, '_blank')
     }
   },
   computed: {