浏览代码

代码合并

xiebaomin 1 年之前
父节点
当前提交
a3d60ddfbc

+ 0 - 16
src/main/java/com/caimei/www/controller/unlimited/ArticleController.java

@@ -241,22 +241,6 @@ public class ArticleController extends BaseController {
         return ERROR_PATH;
         return ERROR_PATH;
     }
     }
 
 
-    /**
-     * 文章推荐和文章
-     */
-    @GetMapping("/info/articlerecommendation.html")
-    public String toArticleRecommendation(final Model model) {
-        List<BaseLink> typeList = articleService.getArticleTypes();
-        List<BaseLink> data = articleService.getArticleLabels().getData();
-        List<ImageLink> Ads = articleService.getLastestInfoAds().getData();
-        model.addAttribute("ads", Ads);
-        model.addAttribute("labels", data);
-        model.addAttribute("articleType", typeList);
-        model.addAttribute("typeId", 0);
-        model.addAttribute("labelId", 0);
-        return ARTICLE_RECOMMENDATION;
-    }
-
     /**
     /**
      * 获取文章热门标签
      * 获取文章热门标签
      */
      */

+ 1 - 1
src/main/resources/mapper/ArticleMapper.xml

@@ -58,7 +58,7 @@
 		from cm_related cr
 		from cm_related cr
 		left join info a on a.id=cr.relatedId
 		left join info a on a.id=cr.relatedId
 		left join info_praise c on a.id = c.infoId
 		left join info_praise c on a.id = c.infoId
-1		where cr.type=2
+		where cr.type=2
 		and a.enabledStatus = 1
 		and a.enabledStatus = 1
 		and a.auditStatus = 2
 		and a.auditStatus = 2
 		and NOW() >= a.pubdate
 		and NOW() >= a.pubdate

+ 11 - 1
src/main/resources/static/js/article/recommendation.js

@@ -22,6 +22,7 @@ var recommendation = new Vue({
             selectDataRoutes: 1 // 最新 最早
             selectDataRoutes: 1 // 最新 最早
         },
         },
         listData: [],
         listData: [],
+        articlerecommendationData: [],
         listRecord: 0,
         listRecord: 0,
         productRecord: 0,
         productRecord: 0,
         productList: [],
         productList: [],
