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

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

@@ -23,10 +23,10 @@
 .article .section.params .tr{width:100%;text-align:center;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;-webkit-box-sizing:border-box;box-sizing:border-box;border-left:1px solid #e3e6eb;flex-wrap: wrap;}
 .article .section.params .tr:first-child{border-top:1px solid;border-left:1px solid;border-color:#e3e6eb}
 .article .section.params .tr .group{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;width:50%}
-.article .section.params .tr .th,.article .section.params .tr .td{width:50%;line-height:40px;font-size:14px;height:40px;border-right:1px solid;border-bottom:1px solid;border-color:#e3e6eb;-webkit-box-sizing:border-box;box-sizing:border-box}
+.article .section.params .tr .th,.article .section.params .tr .td{line-height:40px;font-size:14px;height:40px;border-right:1px solid;border-bottom:1px solid;border-color:#e3e6eb;-webkit-box-sizing:border-box;box-sizing:border-box}
 .article .section.params .tr .th a,.article .section.params .tr .td a{color:#e15616}
-.article .section.params .tr .th{background:#f4f5f8}
-.article .section.params .tr .td{background:#ffffff}
+.article .section.params .tr .th{background:#f4f5f8;width: 30%;}
+.article .section.params .tr .td{background:#ffffff;width: 70%; overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
 .article .section.approve .content .name{font-size:14px;line-height:24px}
 .article .section.approve .content a{color:#e15616}
 .article .section.approve .content .img-list{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}
@@ -38,7 +38,7 @@
 .article .section.question .content .collapse dt{font-weight:bold}
 .article .section.question .content .collapse dt span{background:#ffa457}
 .article .section.question .content .collapse dt .icon{position:absolute;right:0;top:2px;cursor:pointer}
-.article .section.question .content .collapse dd{padding-right:0;margin-top:4px}
+.article .section.question .content .collapse dd{padding-right:0;margin-top:4px;}
 .article .section.question .content .collapse dd span{background:#34cc8c}
 .contact-popup{display: none; position:fixed;top: 50%;left: 50%;z-index: 99999; transform: translate(-50%,-50%); width:314px;height:418px;overflow:hidden;background:url(/img/encyclopedia/contact.png) no-repeat center}
 .contact-popup .close{position:absolute;display:block;width:30px;height:30px;text-align:center;line-height:30px;top:10px;right:20px;font-size:28px;color:#2c3038;cursor:pointer}
@@ -78,11 +78,12 @@ body{padding-top:40.3vw}
 .article .section.params .tr .group .th::after{content:"："}
 .article .section.params .tr .group .td>a{ color: #e15616;}
 .article .section.approve .name{font-size:3.2vw}
-.article .section.approve .img-list img{display:block;width:23.6vw;height:23.6vw;border:1px dashed #e3e6eb;-webkit-box-sizing:border-box;box-sizing:border-box;margin-right:2.4vw;margin-top:2.4vw}
+.article .section.approve .img-list{ overflow-x:scroll;}
+.article .section.approve .img-list img{display:block;/*width:23.6vw;*/height:23.6vw;border:1px dashed #e3e6eb;-webkit-box-sizing:border-box;box-sizing:border-box;margin-right:2.4vw;margin-top:2.4vw}
 .article .section.effect img{display:block;max-width:100%}
 .article .section.question .collapse dt,.article .section.question .collapse dd{font-size:3.2vw}
 .article .section.question .collapse dt span,.article .section.question .collapse dd span{display:inline-block;vertical-align:middle;width:4vw;height:4vw;border-radius:0.2vw;text-align:center;line-height:4vw;color:#fff;margin-right:2.4vw}
-.article .section.question .collapse dt{position:relative;padding-right:6.4vw;height:6.4vw;line-height:6.4vw;margin:1.6vw 0}
+.article .section.question .collapse dt{position:relative;padding-right:6.4vw;height:6.4vw;line-height:6.4vw;margin:1.6vw 0;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
 .article .section.question .collapse dt span{background:#ffa457}
 .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}

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

@@ -386,6 +386,6 @@ $(function () {
         const searchKeyword =  $('#searchKeyword');
         const val = searchKeyword.val().trim();
         searchKeyword.val(val);
-        if(!searchKeyword) return false;
+        if(!val) return false;
     });
 });

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

@@ -50,7 +50,7 @@ $(function () {
         // });
         $('.floor-list .floor').each(function(index, el){
             if($(el).find('.section').length < 6){
-                $(el).find('.more-btn').hide();
+                $(el).find('.more').hide();
             }
         });
     } else {

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

@@ -15,7 +15,7 @@
         <ul class="nav" id="menuNav">
             <li class="active"><a href="product.html">产品百科</a></li>
             <li><a href="instrument.html">仪器百科</a></li>
-            <li><a href="about.html">关于采美百科</a></li>
+<!--            <li><a href="about.html">关于采美百科</a></li>-->
             <li><a href="contact.html">联系我们</a></li>
             <li><span class="nav-close" id="#menuColseBtn"></span></li>
         </ul>

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

@@ -16,10 +16,10 @@
 <template th:replace="encyclopedia/components/header"></template>
 
 <article class="article" th:object="${baikeInstrument}">
-    <!-- 仪器描述 -->
+    <!-- 仪器简述 -->
     <section class="section description">
         <div class="title">
-            <h2>仪器描述</h2>
+            <h2>仪器简述</h2>
             <div class="line"></div>
         </div>
         <div class="content">
@@ -109,7 +109,7 @@
             <div class="tr">
                 <div class="group">
                     <div class="th">上市时间</div>
-                    <div class="td" th:text="*{marketTime}"></div>
+                    <div class="td" th:text="*{#dates.format(marketTime,'yyyy-MM-dd')}"></div>
                 </div>
                 <div class="group">
                     <div class="th">公司/厂商</div>
@@ -119,7 +119,7 @@
             <div class="tr">
                 <div class="group">
                     <div class="th">NMPA认证时间</div>
-                    <div class="td" th:text="*{nmpaTime}"></div>
+                    <div class="td" th:text="*{#dates.format(nmpaTime,'yyyy-MM-dd')}"></div>
                 </div>
                 <div class="group">
                     <div class="th">价格区间</div>
@@ -155,7 +155,7 @@
             <h2>不适应人群</h2>
             <div class="line"></div>
         </div>
-        <div class="content" th:utext="*{adaptiveMan}"></div>
+        <div class="content" th:utext="*{unAdaptiveMan}"></div>
     </section>
     <!-- 术前术后 -->
     <section class="section">

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

@@ -17,10 +17,10 @@
 <!-- 引用公共头部 -->
 <template th:replace="encyclopedia/components/header"></template>
 <article class="article" th:object="${baikeProduct}">
-    <!-- 产品描述 -->
+    <!-- 产品简述 -->
     <section class="section description">
         <div class="title">
-            <h2>产品描述</h2>
+            <h2>产品简述</h2>
             <div class="line"></div>
         </div>
         <div class="content">
@@ -96,7 +96,7 @@
             <div class="tr">
                 <div class="group">
                     <div class="th">上市时间</div>
-                    <div class="td" th:text="*{marketTime}"></div>
+                    <div class="td" th:text="*{#dates.format(marketTime,'yyyy-MM-dd')}"></div>
                 </div>
                 <div class="group">
                     <div class="th">公司/厂商</div>
@@ -106,7 +106,7 @@
             <div class="tr">
                 <div class="group">
                     <div class="th">NMPA认证时间</div>
-                    <div class="td" th:text="*{nmpaTime}"></div>
+                    <div class="td" th:text="*{#dates.format(nmpaTime,'yyyy-MM-dd')}"></div>
                 </div>
                 <div class="group">
                     <div class="th">价格区间</div>
@@ -142,7 +142,7 @@
             <h2>不适应人群</h2>
             <div class="line"></div>
         </div>
-        <div class="content" th:utext="*{adaptiveMan}"></div>
+        <div class="content" th:utext="*{unAdaptiveMan}"></div>
     </section>
     <!-- 术前术后 -->
     <section class="section">

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">
             <!--左侧导航-->