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

src/main/resources/static/css/help/help.css

@@ -4,79 +4,26 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px){
-    .navLayout .left{
-        float: left;
-        width: 200px;
-        line-height: 50px;
-        white-space: nowrap;
-        text-indent: 16px;
-        font-size: 16px;
-        background: #FFF;
-    }
-    .navLayout .left .title{
-        color: #22272e;
-        font-weight: bold;
-        border-bottom: 1px solid #f5f5f5;
-    }
-    .navLayout .navList .tab{
-        display: block;
-        color: #22272e;
-        position: relative;
-    }
-    .navLayout .navList .tab:before{
-        content: '\276F';
-        font-weight: normal;
-        position: absolute;
-        right: 10px;
-        top: 0;
-        transform: rotate(90deg);
-        width: 32px;
-        height: 32px;
-        line-height: 32px;
-        text-align: center;
-        color:#bec2c9;
-    }
-    .navLayout .navList .tab.on:before{
-        top: 18px;
-        transform: rotate(270deg);
-        color:#e15616;
-    }
-    .navLayout .navList .tab.on{
-        color: #e15616;
-    }
-    .navLayout .navList .con{
-        position: relative;
-    }
-    .navLayout .navList .con:before,.navLayout .navList .con:after{
-        content: '';
-        position: absolute;
-        width:168px;
-        border-top: 1px solid #f5f5f5;
-        left:16px;
-    }
-    .navLayout .navList .con:before{top:0;}
-    .navLayout .navList .con:after{bottom:0;}
-    .navLayout .navList .con a{
-        display: block;
-        font-size:14px;
-        color: #627386;
-    }
-    .navLayout .navList .con a.on{
-        color: #e15616;
-        background-color: #ffe6dc;
-    }
+.navLayout .left{float:left;width:200px;line-height:50px;white-space:nowrap;text-indent:16px;font-size:16px;background:#FFF}
+.navLayout .left .title{color:#22272e;font-weight:bold;border-bottom:1px solid #f5f5f5}
+.navLayout .navList .tab{display:block;color:#22272e;position:relative}
+.navLayout .navList .tab:before{content:'\276F';font-weight:normal;position:absolute;right:10px;top:0;transform:rotate(90deg);width:32px;height:32px;line-height:32px;text-align:center;color:#bec2c9}
+.navLayout .navList .tab.on:before{top:18px;transform:rotate(270deg);color:#e15616}
+.navLayout .navList .tab.on{color:#e15616}
+.navLayout .navList .con{position:relative}
+.navLayout .navList .con:before,.navLayout .navList .con:after{content:'';position:absolute;width:168px;border-top:1px solid #f5f5f5;left:16px}
+.navLayout .navList .con:before{top:0}
+.navLayout .navList .con:after{bottom:0}
+.navLayout .navList .con a{display:block;font-size:14px;color:#627386;text-indent:32px}
+.navLayout .navList .con a.on{color:#e15616;background-color:#ffe6dc}
+.navLayout .right{float:right;width:968px}
+.pageContent{background:#FFF;padding:16px}
 
 
 
 
 
 
-    .navLayout .right{
-        float:right;
-        width:968px;
-    }
-
-
 }
 
 /**

src/main/resources/templates/help/help.html

@@ -24,11 +24,12 @@
             <div class="navList" th:each="type: ${helpPages}">
                 <span class="tab" th:text="${type.name}"></span>
                 <div class="con">
-                    <a th:each="page: ${type.linkList}" th:href="'/help/'+${page.id}+'.html'" th:text="${page.name}"  th:attr="class=${pageInfo.id==page.id?'on':''}"></a>
+                    <a th:each="page: ${type.linkList}" th:href="'/help/'+${page.id}+'.html'" th:text="${page.name}"  th:attr="class=${pageInfo?.id==page.id?'on':''}"></a>
                 </div>
             </div>
         </div>
         <div class="right">
+            <div class="pageContent" th:utext="${pageInfo?.content}"></div>
         </div>
     </div>