Przeglądaj źródła

优化子表显隐

yangfan 5 miesięcy temu
rodzic
commit
8a073e9252

+ 2 - 2
src/components/Generator/components/Upload/UploadImg.vue

@@ -249,7 +249,7 @@ export default {
           ImgUrl = this.define.comUrl + '/'
           return ImgUrl + url
         } else {
-          ImgUrl = document.location.origin + '/'
+          ImgUrl = this.define.comUrl + '/'
           return ImgUrl + url
         }
       } else {
@@ -264,7 +264,7 @@ export default {
             ImgUrl = this.define.comUrl + '/'
             return ImgUrl + o.url
           } else {
-            ImgUrl = document.location.origin + '/'
+            ImgUrl = this.define.comUrl + '/'
             return ImgUrl + o.url
           }
         } else {

+ 3 - 3
src/components/Generator/index/RightComponents/UploadImg.vue

@@ -21,9 +21,9 @@
     <el-form-item label="最大上传数">
       <el-input-number :value="activeData.limit" :min="0" placeholder="最大上传数" @input="$set(activeData, 'limit', $event ? $event : undefined)" :step="1" controls-position="right" />
     </el-form-item>
-    <el-form-item label="开启扫码上传">
-      <el-switch v-model="activeData.scanCode" />
-    </el-form-item>
+    <!--    <el-form-item label="开启扫码上传">-->
+    <!--      <el-switch v-model="activeData.scanCode" />-->
+    <!--    </el-form-item>-->
     <!-- <el-form-item label="显示提示">
       <el-switch v-model="activeData.showTip" />
     </el-form-item> -->

+ 2 - 2
src/utils/define.js

@@ -25,8 +25,8 @@ module.exports = {
   HashUrl: process.env.NODE_ENV === 'development' ? 'http://localhost:1889/#/' : 'http://windatawk.platomix.net/#/',
   timeout: process.env.NODE_ENV === 'development' ? 10000 : 1000000,
   // WebSocketUrl: process.env.NODE_ENV === 'development' ? APIURl.replace('http', 'ws') + '/api/message/websocket' : process.env.VUE_APP_BASE_WSS,
-  comUploadUrl: process.env.NODE_ENV === 'development' ? APIURl + '/file/uploadFile/record' : APIURl + '/file/uploadFile/record',
-  comUrl: process.env.NODE_ENV === 'development' ? url : process.env.VUE_APP_BASE_API,
+  comUploadUrl: process.env.NODE_ENV === 'development' ? APIURl + '/file/uploadFile/record' : _CONFIG.APIHead + '/api' + '/file/uploadFile/record',
+  comUrl: process.env.NODE_ENV === 'development' ? url : _CONFIG.APIHead,
   // 本地文件预览
   filePreviewServer: process.env.NODE_ENV === 'development' ? 'http://116.196.94.12:30090' : process.env.VUE_APP_BASE_API + '/FileServer',
   // 大屏应用前端路径

+ 1 - 1
src/utils/request.js

@@ -33,7 +33,7 @@ let paramsObj = queryURLParams(url)
 if (process.env.NODE_ENV === 'development') {
   baseURL = process.env.VUE_APP_BASE_API
   paramsObj.token =
-    'eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJza3k5MTEiLCJpbnN0SWQiOiIxNzM5OTMxNjQxMjY4MjYwODY5Iiwia2lkIjoibXhrX2F1dGhfandrIiwiaXNzIjoiaHR0cHM6Ly9xZXZvYy5jb20vIiwic3R5bGUiOiJ3ZWIiLCJleHAiOjE3Mjg4NzQxNjAsImlhdCI6MTcyNTI3NDE2MCwidXNlcklkIjoiMTczOTkyNzcxNDEyMDQ1NDIzNyIsImp0aSI6IjEwMjgwNTYxODI1NDA5OTI1MTIifQ.4Fcj9cCM4sQGVUGQgkwmBrh90PoePvHYyogu6spJgwid_z2vzEbN6WMAOaFOwiznkYUZKqF0ebwoN_oGNsNhjw'
+    'eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJza3k5MTEiLCJpbnN0SWQiOiIxNzM5OTMxNjQxMjY4MjYwODY5Iiwia2lkIjoibXhrX2F1dGhfandrIiwiaXNzIjoiaHR0cHM6Ly9xZXZvYy5jb20vIiwic3R5bGUiOiJ3ZWIiLCJleHAiOjE3MjkxMjEwOTAsImlhdCI6MTcyNTUyMTA5MCwidXNlcklkIjoiMTczOTkyNzcxNDEyMDQ1NDIzNyIsImp0aSI6IjEwMjkwOTE4ODEzODE3ODk2OTYifQ.UFn-z6vmsoIRxyb9MD_a8MW189vT0Gg7Ig_uKg1S9L6F1c_1Q_CAUoU5OP4M0pbPxeuO-qzCyIRSw1n_W1OuMQ'
   if (!getToken() || getToken() !== paramsObj.token) {
     setToken(paramsObj.token)
   }