Merge branch 'feature' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature

src/views/modules/volunteer/Dynamicmanagement/edit.vue

@@ -65,7 +65,7 @@
  <script>
  import { mapGetters } from 'vuex'
  import { Loading } from 'element-ui' // 引入Loading服务
- import { requestPost } from '@/js/dai/request'
+ import { requestPost,requestGet } from '@/js/dai/request'
  import Tinymce from '@c/tinymce2/index.vue'
  import daiMap from "@/utils/dai-map";
  import util from '@js/util.js';
@@ -114,11 +114,12 @@
     components: { Tinymce, UploadImage },
     mounted() {
         console.log(this.$store.state.user,this.EditList,"this.$store.state.user");
-        this.formData = this.EditList
-        this.fileList.push({fileUrl:this.formData.coverImg})
+        // this.formData = this.EditList
+        this.getTrendDetail()
         // this.formData.agencyName=this.$store.state.user.agencyName
         this.activityType()
     },
+
     props: {
         EditList: {
             type: Object,
@@ -263,6 +264,22 @@
         //         this.formData.coverPic = ob.fileUrl;
         //     }
         // },
+
+        //查询详情
+    async getTrendDetail() {
+
+        console.log("getTrendDetail.........");
+
+        const url = "/voluntary/newsTrends/detail/"+this.EditList.id;
+
+        const { data, code, msg } = await requestGet(url);
+        if (code === 0) {
+            console.log("详情成功！！！！！！！！！！！！！！");
+            this.formData = data
+            this.fileList.push({fileUrl:data.coverImg})
+        } 
+    },
+
         removedImg() {
             this.formData.coverImg = ''
         },

src/views/modules/volunteer/Dynamicmanagement/info.vue

@@ -70,7 +70,7 @@
  <script>
  import { mapGetters } from 'vuex'
  import { Loading } from 'element-ui' // 引入Loading服务
- import { requestPost } from '@/js/dai/request'
+ import { requestPost,requestGet } from '@/js/dai/request'
  import Tinymce from '@c/tinymce2/index.vue'
  import daiMap from "@/utils/dai-map";
  import util from '@js/util.js';
@@ -121,7 +121,7 @@
         this.fileList.push({fileUrl:this.infoList.coverImg})
         
         console.log(this.$store.state.user,this.infoList,"this.$store.state.user");
-        this.formData = this.infoList
+        this.getTrendDetail()
         // this.formData.agencyName=this.$store.state.user.agencyName
         this.activityType()
     },
@@ -262,6 +262,20 @@
                 this.formData.online = 0;
             }
         },
+
+        //查询详情
+        async getTrendDetail() {
+
+          console.log("getTrendDetail.........");
+
+          const url = "/voluntary/newsTrends/detail/"+this.infoList.id;
+  
+          const { data, code, msg } = await requestGet(url);
+          if (code === 0) {
+            console.log("详情成功！！！！！！！！！！！！！！");
+            this.formData = data
+          } 
+        },
  
         // onChangeFileList(e) {
         //     if (e.length > 0) {