LAPTOP-UBJMM5MG\user преди 1 година
родител
ревизия
2d0264e248
променени са 4 файла, в които са добавени 36 реда и са изтрити 35 реда
  1. 33 32
      src/views/common/home.vue
  2. 1 1
      src/views/common/homepage.vue
  3. 1 1
      src/views/notice/detail1.vue
  4. 1 1
      src/views/notice/index.vue

+ 33 - 32
src/views/common/home.vue

@@ -462,7 +462,7 @@
 <script>
 import Swiper from 'swiper'
 import {
-    parkNotice,
+    listNoticeToTop,
     propertyNotice,
     getInvestmentCase,
     getRecruit,
@@ -590,7 +590,7 @@ export default {
             this.getRecruit()
         })
         this.initParkNotice()
-        this.initPropertyNotice()
+        // this.initPropertyNotice()
         this.getInvestmentCase()
 
         this.getPropaganda()
@@ -813,17 +813,18 @@ export default {
                 type: '1',
                 status: 'published'
             }
-            parkNotice(params).then((res) => {
+            listNoticeToTop(params).then((res) => {
                 console.log(res)
                 this.total = res.total
                 if (res.rows) {
+                    console.log('_this.notices.park', _this.notices.park)
                     _this.noticeList = []
                     res.rows.forEach((item) => {
                         const i = {
-                            name: item.title,
-                            detail: item.content,
+                            name: item.noticeTitle,
+                            // detail: item.noticeContent,
                             source: item.source,
-                            content: this.$common.delHtmlTag(item.content)
+                            content: this.$common.delHtmlTag(item.noticeContent)
                         }
                         _this.notices.park.push(i)
                     })
@@ -843,32 +844,32 @@ export default {
         financeDetail(index) {
             this.$router.push({ name: 'financeDetail', params: index })
         },
-        initPropertyNotice() {
-            const _this = this
-            // _this.params.parks = '' //绑定园区
-            const params = {
-                pageNum: 1,
-                pageSize: 2,
-                type: '2',
-                status: 'published'
-            }
-            propertyNotice(params).then((res) => {
-                console.log(res)
-                this.total = res.total
-                if (res.rows) {
-                    _this.noticeList = []
-                    res.rows.forEach((item) => {
-                        const i = {
-                            name: item.title,
-                            detail: item.content,
-                            source: item.source,
-                            content: this.$common.delHtmlTag(item.content)
-                        }
-                        _this.notices.parkManagement.push(i)
-                    })
-                }
-            })
-        },
+        // initPropertyNotice() {
+        //     const _this = this
+        //     // _this.params.parks = '' //绑定园区
+        //     const params = {
+        //         pageNum: 1,
+        //         pageSize: 2,
+        //         type: '2',
+        //         status: 'published'
+        //     }
+        //     propertyNotice(params).then((res) => {
+        //         console.log(res)
+        //         this.total = res.total
+        //         if (res.rows) {
+        //             _this.noticeList = []
+        //             res.rows.forEach((item) => {
+        //                 const i = {
+        //                     name: item.title,
+        //                     detail: item.content,
+        //                     source: item.source,
+        //                     content: this.$common.delHtmlTag(item.content)
+        //                 }
+        //                 _this.notices.parkManagement.push(i)
+        //             })
+        //         }
+        //     })
+        // },
         // 大图预览招商四张图片
         preview(img) {
             this.showimg = true

+ 1 - 1
src/views/common/homepage.vue

@@ -310,7 +310,7 @@ export default {
             if (this.$route.path === '/company/list' || this.$route.path === '/company/detail') {
                 this.menuPlace = '知名企业'
             }
-            if (this.$route.path === '/notice/list') {
+            if (this.$route.path === '/notice/list' || this.$route.path === '/notice/detail') {
                 this.menuPlace = '园区通知'
             }
             if (this.$route.path === '/contact') {

+ 1 - 1
src/views/notice/detail1.vue

@@ -56,7 +56,7 @@ export default {
     },
     mounted() {
         document.documentElement.scrollTop = document.body.scrollTop = 0 // 回到顶部
-        this.detail = this.$route.params
+        this.detail = this.$route.query
     },
     methods: {
         detail1(index) {

+ 1 - 1
src/views/notice/index.vue

@@ -213,7 +213,7 @@ export default {
         detail(index) {
           console.log(index)
             index.active = this.active
-            this.$router.push({ name: 'noticeDetail', params: index })
+            this.$router.push({ name: 'noticeDetail', query: index })
         }
     }
 }