Merge remote-tracking branch 'origin/developerA' into developerA

src/main/resources/static/css/encyclopedia/common.css

@@ -1,13 +1,13 @@
 @charset "UTF-8";
 @media screen and (min-width:768px){
-::-webkit-scrollbar{width:4px;background-color:#f5f5f5}
+::-webkit-scrollbar{width:8px;height: 8px; background-color:#f5f5f5}
 ::-webkit-scrollbar-thumb{border-radius:10px;background-color:#999}
 .icon{display:block;width:20px;height:20px;background-image:url(/img/encyclopedia/icon.png);background-repeat:no-repeat}
 .icon.arrowdown{background-position:-277px -413px}
 .icon.arrowup{background-position:-308px -413px}
 .flex-between-center,.navbar .nav li a,.navbar .nav,.navbar .container{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
 .container{width:1200px;margin:0 auto}
-body{padding-top:80px}
+body{padding-top:80px;min-height: 100vh;}
 .navbar{width:100%;background:#fff;position:fixed;top:0;left:0;z-index:99999;-webkit-box-shadow:0 0 5px rgba(0,0,0,0.1);box-shadow:0 0 5px rgba(0,0,0,0.1)}
 .navbar .logo{width:136px;height:56px;overflow:hidden}
 .navbar .logo .menu-btn{display:none}
@@ -26,7 +26,7 @@ body{padding-top:80px}
 .navbar .search .search-control .search-input::placeholder{color:#9aa5b5;font-size:14px}
 .navbar .search .search-control .search-btn{display:block;width:64px;height:36px;border:0;background:#e15616;border-radius:0px 2px 2px 0px;cursor:pointer;font-size:14px;color:#ffffff}
 .navbar .search .search-control .hot-keyword{display:none}
-.navbar .search .keywords{width:336px;font-size:12px;margin-top:4px;color:#ffb496;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:1;-webkit-box-orient:vertical}
+.navbar .search .keywords{width:336px;font-size:12px;margin-top:4px;color:#ffb496;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;white-space: nowrap;}
 .navbar .search .keywords .close-btn{display:none}
 .navbar .search .keywords a{color:#ffb496}
 .navbar .search .keywords a:hover{color:#e15616}

src/main/resources/static/css/encyclopedia/contact.css

@@ -5,7 +5,7 @@
 .page-title .title h2{color:#fff;width:124px;font-size:30px}
 .page-title .title .line{-webkit-box-flex:1;-ms-flex:1;flex:1;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;margin-left:7px;height:1px;background:rgba(255,255,255,0.2)}
 .page-title .title .line::after{content:"";display:inline-block;width:16px;height:2px;background:#ffffff;opacity:0.72}
-.page-title .subtitle{margin-top:8px;font-size:12px;color:#ffffff;opacity:0.6}
+.page-title .subtitle{margin-top:8px;font-size:12px;color:#ffffff;opacity:0.6;text-transform: uppercase;}
 .page-title .subtitle span{display:inline-block;width:38px;height:1px;background:#ffffff;vertical-align:middle;margin-right:8px}
 .contact{position:relative;height:630px}
 .contact .content{height:713px;padding:40px 55px;background:#ffffff;border-radius:2px;-webkit-transform:translateY(-80px);-ms-transform:translateY(-80px);transform:translateY(-80px);-webkit-box-shadow:0 0 16px rgba(0,0,0,0.1);box-shadow:0 0 16px rgba(0,0,0,0.1);-webkit-box-sizing:border-box;box-sizing:border-box}

src/main/resources/static/css/encyclopedia/detail.css

@@ -14,7 +14,9 @@
 .article .section.description .content{-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start}
 .article .section.description .content .content-left{width:986px}
 .article .section.description .content .content-left .desc{text-align:justify;font-size:14px;line-height:24px}
-.article .section.description .content .content-left .names{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
+.article .section.description .content .content-left .names{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;line-height: 26px}
+.article .section.description .content .content-left .names .name{width: 60%;}
+.article .section.description .content .content-left .names .alias{ flex: 1;}
 .article .section.description .content .content-left .alias{color:#93979f;margin-left:40px}
 .article .section.description .content .cover{width:120px;height:120px;border:1px dashed #93979f;-webkit-box-sizing:border-box;box-sizing:border-box;overflow:hidden}
 .article .section.description .content .cover img{width:120px;height:120px}
@@ -85,7 +87,7 @@ body{padding-top:40.3vw}
 .article .section.question .collapse dt .icon{position:absolute;right:0;top:0}
 .article .section.question .collapse dd{line-height:5.6vw;margin:1.6vw 0;text-align:justify}
 .article .section.question .collapse dd span{background:#34cc8c}
-.contact-popup{display: none; position:fixed;top: 50%;left: 50%;z-index: 99999; transform: translate(-50%,-50%); width:80vw;height:100vw;overflow:hidden;background:url(/img/contact.png) no-repeat center;background-size:80vw auto}
+.contact-popup{display: none; position:fixed;top: 50%;left: 50%;z-index: 99999; transform: translate(-50%,-50%); width:80vw;height:100vw;overflow:hidden;background:url(/img/encyclopedia/contact.png) no-repeat center;background-size:80vw auto}
 .contact-popup .close{position:absolute;display:block;width:8vw;height:8vw;text-align:center;line-height:8vw;top:0;right:5vw;font-size:8vw;color:#2c3038;cursor:pointer}
 .contact-popup .content{margin-top:30vw}
 .contact-popup .content p{font-size:4.2vw;text-align:center;line-height:8vw;color:#9aa5b5;margin:0}

src/main/resources/static/css/encyclopedia/index.css

@@ -1,5 +1,15 @@
 @charset "UTF-8";
 @media screen and (min-width:768px){
+.color0{ color: #EB2F96 !important;}
+.color1{ color: #9254DE !important;}
+.color2{ color: #00BE6F !important;}
+.color3{ color: #FD8321 !important;}
+.color4{ color: #EB2F96 !important;}
+.color5{ color: #9254DE !important;}
+.color6{ color: #FF4D4F !important;}
+.color7{ color: #40A9FF !important;}
+.color8{ color: #FCC004 !important;}
+.color9{ color: #3AD0CA !important;}
 .flex-between-center,.floor .article .section .content .footer,.floor .emtyp,.category .name,.category{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-ms-flex-align:center;align-items:center}
 .banner{width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;overflow:hidden}
 .banner img{width:1920px;height:510px}
@@ -29,11 +39,12 @@
 .floor .article .section:nth-child(3n){margin-right:0}
 .floor .article .section .cover{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;height:260px}
 .floor .article .section .cover img{width:246px;height:246px}
-.floor .article .section .content{padding:16px 16px 0;-webkit-box-sizing:border-box;box-sizing:border-box}
-.floor .article .section .content h3{-webkit-transition:all 0.4s;-o-transition:all 0.4s;transition:all 0.4s;font-weight:bold}
+.floor .article .section .content{padding:16px 16px 0;-webkit-box-sizing:border-box;box-sizing:border-box;}
+.floor .article .section .content h3{-webkit-transition:all 0.4s;-o-transition:all 0.4s;transition:all 0.4s;font-weight:bold;overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:1;-webkit-box-orient:vertical;}
 .floor .article .section .content .title{overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;height:52px;color:#4a4f58;margin-top:12px;line-height:26px;text-align:justify;word-break:break-all}
 .floor .article .section .content .question{margin:12px 0;height:78px}
 .floor .article .section .content .question p{overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:1;-webkit-box-orient:vertical;color:#93979f;line-height:26px;font-size:14px}
+.floor .article .section .content .question p:nth-child(3)~p{display: none}
 .floor .article .section .content .tag-list{height:24px}
 .floor .article .section .content .tag-list .tag{display:inline-block;height:24px;line-height:24px;background:#fef6f3;border-radius:2px;font-size:12px;color:#e15616;padding:0 8px;margin-right:8px}
 .floor .article .section .content .dashed-line{margin-top:12px;height:0px;border-bottom:1px dashed #b8bfca}
@@ -77,7 +88,7 @@
 .floor .article .section .content .title{overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical;margin-top:1.6vw;font-size:3.2vw;line-height:4.6vw;text-align:justify;height:9.2vw; word-break: break-all;}
 .floor .article .section .content .question{height:10vw;margin:2.4vw 0}
 .floor .article .section .content .question p{overflow:hidden;-o-text-overflow:ellipsis;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:1;-webkit-box-orient:vertical;font-size:2.6vw;line-height:5vw;color:#93979f}
-.floor .article .section .content .question p:last-child{display:none}
+.floor .article .section .content .question p:nth-child(2)~p{display: none}
 .floor .article .section .content .tag-list{height:4.8vw;-ms-flex-wrap:wrap;flex-wrap:wrap}
 .floor .article .section .content .tag-list .tag{height:4.8vw;padding:0 1.2vw;margin-right:1.6vw;background:#fef6f3;border-radius:0.2vw;font-size:2.6vw;color:#e15616;line-height:4.8vw}
 .floor .article .section .content .tag-list .tag:last-child{display:none}

src/main/resources/static/css/supplier-center/article/article-list.css

@@ -127,6 +127,7 @@
     padding: 16px 0;
 }
 
+
 .article-list .table .title,
 .article-list .table .time,
 .article-list .table .option {
@@ -154,7 +155,7 @@
 }
 
 .article-list .table .cover {
-    display: block;
+    display: inline-block;
     width: 48px;
     height: 48px;
     border: 1px dashed #E2E7EF;

src/main/resources/static/js/encyclopedia/common.js

@@ -374,14 +374,6 @@ function slideBarHandle(selector) {
     });
 }
 
-/*
-* 跳转到搜索页面
-* */
-function toSearchPage(){
-
-}
-
-
 $(function () {
     activeNavbar('.navbar .nav li');
     slideBarHandle('#menuBtn', 'flex');
@@ -389,4 +381,11 @@ $(function () {
     responseScreen(768, function () {
         window.location.reload();
     });
+    // 搜索框内容为空时阻止表单提交
+    $('form').submit(function(){
+        const searchKeyword =  $('#searchKeyword');
+        const val = searchKeyword.val().trim();
+        searchKeyword.val(val);
+        if(!searchKeyword) return false;
+    });
 });

src/main/resources/static/js/encyclopedia/detail.js

@@ -2,27 +2,28 @@
 
 $(function () {
     // 页面滚动偏移
-    var offset = 0; // 生成导航
-
+    var offset = 0;
+    var windowWidth = $(window).width();
+    var timer = null; // 定时器
+    var middleScreenWidth = 1450;
+    // 生成导航
     makeNavigate('.section h2', '.navigate');
-
-    if ($(window).width() > 768) {
+    if (windowWidth > 768) {
         offset = getScrollOffset('.navbar') + 10;
     } else {
         offset = getScrollOffset(['.navbar', '.navigate']) + 10;
-    } // 侧边导航跳转
-
-
+    }
+    // 侧边导航跳转
     bindCategory('.navigate li', '.section', offset, function (index) {
         activeCategory('.navigate li', index);
-    }); // 页面滚动观测
-
+    });
+    // 页面滚动观测
     pageScrollObserve('.section', offset, function (el, index) {
         if (index > -1) {
             activeCategory('.navigate li', index);
         }
-    }); // 常见问题展开收起
-
+    });
+    // 常见问题展开收起
     $('[data-toggle="collapse"]').each(function (index, el) {
         var targetEl = $(el).attr('data-target');
         if (!targetEl) return;
@@ -39,4 +40,30 @@ $(function () {
     $('#contactPopupClose').on('click', function () {
         $('#contactPopup').hide();
     });
+    // 切换显示侧边导航
+    function toggleNavigate(selector, time, maxWidth, offset) {
+        selector = $(selector);
+        if(windowWidth <= middleScreenWidth){
+            selector.hide();
+        }
+        // 鼠标移动事件
+        $('body').on('mousemove', function (e) {
+            var width = $(this).width();
+            if (!(e.clientX > width - offset && width <= maxWidth)) return;
+            clearTimeout(timer);
+            selector.fadeIn();
+            timer = setTimeout(function () {
+                selector.fadeOut();
+            }, time)
+        });
+        // 窗口大小改变
+        $(window).resize(function () {
+            if ($(this).width() <= maxWidth) {
+                selector.hide();
+            }else{
+                selector.show();
+            }
+        });
+    }
+    // toggleNavigate('.navigate', 1000, middleScreenWidth, 80);
 });

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,
@@ -48,8 +48,18 @@ $(function () {
         //         floor.$floor.find('.more .icon').removeClass('arrowup');
         //     }
         // });
+        $('.floor-list .floor').each(function(index, el){
+            if($(el).find('.section').length < 6){
+                $(el).find('.more-btn').hide();
+            }
+        });
     } else {
         // 移动端
+        $('.floor-list .floor').each(function(index, el){
+            if($(el).find('.section').length < 6){
+                $(el).find('.h5-more-btn').hide();
+            }
+        });
         offset = getScrollOffset(['.navbar', '.category']);
         stickyResponse('#category', getScrollOffset('.banner'), function (e) {
             if (e.sticky) {
@@ -58,16 +68,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) {

src/main/resources/static/js/encyclopedia/moreFloor.js

@@ -0,0 +1,66 @@
+"use strict";
+
+// 页码vue实例
+var pagination = new Vue({
+    el: '#pagination',
+    data: {
+        name: 'more-list',
+        pageSize: 12,
+        pageNum: 0,
+        totalPage: 0,
+        typeId: 0,
+        jumpInput: 1
+    },
+    computed: {
+        // 页码
+        pagination: function pagination() {
+            return this.makePagination(this.pageNum, this.totalPage);
+        }
+    },
+    mounted: function mounted() {
+        window.name = this.name;
+        this.initPaginationData();
+    },
+    methods: {
+        // 初始化页码
+        initPaginationData: function initPaginationData() {
+            var moreData = getMoreData() || {};
+            this.pageNum = moreData.pageNum;
+            this.pageSize = moreData.pageSize;
+            this.totalPage = moreData.totalPage;
+            this.typeId = moreData.typeId;
+            console.log(moreData);
+        },
+        makeUrl: function makeUrl(pageNum) {
+            return 'more-' + this.typeId + '-' + pageNum + '-' + this.pageSize + '.html';
+        },
+        // 页码切换
+        pageChange: function pageChange(pageNum) {
+            if (pageNum < 1 || pageNum > this.totalPage) return;
+            window.open(this.makeUrl(pageNum), this.name);
+        },
+        // 处理页码
+        makePagination: function makePagination(pageNum, totalPage) {
+            // 页码列表
+            var arr = [];
+            // 初始化页码列表
+            for (var i = 1; i <= totalPage; i++) {
+                arr[i - 1] = i;
+            }
+
+            if (totalPage <= 7) return arr;
+            // 查找当前页码在页码列表中的位置
+            var pop = arr.indexOf(pageNum);
+            // 截取页码
+            if (pageNum < 4) {
+                arr = arr.splice(pop + 1 - pageNum, 6);
+            } else if (pageNum > totalPage - 3) {
+                arr = arr.reverse().splice(0, 6).reverse();
+            } else {
+                arr = arr.splice(pop - 2, 5);
+            }
+            console.log(arr);
+            return arr;
+        }
+    }
+});

src/main/resources/static/js/encyclopedia/search.js

@@ -1,33 +1,31 @@
+"use strict";
 var search = new Vue({
     el: '#search',
     data: {
         listQuery: {
             keyword: '',
-            pageSize: 6,
+            pageSize: 12,
             pageNum: 1
         },
-        searchList: [],
-        hasNextPage: false,
-        total: 100,
-        totalPage: 10,
-        jumpInput: 1,
+        searchList: [], // 查询列表
+        totalRecord: 0,
+        totalPage: 0,
+        jumpInput: 1
     },
     filters: {
         // 处理url
         formatUrl: function (item) {
             if (item.commodityType === 1) {
-                return 'product-' + item.productId + '.html'
+                return 'product-' + item.productId + '.html';
             } else {
-                return 'instrument-' + item.productId + '.html'
+                return 'instrument-' + item.productId + '.html';
             }
-        },
-
+        }
     },
     computed: {
+        // 页码
         pagination: function () {
-            const pageNum = this.listQuery.pageNum;
-            const pageNumList = [pageNum - 2, pageNum - 1, pageNum, pageNum + 1, pageNum + 2];
-            return pageNumList;
+            return this.makePagination(this.listQuery.pageNum, this.totalPage);
         }
     },
     mounted: function () {
@@ -35,39 +33,26 @@ var search = new Vue({
         this.fetchSearchList();
     },
     methods: {
-        queryString: function (queryStr) {
-            const queryStrList = decodeURI(queryStr).split('&');
-            const query = Object.create(null);
-            queryStrList.forEach(function (str) {
-                const temp = str.split('=');
-                const key = temp[0];
-                const val = temp[1] || '';
-                query[key] = val;
-            });
-            return query
-        },
         // 初始化关键字
         initSearchWord: function () {
-            console.log(decodeURI(window.location.search.slice(1)));
-            const query = this.queryString(window.location.search.slice(1));
+            var query = this.queryString(window.location.search.slice(1));
             document.querySelector('#searchKeyword').value = query.keyword;
             this.listQuery.keyword = query.keyword || '';
         },
         // 获取查询列表
         fetchSearchList: function () {
-            const self = this;
+            var self = this;
             EncyclopediaApi.FetchListByKeyword(this.listQuery, function (res) {
                 if (res.code === 0) {
-                    const data = res.data;
-                    self.hasNextPage = data.hasNextPage;
+                    var data = res.data;
                     self.listQuery.pageNum = data.pageNum;
                     self.searchList = data.results;
-                    self.total = data.totalRecord;
+                    self.totalRecord = data.totalRecord;
                     self.totalPage = data.totalPage;
                 } else {
                     CAIMEI.Alert(res.msg, '确定', false);
                 }
-            })
+            });
         },
         // 页码切换
         pageChange: function (pageNum) {
@@ -78,10 +63,43 @@ var search = new Vue({
         },
         // 根据关键词进行标题格式化
         formatFromKeyword: function (name) {
-            const reg = new RegExp(this.listQuery.keyword, 'ig');
+            var reg = new RegExp(this.listQuery.keyword, 'ig');
             return name.replace(reg, function ($1) {
-                return '<span style="color: #e15616">' + $1 + '</span>'
+                return '<span style="color: #e15616">' + $1 + '</span>';
             });
+        },
+        // 处理url参数 返回参数键值对
+        queryString: function (queryStr) {
+            var queryStrList = decodeURI(queryStr).split('&');
+            var query = Object.create(null);
+            queryStrList.forEach(function (str) {
+                var temp = str.split('=');
+                var key = temp[0];
+                var val = temp[1] || '';
+                query[key] = val;
+            });
+            return query;
+        },
+        // 处理页码
+        makePagination: function (pageNum, totalPage) {
+            // 页码列表
+            var arr = [];
+            // 初始化页码列表
+            for (var i = 1; i <= totalPage; i++) {
+                arr[i - 1] = i;
+            }
+            if (totalPage <= 7) return arr;
+            // 查找当前页码在页码列表中的位置
+            var pop = arr.indexOf(pageNum);
+            // 截取页码
+            if (pageNum < 4) {
+                arr = arr.splice(pop + 1 - pageNum, 6);
+            } else if (pageNum > totalPage - 3) {
+                arr = arr.reverse().splice(0, 6).reverse();
+            } else {
+                arr = arr.splice(pop - 2, 5);
+            }
+            return arr;
         }
     }
 });

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

@@ -119,9 +119,9 @@ var articleList = new Vue({
         },
         //查看
         toDetail: function toDetail(article) {
-            if(article.auditStatus !== 2) return CAIMEI.dialog('请等待审核通过后查看!');
-            if(!article.status) return CAIMEI.dialog('文章未启用!');
-            window.open('/info/detail-' + article.articleId +'-1.html');
+            if (article.auditStatus !== 2) return CAIMEI.dialog('请等待审核通过后查看!');
+            if (!article.status) return CAIMEI.dialog('文章未启用!');
+            window.open('/info/detail-' + article.articleId + '-1.html');
         },
         // 跳转添加文章页面
         handleAddArticle: function handleAddArticle() {
@@ -173,8 +173,8 @@ var articleList = new Vue({
         toPagination: function toPagination(pageNum) {
             if (pageNum <= this.pageTotal) {
                 this.listQuery.pageNum = pageNum; // console.log('页码跳转');
-
                 this.getArticleList();
+                $('html ,body').animate({scrollTop: 0}, 400, 'linear'); // 页面置顶
             }
         },
         // 输入框设置页码

src/main/resources/templates/encyclopedia/about.html

@@ -5,14 +5,30 @@
     <meta charset="UTF-8"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <title>采美百科关于我们呢</title>
+    <title>采美百科-联系我们</title>
     <link rel="stylesheet" th:href="@{/css/encyclopedia/normalize.css(v=${version})}"/>
     <link rel="stylesheet" th:href="@{/css/encyclopedia/base.css(v=${version})}"/>
     <link rel="stylesheet" th:href="@{/css/encyclopedia/common.css(v=${version})}"/>
+    <link rel="stylesheet" th:href="@{/css/encyclopedia/contact.css(v=${version})}"/>
 </head>
 <body>
 <!-- 引用公共头部 -->
 <template th:replace="encyclopedia/components/header"></template>
+<!-- 页面标题 -->
+<div class="page-title">
+    <div class="container">
+        <div class="title">
+            <h2>关于我们</h2>
+            <div class="line"></div>
+        </div>
+        <p class="subtitle"><span></span>about us</p>
+    </div>
+</div>
+<div class="contact container">
+    <div class="content">
+
+    </div>
+</div>
 <!-- 引用公共底部 -->
 <template th:replace="encyclopedia/components/footer"></template>
 </body>

src/main/resources/templates/encyclopedia/components/footer.html

@@ -8,7 +8,7 @@
             <span class="br">互联网药品信息服务资格证编号(粤)-非经营性-2021-0339</span>
             <span class="br">中华人民共和国增值电信业务经营许可证</span>
         </p>
-        <p>Copyright © 2015-2020 CAIMEI365.com All Rights Reserved 深圳市采美信息技术有限公司</p>
+        <p>Copyright © 2015-2020 CAIMEI365.com All Rights Reserved 深圳市采美网络信息有限公司</p>
     </div>
 </footer>
 <!-- 底部公共js -->

src/main/resources/templates/encyclopedia/components/header.html

@@ -7,7 +7,7 @@
             <div class="menu-btn" id="menuBtn" data-target="#menuNav" data-colse="#menuColseBtn">
                 <i class="icon menu"></i>
             </div>
-            <a href="index.html">
+            <a href="/">
                 <h1>采美百科丰富的百科文库</h1>
                 <img src="/img/encyclopedia/logo.png" alt="采美百科"/>
             </a>
@@ -31,9 +31,12 @@
                 <span class="close-btn icon close"></span>
                 <span>热门搜索：</span>
                 <!--跳转方式：1仅搜索，2产品，3仪器，4链接-->
-                <th:block th:each="keyword,keywordStat: ${searchHotWord}">
-                    <a th:href="'search.html?keyword=' + ${keyword}" th:text="${keyword}" th:title="${keyword}"></a>
-                    <em th:if="${keywordStat.size gt 1}">/</em>
+                <th:block th:each="item,stat: ${searchHotWord}" th:object="${item}">
+                    <a th:href="*{'search.html?keyword=' + keyWord}" th:if="*{jumpType eq 1}" th:text="*{keyWord}" th:title="*{keyWord}"></a>
+                    <a th:href="*{'product-' + productId + '.html'}" th:if="*{jumpType eq 2}" th:text="*{keyWord}" th:title="*{keyWord}"></a>
+                    <a th:href="*{'instrument-' + productId + '.html'}" th:if="*{jumpType eq 3}" th:text="*{keyWord}" th:title="*{keyWord}"></a>
+                    <a th:href="*{jumpLink}" th:if="*{jumpType eq 4}" th:text="*{keyWord}" th:title="*{keyWord}"></a>
+                    <em th:if="${stat.size gt 1 and stat.size ne stat.index + 1}">/</em>
                 </th:block>
             </div>
         </div>

src/main/resources/templates/encyclopedia/contact.html

@@ -26,7 +26,7 @@
 </div>
 <div class="contact container">
     <div class="content">
-        <h2>深圳市采美信息技术有限公司</h2>
+        <h2>深圳市采美网络信息有限公司</h2>
         <p>
             采美365网，是一家集美业仪器、产品采购交易和信息咨询为一体的一站式B2B服务平台，另设有针对C端的线上商城。
             平台集合了各类美业资源及多方优质供应商，不仅能满足生活美容院、高级医美会所、医疗美容机构对产品、光电仪器、易耗品的采购需求，还能提供专业的产品信息咨询服务，包括仪器对比、配套信息，仪器查找、项目合作洽谈，

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

@@ -141,18 +141,18 @@
             </div>
         </div>
     </section>
-    <!-- 适宜人群 -->
+    <!-- 适应人群 -->
     <section class="section">
         <div class="title">
-            <h2>适宜人群</h2>
+            <h2>适应人群</h2>
             <div class="line"></div>
         </div>
         <div class="content" th:utext="*{adaptiveMan}"></div>
     </section>
-    <!-- 不适宜人群 -->
+    <!-- 不适应人群 -->
     <section class="section">
         <div class="title">
-            <h2>不适宜人群</h2>
+            <h2>不适应人群</h2>
             <div class="line"></div>
         </div>
         <div class="content" th:utext="*{adaptiveMan}"></div>

src/main/resources/templates/encyclopedia/instrument.html

@@ -16,7 +16,7 @@
 <template th:replace="encyclopedia/components/header"></template>
 <!-- banner -->
 <div class="banner">
-    <img th:src="${banner.image}" th:alt="${banner.link}"/>
+    <a th:href="${banner.link}"><img th:src="${banner.image}" th:alt="${banner.link}"/></a>
 </div>
 <!-- 产品 / 仪器分类 -->
 <div class="category container" id="category">
@@ -35,16 +35,16 @@
 </div>
 <!-- 分类楼层 -->
 <div class="floor-list">
-    <div class="floor" th:each="floor : ${typeData}" th:id="${floor}">
+    <div class="floor" th:each="floor,floorStat : ${typeData}" th:if="${floor.productList.size} > 0">
         <div class="floor-title">
-            <h2 th:text="${floor.name}"></h2>
+            <h2 th:text="${floor.name}" th:class="'color' + ${floor.typeId % 10}"></h2>
             <div class="h5-more-btn">
                 <a th:href="'more-' + ${floor.typeId} + '-1-12.html'">
                     <span>更多</span>
                     <i class="icon arrowright"></i>
                 </a>
             </div>
-            <img src="/img/encyclopedia/01.png" th:alt="${floor.name}"/>
+            <img th:src="'/img/encyclopedia/title-bg-' + ${floor.typeId % 10} + '.png'" th:alt="${floor.name}"/>
         </div>
         <article class="article container">
             <section class="section" th:each="item,stat : ${floor.productList}" th:object="${item}">
@@ -67,7 +67,7 @@
                         <div class="dashed-line"></div>
                         <footer class="footer">
                             <time>日期：<span th:text="*{publishTime}"></span></time>
-                            <span>浏览量：<span th:text="*{pv}"></span></span>
+                            <span>浏览量：<span th:text="*{pv lt 10000 ? pv : '9999+'}"></span></span>
                         </footer>
                     </div>
                 </a>

src/main/resources/templates/encyclopedia/map.html

@@ -23,7 +23,7 @@
                     icon: 'twig',
                     color: 'red',
                     name: '锦峰大厦A座21B',
-                    desc: '深圳市采美信息技术有限公司',
+                    desc: '深圳市采美网络信息有限公司',
                     lnglat: {Q: 22.53608091509164, R: 114.09600510165099, lng: 114.096005, lat: 22.536081},
                     offset: {x: -18, y: -25},
                     type: 'Marker',

src/main/resources/templates/encyclopedia/more.html

@@ -18,13 +18,13 @@
 <!-- 分类楼层 -->
 <div class="floor container more-floor" id="moreFloor" th:object="${moreData}">
     <div class="floor-title" th:id="${moreData}">
-        <h2 v-text="*{typeName}"></h2>
-        <img src="/img/encyclopedia/01.png" alt="中胚层产品"/>
+        <h2 th:text="*{typeName}" th:class="'color' + *{typeId % 10}"></h2>
+        <img th:src="'/img/encyclopedia/title-bg-' + *{typeId % 10} + '.png'" alt="中胚层产品"/>
     </div>
     <article class="article">
         <section class="section" th:each="item: *{results}">
             <!-- commodityType : 1 产品  2 仪器 -->
-            <a th:href="${item.commodityType eq 1 ? 'product-' + item.productId + '.html' : 'product-' + item.instrument + '.html'}">
+            <a th:href="${item.commodityType eq 1 ? 'product-' + item.productId + '.html' : 'instrument-' + item.productId + '.html'}">
                 <div class="cover">
                     <img th:src="${item.image}" th:alt="${item.name}"/>
                 </div>
@@ -43,7 +43,7 @@
                     <div class="dashed-line"></div>
                     <footer class="footer">
                         <time>日期：<span th:text="${item.publishTime}"></span></time>
-                        <span>浏览量：<span th:text="${item.pv}"></span></span>
+                        <span>浏览量：<span th:text="${item.pv lt 10000 ? item.pv : '9999+'}"></span></span>
                     </footer>
                 </div>
             </a>
@@ -51,43 +51,43 @@
     </article>
 </div>
 
-<th:block th:object="${moreData}">
-    <div class="pagination-container" th:if="*{totalPage gt 1}">
-        <ul class="pagination">
-            <li th:if="*{pageNum gt 1}"><a th:href="'more-7-' + *{pageNum - 1} + '-12.html'">«</a></li>
-            <li th:if="*{pageNum gt 3}">
-                <a th:href="'more-7-1-12.html'">1</a>
+<!--页码-->
+<div class="pagination-container" id="pagination" th:if="${moreData.totalPage > 1}">
+    <ul class="pagination" v-if="totalPage > 1">
+        <!--左侧固定-->
+        <li v-if="pageNum > 1"><a :href="makeUrl(pageNum - 1)" @click.prevent="pageChange(pageNum - 1)">«</a></li>
+        <li v-if="pagination[0] > 1"><a :href="makeUrl(1)" @click.prevent="pageChange(1)">1</a></li>
+        <li class="ellipsis" v-if="pagination[0] > 2"><span>···</span></li>
+        <!--可变动-->
+        <template v-for="num in pagination">
+            <li :class="{ active: pageNum === num }" v-if="num >= 1  && num <= totalPage">
+                <a :href="makeUrl(num)" @click.prevent="pageChange(num)" v-text="num"></a>
             </li>
-            <li class="ellipsis" th:if="*{pageNum gt 4}"><span>···</span></li>
-            <li th:if="*{pageNum gt 2}">
-                <a th:href="'more-7-' + *{pageNum - 2} + '-12.html'" th:text="*{pageNum - 2}"></a>
-            </li>
-            <li th:if="*{pageNum gt 1}">
-                <a th:href="'more-7-' + *{pageNum - 1} + '-12.html'" th:text="*{pageNum - 1}"></a>
-            </li>
-            <li class="active"><a href="#" th:text="*{pageNum}"></a></li>
-            <li th:if="*{pageNum lt totalPage - 1}">
-                <a th:href="'more-7-' + *{pageNum + 1} + '-12.html'" th:text="*{pageNum + 1}"></a>
-            </li>
-            <li th:if="*{pageNum lt totalPage - 2}">
-                <a th:href="'more-7-' + *{pageNum + 2} + '-12.html'" th:text="*{pageNum + 2}"></a>
-            </li>
-            <li class="ellipsis" th:if="*{pageNum lt totalPage - 3}"><span>···</span></li>
-            <li th:if="*{pageNum lt totalPage}">
-                <a th:href="'more-7-' + *{totalPage} + '-12.html'" th:text="*{totalPage}"></a>
-            </li>
-            <li th:if="*{pageNum lt totalPage}"><a th:href="'more-7-' + *{pageNum + 1} + '-12.html'">»</a></li>
-        </ul>
-        <div class="tool">
-            <div class="total">共<span th:text="*{totalPage}"></span>页</div>
-            <div class="jump">
-                <div class="pagenum-input">跳至<input type="text" value="1"/>页</div>
-                <a href="#" class="jump-btn">点击跳转</a>
-            </div>
+        </template>
+        <!--右侧固定-->
+        <li class="ellipsis" v-if="pagination[pagination.length - 1] < totalPage - 1"><span>···</span></li>
+        <li v-if="pagination[pagination.length - 1] < totalPage">
+            <a :href="makeUrl(totalPage)" @click.prevent="pageChange(totalPage)" v-text="totalPage"></a>
+        </li>
+        <li v-if="pageNum < totalPage" :class="{ active: pageNum === totalPage }">
+            <a :href="makeUrl(pageNum + 1)" @click.prevent="pageChange(pageNum + 1)">»</a>
+        </li>
+    </ul>
+    <div class="tool">
+        <div class="total">共<span v-text="totalPage"></span>页</div>
+        <div class="jump">
+            <div class="pagenum-input">跳至<input type="text" v-model="jumpInput"/>页</div>
+            <a :href="makeUrl(jumpInput)" class="jump-btn" @click.prevent="pageChange(jumpInput)">点击跳转</a>
         </div>
     </div>
-</th:block>
+</div>
 <!-- 引用公共底部 -->
 <template th:replace="encyclopedia/components/footer"></template>
+<script src="/lib/vue2.6.12.min.js"></script>
+<script th:inline="javascript">
+// 从 Thymeleaf 域中获取数据使用[[${prototype}]]
+function getMoreData() { return [[${moreData}]]}
+</script>
+<script th:src="@{/js/encyclopedia/moreFloor.js(v=${version})}"></script>
 </body>
 </html>

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

@@ -5,7 +5,9 @@
     <meta charset="UTF-8"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-    <title>采美百科-产品百科详情</title>
+    <meta name="keyword" th:content="${baikeProduct.name}" />
+    <meta name="description" th:content="${baikeProduct.discription}" />
+    <title th:text="${'采美百科-产品百科详情-' + baikeProduct.name}"></title>
     <link rel="stylesheet" th:href="@{/css/encyclopedia/normalize.css(v=${version})}"/>
     <link rel="stylesheet" th:href="@{/css/encyclopedia/base.css(v=${version})}"/>
     <link rel="stylesheet" th:href="@{/css/encyclopedia/common.css(v=${version})}"/>
@@ -126,18 +128,18 @@
             </div>
         </div>
     </section>
-    <!-- 适宜人群 -->
+    <!-- 适应人群 -->
     <section class="section">
         <div class="title">
-            <h2>适宜人群</h2>
+            <h2>适应人群</h2>
             <div class="line"></div>
         </div>
         <div class="content" th:utext="*{adaptiveMan}"></div>
     </section>
-    <!-- 不适宜人群 -->
+    <!-- 不适应人群 -->
     <section class="section">
         <div class="title">
-            <h2>不适宜人群</h2>
+            <h2>不适应人群</h2>
             <div class="line"></div>
         </div>
         <div class="content" th:utext="*{adaptiveMan}"></div>

src/main/resources/templates/encyclopedia/product.html

@@ -16,7 +16,7 @@
 <template th:replace="encyclopedia/components/header"></template>
 <!-- banner -->
 <div class="banner">
-    <img th:src="${banner?.image}" th:alt="${banner?.link}"/>
+    <a th:href="${banner.link}"><img th:src="${banner.image}" th:alt="${banner.link}"/></a>
 </div>
 <!-- 产品 / 仪器分类 -->
 <div class="category container" id="category">
@@ -35,16 +35,16 @@
 </div>
 <!-- 分类楼层 -->
 <div class="floor-list">
-    <div class="floor" th:each="floor : ${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>
+            <h2 th:text="${floor?.name}" th:class="'color' + ${floor.typeId % 10}"></h2>
             <div class="h5-more-btn">
                 <a th:href="'more-' + ${floor.typeId} + '-1-12.html'">
                     <span>更多</span>
                     <i class="icon arrowright"></i>
                 </a>
             </div>
-            <img src="/img/encyclopedia/01.png" th:alt="${floor.name}"/>
+            <img th:src="'/img/encyclopedia/title-bg-' + ${floor.typeId % 10} + '.png'" th:alt="${floor.name}"/>
         </div>
         <article class="article container">
             <section class="section" th:each="item,stat : ${floor.productList}" th:object="${item}">
@@ -67,7 +67,7 @@
                         <div class="dashed-line"></div>
                         <footer class="footer">
                             <time>日期：<span th:text="*{publishTime}"></span></time>
-                            <span>浏览量：<span th:text="*{pv}"></span></span>
+                            <span>浏览量：<span th:text="*{pv lt 10000 ? pv : '9999+'}"></span></span>
                         </footer>
                     </div>
                 </a>

src/main/resources/templates/encyclopedia/search.html

@@ -17,8 +17,8 @@
 <template th:replace="encyclopedia/components/header"></template>
 <!-- 分类楼层 -->
 <div class="floor container search-floor" id="search">
-    <p class="search-title">为您找到相关结果<span v-text="total"></span>条</p>
-    <div class="emtyp" v-if="searchList.length <= 0">
+    <p class="search-title">为您找到相关结果<span v-text="totalRecord"></span>条</p>
+    <div class="emtyp" v-if="totalRecord <= 0">
         <img src="/img/encyclopedia/pc-icon-empty.png" alt="搜索结果为空"/>
         <p>未找到相关结果！</p>
     </div>
@@ -49,24 +49,28 @@
             </a>
         </section>
     </article>
+
     <!--页码-->
-    <div class="pagination-container" v-if="totalPage >1">
+    <div class="pagination-container" v-if="totalPage > 1">
         <ul class="pagination">
-            <li><a href="#" @click.prevent="pageChange(listQuery.pageNum - 1)">«</a></li>
-            <li :class="{active: listQuery.pageNum === 1}" v-if="listQuery.pageNum >= 4">
-                <a href="#" @click.prevent="pageChange(1)">1</a>
-            </li>
-            <li class="ellipsis" v-if="listQuery.pageNum - 2 > 2"><span>···</span></li>
+            <!--左侧固定-->
+            <li v-if="listQuery.pageNum > 1"><a href="#" @click.prevent="pageChange(listQuery.pageNum - 1)">«</a></li>
+            <li v-if="pagination[0] > 1"><a href="#" @click.prevent="pageChange(1)">1</a></li>
+            <li class="ellipsis" v-if="pagination[0] > 2"><span>···</span></li>
+            <!--可变动-->
             <template v-for="num in pagination">
-                <li :class="{active: listQuery.pageNum === num}" v-if="num >= 1 && num <= totalPage">
-                    <a href="#" v-text="num" @click.prevent="pageChange(num)"></a>
+                <li :class="{ active: listQuery.pageNum === num }" v-if="num >= 1  && num <= totalPage">
+                    <a href="#" @click.prevent="pageChange(num)" v-text="num"></a>
                 </li>
             </template>
-            <li class="ellipsis" v-if="listQuery.pageNum + 3 < totalPage"><span>···</span></li>
-            <li :class="{active: listQuery.pageNum === totalPage}" v-if="listQuery.pageNum + 2 < totalPage">
-                <a href="#" v-text="totalPage" @click.prevent="pageChange(totalPage)"></a>
+            <!--右侧固定-->
+            <li class="ellipsis" v-if="pagination[pagination.length - 1] < totalPage - 1"><span>···</span></li>
+            <li v-if="pagination[pagination.length - 1] < totalPage">
+                <a href="#" @click.prevent="pageChange(totalPage)" v-text="totalPage"></a>
+            </li>
+            <li v-if="listQuery.pageNum < totalPage" :class="{ active: listQuery.pageNum === totalPage }">
+                <a href="#" @click.prevent="pageChange(listQuery.pageNum + 1)">»</a>
             </li>
-            <li><a href="#" @click.prevent="pageChange(listQuery.pageNum + 1)">»</a></li>
         </ul>
         <div class="tool">
             <div class="total">共<span v-text="totalPage"></span>页</div>

src/main/resources/templates/index.html

@@ -106,11 +106,11 @@
                             </a>
                         </div>
                         <div class="right_item_main" th:each="info,stat : ${sideJson.get('baikeList')}" th:object="${info}">
-                            <a th:if="${stat.index}==0" th:href="*{commodityType eq 1 ? 'product-' + productId + '.html' : 'product-' + item.instrument + '.html'}" th:title="*{name}" class="item_banner" target="_blank" onclick="_czc.push(['_trackEvent','商城首页','热门百科','点击','','Um_Event_HomeBaikeTemplateClick'])">
+                            <a th:if="${stat.index}==0" th:href="*{link}" th:title="*{name}" class="item_banner" target="_blank" onclick="_czc.push(['_trackEvent','商城首页','热门百科','点击','','Um_Event_HomeBaikeTemplateClick'])">
                                 <img src="/img/base/placeholder.png" th:attr="data-original=*{image}" th:alt="*{name}">
                                 <div class="name" th:text="*{name}"></div>
                             </a>
-                            <a th:if="${stat.index}>0" th:href="*{commodityType eq 1 ? 'product-' + productId + '.html' : 'product-' + item.instrument + '.html'}" th:title="*{name}" class="item_text" target="_blank" onclick="_czc.push(['_trackEvent','商城首页','热门百科','点击','','Um_Event_HomeBaikeTemplateClick'])">
+                            <a th:if="${stat.index}>0" th:href="*{link}" th:title="*{name}" class="item_text" target="_blank" onclick="_czc.push(['_trackEvent','商城首页','热门百科','点击','','Um_Event_HomeBaikeTemplateClick'])">
                                 <p class="item_text_name info" th:text="*{name}"></p>
                                 <!-- <p class="item_text_time" v-if="isPC" th:text="*{createDate}"></p> -->
                             </a>

src/main/resources/templates/supplier-center/article/article-edit.html

@@ -2,7 +2,7 @@
 <html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
-    <title>采美365网-文章列表</title>
+    <title>采美365网-编辑文章</title>
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
     <link th:if="${pageId==1026}" th:href="@{/css/base/form.css(v=${version})}" rel="stylesheet" type="text/css">
@@ -23,7 +23,7 @@
             <span>&gt;</span>
             <span>文章管理</span>
             <span>&gt;</span>
-            <span>添加文章</span>
+            <span>编辑文章</span>
         </div>
         <div class="wrap clear">
             <!--左侧导航-->

src/main/resources/templates/supplier-center/article/article-list.html

@@ -25,7 +25,7 @@
                 <span>&gt;</span>
                 <span>文章列表</span>
             </div>
-            <div class="hot-tip">温馨提示：发布文章有利于曝光您的店铺商品，提高成交量（发布并且审核通过后，可在信息中心搜索您的文章）</div>
+            <div class="hot-tip">温馨提示：多发布文章，发布文章有利于曝光您的店铺商品，提高成交量（发布并且审核通过后，可在信息中心搜索您的文章）</div>
         </div>
         <div class="wrap clear">
             <!--左侧导航-->