Merge branch 'developer' into developerC

# Conflicts:
#	src/main/resources/static/js/product/list.js

src/main/java/com/caimei/www/controller/RedirectController.java

@@ -85,6 +85,15 @@ public class RedirectController {
         return "redirect:/page-"+id+".html";
     }
 
+    /**
+     * 文章搜索
+     * /info/search.shtml?kw=
+     */
+    @GetMapping("/info/search.shtml")
+    public String toArticleSearch(@RequestParam("kw") String keyword) {
+        return "redirect:/info/search-1.html?keyword=" + keyword;
+    }
+
     /**
      * 产品仪器
      */

src/main/resources/static/css/product/list.css

@@ -174,5 +174,4 @@ li{list-style:none}
     .product-screen-btn{width: 100%;height: 11.2vw;float: left;margin-top: 4vw;}
     .product-screen-btn .sub-button{width: 64vw;height: 11.2vw;margin: 0 auto;line-height: 11.2vw;background-color: #E15621;text-align: center;font-size: 3.4ve;color: #FFFFFF;}
 
-}
-
+}

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

@@ -467,7 +467,7 @@
                                 <div th:utext="${product.detailInfo}"></div>
                             </template>
                             <template v-else-if="GLOBAL_USER_ID == 0 || GLOBAL_USER_ID>0 && ( GLOBAL_USER_IDENTITY === 4)">
-                                <div th:utext="${product.commonDetailInfo}"></div>
+                                <div th:utext="*{#strings.isEmpty(product.commonDetailInfo)}? '若要查看更多产品信息，请注册机构会员，如有疑问请联系客服。' : *{product.commonDetailInfo}"></div>
                             </template>
                         </template>
                     </template>

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

@@ -238,4 +238,4 @@
         th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/product/list.js(v=${version})}"></script>
 </body>
-</html>
+</html>