喻文俊 пре 3 година
родитељ
комит
40fa548ac5

+ 2 - 1
src/main/resources/static/js/supplier-center/article/article-list.js

@@ -123,7 +123,8 @@ var articleList = new Vue({
         //查看
         toDetail: function toDetail(article) {
             if (article.auditStatus !== 2) return CAIMEI.dialog('请等待审核通过后查看!');
-            if (!article.status) return CAIMEI.dialog('文章未启用!');
+            if (article.onlineStatus !== 2) return CAIMEI.dialog('请等待文章上线后查看!');
+            if (!article.status) return CAIMEI.dialog('请发布后查看!');
             window.open('/info/detail-' + article.articleId + '-1.html');
         },
         // 跳转添加文章页面

+ 2 - 1
src/main/resources/static/js/supplier-center/encyclopedia/instrument-list.js

@@ -157,7 +157,8 @@ var productList = new Vue({
         //查看
         toDetail: function toDetail(product) {
             if (product.auditStatus !== 2) return CAIMEI.dialog('请等待审核通过后查看!');
-            if (!product.status) return CAIMEI.dialog('请启用后查看!');
+            if (product.onlineStatus !== 2) return CAIMEI.dialog('请等待文章上线后查看!');
+            if (!product.status) return CAIMEI.dialog('请发布后查看!');
             window.open('/encyclopedia/instrument-' + product.productId + '.html');
         },
         // 跳转添加文章页面

+ 2 - 1
src/main/resources/static/js/supplier-center/encyclopedia/product-list.js

@@ -155,7 +155,8 @@ var productList = new Vue({
         //查看
         toDetail: function toDetail(product) {
             if (product.auditStatus !== 2) return CAIMEI.dialog('请等待审核通过后查看!');
-            if (!product.status) return CAIMEI.dialog('请启用后查看!');
+            if (product.onlineStatus !== 2) return CAIMEI.dialog('请等待文章上线后查看!');
+            if (!product.status) return CAIMEI.dialog('请发布后查看!');
             window.open('/encyclopedia/product-' + product.productId + '.html');
         },
         // 跳转添加文章页面

+ 2 - 2
src/main/resources/templates/encyclopedia/instrument-detail.html

@@ -204,7 +204,7 @@
     <!-- 日期 && 浏览量 -->
     <section class="section publish-info">
         <div class="publish-date"><span>日   期:</span><span>2021-10-27 17:23</span></div>
-        <div class="review"><span>浏览量:</span><span>35</span></div>
+        <div class="review"><span>浏览量:</span><span th:text="*{pv}"></span></div>
     </section>
 
     <!--  相关链接 -->
@@ -218,7 +218,7 @@
                 <img th:src="*{image}" th:alt="*{name}" class="image"/>
                 <span th:text="*{name}" class="name"></span>
             </a>
-            <a th:href="*{ '/supplier-' + shopId + '.html' }" target="_blank" class="link">
+            <a th:href="*{ '/supplier-' + shopId + '.html' }" target="_blank" class="link" th:if="*{shopId != ''}">
                 <img th:src="*{shopLogo}" th:alt="*{shopName}" class="image"/>
                 <span th:text="*{shopName}" class="name"></span>
             </a>

+ 2 - 2
src/main/resources/templates/encyclopedia/product-detail.html

@@ -187,7 +187,7 @@
     <!-- 日期 && 浏览量 -->
     <section class="section publish-info">
         <div class="publish-date"><span>日   期:</span><span>2021-10-27 17:23</span></div>
-        <div class="review"><span>浏览量:</span><span>35</span></div>
+        <div class="review"><span>浏览量:</span><span th:text="*{pv}"></span></div>
     </section>
 
     <!--  相关链接 -->
@@ -201,7 +201,7 @@
                 <img th:src="*{image}" th:alt="*{name}" class="image"/>
                 <span th:text="*{name}" class="name"></span>
             </a>
-            <a th:href="*{ '/supplier-' + shopId + '.html' }" target="_blank" class="link">
+            <a th:href="*{ '/supplier-' + shopId + '.html' }" target="_blank" class="link" th:if="*{shopId != ''}">
                 <img th:src="*{shopLogo}" th:alt="*{shopName}" class="image"/>
                 <span th:text="*{shopName}" class="name"></span>
             </a>