Merge remote-tracking branch 'origin/master'

# Conflicts:
#	h_exam/exam_detail_img.html

css/exam_detail_img.css

@@ -130,8 +130,26 @@
 .body .edi-body p img {
   width: 100%;
 }
-.body .edi-body #edi-answer {
+.body .edi-body .edi-line {
   color: #f03;
+  display: flex;
+  font-size: 16px;
+  justify-content: center;
+  align-items: center;
+}
+.body .edi-body .edi-line::after {
+  content: '';
+  display: inline-block;
+  border-bottom: 1px solid #e6e6e6;
+  width: 30%;
+  margin-left: 10px;
+}
+.body .edi-body .edi-line::before {
+  content: '';
+  display: inline-block;
+  border-bottom: 1px solid #e6e6e6;
+  width: 30%;
+  margin-right: 10px;
 }
 .body .edi-body .edi-open {
   width: 100%;

css/exam_detail_img.less

@@ -158,9 +158,25 @@
         width: 100%;
       }
     }
-
-    #edi-answer {
+    .edi-line{
       color: #f03;
+      display: flex;
+      font-size: 16px;
+      justify-content: center;align-items: center;
+      &::after{
+        content: '';
+        display: inline-block;
+        border-bottom: 1px solid #e6e6e6;
+        width: 30%;
+        margin-left: 10px;
+      }
+      &::before{
+        content: '';
+        display: inline-block;
+        border-bottom: 1px solid #e6e6e6;
+        width: 30%;
+        margin-right: 10px;
+      }
     }
 
     .edi-open {

h_exam/exam_detail_img.html

@@ -67,13 +67,14 @@
                 <li>答案</li>
               </ul>
             </div>
-            <div id="title">试题</div>
+
+            <p id="title" class="edi-line">试题</p>
             <!-- 懒加载图片 除非静态页面含有大量图片 否则没有必要使用 -->
             <p> <img data-original="http://www.zzliaoyuan.com/pics/app1.png" src="../imgs/juanzi.png" alt="大联考"></p>
             <p> <img data-original="http://www.zzliaoyuan.com/pics/app1.png" src="../imgs/juanzi.png" alt="大联考"></p>
             <p> <img data-original="http://www.zzliaoyuan.com/pics/app1.png" src="../imgs/juanzi.png" alt="大联考"></p>
             <p> <img data-original="http://www.zzliaoyuan.com/pics/app1.png" src="../imgs/juanzi.png" alt="大联考"></p>
-            <p name="answer" id="edi-answer">参考答案<br></p>
+            <p  class="edi-line" id="edi-answer">参考答案<br></p>
             <p><br></p>
             <p> <img data-original="http://www.zzliaoyuan.com/pics/app1.png" src="../imgs/juanzi.png" alt="大联考"></p>
             <p> <img data-original="http://www.zzliaoyuan.com/pics/app1.png" src="../imgs/juanzi.png" alt="大联考"></p>

js/exam_detail_img.js

@@ -8,7 +8,6 @@ $(function () {
   $(".my-nav").click(function (e) {
     let active = Array.prototype.slice.call($(this).find("li")).indexOf(e.target);
     if (active == globaldata.active) return false;
-    globaldata.active = active;
     $(this).find(".active").removeClass("active");
     $(e.target).addClass("active");
     // 获取跳转锚点到顶部的距离