xiebaomin 1 年之前
父节点
当前提交
6199a2a97f

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

@@ -80,7 +80,6 @@ public class ArticleController extends BaseController {
         model.addAttribute("pageNum", pageNum);
         model.addAttribute("isSearch", true);
         model.addAttribute("isSelectInfo", true);
-        System.out.println("articleImages" + cmBrandLandingList);
         //model.addAttribute("pagePath", String.format("/info/center-%s-1.html", id));
         return ARTICLE_LIST_PATH;
     }

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

@@ -92,7 +92,7 @@ dl,dd,dt{zoom:1}
 
 	/* 信息中心更新搜索头 */
 	.header .search-top{display:flex;width:1185px;margin:0 auto; height: 100px;align-items: center;}
-	.search-top .info-logo-content {width: 168px;height: 76px;background: url(/img/article/h5-logo.png);background-size: contain;}
+	.search-top .info-logo-content {width: 168px;height: 76px;background: url(/img/article/h5-logo.png);background-size: contain;cursor: pointer;}
 	.search-top .search{position:relative;display:flex;width:685px;margin-left:134px;flex-direction: column;}
 	.search-top .search .search-info {width: 100%;height: 44px;border:1px solid #FF5B00;box-sizing: border-box;border-radius:2px;overflow: hidden;}
 	.search-top .search .keyword{width:100%;height:100%;border: none;color:#B2B2B2;font-size:14px; padding: 0 80px 0 16px;}

+ 1 - 1
src/main/resources/static/js/document/beautyArchiveDetailMixin.js

@@ -4,7 +4,7 @@ var beautyArchiveDetailMixin = {
     data: {
         listLoading: false,
         //用户信息相关
-        permission: 1, //用户权限  0可查看,1未登录,2需升级会员机构,3需升级医美会员机构,4需要抵扣采美豆,5无权限查看
+        permission: 5, //用户权限  0可查看,1未登录,2需升级会员机构,3需升级医美会员机构,4需要抵扣采美豆,5无权限查看
         //页面配置
         archiveId: '',  //资料列表id
         currentVideoUrl: '', //正在播放的视频链接(上一个播放的的视频)

+ 1 - 0
src/main/resources/static/js/product/filePreview.js

@@ -6,6 +6,7 @@ var FilePreview = new Vue({
     },
     mounted() {
         this.fileInfo = JSON.parse(window.localStorage.getItem('filePreviewInfo'));
+        document.title = this.fileInfo.fileName
     },
     methods: {
     //    查看更多

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

@@ -54,17 +54,17 @@
 <!--</div>-->
 <div class="info-banner AppBanner" th:if="${isSearch} and ${articleImages}">
     <div class="banner" th:each="type: ${articleImages}" th:if="${type.levelType} == 1 and ${type.headAppBanner}" >
-        <a th:href="${type.jumpLink}" th:if="${type.jumpLink}">
+        <a th:href="${type.jumpLink}" th:if="${type.jumpStatus} == 2">
             <img th:src="${type.headAppBanner}" style="width: 100%;height: 100%;" />
         </a>
-        <img th:src="${type.headAppBanner}" style="width: 100%;height: 100%;" th:if="${type.jumpLink} == null"/>
+        <img th:src="${type.headAppBanner}" style="width: 100%;height: 100%;" th:if="${type.jumpStatus} == 0"/>
     </div>
     <div class="sider-banner">
         <div th:each="type: ${articleImages}" th:if="${type.levelType} == 2 and ${type.headAppBanner}" >
-            <a th:href="${type.jumpLink}" th:if="${type.jumpLink}">
+            <a th:href="${type.jumpLink}" th:if="${type.jumpStatus} == 2">
                 <img th:src="${type.headAppBanner}" style="width: 100%;height: 100%;" />
             </a>
-            <img th:src="${type.headAppBanner}" style="width: 100%;height: 100%;" th:if="${type.jumpLink} == null"/>
+            <img th:src="${type.headAppBanner}" style="width: 100%;height: 100%;" th:if="${type.jumpStatus} == 0"/>
         </div>
     </div>
 </div>
@@ -85,17 +85,17 @@
             </div>
             <div class="info-banner PcBanner" th:if="${isSearch} and ${articleImages}">
                 <div class="banner" th:each="type: ${articleImages}" th:if="${type.levelType} == 1 and ${type.headPcBanner}" >
-                    <a th:href="${type.jumpLink}" th:if="${type.jumpLink}">
+                    <a th:href="${type.jumpLink}" th:if="${type.jumpStatus} == 2">
                         <img th:src="${type.headPcBanner}" style="width: 100%;height: 100%;" />
                     </a>
-                    <img th:src="${type.headPcBanner}" style="width: 100%;height: 100%;" th:if="${type.jumpLink} == null"/>
+                    <img th:src="${type.headPcBanner}" style="width: 100%;height: 100%;" th:if="${type.jumpStatus} == 0"/>
                 </div>
                 <div class="sider-banner">
                     <div th:each="type: ${articleImages}" th:if="${type.levelType} == 2 and ${type.headPcBanner}">
-                        <a th:href="${type.jumpLink}" th:if="${type.jumpLink}">
+                        <a th:href="${type.jumpLink}" th:if="${type.jumpStatus} == 2">
                             <img th:src="${type.headPcBanner}" style="width: 100%;height: 100%;" />
                         </a>
-                        <img th:src="${type.headPcBanner}" style="width: 100%;height: 100%;" th:if="${type.jumpLink} == null"/>
+                        <img th:src="${type.headPcBanner}" style="width: 100%;height: 100%;" th:if="${type.jumpStatus} == 0"/>
                     </div>
                 </div>
             </div>