Merge remote-tracking branch 'origin/master'

# Conflicts:
#	h_exam/exam_detail.html
#	h_exam/exam_detail_img.html
#	h_exam/exam_list.html
#	xgk/xgk.html

css/components.css

@@ -374,18 +374,28 @@ body::-webkit-scrollbar-track {
 .body .my-articles ul {
   width: 100%;
   border-top: 1px solid #e6e6e6;
-  padding: 10px 20px;
-  list-style: square;
-  color: #777;
+  padding: 0;
+  list-style: none;
   overflow: hidden;
 }
 .body .my-articles ul li {
+  color: #777;
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
   width: 100%;
   padding: 5px 0px;
 }
+.body .my-articles ul li::before {
+  content: "";
+  display: inline-block;
+  width: 6px;
+  height: 6px;
+  background-color: #000;
+  transform: translateY(-2px);
+  margin-right: 5px;
+  border-radius: 50%;
+}
 .body .my-comment .h5 {
   display: flex;
   justify-content: space-between;

css/components.less

@@ -482,12 +482,21 @@ body {
     ul {
       width: 100%;
       border-top: 1px solid #e6e6e6;
-      padding: 10px 20px;
-      list-style: square;
-      color: #777;
+      padding: 0;
+      list-style:  none;
       overflow: hidden;
-
+      // margin: ;
       li {
+        &::before{
+          content: "";
+          display: inline-block;
+          width: 6px;height: 6px;
+          background-color: #000;
+          transform: translateY(-2px);
+          margin-right: 5px;
+          border-radius: 50%;
+        }
+        color: #777;
         overflow: hidden;
         text-overflow: ellipsis;
         white-space: nowrap;

css/exam_detail_img.css

@@ -143,7 +143,7 @@
   display: inline-block;
   border-radius: 30px;
   background-color: #eef5ff;
-  padding: 6px 10px;
+  padding: 6px 20px;
   color: #2382ff;
 }
 .body .edi-body .edi-open span i {
@@ -152,3 +152,107 @@
 .body .edi-body-height {
   height: auto;
 }
+.body .edi-footer {
+  margin-top: 50px;
+  text-align: center;
+  color: #777;
+}
+.body .edi-footer .choose {
+  width: 300px;
+  margin: auto;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+}
+.body .edi-footer .choose .img {
+  width: 66px;
+  color: #000;
+}
+.body .edi-footer .choose .img img {
+  width: 100%;
+}
+.body .edi-footer .choose .img span {
+  color: #777;
+  margin-left: 5px;
+}
+.body .interactive h5 {
+  border-bottom: 1px solid #e6e6e6;
+  padding: 10px 0px;
+  margin: 5px 0px;
+}
+.body .interactive .pull-right .active {
+  color: #000;
+}
+.body .interactive .pull-right span {
+  color: #777;
+}
+.body .interactive .alert {
+  clear: both;
+}
+.body .prog {
+  background-color: #eef5ff;
+  border-radius: 5px;
+  padding: 20px;
+  position: relative;
+}
+.body .prog .title {
+  color: #2382ff;
+  position: absolute;
+  top: 10px;
+}
+.body .prog .flex {
+  height: 50px;
+  box-sizing: border-box;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.body .prog .flex .pro {
+  width: 100%;
+  max-width: 50%;
+  min-width: 200px;
+  box-sizing: border-box;
+  height: 5px;
+  border-radius: 5px;
+  background-color: #fff;
+  margin-right: 20px;
+  position: relative;
+}
+.body .prog .flex .pro .pro-title {
+  position: absolute;
+  right: 0px;
+  top: -20px;
+  color: #999;
+}
+.body .prog .flex .pro .pro-content {
+  width: 0%;
+  height: 100%;
+  background-color: #2382ff;
+}
+.body .prog .flex .pro .icon {
+  position: absolute;
+  width: 30px;
+  height: 30px;
+  box-sizing: border-box;
+  background-color: #fff;
+  text-align: center;
+  line-height: 27px;
+  border-radius: 50%;
+  top: -12px;
+  border: 2px solid #7aaef3;
+}
+.body .prog .flex .pro .pro-show {
+  position: absolute;
+  top: 20px;
+  margin-left: 5px;
+  color: #2382ff;
+}
+.body .prog .flex .button {
+  width: 80px;
+  line-height: 40px;
+  text-align: center;
+  color: #fff;
+  background-color: #7aaef3;
+  border-radius: 10px;
+  box-sizing: border-box;
+}

css/exam_detail_img.less

@@ -173,7 +173,7 @@
         display: inline-block;
         border-radius: 30px;
         background-color: #eef5ff;
-        padding: 6px 10px;
+        padding: 6px 20px;
         color:@body-bg;
         i{
           margin-left: 5px;
@@ -184,4 +184,109 @@
   .edi-body-height{
     height: auto;
   }
+  .edi-footer{
+    margin-top: 50px;
+    text-align: center;
+    color: #777;
+    .choose{
+      width: 300px;
+      margin: auto;
+      display: flex;justify-content: space-around;
+      align-items: center;
+      .img{
+        width: 66px;
+        img{
+          width: 100%;
+        }
+        color: #000;
+        span{
+          color: #777;
+          margin-left: 5px;
+        }
+      }
+    }
+  }
+  .interactive{
+    h5{
+      border-bottom: 1px solid #e6e6e6;
+      padding: 10px 0px;
+      margin: 5px 0px;
+    }
+    .pull-right{
+      .active{
+        color: #000;
+      }
+      span{
+        color: #777;
+      }
+    }
+    .alert{
+      clear: both;
+    }
+  }
+  .prog{
+    background-color: #eef5ff;
+    border-radius: 5px;
+    padding: 20px;
+    position: relative;
+    .title{
+      color: @body-bg;
+      position: absolute;
+      top: 10px;
+    }
+    .flex{
+      height: 50px;
+      box-sizing: border-box;
+      display: flex;justify-content: space-between;align-items: center;
+      .pro{
+        width: 100%;
+        max-width: 50%;
+        min-width:200px;
+        box-sizing: border-box;
+        height: 5px;
+        border-radius: 5px;
+        background-color: #fff;
+        margin-right: 20px;
+        position: relative;
+        .pro-title{
+          position: absolute;
+          right: 0px;
+          top: -20px;
+          color: #999;
+        }
+        .pro-content{
+          width: 0%;
+          height: 100%;
+          background-color: @body-bg;
+        }
+        .icon{
+          position: absolute;
+          width: 30px;
+          height:30px;
+          box-sizing: border-box;
+          background-color: #fff;
+          text-align: center;
+          line-height: 27px;
+          border-radius: 50%;
+          top: -12px;
+          border: 2px solid #7aaef3;
+        }
+        .pro-show{
+          position: absolute;
+          top: 20px;
+          margin-left: 5px;
+          color: @body-bg;
+        }
+      }
+      .button{
+        width: 80px;
+        line-height: 40px;
+        text-align: center;
+        color: #fff;
+        background-color: #7aaef3;
+        border-radius: 10px;
+        box-sizing: border-box;
+      }
+    }
+  }
 }

css/new_list.less

@@ -1,85 +0,0 @@
-
-.new2 .body {
-  margin-top: 90px;
-  padding: 10px 0;
-}
-.new2 .body .list .list-item {
-  text-decoration: none;
-  color: black;
-  display: flex;
-  justify-content: flex-start;
-  align-items: start;
-  padding-bottom: 10px;
-  margin-bottom: 10px;
-  border-bottom: 1px solid #e6e6e6;
-}
-.new2 .body .list-header{
-  position: relative;
-  margin-bottom: 20px;
-  background-size: cover;
--webkit-background-size: 100% 160px;
--moz-background-size: 100% auto;
-background-position: center center;
- img{
-   width: 100%;
-  }
-  div{
-    position: absolute;
-    color: #fff;
-    bottom: 0;
-    left: 10px;
-    h3{
-      font-size: 16px;
-      margin-bottom: 5px;
-    }
-  }
-}
-.new2 .body .list .list-item:hover {
-  color: #2382ff;
-}
-.new2 .body .list .list-item .item-img {
-  flex: 1;
-  padding: 0 20px;
-}
-@media screen and (max-width: 768px) {
-  .new2 .body .list .list-item .item-img {
-    padding: 0 10px;
-  }
-}
-.new2 .body .list .list-item .item-img img {
-  width: 100%;
-  border-radius: 5px;
-}
-.new2 .body .list .list-item .item-img img:hover {
-  transform: scale(1.1);
-}
-.new2 .body .list .list-item .item-detail {
-  flex: 4;
-  height: 100%;
-  position: relative;
-  overflow: hidden;
-}
-@media screen and (max-width: 768px) {
-  .new2 .body .list .list-item .item-detail {
-    flex: 2;
-  }
-}
-.new2 .body .list .list-item .item-detail .title {
-  font-weight: 400;
-}
-@media screen and (max-width: 768px) {
-  .new2 .body .list .list-item .item-detail .title {
-    white-space: normal;
-    display: -webkit-box;
-    -webkit-box-orient: vertical;
-    -webkit-line-clamp: 2;
-  }
-}
-.new2 .body .list .list-item .item-detail .time {
-  font-size: 12px;
-  color: #777;
-  margin-top: 5px;
-}
-.new2 .body .list .list-item .item-detail .time span {
-  margin-left: 5px;
-}

h_exam/exam_detail.html

@@ -5,8 +5,19 @@
   <meta charset="UTF-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="keywords" content="大联考,大联考网页版,新高考,高考动态,志愿填报,招生报考,历年真题,模拟考试,高考">
+  <meta name="description" id="sharedsc" content="大联考提供新高考动态、志愿填报、招生报考、历年真题、模拟考试等海量的高考资讯与模考资料。旗下有大联考APP、大联考APP小程序。">
   <link rel="shortcut icon" type="image/x-icon" href="../imgs/favicon.ico">
   <title>2021昭通高二期中考试</title>
+  <script>
+    var _hmt = _hmt || [];
+    (function () {
+      var hm = document.createElement("script");
+      hm.src = "https://hm.baidu.com/hm.js?c422004622ec075298aaf0a1a7bd21fe";
+      var s = document.getElementsByTagName("script")[0];
+      s.parentNode.insertBefore(hm, s);
+    })();
+  </script>
   <script src="../js/jquery.js"></script>
   <script src="../bootstrap/bootstrap.min.js"></script>
   <link rel="stylesheet" href="../bootstrap/bootstrap.min.css">
@@ -22,12 +33,13 @@
       <div id="face" class="ha-item">
         <div class="img pull-left">
           <!-- 网站图标 -->
-          <!-- <img src="http://www.nostone.cn/static/img/logo.dd1b687.png " alt="大联考" draggable="false"> -->
-          <a href="../index.html"><span>大联考</span></a>
+          <a href="../index.html">
+            <img src="../imgs/app.png" alt=""></a>
+          <!-- <span>大联考</span> -->
         </div>
         <div data-app="download" class="app pull-right">
-          <a href="http://down.gaokaoapp.net" draggable="false">
-            <img src="../imgs/app_dowload.png" alt="大联考" draggable="false"><br>
+          <a href="http://app.gaokaoapp.net" draggable="false">
+            <img src="../imgs/app_dowload.png" alt="" draggable="false"><br>
             <span>大联考App下载</span>
           </a>
         </div>
@@ -186,7 +198,7 @@
     <ul>
       <li>分享到</li>
       <li><img src="../imgs/qq.png" alt="qq">QQ</li>
-      <!-- <li><img src="./imgs/weixin.png" alt="qq">微信</li> -->
+      <li><img src="../imgs/weixin.png" alt="qq">微信</li>
       <li><img src="../imgs/weibo.png" alt="qq">微博</li>
     </ul>
   </div>

h_exam/exam_detail_img.html

@@ -5,8 +5,19 @@
   <meta charset="UTF-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <meta name="keywords" content="大联考,大联考网页版,新高考,高考动态,志愿填报,招生报考,历年真题,模拟考试,高考">
+  <meta name="description" id="sharedsc" content="大联考提供新高考动态、志愿填报、招生报考、历年真题、模拟考试等海量的高考资讯与模考资料。旗下有大联考APP、大联考APP小程序。">
   <link rel="shortcut icon" type="image/x-icon" href="../imgs/favicon.ico">
   <title>2021天津南开区高一期末语文试题及参考答案</title>
+  <script>
+    var _hmt = _hmt || [];
+    (function () {
+      var hm = document.createElement("script");
+      hm.src = "https://hm.baidu.com/hm.js?c422004622ec075298aaf0a1a7bd21fe";
+      var s = document.getElementsByTagName("script")[0];
+      s.parentNode.insertBefore(hm, s);
+    })();
+  </script>
   <script src="../js/jquery.js"></script>
   <script src="../bootstrap/bootstrap.min.js"></script>
   <link rel="stylesheet" href="../bootstrap/bootstrap.min.css">
@@ -23,12 +34,13 @@
       <div id="face" class="ha-item">
         <div class="img pull-left">
           <!-- 网站图标 -->
-          <!-- <img src="http://www.nostone.cn/static/img/logo.dd1b687.png " alt="大联考" draggable="false"> -->
-          <a href="../index.html"><span>大联考</span></a>
+          <a href="../index.html">
+            <img src="../imgs/app.png" alt=""></a>
+          <!-- <span>大联考</span> -->
         </div>
         <div data-app="download" class="app pull-right">
-          <a href="http://down.gaokaoapp.net" draggable="false">
-            <img src="../imgs/app_dowload.png" alt="大联考" draggable="false"><br>
+          <a href="http://app.gaokaoapp.net" draggable="false">
+            <img src="../imgs/app_dowload.png" alt="" draggable="false"><br>
             <span>大联考App下载</span>
           </a>
           <div style="display: none;">
@@ -95,7 +107,65 @@
             <p><img src="../imgs/juanzi.png" style=""></p>
             <p><br></p>
             <div class="edi-open">
-              <span data-click="open" data-open="false">展开阅读全部<i class="glyphicon glyphicon-chevron-down"></i></span>
+              <span data-click="open" data-open="false"><span>展开阅读全部</span><i
+                  class="glyphicon glyphicon-chevron-down"></i></span>
+            </div>
+          </div>
+          <!-- 提示 评价 -->
+          <div class="edi-footer">
+            <p>本文档由用户提供并上传，若内容存在侵权，请进行举报或认领</p>
+            <p>快来评价一下难度吧~</p>
+            <div class="choose">
+              <div class="img">
+                <img src="../imgs/pingjia/a2.png" alt="">
+                <p>简单<span>0</span></p>
+              </div>
+              <div class="img">
+                <img src="../imgs/pingjia/b2.png" alt="">
+                <p>一般<span>0</span></p>
+              </div>
+              <div class="img">
+                <img src="../imgs/pingjia/c2.png" alt="">
+                <p>困难<span>0</span></p>
+              </div>
+            </div>
+          </div>
+          <!-- 相关文章 -->
+          <div class="my-articles">
+            <h5>相关文章</h5>
+            <ul>
+              <li><a target="_blank"
+                  href="">某某的文章111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111</a>
+              </li>
+              <li><a target="_blank" href="">某某的文章</a></li>
+              <li><a target="_blank" href="">某某的文章</a></li>
+              <li><a target="_blank" href="">某某的文章</a></li>
+            </ul>
+          </div>
+          <div id="interactive" class="interactive">
+            <h5>互动</h5>
+            <div class="pull-left">
+              <input type="checkbox" name="choose" id="see">
+              <label for="see">只看内容</label>
+            </div>
+            <div class="pull-right">
+              <span class="active">默认排序</span>
+              <span>时间排序</span>
+            </div>
+            <div class="alert alert-danger"><span><i
+                  class="glyphicon glyphicon-exclamation-sign"></i>特别提醒：</span>发布广告、买答案、考试对答案，一律封号！一切以高考直通车认证为名的广告均为骗子！
+            </div>
+            <div class="prog">
+              <div class="title">快来拖动预估你的分数吧~</div>
+              <div class="flex">
+                <div class="pro" data-gross="150">
+                  <div class="pro-content"></div>
+                  <i class="glyphicon glyphicon-thumbs-up icon"></i>
+                  <div class="pro-title">150分</div>
+                  <div class="pro-show">0分</div>
+                </div>
+                <div class="button">确定</div>
+              </div>
             </div>
           </div>
         </div>
@@ -121,7 +191,7 @@
     <ul>
       <li>分享到</li>
       <li><img src="../imgs/qq.png" alt="qq">QQ</li>
-      <!-- <li><img src="./imgs/weixin.png" alt="qq">微信</li> -->
+      <li><img src="../imgs/weixin.png" alt="qq">微信</li>
       <li><img src="../imgs/weibo.png" alt="qq">微博</li>
     </ul>
   </div>

h_exam/exam_list.html

@@ -6,7 +6,18 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link rel="shortcut icon" type="image/x-icon" href="../imgs/favicon.ico">
+  <meta name="keywords" content="大联考,大联考网页版,新高考,高考动态,志愿填报,招生报考,历年真题,模拟考试,高考">
+  <meta name="description" id="sharedsc" content="大联考提供新高考动态、志愿填报、招生报考、历年真题、模拟考试等海量的高考资讯与模考资料。旗下有大联考APP、大联考APP小程序。">
   <title>高三试题-模拟考试-大联考官网</title>
+  <script>
+    var _hmt = _hmt || [];
+    (function () {
+      var hm = document.createElement("script");
+      hm.src = "https://hm.baidu.com/hm.js?c422004622ec075298aaf0a1a7bd21fe";
+      var s = document.getElementsByTagName("script")[0];
+      s.parentNode.insertBefore(hm, s);
+    })();
+  </script>
   <script src="../js/jquery.js"></script>
   <script src="../bootstrap/bootstrap.min.js"></script>
   <link rel="stylesheet" href="../bootstrap/bootstrap.min.css">
@@ -23,11 +34,12 @@
       <div id="face" class="ha-item">
         <div class="img pull-left">
           <!-- 网站图标 -->
-          <!-- <img src="http://www.nostone.cn/static/img/logo.dd1b687.png " alt="大联考" draggable="false"> -->
-          <a href="/"><span>大联考</span></a>
+          <a href="../index.html">
+            <img src="../imgs/app.png" alt=""></a>
+          <!-- <span>大联考</span> -->
         </div>
         <div data-app="download" class="app pull-right">
-          <a href="http://down.gaokaoapp.net" draggable="false">
+          <a href="http://app.gaokaoapp.net" draggable="false">
             <img src="../imgs/app_dowload.png" alt="大联考App下载" draggable="false"><br>
             <span>大联考App下载</span>
           </a>
@@ -369,7 +381,7 @@
               </a>
               <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
                 <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
+                  <img src="../imgs/app_dowload.png" alt="">
                 </div>
                 <div class="item-detail">
                   <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
@@ -449,7 +461,7 @@
     <ul>
       <li>分享到</li>
       <li><img src="../imgs/qq.png" alt="qq">QQ</li>
-      <!-- <li><img src="./imgs/weixin.png" alt="qq">微信</li> -->
+      <li><img src="../imgs/weixin.png" alt="qq">微信</li>
       <li><img src="../imgs/weibo.png" alt="qq">微博</li>
     </ul>
   </div>

index.html

@@ -2,20 +2,29 @@
 <html lang="en">
 
 <head>
-    <meta charset="UTF-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=`, initial-scale=1.0">
-    <title>大联考网页版</title>
-    <meta name="keywords" content="大联考,大联考网页版,新高考,高考动态,志愿填报,招生报考,历年真题,模拟考试,高考">
-    <meta name="description" id="sharedsc" content="大联考提供新高考动态、志愿填报、招生报考、历年真题、模拟考试等海量的高考资讯与模考资料。旗下有大联考APP、大联考APP小程序。">
-    <link rel="shortcut icon" type="image/x-icon" href="./imgs/favicon.ico">
-    <script src="./js/jquery.js"></script>
-    <script src="./bootstrap/bootstrap.min.js"></script>
-    <link rel="stylesheet" href="./bootstrap/bootstrap.min.css">
-    <link rel="stylesheet" href="./css/components.css">
-    <link rel="stylesheet" href="./css/index.css">
-    <script src="./js/components.js"></script>
-    <script src="./js/index.js"></script>
+  <meta charset="UTF-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=`, initial-scale=1.0">
+  <meta name="keywords" content="大联考,大联考网页版,新高考,高考动态,志愿填报,招生报考,历年真题,模拟考试,高考">
+  <meta name="description" id="sharedsc" content="大联考提供新高考动态、志愿填报、招生报考、历年真题、模拟考试等海量的高考资讯与模考资料。旗下有大联考APP、大联考APP小程序。">
+  <title>大联考网页版</title>
+  <script>
+    var _hmt = _hmt || [];
+    (function () {
+      var hm = document.createElement("script");
+      hm.src = "https://hm.baidu.com/hm.js?c422004622ec075298aaf0a1a7bd21fe";
+      var s = document.getElementsByTagName("script")[0];
+      s.parentNode.insertBefore(hm, s);
+    })();
+  </script>
+  <link rel="shortcut icon" type="image/x-icon" href="./imgs/favicon.ico">
+  <script src="./js/jquery.js"></script>
+  <script src="./bootstrap/bootstrap.min.js"></script>
+  <link rel="stylesheet" href="./bootstrap/bootstrap.min.css">
+  <link rel="stylesheet" href="./css/components.css">
+  <link rel="stylesheet" href="./css/index.css">
+  <script src="./js/components.js"></script>
+  <script src="./js/index.js"></script>
 </head>
 
 <body>
@@ -113,17 +122,16 @@
                             <!-- 轮播（Carousel）项目 -->
                             <div class="carousel-inner">
                                 <div class="item active">
-                                    <img class="carousel-img-style"
-                                         src="#" alt="First slide">
+                                        <!-- 轮播图片跳转 -->
+                    <a target="_blank" href="/">
+                      <img class="carousel-img-style" src="" alt="First slide">
+                    </a>
                                 </div>
                                 <div class="item">
-                                    <img class="carousel-img-style"
-                                         src="#"
-                                         alt="Second slide">
+                                    <a target="_blank" href="/"><img class="carousel-img-style" src="" alt="Second slide"></a>
                                 </div>
                                 <div class="item">
-                                    <img class="carousel-img-style"
-                                         src="#" alt="Third slide">
+                                    <a target="_blank" href="/"><img class="carousel-img-style" src="" alt="Third slide"></a>
                                 </div>
                             </div>
                             <!-- 轮播（Carousel）导航 -->
@@ -465,10 +473,10 @@
 <div id="share">
     <div>分享</div>
     <ul>
-        <li>分享到</li>
-        <li><img src="./imgs/qq.png" alt="qq">QQ</li>
-        <!-- <li><img src="./imgs/weixin.png" alt="qq">微信</li> -->
-        <li><img src="./imgs/weibo.png" alt="qq">微博</li>
+      <li>分享到</li>
+      <li><img src="./imgs/qq.png" alt="qq">QQ</li>
+      <li><img src="./imgs/weixin.png" alt="qq">微信</li>
+      <li><img src="./imgs/weibo.png" alt="qq">微博</li>
     </ul>
 </div>
 <!-- 下载app -->

js/exam_detail_img.js

@@ -1,19 +1,68 @@
 $(function () {
-  // const globaldata = {
-  // };
+  const globaldata = {
+    active: null,
+    maxlength: null,
+  };
+  // 实现跳转
   $(".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");
+    // 获取跳转锚点到顶部的距离
+    let title = $("#title").offset().top;
+    let edi_answer = $("#edi-answer").offset().top;
+    let interactive = $("#interactive").offset().top;
+    let lis = $(this).find("li");
+    let i = Array.prototype.slice.call(lis).indexOf($(e.target)[0]);
+    // 储存锚点
+    let maos = [title, edi_answer, interactive];
+    $(window).scrollTop(maos[i]);
   })
+  // 查看更多
   $("[data-click='open']").click(function () {
     let bool = $(this).data("open");
     if (!bool) {
-      $(this).data("open", true).children("i").removeClass("glyphicon-chevron-down").addClass("glyphicon-chevron-up").parent().parent().parent().addClass("edi-body-height");
+      $(this).data("open", true).children("span").text("收起阅读全部").parent().children("i").removeClass("glyphicon-chevron-down").addClass("glyphicon-chevron-up").parent().parent().parent().addClass("edi-body-height");
     } else {
-      $(this).data("open", false).children("i").removeClass("glyphicon-chevron-up").addClass("glyphicon-chevron-down").parent().parent().parent().removeClass("edi-body-height");
+      $(this).data("open", false).children("span").text("展开阅读全部").parent().children("i").removeClass("glyphicon-chevron-up").addClass("glyphicon-chevron-down").parent().parent().parent().removeClass("edi-body-height");
     }
   })
+  // 进度条拖动
+  window.onresize = function () {
+    globaldata.maxlength = $(".pro").width();
+  }
+  // 进度条宽度
+  let maxlength = globaldata.maxlength || $(".pro").width();
+  // 移动dom
+  let movedom = $(".pro>.icon");
+  //起始坐标
+  let startX = null;
+  // 分数
+  let gross = $(".pro").data("gross");
+  // 进度条
+  let showdom = $(".pro>.pro-content");
+  // 显示数值
+  let pro_show = $("pro_show");
+  movedom.mousedown(function (e) {
+    startX = e.pageX;
+    $(this).css('left') ? $(this).css('left') : $(this).css('left', '0px');
+    let startLeft = parseInt($(this).css('left'));
+    console.log(startLeft)
+    let $that = $(this);
+    $(document).mousemove(function (e) {
+      let moveX = (e.pageX - startX) > 0 ? true : false;
+      let movesection = startLeft + (e.pageX - startX);
+      if (movesection >= 0 && movesection <= maxlength) {
+        let percent = (movesection / maxlength).toFixed(4) * 100 * gross;
+        percent = Math.round(percent) + "分";
+        let move = movesection + "px";
+        showdom.css("width", move);
+        console.log(percent)
+        pro_show.css("left", move).text(percent);
+        $that.css("left", move)
+      }
+    })
+  }).mouseleave(function () { $(document).mousemove = null })
 })

js/new_detail.js

@@ -0,0 +1,6 @@
+$(function () {
+  $(".clickmao").click(function () {
+    let mao = $("#comment").offset().top;
+    $(window).scrollTop(mao);
+  })
+})

xgk/xgk.html

@@ -9,6 +9,15 @@
   <meta name="description" id="sharedsc" content="大联考提供新高考动态、志愿填报、招生报考、历年真题、模拟考试等海量的高考资讯与模考资料。旗下有大联考APP、大联考APP小程序。">
   <link rel="shortcut icon" type="image/x-icon" href="../imgs/favicon.ico">
   <title>新高考专题-大联考网页版</title>
+  <script>
+    var _hmt = _hmt || [];
+    (function () {
+      var hm = document.createElement("script");
+      hm.src = "https://hm.baidu.com/hm.js?c422004622ec075298aaf0a1a7bd21fe";
+      var s = document.getElementsByTagName("script")[0];
+      s.parentNode.insertBefore(hm, s);
+    })();
+  </script>
   <script src="../js/jquery.js"></script>
   <script src="../bootstrap/bootstrap.min.js"></script>
   <link rel="stylesheet" href="../bootstrap/bootstrap.min.css">
@@ -25,12 +34,13 @@
       <div id="face" class="ha-item">
         <div class="img pull-left">
           <!-- 网站图标 -->
-          <!-- <img src="http://www.nostone.cn/static/img/logo.dd1b687.png " alt="大联考" draggable="false"> -->
-          <span>大联考</span>
+          <a href="../index.html">
+            <img src="../imgs/app.png" alt=""></a>
+          <!-- <span>大联考</span> -->
         </div>
         <div data-app="download" class="app pull-right">
-          <a href="http://down.gaokaoapp.net" draggable="false">
-            <img src="../imgs/app_dowload.png" alt="大联考" draggable="false"><br>
+          <a href="http://app.gaokaoapp.net" draggable="false">
+            <img src="../imgs/app_dowload.png" alt="" draggable="false"><br>
             <span>大联考App下载</span>
           </a>
           <div style="display: none;">
@@ -46,7 +56,7 @@
         <div class="body">
           <div class="list-header">
             <!-- 背景图片 -->
-            <img src="../imgs/lunbo.jpg" alt="大联考">
+            <img src="../imgs/bg.png" alt="">
             <div>
               <h3>武汉市高三调考</h3>
               <p>实时更新</p>
@@ -84,7 +94,7 @@
     <ul>
       <li>分享到</li>
       <li><img src="../imgs/qq.png" alt="qq">QQ</li>
-      <!-- <li><img src="./imgs/weixin.png" alt="qq">微信</li> -->
+      <li><img src="../imgs/weixin.png" alt="qq">微信</li>
       <li><img src="../imgs/weibo.png" alt="qq">微博</li>
     </ul>
   </div>