Merge remote-tracking branch 'origin/master'

src/views/news/index.vue

@@ -132,7 +132,7 @@
     </el-dialog>
 
     <el-dialog :visible.sync="dialogVisible" fullscreen append-to-body @close="dialogVisible = false">
-      <img width="100%" :src="form.picture" alt="" />
+      <img width="100%" :src="baseURL+form.picture" alt="" />
     </el-dialog>
   </div>
 </template>
@@ -265,7 +265,7 @@ export default {
       let formData = new FormData();
       formData.append('file', file);
       upload(formData).then(res => {
-        this.form.picture = res.url;
+        this.form.picture = res.fileName;
       });
     },
     handleRemove(file) {
@@ -357,7 +357,7 @@ export default {
         this.form = response.data;
         this.open = true;
         this.title = '修改网站新闻';
-        this.fileList.push({ name: 'xxx', url: this.form.picture });
+        this.fileList.push({ name: 'xxx', url: this.baseURL+this.form.picture });
         // downloadpic(this.form.picture).then(res => {
         //   let src = window.URL.createObjectURL(res);
         //   this.fileList.push({ name: 'xxx', url: src });

src/views/news/task/index.vue

@@ -123,6 +123,8 @@ export default {
   data() {
     return {
       activeName: "详细信息",
+           // 根路径
+           baseURL: process.env.VUE_APP_BASE_API,
       typeList: [
         { label: "要闻咨询", value: "1" },
         { label: "政策法规", value: "2" },
@@ -137,7 +139,7 @@ export default {
   created() {
     if (this.taskList.formobj.picture) {
       this.fileList.push({
-        url: this.taskList.formobj.picture,
+        url: this.baseURL + this.taskList.formobj.picture,
         name: "xxx",
       });
       // downloadpic(this.taskList.formobj.picture).then((res) => {
@@ -150,10 +152,10 @@ export default {
     taskList(curVal, oldVal) {
       if (curVal) {
         this.fileList.pop();
-          this.fileList.push({
-            url: curVal.formobj.picture,
-            name: "xxx",
-          });
+        this.fileList.push({
+          url: this.baseURL + curVal.formobj.picture,
+          name: "xxx",
+        });
         // downloadpic(curVal.formobj.picture).then((res) => {
         //   this.fileList.push({
         //     url: window.URL.createObjectURL(res),