2 gadi atpakaļ · b54d0bb6a5
--- a/src/main/resources/static/js/document/beautyArchiveDetailMixin.js
+++ b/src/main/resources/static/js/document/beautyArchiveDetailMixin.js
@@ -22,12 +22,7 @@ var beautyArchiveDetailMixin = {
 
				         relatedLabels:'',
			
 
				         archiveProductInfo: {},
			
 
				         userInfo: {}, // 用户信息
			
 
				-        videoPermission: { // 视频播放权限
			
 
				-            allTime: 10, // 分
			
 
				-            onplay: 3 * 100 * 60 // 分钟
			
 
				-        },
			
 
				         num:0,
			
 
				-        duration: 0
			
 
				     },
			
 
				     filters: {
			
 
				         // 时间格式化
			
@@ -55,9 +50,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/static/js/supplier-center/mixins/noticeMixin.js
+++ b/src/main/resources/static/js/supplier-center/mixins/noticeMixin.js
@@ -29,7 +29,11 @@ var noticeMixin = function () {// 通知消息
 
				                     2: `恭喜您（微信昵称：${cell.content}）成功成为【${cell.shopName}】的运营人员。`,
			
 
				                     3: `商品”${cell.productName}“,上架审核未通过，暂时不能上架采美商城，请重新${linkMap[cell.shopMessType]}进行提交。`,
			
 
				                     4: `商品”${cell.productName}“,新品展示审核未通过，未能展示在采美商城新品橱窗。`,
			
 
				-                    5: `商品”${cell.productName}“,该商品的资质证书将于${cell.content}后失效，请及时${linkMap[cell.shopMessType]}新证书。`
			
 
				+                    5: `商品”${cell.productName}“,该商品的资质证书将于${cell.content}后失效，请及时${linkMap[cell.shopMessType]}新证书。`,
			
 
				+                    6: `恭喜您发布的采美百科词条“${cell.content}”审核已通过。`,
			
 
				+                    7: `很遗憾！您发布的采美百科词条“${cell.content}”审核未通过，原因是“${cell.reasonContent}”，可前往电脑端“我的词条”进行修改后，重新提交审核。`,
			
 
				+                    8: `恭喜您发布的采美文章“${cell.content}”审核已通过。`,
			
 
				+                    9: `很遗憾！您发布的采美文章“${cell.content}”审核未通过，原因是“${cell.reasonContent}”，可前往电脑端“文章管理”进行修改后，重新提交审核。`
			
 
				                 }
			
 
				                 return map[cell.shopMessType]
			
 
				             },
			
--- 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">