Merge remote-tracking branch 'origin/麦塔' into 麦塔

src/router.js

@@ -118,8 +118,8 @@ const router = new Router({
                                               },
                                           },
                                           {
-                                              path: 'newsInforDetails',
-                                              name: '/newsInforDetails',
+                                              path: '/newsInforDetails',
+                                              name: 'newsInforDetails',
                                               meta:      {
                                                   parentPath: 'croot',
                                                   breadcrumb: {

src/views/client/newsInfor.vue

@@ -1,105 +1,106 @@
 <template>
     <div class="client-newsInfor-page">
         <!-- 新闻资讯banner栏 -->
-        <div class="newsInfor-banner"></div>
+        <!-- <div class="newsInfor-banner"></div>-->
 
         <!-- 新闻资讯 -->
         <div class="client-container newsInfor-content-box">
             <ul class="newsInfor-menu-ul">
-                <li :class="menuLiActive">行业动态</li>
-                <li>媒体关注</li>
+                <li :class="{'active':clicked===index}" @click="tabSwitch(item,index)" v-for="(item,index) in homeNewsClassify ">{{item.name}}</li>
             </ul>
-            <ul v-infinite-scroll="load" :infinite-scroll-disabled="false" :infinite-scroll-immediate="false" class="newsInfor-content-ul">
+            <ul class="newsInfor-content-ul">
                 <li v-for="(item,index) in newsList  " :key="index">
                     <img :src=" item.pic ||newsInforImg" alt="行业动态">
                     <div class="newsInfor-list-content">
                         <h1>{{item.title}}</h1>
-                        <div><i></i><span>{{item.startTime}}</span><i type="visits"></i><span>{{item.visits}}</span></div>
+                        <div><i></i><span>{{item.startTime}}</span><i type="visits"></i><span>{{item.visits}}</span>
+                        </div>
                         <p>{{item.intro}}</p>
-                        <a>了解更多</a>
+                        <a @click="checkInfo(item)">了解更多</a>
                     </div>
                 </li>
-                <p v-if="loading" style="margin-top:10px;" class="loading">
-                    <span></span>
-                </p>
-                <p v-if="noMore" style="margin-top:10px;font-size:13px;color:#ccc">没有更多了</p>
-            </ul>
+            </ul >
+            <div>
+                <el-pagination
+                        background
+                        layout="prev, pager, next"
+                        @current-change="handleCurrentChange"
+                        :current-page.sync="currentPage"
+                        :page-size="pageSize"
+                        :total="totalLists">
+                </el-pagination>
+            </div>
         </div>
 
     </div>
 </template>
 
 <script>
-    import MtaBreadcrumb    from '@/components/client/common/MtaBreadcrumb.vue';
-    import { homeNewsList,homeNewsClassifyList } from '@/api/login.js';
+    import MtaBreadcrumb                          from '@/components/client/common/MtaBreadcrumb.vue';
+    import { homeNewsList, homeNewsClassifyList } from '@/api/login.js';
+
     export default {
         name:       'newsInfor',
-        props:      {
-        },
+        props:      {},
         data() {
             return {
-                menuLiActive:'',//li样式
-                activeName:'',
-                newsClassifyId:null,
-                newsInforImg:  require(`@/assets/images/client/newsInfor/newsInfor-list-img.png`),
-                count: 0,//起始页数值为0
-                loading: false,
-                totalPages: "",//取后端返回内容的总页数
-                newsList: [] //后端返回的数组
-
+                clicked:0,
+                newsClassifyId:   null,
+                newsInforImg:     require(`@/assets/images/client/newsInfor/newsInfor-list-img.png`),
+                newsList:         [], //后端返回的数组
+                homeNewsClassify: [],
+                totalLists:         0,
+                currentPage:        1,
+                pageSize:           5,
             };
         },
         components: {
-            MtaBreadcrumb
-        },
-        computed:   {
-            noMore() {
-                //当起始页数大于总页数时停止加载
-                return this.count >= this.totalPages - 1;
-            },
-            disabled() {
-                return this.loading || this.noMore;
-            }
+            MtaBreadcrumb,
         },
+        computed:   {},
         methods:    {
-            load() {
-                //滑到底部时进行加载
-                this.loading = true;
-                setTimeout(() => {
-                    this.count += 1; //页数+1
-                    this.getMessage(); //调用接口，此时页数+1，查询下一页数据
-                }, 2000);
+            handleCurrentChange(val){
+                this.currentPage = val;
+                this.getMessage();
+
             },
-            handleClick(data,data1){
-                console.log(data);
-                console.log(data1);
+            tabSwitch(data,index){
+                this.clicked = index
+                this.newsClassifyId = data.newsClassifyId
+                this.getMessage();
 
             },
-            getMessage(){
+            getMessage() {
                 let req = {
-                    newsClassifyId : 0,
-                    page : 1,
-                    size : 4,
-                    };
-                homeNewsList(req).then(res=>{
-                       if(res.code===0){
-                          this.newsList = res.data.data
-                       }
-                })
+                    newsClassifyId:  this.newsClassifyId,
+                    page:           this.currentPage,
+                    size:            this.pageSize,
+                };
+                homeNewsList(req).then(res => {
+                    if (res.code === 0) {
+                        this.newsList = res.data.data;
+                        this.totalLists = res.data.total
+                    }
+                });
 
             },
-            getHomeNewsClassify(){
-                homeNewsClassifyList().then(res=>{
-                       if(res.code===0){
-
-                       }
-                })
+            getHomeNewsClassify() {
+                homeNewsClassifyList().then(res => {
+                    if (res.code === 0) {
+                        this.homeNewsClassify = res.data;
+                        this.newsClassifyId = res.data[0].newsClassifyId
+                        this.getMessage(res.data[0].newsClassifyId);
+                    }
+                });
 
-            }
+            },
+            checkInfo(data) {
+                this.$router.push({ name: 'newsInforDetails', params: data });
+            },
         },
         created() {
             this.getHomeNewsClassify();
-            this.getMessage();
+
         },
         mounted() {
 
@@ -110,7 +111,7 @@
 </script>
 <style>
     .newsInfor-content-ul {
-        height: 620px;
+        height:     620px;
         overflow-y: auto;
     }
 </style>

src/views/client/newsInforDetails.vue

@@ -5,7 +5,7 @@
         <div class="client-details-wrap">
             <h1>{{infoData.title}}</h1>
             <p><i></i><span>{{infoData.startTime}}</span><i type="visits"></i><span>{{infoData.visits}}</span></p>
-            <div class="client-content-box">{{infoData.content}}</div>
+            <div class="client-content-box" v-html="infoData.content"></div>
         </div>
     </div>
 </template>