喻文俊 3 роки тому
батько
коміт
73ce522f6a

+ 1 - 1
src/main/resources/static/js/encyclopedia/common.js

@@ -381,7 +381,7 @@ $(function () {
     responseScreen(768, function () {
         window.location.reload();
     });
-    // 搜索框内容为空阻止表单提交
+    // 搜索框内容为空阻止表单提交
     $('form').submit(function(){
         if(!$('#searchKeyword').val()) return false;
     });

+ 13 - 13
src/main/resources/static/js/encyclopedia/index.js

@@ -1,13 +1,13 @@
 "use strict";
 
 $(function () {
-    var windowWidth = $(window).width(); // 页面滚动偏移
-
-    var offset = 0; // pc端
-
+    var windowWidth = $(window).width();
+    // 页面滚动偏移
+    var offset = 0;
+    // pc端
     if (windowWidth > 768) {
-        offset = getScrollOffset('.navbar'); // 导航菜单展开折叠
-
+        offset = getScrollOffset('.navbar');
+        // 导航菜单展开折叠
         collapseToggle('[data-collapse-toggle="category"]', 'click', function (result) {
             var bindEl = result.bindEl,
                 parent = result.parent,
@@ -52,10 +52,10 @@ $(function () {
             $('.more-btn').hide()
         }
     } else {
+        // 移动端
         if($('.floor-list .floor-title .h5-more-btn a').length < 6 ){
             $('.more-btn').hide()
         }
-        // 移动端
         offset = getScrollOffset(['.navbar', '.category']);
         stickyResponse('#category', getScrollOffset('.banner'), function (e) {
             if (e.sticky) {
@@ -64,16 +64,16 @@ $(function () {
                 $('#category-list').removeClass('fixed');
             }
         });
-    } // 生成导航
-
+    }
 
+    // 生成导航
     makeNavigate('.floor h2', '.navigate');
-    makeNavigate('.floor h2', '#category-list'); // 楼层滚动
-
+    makeNavigate('.floor h2', '#category-list');
+    // 楼层滚动
     bindCategory('.navigate li,.category-list li', '.floor', offset, function (index) {
         activeCategory('.navigate li, .category-list li', index);
-    }); // 页面滚动
-
+    });
+    // 页面滚动
     $('.navigate').hide();
     pageScrollObserve('.floor', offset, function (el, index) {
         if (index > -1) {

+ 2 - 2
src/main/resources/static/js/encyclopedia/search.js

@@ -8,8 +8,8 @@ var search = new Vue({
             pageNum: 1
         },
         searchList: [], // 查询列表
-        totalRecord: 100,
-        totalPage: 10,
+        totalRecord: 0,
+        totalPage: 0,
         jumpInput: 1
     },
     filters: {

+ 1 - 1
src/main/resources/templates/encyclopedia/instrument.html

@@ -35,7 +35,7 @@
 </div>
 <!-- 分类楼层 -->
 <div class="floor-list">
-    <div class="floor" th:each="floor,floorStat : ${typeData}">
+    <div class="floor" th:each="floor,floorStat : ${typeData}" th:if="${floor.productList.size} > 0">
         <div class="floor-title">
             <h2 th:text="${floor.name}"></h2>
             <div class="h5-more-btn">

+ 1 - 1
src/main/resources/templates/encyclopedia/product.html

@@ -35,7 +35,7 @@
 </div>
 <!-- 分类楼层 -->
 <div class="floor-list">
-    <div class="floor" th:each="floor : ${typeData}">
+    <div class="floor" th:each="floor : ${typeData}" th:if="${floor.productList.size} > 0">
         <div class="floor-title">
             <h2 th:text="${floor?.name}"></h2>
             <div class="h5-more-btn">