Merge remote-tracking branch 'origin/master'

# Conflicts:
#	serverside/cihai-wechat/src/main/webapp/static/css/vendor.css

serverside/cihai-wechat/src/main/webapp/WEB-INF/jsp/portal/word/baike.jsp

@@ -340,13 +340,17 @@
                     <div class="single-word">
                         <div class="word-body">
                             <div class="word-title">
-                                <a class="word-title-pager prev js-jump-page" href="/word/detail/${word.id}">语词
-                                    <span class="icon icon-word-prev"></span>
-                                </a>
+                                <c:if test="${word.word.length() eq 1}">
+                                    <a class="word-title-pager prev js-jump-page" href="/word/detail/${word.id}">语词
+                                        <span class="icon icon-word-prev"></span>
+                                    </a>
+                                </c:if>
                                 <h1 class="word-title-inner">${word.word}</h1>
-                                <a class="word-title-pager next active">百科
-                                    <span class="icon icon-word-next"></span>
-                                </a>
+                                <c:if test="${word.word.length() eq 1}">
+                                    <a class="word-title-pager next active">百科
+                                        <span class="icon icon-word-next"></span>
+                                    </a>
+                                </c:if>
                             </div>
                         </div>
                         <div class="word-footer">
@@ -387,12 +391,12 @@
                     <div class="tab-con js-tab-con">
                         <div class="tab-panel active" id="tab01">
                             <%--<div class="tip-box">--%>
-                                <%--<span> 这段话可设置舒适的文字大小。</span>--%>
-                                <%--<div class="tip-operation">--%>
-                                    <%--<a class="large-btn" href="#">大</a>--%>
-                                    <%--<a class="normal-btn" href="#">选中</a>--%>
-                                    <%--<a class="small-btn" href="#">小</a>--%>
-                                <%--</div>--%>
+                            <%--<span> 这段话可设置舒适的文字大小。</span>--%>
+                            <%--<div class="tip-operation">--%>
+                            <%--<a class="large-btn" href="#">大</a>--%>
+                            <%--<a class="normal-btn" href="#">选中</a>--%>
+                            <%--<a class="small-btn" href="#">小</a>--%>
+                            <%--</div>--%>
                             <%--</div>--%>
                             <div class="article">${word.baikeParaphrase}</div>
                         </div>
@@ -684,12 +688,12 @@
                     </div>
                 </div>
                 <%--<div class="card card-accordion card-accordion-spe">--%>
-                    <%--<div class="card-content">--%>
-                        <%--<div class="card-content-inner">--%>
-                            <%--<span>标签：</span>--%>
-                            <%--<a href="">动物</a>--%>
-                        <%--</div>--%>
-                    <%--</div>--%>
+                <%--<div class="card-content">--%>
+                <%--<div class="card-content-inner">--%>
+                <%--<span>标签：</span>--%>
+                <%--<a href="">动物</a>--%>
+                <%--</div>--%>
+                <%--</div>--%>
                 <%--</div>--%>
                 <div class="tip-pic">
                     <img src="${ctx}/static/images/cihai-tip.png">