Merge branch 'master' of http://116.255.135.38:3000/zhangzl/nsgk_mobile

config/index.js

@@ -22,7 +22,7 @@ module.exports = {
     },
 
     // Various Dev Server settings
-    host: '0.0.0.0', // can be overwritten by process.env.HOST
+    host: '192.168.31.228', // can be overwritten by process.env.HOST
     port: 85, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

src/views/authenticRight/index.vue

@@ -1140,8 +1140,12 @@
           i++
         }
         this.xcdcform["lackCount"] = i
-         this.xcdcform.fileUrl1 = location.protocol+"//"+location.host+request.defaults.baseURL+ this.xcdcform.fileUrl1
-         this.xcdcform.fileUrl2 = location.protocol+"//"+location.host+request.defaults.baseURL+ this.xcdcform.fileUrl2
+        if(this.xcdcform.fileUrl1.length>0){
+          this.xcdcform.fileUrl1 = location.protocol+"//"+location.host+request.defaults.baseURL+ this.xcdcform.fileUrl1.replace(location.protocol+"//"+location.host+request.defaults.baseURL,"")
+
+        }if(this.xcdcform.fileUrl2.length>0){
+          this.xcdcform.fileUrl2 = location.protocol+"//"+location.host+request.defaults.baseURL+ this.xcdcform.fileUrl2.replace(location.protocol+"//"+location.host+request.defaults.baseURL,"")
+        }
         if(this.xcdcform.id){
           updateInvestigate(this.xcdcform).then(res => {
             this.showXCDC = false