xiebaomin преди 1 година
родител
ревизия
4e0660bef7

+ 6 - 6
src/main/resources/static/css/article/article.css

@@ -138,13 +138,13 @@ dl,dd,dt{zoom:1}
 	.bar a{color:#777;font-size:14px}
 	.classify.biaoqian{border-bottom:solid 1px #ededed}
 	/*精选文章*/
-	.featured-Articles {width:100%;position:relative;height: 298px;border: 1px solid;box-sizing: border-box;padding: 24px 16px;margin-bottom: 16px;background: #fff;}
+	.featured-Articles {width:100%;position:relative;height: 298px;box-sizing: border-box;padding: 24px 16px;margin-bottom: 16px;background: #fff;}
 	.featured-Articles .featured-title {display: flex;justify-content: space-between;border-bottom: 1px solid #F0F0F0;margin-bottom: 24px;}
 	.featured-Articles .featured-title div:nth-child(1) {color: #333333;font-size: 18px;font-weight: bold;border-bottom: 2px solid #FF5B00;height: 40px;}
 	.featured-Articles .featured-content {display: flex;}
-	.featured-Articles .featured-content .item-content {margin-right:16px;display: flex;flex-direction: column; width: 202px;height: 190px;border: 1px solid;box-sizing: border-box;}
+	.featured-Articles .featured-content .item-content {margin-right:16px;display: flex;flex-direction: column; width: 202px;height: 190px;box-sizing: border-box;}
 	.featured-Articles .featured-content .item-content .item-img {width: 100%;height: 120px;}
-	.featured-Articles .featured-content .item-content .item-title {margin-top: 10px;width: 100%;height: calc(100% - 130px);font-size: 16px;color: #333333;line-height: 28px;}
+	.featured-Articles .featured-content .item-content .item-title {margin-top: 10px;width: 100%;height: calc(100% - 130px);font-size: 16px;color: #333333;line-height: 28px; -webkit-line-clamp: 2;text-overflow: ellipsis;overflow: hidden;display: -webkit-box;-webkit-box-orient: vertical;}
 
 	.content{width:1185px;margin:0 auto;position:relative;}
 	.content .mainData{float:left;width: 884px;background:#f5f5f5;min-height: 900px; }
@@ -385,14 +385,14 @@ dl,dd,dt{zoom:1}
 	.info-banner .banner {width: 55vw;height: 100%;border: 1px solid;box-sizing: border-box;}
 	.info-banner .sider-banner {width: 37.8vw; height: 100%;box-sizing: border-box;display: flex;flex-direction: column;justify-content: space-between;}
 	.info-banner .sider-banner div {width: 100%;height: 49%;border: 1px solid;}
-	.info-h5-notice {height: 10vw; border: 1px solid; box-sizing: border-box;margin: 1.6vw auto 3.2vw auto;width: 93.6vw;background: #fff;display: flex;justify-content: space-between;padding: 2.7vw 3.2vw;}
+	.info-h5-notice {height: 10vw;box-sizing: border-box;margin: 1.6vw auto 3.2vw auto;width: 93.6vw;background: #fff;display: flex;justify-content: space-between;padding: 2.7vw 3.2vw;}
 	.info-h5-notice .h5-notice {font-weight: bold;font-size: 3.6vw;color: #333333;}
-	.info-h5-notice .h5-notice-title ul > li {list-style: disc;}
+	.info-h5-notice .h5-notice-title ul > li {list-style: disc;white-space: nowrap;text-overflow: ellipsis;width: 60vw;overflow: hidden;font-size: 3.2vw;}
 	.featured-Articles {height: 53.1vw;padding: 4vw 3.2vw;box-sizing: border-box;background: #fff;width: 94.4vw;margin: 0 auto 4vw auto;}
 	.featured-Articles .featured-title {display: flex;justify-content: space-between;margin-bottom: 10px;border-bottom: 1px solid #CCCCCC;height: 8.8vw;}
 	.featured-Articles .featured-title div:nth-child(1) {color: #333333;font-size: 3.6vw;font-weight: bold;border-bottom: 2px solid #FF5B00;}
 	.featured-Articles .featured-content {height: 34vw;overflow-x: scroll;width: 100%;white-space: nowrap;}
-	.featured-Articles .featured-content .item-content {margin-right:1.6vw;flex-direction: column;border: 1px solid; width: 33.6vw; box-sizing: border-box;height: 100%;display: inline-block;vertical-align: top;}
+	.featured-Articles .featured-content .item-content {margin-right:1.6vw;flex-direction: column;width: 33.6vw; box-sizing: border-box;height: 100%;display: inline-block;vertical-align: top;}
 	.featured-Articles .featured-content .item-content .item-img {width: 100%;height: 20vw;margin-bottom: 2.4vw;}
 	.featured-Articles .featured-content .item-content .item-title {color: #333333;font-size: 2.8vw;width:100%;overflow: hidden;white-space: normal;text-overflow: ellipsis;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;}
 

+ 2 - 2
src/main/resources/static/css/article/error.css

@@ -21,7 +21,7 @@ body{min-width:1184px}
     .recommend .page span:hover{background-color: #FF5B00; }
 }
 @media screen and (max-width:768px){
-    #errorContent{width:100% !important;overflow:hidden;border:none;padding-top:23.7vw}
+    #errorContent{width:100% !important;overflow:hidden;border:none;padding-top:23.7vw;display: flex;align-items: center;flex-direction: column;justify-content: space-between;height: 70vw;}
     #errorContent img{width:53.7vw;height:23.2vw}
     #errorContent p{font-size:3.4vw;color:#666666;padding:7.8vw 7.8vw 5vw}
     #errorContent p span{color: #FF5B00;}
@@ -39,4 +39,4 @@ body{min-width:1184px}
     .recommend .page span::after{ content: ""; display: block; width: 3.2vw; height: 3.2vw; position: absolute; left: 0.8vw; top: 0.8vw; background: url("/img/article/h5-icon-prev.png") no-repeat center; background-size: 3.2vw;}
     .recommend .page span.next::after{background-image: url("/img/article/h5-icon-next.png")}
     .recommend .page span:hover{background-color: #FF5B00; }
-}
+}

+ 139 - 6
src/main/resources/static/css/article/recommendation.css

@@ -50,6 +50,7 @@
         justify-content: space-between;
         flex-direction: column;
         height: 168px;
+        width: 574px;
     }
     .select-content-item .item-content .item-1 {
         font-size: 18px;
@@ -64,14 +65,47 @@
         font-size: 14px;
         line-height: 24px;
         margin-bottom: 16px;
+        height: 43px;
+        -webkit-line-clamp: 2;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
     }
     .select-content-item .item-content .item-3 {
         font-size: 14px;
         color: #333;
     }
+    .select-content-item .item-content .icon {
+        width: 18px;
+        height: 20px;
+        background: url(/img/article/PC.png);
+        margin-right: 8px;
+    }
+    .select-content-item .item-content .item-3 .label-icon {
+        float: left;
+        background-position: -78px -777px;
+    }
+    .select-content-item .item-content .item-3 .split {
+        margin: 0 5px;
+    }
     .select-content-item .item-content .item-4 {
         font-size: 14px;
         color: #B2B2B2;
+        display: flex;
+        align-items: center;
+    }
+    .select-content-item .item-content .item-4 .label-text {
+        margin-right: 24px;
+    }
+    .select-content-item .item-content .item-4 .label-icon-1 {
+        background-position: -107px -777px;
+    }
+    .select-content-item .item-content .item-4 .label-icon-2 {
+        background-position: -137px -777px;
+    }
+    .select-content-item .item-content .item-4 .label-icon-3 {
+        background-position: -166px -777px;
     }
 
     /*公告和文件*/
@@ -229,9 +263,109 @@
 }
 
 @media screen and (max-width:768px) {
-    /*#drawer-footer, .advertisement {*/
-    /*    display: none;*/
-    /*}*/
+    #drawer-footer, .advertisement {
+        display: none;
+    }
+    /*精品推荐*/
+    .mainData {
+        padding: 3.2vw;
+    }
+    .mainData .selectList {
+        background: #fff;
+        padding: 4vw 3.2vw;
+    }
+    .mainData .more {
+        margin: 7.3vw auto 0 auto;
+        width: 26vw;
+        height: 7.2vw;
+        font-size: 3.2vw;
+        color: #909090;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        border: 1px solid #CCCCCC;
+    }
+    .selectList .select-title {
+        height: 7.5vw;
+        font-size: 3.6vw;
+        color: #333333;
+        font-weight: bold;
+        border-bottom: 1px solid #ccc;
+        display: flex;
+    }
+    .selectList .select-title div {
+        height: 100%;
+        border-bottom: 2px solid #FF5B00;
+    }
+    .select-content .select-content-item {
+        height: 34.2vw;
+        border-bottom: 1px solid #CCCCCC;
+        display: flex;
+        align-items: center;
+    }
+    .select-content .select-content-item .img-left {
+        width: 38.8vw;
+        height: 25.2vw;
+        margin-right: 2.4vw;
+    }
+    .select-content .select-content-item .item-content {
+        width: 46.1vw;
+        height: 29.2vw;
+        overflow: hidden;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+    }
+    .select-content .select-content-item .item-content .icon {
+        width: 4.8vw;
+        height: 4.8vw;
+        background: url(/img/article/PC.png);
+    }
+    .select-content .select-content-item .item-content .item-1 {
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        font-size: 3.4vw;
+        color: #333;
+    }
+    .select-content .select-content-item .item-content .item-2 {
+        -webkit-line-clamp: 2;
+        text-overflow: ellipsis;
+        overflow: hidden;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        font-size: 2.6vw;
+        color: #888888;
+    }
+    .select-content .select-content-item .item-content .item-3 {
+        font-size: 2.4vw;
+        color: #333;
+        margin: 1vw 0;
+    }
+    .select-content .select-content-item .item-content .item-3 .label-icon {
+        float: left;
+        background-position: -18vw -183vw;
+    }
+    .select-content .select-content-item .item-content .item-3 .split {
+        margin: 0 1vw;
+    }
+    .select-content .select-content-item .item-content .item-4 {
+        color: #B2B2B2;
+        font-size: 2.2vw;
+        display: flex;
+        align-items: center;
+    }
+    .select-content .select-content-item .item-content .item-4 .label-icon-1 {
+        background-position: -25vw -183vw;
+    }
+    .select-content .select-content-item .item-content .item-4 .label-icon-2 {
+        background-position: -32vw -183vw;
+    }
+    .select-content .select-content-item .item-content .item-4 .label-icon-3 {
+        background-position: -39vw -183vw;
+    }
+
+    /*美业资料*/
     .infomationlist {
         margin: 1.6vw 0 12.4vw 0;
         background: #fff;
@@ -288,13 +422,12 @@
         align-items: center;
     }
 
-    .infomationlist ul .info-item:nth-child(1) {
+    .infomationlist ul .info-item div:nth-child(1) {
         width: 11.125vw;
         height: 12.136vw;
-        border: 1px solid #ccc;
     }
 
-    .infomationlist ul .info-item:nth-child(2) {
+    .infomationlist ul .info-item div:nth-child(2) {
         margin-left: 4.2vw;
     }
 

+ 20 - 10
src/main/resources/static/js/article/list.js

@@ -37,18 +37,10 @@ var articleList = new Vue({
         pageInput: '1',
         keyword: '',
         requestType: '', // 请求链接类型keyword | labelId | typeId
-        featuredList: [{
-            id: 1,
-            content: "采美新品奈瑞儿王牌美养项目「温通暖宫」上线,中..."
-        },{
-            id: 2,
-            content: "adadad"
-        },{
-            id: 3,
-            content: "adadad"
-        }], // 精选推荐列表
+        featuredList: [], // 精选推荐列表
         dialogVisible: true, // 弹窗
         searchKeys: "", // 搜索词
+        newsList: []
     },
     computed: {
         pageTotal: function () {
@@ -85,6 +77,7 @@ var articleList = new Vue({
             self.initBase();
         });
         self.initAuthInputComplete();
+        this.getNewList()
     },
 
     methods: {
@@ -377,6 +370,23 @@ var articleList = new Vue({
                 $('body').on('scroll', this.onPageScroll);
             }
         },
+
+    //    文章列表切换 最新 最早
+        selectListNew(e) {
+            this.params.selectDataRoutes = e
+        },
+        hanldDetails(id) {
+            window.open('/news/details.html?id='+id);
+        },
+        getNewList() {
+            PublicApi.GetHomeInit({ source: 1 },({ data }) => {
+                if (isPC) {
+                    this.newsList = data.annlist
+                } else {
+                    this.newsList = data.annlist.slice(0,1)
+                }
+            });
+        }
     }
 });
 

+ 52 - 10
src/main/resources/static/js/article/recommendation.js

@@ -29,6 +29,8 @@ var recommendation = new Vue({
         pageInput: '1',
         keyword: '',
         isRossShow: false,
+        stateObj: {},
+        noMore: true,
     },
     computed: {
         pageTotal: function () {
@@ -60,6 +62,11 @@ var recommendation = new Vue({
             immediate: true
         }
     },
+    filters: {
+        filterDate(str) {
+            return str.substring(0, 11)
+        },
+    },
     mounted() {
         this.initData()
     },
@@ -67,16 +74,34 @@ var recommendation = new Vue({
         initData() {
             if (this.state === 2) {
                 this.getNewList()
+            } else {
+                this.getArticlerecommendation(this.state)
             }
-            this.getArticlerecommendation(this.state,1)
         },
-        getArticlerecommendation: function (id, pageNum) {
+        getArticlerecommendation: function (id, num) {
             var _self = this;
-            $.getJSON("/info/articlerecommendation/" + id + "/" + pageNum, {}, function (r) {
-                if (r.code === 0 && r.data) {
-                    _self.articlerecommendationData = r.data;
-                }
-            });
+            if (isPC) {
+                let paramsArr = window.location.pathname.split(".")[0].split("-");
+                this.params.num = paramsArr[2]
+                $.getJSON("/info/articlerecommendation/" + id + "/" + this.params.num, {}, function (r) {
+                    console.log(r.data)
+                    if (r.code === 0 && r.data) {
+                        _self.stateObj = r.data
+                        _self.articlerecommendationData = r.data.results;
+                        _self.listRecord = r.data.totalRecord
+                    }
+                });
+            } else {
+                this.params.num = num || '1'
+                $.getJSON("/info/articlerecommendation/" + id + "/" + this.params.num, {}, function (r) {
+                    console.log(r.data)
+                    if (r.code === 0 && r.data) {
+                        _self.stateObj = r.data
+                        _self.articlerecommendationData = [..._self.articlerecommendationData, ...r.data.results];
+                        _self.listRecord = r.data.totalRecord
+                    }
+                });
+            }
         },
         getNewList(num) {
             if (isPC) {
@@ -106,10 +131,16 @@ var recommendation = new Vue({
         handleMore (num) {
             if (this.state===2) {
                 if (this.params.num < this.pageTotal) { // 获取列表数据
-                    this.params.num = this.params.num + 1;
+                    this.params.num = num
                     this.getNewList(num);
                 } else { //到底了
-                    this.noMore = true;
+                    this.noMore = false;
+                }
+            } else {
+                this.params.num = num;
+                this.getArticlerecommendation(this.state, num)
+                if (num === this.stateObj.totalPage) {
+                    this.noMore = false;
                 }
             }
         },
@@ -132,9 +163,20 @@ var recommendation = new Vue({
         },
         //页面跳转
         changeLink() {
+            console.log(this.pageInput)
             if (this.state === 1) {
                 window.location.href = '/info/articlerecommendation-1-' + this.pageInput + '.html?isSelected'
+            } else {
+                window.location.href = '/info/articlerecommendation-0-' + this.pageInput + '.html?isDocument'
             }
-        }
+        },
+        // 过滤标签
+        filterTab(str) {
+            return str.replace(/<[^>]+>/g, '')
+        },
+        // 数组
+        filterArr(str) {
+            return str.split(',')
+        },
     }
 })

+ 11 - 1
src/main/resources/static/js/common/serviceapi/utils.service.js

@@ -637,7 +637,17 @@ var PublicApi = {
                 callback(res);
             });
         },
-
+        getArticleRecommendation(params, callback) { // 精选文章和美业资料列表数据
+            Http.AjaxService({
+                url: '/info/articlerecommendation',
+                type:'get',
+                data:params,
+                json:false,
+                isHost:true
+            }).then((res) => {
+                callback(res);
+            });
+        }
 };
 
 

+ 1 - 1
src/main/resources/templates/article/components/article-drawer.html

@@ -53,7 +53,7 @@
       <div class="hot-recommend-title">
         <div>您可能感兴趣的美业资料</div>
         <div>
-          <a>更多 ></a>
+          <a href="/info/articlerecommendation-0-1.html?isDocument">更多 ></a>
         </div>
       </div>
       <div class="hot-recommend-content">

+ 0 - 1
src/main/resources/templates/article/components/article-link.html

@@ -16,5 +16,4 @@
     <link th:href="@{/css/base/init.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:href="@{/css/article/article.css(v=${version})}" rel="stylesheet" type="text/css">
     <link rel="stylesheet" href="https://unpkg.com/vant@2.12/lib/index.css" />
-    <link th:href="@{/css/article/recommendation.css(v=${version})}" rel="stylesheet" type="text/css">
 

+ 1 - 1
src/main/resources/templates/article/components/article-sidebar.html

@@ -53,7 +53,7 @@
             <span class="more-product">
 <!--                <span v-if="recommend.nextPage" class="next" @click="getRecommend(typeId, recommend.nextPage)"></span>-->
 <!--                <span v-if="recommend.prePage" class="pre" @click="getRecommend(typeId, recommend.prePage)"></span>-->
-                <a href="/info/articlerecommendation-2-1.html?isDocument">更多 ></a>
+                <a href="/info/articlerecommendation-0-1.html?isDocument">更多 ></a>
             </span>
         </p>
         <div class="row" th:each="file: ${archiveFiles}">

+ 3 - 3
src/main/resources/templates/article/list.html

@@ -52,7 +52,7 @@
                 <div class="h5-notice">公告:</div>
                 <div class="h5-notice-title">
                     <ul>
-                        <li>12月德玛莉直播秒杀活动即将开始</li>
+                        <li @click="hanldDetails(newsList[0].id)">{{ newsList[0].title }}</li>
                     </ul>
                 </div>
                 <div class="h5-notice-more"><a href="/info/articlerecommendation-3-1.html?isNotice">更多 ></a></div>
@@ -121,8 +121,8 @@
             <!-- 文章列表 -->
             <div class="listData-select-title">
                 <div class="search-select">
-                    <div class="select-new" :class="params.selectDataRoutes === 1 ? 'now-search-select' : '' " @click="params.selectDataRoutes = 1">最新</div>
-                    <div class="select-earliest" :class="params.selectDataRoutes === 0 ? 'now-search-select' : '' " @click="params.selectDataRoutes = 0">最早</div>
+                    <div class="select-new" :class="params.selectDataRoutes === 1 ? 'now-search-select' : '' " @click="selectListNew(1)">最新</div>
+                    <div class="select-earliest" :class="params.selectDataRoutes === 0 ? 'now-search-select' : '' " @click="selectListNew(0)">最早</div>
                 </div>
             </div>
             <div v-if="listData.length>0" class="dataRousce">

+ 45 - 31
src/main/resources/templates/article/recommendation.html

@@ -2,6 +2,7 @@
 
 <head>
     <title>信息平台</title>
+    <link th:href="@{/css/article/recommendation.css(v=${version})}" rel="stylesheet" type="text/css">
     <template th:replace="article/components/article-link"></template>
     <template th:replace="components/analysis"></template>
 </head>
@@ -18,30 +19,46 @@
                         <div>精选推荐</div>
                     </div>
                     <div class="select-content">
-                        <div class="select-content-item" v-for="item in articlerecommendationData.results">
+                        <div class="select-content-item" v-for="item in articlerecommendationData">
                             <div class="img-left">
                                 <img style="width: 100%;height: 100%;" :src="item.image" />
                             </div>
                             <div class="item-content">
                                 <div>
                                     <div class="item-1" v-html="item.title"></div>
-                                    <div class="item-2" v-html="item.title"></div>
-                                    <div class="item-3" v-html="item.title"></div>
+                                    <div class="item-2" v-text="filterTab(item.content)"></div>
+                                    <div class="item-3">
+                                        <div class="label-icon icon"></div>
+                                        <template v-for="(i, o) in filterArr(item.label)">
+                                            <span class="split" v-if="o !== 0">|</span>
+                                            <span>{{i}}</span>
+                                        </template>
+                                    </div>
+                                </div>
+                                <div class="item-4">
+                                    <div class="label-icon-1 icon"></div>
+                                    <div class="label-text">{{ item.pv }}</div>
+                                    <div class="label-icon-2 icon"></div>
+                                    <div class="label-text">采美网</div>
+                                    <div class="label-icon-3 icon"></div>
+                                    <div class="label-text">{{ item.publishDate | filterDate }}</div>
                                 </div>
-                                <div class="item-4" v-html="item.title"></div>
                             </div>
                         </div>
                     </div>
+                    <div v-if="!isPC && noMore && stateObj.hasNextPage" class="more" @click="handleMore(params.num*1+1)">
+                        <div>查看更多</div>
+                        <img src="">
+                    </div>
                 </div>
 
-                <div class="pageWrap clear" v-if="isPC && articlerecommendationData.totalRecord > 0">
-                    <a class="prev" :href="'/info/articlerecommendation-1-' + (articlerecommendationData.pageNum - 1) + '.html?isSelected'" v-if="articlerecommendationData.hasPreviousPage"></a>
-                    <template v-for="item in articlerecommendationData.totalPage">
-          <a :href="'/info/articlerecommendation-1-' + item + '.html?isSelected'" v-text="item"></a>
-<!--          <span th:else>···</span>-->
-        </template>
-                    <a class="next" v-if="articlerecommendationData.hasNextPage" :href="'/info/articlerecommendation-1-' + (articlerecommendationData.pageNum + 1) + '.html?isSelected'"></a>
-                    <span>共<b v-text="articlerecommendationData.totalPage"></b>页</span>
+                <div class="pageWrap clear" v-if="isPC && stateObj.totalRecord > 0">
+                    <a class="prev" :href="'/info/articlerecommendation-1-' + (stateObj.pageNum - 1) + '.html?isSelected'" v-if="stateObj.hasPreviousPage"></a>
+                    <template v-for="item in stateObj.totalPage">
+                      <a :href="'/info/articlerecommendation-1-' + item + '.html?isSelected'" v-text="item"></a>
+                    </template>
+                    <a class="next" v-if="stateObj.hasNextPage" :href="'/info/articlerecommendation-1-' + (stateObj.pageNum + 1) + '.html?isSelected'"></a>
+                    <span>共<b v-text="stateObj.totalPage"></b>页</span>
                     <span>跳至</span>
                     <input v-model="pageInput" />
                     <span>页</span>&nbsp;
@@ -67,7 +84,7 @@
                     </li>
                 </ul>
                 <ul v-else>
-                    <li v-for="item in listData">
+                    <li v-for="item in articlerecommendationData">
                         <a class="info-item" :href="item.ossUrl">
                             <div>
                                 <img src="/img/article/PC--pdf.png" style="width: 100%;height: 100%;object-fit: contain;" />
@@ -76,25 +93,25 @@
                         </a>
                     </li>
                 </ul>
-                <div class="pageWrap clear" v-if="state !== 2">
-                    <a class="prev" :href="paginationUrl(params.num*1-1)"></a>
-                    <template v-for="n in showPageBtn">
-          <a v-if="n" :class="{'on':(n==params.num)}" :href="paginationUrl(n)" v-text="n"></a>
-          <span v-else>···</span>
-        </template>
-                    <a v-if="params.num<pageTotal" class="next" :href="paginationUrl(params.num*1+1)"></a>
-                    <span>共<b v-text="pageTotal>1?pageTotal:1"></b>页</span>
+                <div class="pageWrap clear" v-if="isPC && state !== 2">
+                    <a class="prev" :href="'/info/articlerecommendation-0-' + (stateObj.pageNum - 1) + '.html?isDocument'" v-if="stateObj.hasPreviousPage"></a>
+                    <template v-for="n in stateObj.totalPage">
+                      <a v-if="n" :class="{'on':(n==params.num)}" :href="'/info/articlerecommendation-0-' + n + '.html?isDocument'" v-text="n"></a>
+                      <span v-else>···</span>
+                    </template>
+                    <a v-if="stateObj.hasNextPage" class="next" :href="'/info/articlerecommendation-0-' + (stateObj.pageNum + 1) + '.html?isDocument'"></a>
+                    <span>共<b v-text="stateObj.pageNum"></b>页</span>
                     <span>跳至</span>
-                    <input v-model="pageInput" @blur="checkNum()" />
+                    <input v-model="pageInput" />
                     <span>页</span>&nbsp;
-                    <a class="btn" :href="paginationUrl(pageInput)">点击跳转</a>
+                    <a class="btn" href="javascript:void(0)" @click="changeLink">点击跳转</a>
                 </div>
                 <div v-if="isPC && pageTotal>1 && state == 2" class="pageWrap clear">
                     <a v-if="params.num>1" class="prev" :href="paginationUrl(params.num*1-1)"></a>
                     <template v-for="n in showPageBtn">
-          <a v-if="n" :class="{'on':(n==params.num)}" :href="paginationUrl(n)" v-text="n"></a>
-          <span v-else>···</span>
-        </template>
+                      <a v-if="n" :class="{'on':(n==params.num)}" :href="paginationUrl(n)" v-text="n"></a>
+                      <span v-else>···</span>
+                    </template>
                     <a v-if="params.num<pageTotal" class="next" :href="paginationUrl(params.num*1+1)"></a>
                     <span>共<b v-text="pageTotal>1?pageTotal:1"></b>页</span>
                     <span>跳至</span>
@@ -102,14 +119,11 @@
                     <span>页</span>&nbsp;
                     <a class="btn" :href="paginationUrl(pageInput)">点击跳转</a>
                 </div>
-                <div v-if="!isPC && params.num < pageTotal" class="more" @click="handleMore(params.num*1+1)">查看更多</div>
+                <div v-if="!isPC && noMore" class="more" @click="handleMore(params.num*1+1)">查看更多</div>
             </div>
         </div>
     </div>
 
-    <script type="text/javascript">
-    </script>
-
     <template th:replace="article/components/article-drawer"></template>
     <template th:replace="article/components/article-footer"></template>
     <template th:replace="components/foot-link"></template>
@@ -125,4 +139,4 @@
     <script charset="utf-8" type="text/javascript" th:src="@{/js/article/recommendation.js(v=${version})}"></script>
 </body>
 
-</html>
+</html>