@@ -64,9 +65,18 @@ var recommendation = new Vue({
     },
     },
     methods: {
     methods: {
         initData() {
         initData() {
-            if (this.state===2) {
+            if (this.state === 2) {
                 this.getNewList()
                 this.getNewList()
             }
             }
+            this.getArticlerecommendation(this.state,1)
+        },
+        getArticlerecommendation: function (id, pageNum) {
+            var _self = this;
+            $.getJSON("/info/articlerecommendation/" + id + "/" + pageNum, {}, function (r) {
+                if (r.code === 0 && r.data) {
+                    _self.articlerecommendationData = r.data;
+                }
+            });
         },
         },
         getNewList(num) {
         getNewList(num) {
             if (isPC) {
             if (isPC) {

+ 120 - 117
src/main/resources/templates/article/recommendation.html

@@ -1,125 +1,128 @@
-<html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="https://www.thymeleaf.org ">
+<html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://www.thymeleaf.org ">
+
 <head>
 <head>
-  <title>信息平台</title>
-  <template th:replace="article/components/article-link"></template>
-  <template th:replace="components/analysis"></template>
+    <title>信息平台</title>
+    <template th:replace="article/components/article-link"></template>
+    <template th:replace="components/analysis"></template>
 </head>
 </head>
+
 <body class="home listData">
 <body class="home listData">
-<!--导航栏-->
-<template th:replace="article/components/article-header"></template>
+    <!--导航栏-->
+    <template th:replace="article/components/article-header"></template>
 
 
-<div id="Recommendation" v-cloak>
-<!--  <div class="content clearfix" v-if="state == 1">-->
-<!--    <div class="mainData">-->
-<!--      <div class="selectList">-->
-<!--        <div class="select-title">-->
-<!--          <div>精选推荐</div>-->
-<!--        </div>-->
-<!--        <div class="select-content">-->
-<!--          <div class="select-content-item" th:each="select: ${pageData.results}">-->
-<!--            <div class="img-left">-->
-<!--              <img style="width: 100%;height: 100%;" th:src="${select.image}" />-->
-<!--            </div>-->
-<!--            <div class="item-content">-->
-<!--              <div>-->
-<!--                <div class="item-1" th:text="${select.title}"></div>-->
-<!--                <div class="item-2" th:text="${select.title}"></div>-->
-<!--                <div class="item-3" th:text="${select.title}"></div>-->
-<!--              </div>-->
-<!--              <div class="item-4" th:text="${select.title}"></div>-->
-<!--            </div>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--      </div>-->
-<!--      <div v-if="isPC" class="pageWrap clear" th:if="${pageData.totalRecord} > 0">-->
-<!--        <a class="prev" th:href="'/info/articlerecommendation-1-' + ${pageData.pageNum - 1} + '.html?isSelected'" th:if="${pageData.hasPreviousPage}"></a>-->
-<!--        <template th:each="selectInfo: ${pageData.totalPage}">-->
-<!--          <a th:href="'/info/articlerecommendation-1-' + ${selectInfo} + '.html?isSelected'" th:text="${selectInfo}"></a>-->
+    <div id="Recommendation" v-cloak>
+        <div class="content clearfix" v-if="state == 1">
+            <div class="mainData">
+                <div class="selectList">
+                    <div class="select-title">
+                        <div>精选推荐</div>
+                    </div>
+                    <div class="select-content">
+                        <div class="select-content-item" v-for="item in articlerecommendationData.results">
+                            <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>
+                                <div class="item-4" v-html="item.title"></div>
+                            </div>
+                        </div>
+                    </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>-->
 <!--          <span th:else>···</span>-->
-<!--        </template>-->
-<!--        <a class="next" th:if="${pageData.hasNextPage}" th:href="'/info/articlerecommendation-1-' + ${pageData.pageNum + 1} + '.html?isSelected'"></a>-->
-<!--        <span>共<b th:text="${pageData.totalPage}"></b>页</span>-->
-<!--        <span>跳至</span>-->
-<!--        <input v-model="pageInput"/>-->
-<!--        <span>页</span>&nbsp;-->
-<!--        <a class="btn" href="javascript:void(0)" @click="changeLink">点击跳转</a>-->
-<!--      </div>-->
-<!--    </div>-->
-<!--    &lt;!&ndash;侧边栏Ross广告图&ndash;&gt;-->
-<!--    <div v-if="isPC && isRossShow" class="article-right-ross" :class="isRossShow ? 'show' : 'none'">-->
-<!--      <a href="/supplier-1378.html" v-if="isPC"><img src="/img/ross/ross-image@1x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>-->
-<!--    </div>-->
-<!--    &lt;!&ndash;侧边栏&ndash;&gt;-->
-<!--    <template th:replace="article/components/article-sidebar"></template>-->
-<!--  </div>-->
-<!--  <div class="infomationlist" v-else>-->
-<!--    <div class="title" v-if="state == 2">-->
-<!--      <div>所有公告</div>-->
-<!--    </div>-->
-<!--    <div class="list-mainData">-->
-<!--      <ul v-if="state == 2">-->
-<!--        <li class="item" v-for="item in listData" :key="item.id">-->
-<!--          <div>{{item.title}}</div>-->
-<!--          <div>{{item.creationtime}}</div>-->
-<!--        </li>-->
-<!--      </ul>-->
-<!--      <ul v-else>-->
-<!--        <li th:each="file: ${pageData}">-->
-<!--          <a class="info-item" th:href="${file.ossUrl}">-->
-<!--            <div>-->
-<!--              <img src="/img/article/PC&#45;&#45;pdf.png" style="width: 100%;height: 100%;object-fit: contain;"/>-->
-<!--            </div>-->
-<!--            <div th:text="${file.fileName}"></div>-->
-<!--          </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>-->
-<!--        <span>跳至</span>-->
-<!--        <input v-model="pageInput" @blur="checkNum()"/>-->
-<!--        <span>页</span>&nbsp;-->
-<!--        <a class="btn" :href="paginationUrl(pageInput)">点击跳转</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="params.num<pageTotal" class="next" :href="paginationUrl(params.num*1+1)"></a>-->
-<!--        <span>共<b v-text="pageTotal>1?pageTotal:1"></b>页</span>-->
-<!--        <span>跳至</span>-->
-<!--        <input v-model="pageInput" @blur="checkNum()"/>-->
-<!--        <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>-->
-<!--  </div>-->
-</div>
+        </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>
+                    <span>跳至</span>
+                    <input v-model="pageInput" />
+                    <span>页</span>&nbsp;
+                    <a class="btn" href="javascript:void(0)" @click="changeLink">点击跳转</a>
+                </div>
+            </div>
+            <!--侧边栏Ross广告图-->
+            <div v-if="isPC && isRossShow" class="article-right-ross" :class="isRossShow ? 'show' : 'none'">
+                <a href="/supplier-1378.html" v-if="isPC"><img src="/img/ross/ross-image@1x.jpg" alt="深圳艾斯佰丽生物科技有限公司"></a>
+            </div>
+            <!--侧边栏-->
+            <template th:replace="article/components/article-sidebar"></template>
+        </div>
+        <div class="infomationlist" v-else>
+            <div class="title" v-if="state == 2">
+                <div>所有公告</div>
+            </div>
+            <div class="list-mainData">
+                <ul v-if="state == 2">
+                    <li class="item" v-for="item in listData" :key="item.id">
+                        <div>{{item.title}}</div>
+                        <div>{{item.creationtime}}</div>
+                    </li>
+                </ul>
+                <ul v-else>
+                    <li v-for="item in listData">
+                        <a class="info-item" :href="item.ossUrl">
+                            <div>
+                                <img src="/img/article/PC--pdf.png" style="width: 100%;height: 100%;object-fit: contain;" />
+                            </div>
+                            <div v-html="item.fileName"></div>
+                        </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>
+                    <span>跳至</span>
+                    <input v-model="pageInput" @blur="checkNum()" />
+                    <span>页</span>&nbsp;
+                    <a class="btn" :href="paginationUrl(pageInput)">点击跳转</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="params.num<pageTotal" class="next" :href="paginationUrl(params.num*1+1)"></a>
+                    <span>共<b v-text="pageTotal>1?pageTotal:1"></b>页</span>
+                    <span>跳至</span>
+                    <input v-model="pageInput" @blur="checkNum()" />
+                    <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>
+        </div>
+    </div>
 
 
-<script type="text/javascript">
-</script>
+    <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>
-<script charset="utf-8" type="text/javascript" src="/lib/datapicker/moment-2.29.min.js"></script>
-<script charset="utf-8" type="text/javascript" src="/lib/datapicker/jquery.daterangepicker.js"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/lib/element-ui/element-ui.min.js}"></script>
-<script src="https://unpkg.com/vant@2.12/lib/vant.min.js"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/common/ajax.service.js}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/article/common.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/utils.service.js}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/article/list.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/article/recommendation.js(v=${version})}"></script>
+    <template th:replace="article/components/article-drawer"></template>
+    <template th:replace="article/components/article-footer"></template>
+    <template th:replace="components/foot-link"></template>
+    <script charset="utf-8" type="text/javascript" src="/lib/datapicker/moment-2.29.min.js"></script>
+    <script charset="utf-8" type="text/javascript" src="/lib/datapicker/jquery.daterangepicker.js"></script>
+    <script charset="utf-8" type="text/javascript" th:src="@{/lib/element-ui/element-ui.min.js}"></script>
+    <script src="https://unpkg.com/vant@2.12/lib/vant.min.js"></script>
+    <script charset="utf-8" type="text/javascript" th:src="@{/js/common/ajax.service.js}"></script>
+    <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js}"></script>
+    <script charset="utf-8" type="text/javascript" th:src="@{/js/article/common.js(v=${version})}"></script>
+    <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/utils.service.js}"></script>
+    <script charset="utf-8" type="text/javascript" th:src="@{/js/article/list.js(v=${version})}"></script>
+    <script charset="utf-8" type="text/javascript" th:src="@{/js/article/recommendation.js(v=${version})}"></script>
 </body>
 </body>
-</html>
+
+</html>