Merge remote-tracking branch 'origin/develop' into develop

src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index.vue

@@ -185,7 +185,7 @@ export default {
       pubOrgName: '',
       content: '',
       linkUri: '',
-      uploadPath: 'uploadPath',
+      uploadPath: 'file',
       resPk: '',
       fileList: [],
       picList: [],

src/pages/config/pages/dynamicInformationManage/dynamicInfomationDetails/index2.vue

@@ -174,7 +174,7 @@ export default {
       pubOrgName: '',
       content: '',
       linkUri: '',
-      uploadPath: 'uploadPath',
+      uploadPath: 'file',
       resPk: '',
       fileList: [],
       picList: [],

src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue

@@ -1707,7 +1707,7 @@ export default {
       if (res.ok) {
         let imgPath = res.data.filePath
         let imgName = res.data.fileName
-        let imgSrc = 'uploadPath' + imgPath + imgName
+        let imgSrc = 'file' + imgPath + imgName
         // let imgSrc = imgPath + imgName
         // this.itemsContentList[this.saveUploadImgIndex].itemContent = 'uploadPath' + imgPath + imgName
         this.itemsContentList[this.saveAddIndex + 1].itemContent = '<img class=\'wordImg\' src=\'' + imgSrc + '\'>'

src/pages/personal/pages/my-collection/collectionDetail/CollectionDynamicDetail.vue

@@ -87,7 +87,7 @@ export default {
       pubOrgName: '',
       content: '',
       linkUri: '',
-      uploadPath: 'uploadPath',
+      uploadPath: 'file',
       resPk: '',
       fileList: [],
       picList: [],

src/pages/personal/pages/personal-info/components/PersonalData.vue

@@ -194,7 +194,7 @@ export default {
         loading: 'loading'
       }, res => {
         this.userInfo.userPic = res.data.id
-        this.userAvator = 'uploadPath' + res.data.filePath + res.data.fileName
+        this.userAvator = 'file' + res.data.filePath + res.data.fileName
       })
     },
     // 保存用户信息

src/pages/regulatoryRepository/dynamicInformation/pages/DynamicInformationDetails.vue

@@ -81,7 +81,7 @@ export default {
         content: ''
       },
       linkUri: '',
-      uploadPath: 'uploadPath',
+      uploadPath: 'file',
       resPk: '',
       fileList: [],
       picList: [],

src/pages/regulatoryRepository/information/index2.vue

@@ -158,7 +158,7 @@ export default {
       pubOrgName: '',
       content: '',
       linkUri: '',
-      uploadPath: 'uploadPath',
+      uploadPath: 'file',
       resPk: '',
       fileList: [],
       picList: [],