2 years ago · 465ffe4a0e
--- a/src/main/resources/static/js/document/beautyArchiveDetailMixin.js
+++ b/src/main/resources/static/js/document/beautyArchiveDetailMixin.js
@@ -48,9 +48,9 @@ var beautyArchiveDetailMixin = {
 
				         // 图片点击事件
			
 
				         handleShowImage: function (i, imageList) {
			
 
				             // this.initPreviewImage()
			
 
				-            console.log(this.permission)
			
 
				+            console.log(this.permission, )
			
 
				             if (this.permission === 2 || this.permission === 4 || this.permission === 1) {
			
 
				-                if (imageList.length >= 5) {
			
 
				+                if (imageList && imageList.length >= 5) {
			
 
				                     if (i < 2) {
			
 
				                         console.log(111)
			
 
				                         this.initPreviewImage()
			
--- a/src/main/resources/templates/article/components/article-preview.html
+++ b/src/main/resources/templates/article/components/article-preview.html
@@ -12,7 +12,6 @@
 
				       <div>
			
 
				         <!-- <a class="home" href="/" target="_blank">商城</a> -->
			
 
				         <a th:each="type: *{articleType}" th:text="${type.name}" th:href="'/info/center-'+${type.id}+'-1.html'" th:class="${typeId==type.id}?'typeBtn current':'typeBtn'" th:typeId="${type.id}"></a>
			
 
				-        <a class="typeBtn" href="#">美业科普</a>
			
 
				         <!-- <a class="typeBtn" href="/encyclopedia/product.html" target="_blank">采美百科</a> -->
			
 
				       </div>
			
 
				     </div>
			
--- a/src/main/resources/templates/supplier-center/encyclopedia/preview.html
+++ b/src/main/resources/templates/supplier-center/encyclopedia/preview.html
@@ -14,11 +14,16 @@
 
				   <link rel="stylesheet" href="/lib/element-ui/element-ui-min.css"/>
			
 
				   <link rel="stylesheet" th:href="@{/css/encyclopedia/common.css(v=${version})}">
			
 
				   <link rel="stylesheet" th:href="@{/css/encyclopedia/preview.css(v=${version})}">
			
 
				+  <template th:replace="article/components/article-link"></template>
			
 
				+  <meta name="keywords" th:content="${article?.keyword}">
			
 
				+  <meta name="description" th:content="${article?.recommendContent}">
			
 
				+  <template th:replace="article/components/article-link"></template>
			
 
				+  <template th:replace="components/analysis"></template>
			
 
				   <script type="text/javascript" src="/lib/swiper.min.js"></script>
			
 
				 </head>
			
 
				 <body>
			
 
				 <!-- 顶部公共区域 -->
			
 
				-<template th:replace="encyclopedia/components/header"></template>
			
 
				+<template th:replace="article/components/article-preview"></template>
			
 
				 <!-- 顶部公共区域 end-->
			
 
				 <!--<input type="hidden" th:value="${baikeproduct.relatedLabels}" id="relatedLabels">-->
			
 
				 <main id="bk-page-container">