Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/workspace.xml

css/components.css

@@ -153,7 +153,7 @@ body::-webkit-scrollbar-track {
 }
 .header .my-province {
   margin-left: 5px;
-  margin-top: 30px;
+  margin-top: 20px;
 }
 @media screen and (max-width: 768px) {
   .header .my-province {

css/components.less

@@ -198,7 +198,7 @@ body {
   // 通用样式
   .my-province {
     margin-left: 5px;
-    margin-top: 30px;
+    margin-top: 20px;
 
     @media screen and (max-width:768px) {
       & {

css/exam_list.css

@@ -1,4 +1,5 @@
 .body {
+  margin-top: 90px;
   padding-top: 0px;
   transform: translateY(-10px);
 }

h_exam/exam_detail_img.html

@@ -19,6 +19,7 @@
     })();
   </script>
   <script src="../js/jquery.js"></script>
+  <script type="text/javascript" src="../js/jquery.lazyload.min.js"></script>
   <script src="../bootstrap/bootstrap.min.js"></script>
   <link rel="stylesheet" href="../bootstrap/bootstrap.min.css">
   <link rel="stylesheet" href="../css/components.css">
@@ -87,25 +88,26 @@
               </div>
             </div>
             <div id="title">试题</div>
-            <p><img src="../imgs/juanzi.png" style=""></p>
-            <p><img src="../imgs/juanzi.png" style=""></p>
-            <p><img src="../imgs/juanzi.png" style=""></p>
-            <p><img src="../imgs/juanzi.png" style=""></p>
-            <p><img src="../imgs/juanzi.png" style=""></p>
-            <p><img src="../imgs/juanzi.png" style=""></p>
-            <p><img src="../imgs/juanzi.png" style=""></p>
-            <p><img src="../imgs/juanzi.png" style=""></p>
+            <!-- 懒加载图片 除非静态页面含有大量图片 否则没有必要使用 -->
+            <p><img data-original="../imgs/juanzi.png" alt="大联考"></p>
+            <p><img data-original="../imgs/juanzi.png" alt="大联考"></p>
+            <p><img data-original="../imgs/juanzi.png" alt="大联考"></p>
+            <p><img data-original="../imgs/juanzi.png" alt="大联考"></p>
+            <p><img data-original="../imgs/juanzi.png" alt="大联考"></p>
+            <p><img data-original="../imgs/juanzi.png" alt="大联考"></p>
+            <p><img data-original="../imgs/juanzi.png" alt="大联考"></p>
+            <p><img data-original="../imgs/juanzi.png" alt="大联考"></p>
             <p name="answer" id="edi-answer">参考答案<br></p>
             <p><br></p>
-            <p><img src="../imgs/juanzi.png" style=""></p>
-            <p><img src="../imgs/juanzi.png" style=""></p>
-            <p><img src="../imgs/juanzi.png" style=""></p>
-            <p><img src="../imgs/juanzi.png" style=""></p>
-            <p><img src="../imgs/juanzi.png" style=""></p>
-            <p><img src="../imgs/juanzi.png" style=""></p>
-            <p><img src="../imgs/juanzi.png" style=""></p>
-            <p><img src="../imgs/juanzi.png" style=""></p>
-            <p><img src="../imgs/juanzi.png" style=""></p>
+            <p><img data-original="../imgs/juanzi.png" alt="大联考"></p>
+            <p><img data-original="../imgs/juanzi.png" alt="大联考"></p>
+            <p><img data-original="../imgs/juanzi.png" alt="大联考"></p>
+            <p><img data-original="../imgs/juanzi.png" alt="大联考"></p>
+            <p><img data-original="../imgs/juanzi.png" alt="大联考"></p>
+            <p><img data-original="../imgs/juanzi.png" alt="大联考"></p>
+            <p><img data-original="../imgs/juanzi.png" alt="大联考"></p>
+            <p><img data-original="../imgs/juanzi.png" alt="大联考"></p>
+            <p><img data-original="../imgs/juanzi.png" alt="大联考"></p>
             <p><br></p>
             <div class="edi-open">
               <span data-click="open" data-open="false"><span>展开阅读全部</span><i

h_exam/exam_list.html

@@ -39,6 +39,12 @@
             <img src="../imgs/app.png" alt=""></a>
           <!-- <span>大联考</span> -->
         </div>
+        <div class="my-province pull-left">
+          <span>全国</span><i class="glyphicon glyphicon-chevron-down"></i>
+          <div data-province="true">
+            <i class="glyphicon glyphicon-play icon-play"></i>
+          </div>
+        </div>
         <div data-app="download" class="app pull-right">
           <a href="http://app.gaokaoapp.net" draggable="false">
             <img src="../imgs/app_dowload.png" alt="大联考App下载" draggable="false"><br>
@@ -52,73 +58,16 @@
           <div id="listbutton" class="glyphicon glyphicon-th-list button"></div>
         </div>
       </div>
-      <div class="hb-item">
-        <!-- @大屏修改下拉菜单 -->
-        <div id="nav" class="nav">
-          <div class="nav-item">
-            <!-- active 表明当前页面属于那个动作分类 -->
-            <a class="active" href="javascript:;" draggable="false">首页</a>
-            <ul class="nav-ul">
-            </ul>
-          </div>
-          <div class="nav-item">
-            <a href="javascript:;" draggable="false">新高考<i class="glyphicon glyphicon-chevron-down"></i></a>
-            <ul class="nav-ul xingaokao">
-              <li class="nav-li xingaokao"><a href="#" target="_blank" draggable="false">新高考</a></li>
-            </ul>
-          </div>
-          <div class="nav-item">
-            <a href="javascript:;" draggable="false">机构联考<i class="glyphicon glyphicon-chevron-down"></i></a>
-            <ul class="nav-ul">
-              <li class="nav-li"><a href="#" target="_blank" draggable="false">机构联考</a></li>
-            </ul>
-          </div>
-          <div class="nav-item">
-            <a href="javascript:;" draggable="false">模拟考试<i class="glyphicon glyphicon-chevron-down"></i></a>
-            <ul class="nav-ul">
-              <li class="nav-li"><a href="#" target="_blank" draggable="false">模拟考试</a></li>
-            </ul>
-          </div>
-        </div>
-      </div>
     </div>
   </div>
-  <!-- components 共用菜单 -->
   <!-- @小屏幕 下拉菜单 -->
   <div id="nav-sm" class="nav-sm-noheight">
-    <ul>
-      <!-- active 表明当前页面属于那个动作分类 -->
-      <li><a class="nav-sm-title active" href="javascript:;" draggable="false">首页</a>
-        <ul class="nav-sm-ul"></ul>
-      </li>
-      <li>
-        <a class="nav-sm-title" href="javascript:;"" draggable=" false">新高考</a>
-        <ul class="nav-sm-ul">
-          <li class="nav-sm-li"><a href="/" target="_blank" draggable="false">新item 1</a></li>
-          <li class="nav-sm-li"><a href="/" target="_blank" draggable="false">新item 1</a></li>
-          <li class="nav-sm-li"><a href="/" target="_blank" draggable="false">新item 1</a></li>
-          <li class="nav-sm-li"><a href="/" target="_blank" draggable="false">新item 1</a></li>
-        </ul>
-      </li>
-      <li>
-        <a class="nav-sm-title" href="javascript:;" draggable="false">机构联考</a>
-        <ul class="nav-sm-ul">
-          <li class="nav-sm-li"><a href="/" target="_blank" draggable="false">模拟考试</a></li>
-          <li class="nav-sm-li"><a href="/" target="_blank" draggable="false">新item 1</a></li>
-          <li class="nav-sm-li"><a href="/" target="_blank" draggable="false">新item 1</a></li>
-          <li class="nav-sm-li"><a href="/" target="_blank" draggable="false">新item 1</a></li>
-        </ul>
-      </li>
-      <li>
-        <a class="nav-sm-title" href="javascript:;" draggable="false">模拟考试</a>
-        <ul class="nav-sm-ul">
-          <li class="nav-sm-li"><a href="/" target="_blank" draggable="false">模拟考试</a></li>
-          <li class="nav-sm-li"><a href="/" target="_blank" draggable="false">新item 1</a></li>
-          <li class="nav-sm-li"><a href="/" target="_blank" draggable="false">新item 1</a></li>
-          <li class="nav-sm-li"><a href="/" target="_blank" draggable="false">新item 1</a></li>
-        </ul>
-      </li>
-    </ul>
+    <div class="my-province">
+      <span>全国</span><i class="glyphicon glyphicon-chevron-down"></i>
+      <div data-province="true">
+        <i class="glyphicon glyphicon-play icon-play"></i>
+      </div>
+    </div>
   </div>
   <div id="body" class="container">
     <div class="row">

h_news/news_list.html

@@ -10,6 +10,7 @@
   <link rel="shortcut icon" type="image/x-icon" href="../imgs/favicon.ico">
   <title>热点资讯-大联考网页版</title>
   <script src="../js/jquery.js"></script>
+  <script type="text/javascript" src="../js/jquery.lazyload.min.js"></script>
   <script src="../bootstrap/bootstrap.min.js"></script>
   <link rel="stylesheet" href="../bootstrap/bootstrap.min.css">
   <link rel="stylesheet" href="../css/components.css">
@@ -56,7 +57,8 @@
           <div class="my-list list">
             <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
               <div class="item-img">
-                <img src="../imgs/app_dowload.png" alt="大联考">
+                <!-- 懒加载图片 除非静态页面含有大量图片 否则没有必要使用 -->
+                <img data-original="../imgs/app_dowload.png" alt="大联考">
               </div>
               <div class="item-detail">
                 <div class="title">大联考APP热点资讯</div>
@@ -83,9 +85,9 @@
     <div>分享</div>
     <ul>
       <li>分享到</li>
-      <li><img src="../imgs/qq.png" alt="QQ">QQ</li>
-      <li><img src="../imgs/weixin.png" alt="微信">微信</li>
-      <li><img src="../imgs/weibo.png" alt="微博">微博</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/components.js

@@ -389,7 +389,8 @@ $(function () {
   // 底部弹出框
   let lis = $("[data-province='true']").append(province(globaldata.province)).find("li");
   Array.prototype.slice.call(lis).forEach(item => {
-    $(item).click(function () {
+    $(item).click(function (e) {
+      e.stopPropagation();
       let text = $(this).text();
       if (text == "默认") {
         $(".my-province div[data-province='true']").hide();
@@ -399,9 +400,49 @@ $(function () {
     })
   })
 
-  function province_show () {
+  function province_show (e) {
+    e.stopPropagation();
     $(".my-province div[data-province='true']").show().unbind("mouseleave").mouseleave(function () { $(this).hide() });
   }
   $(".my-province>span").click(province_show);
   $(".my-province>i").click(province_show);
+})
+
+// 全局添加路径解析
+$(function () {
+  var r = {
+    protocol: /([^\/]+:)\/\/(.*)/i,
+    host: /(^[^\:\/]+)((?:\/|:|$)?.*)/,
+    port: /\:?([^\/]*)(\/?.*)/,
+    pathname: /([^\?#]+)(\??[^#]*)(#?.*)/
+  };
+
+  function parseUrl (url) {
+    var tmp, res = {};
+    res["href"] = url;
+    for (p in r) {
+      tmp = r[p].exec(url);
+      res[p] = tmp[1];
+      url = tmp[2];
+      if (url === "") {
+        url = "/";
+      }
+      if (p === "pathname") {
+        res["pathname"] = tmp[1];
+        res["search"] = tmp[2];
+        res["hash"] = tmp[3];
+      }
+    }
+    let param = res.search.replace('?', '').split("&");
+    let params = {};
+    param.forEach(item => {
+      let arr = item.split("=");
+      params[arr[0]] = arr[1]
+    })
+    res["query"] = params;
+    return res;
+  };
+  window["lxd"] = {
+    parseUrl
+  }
 })

js/exam_detail_img.js

@@ -1,4 +1,5 @@
 $(function () {
+  $("img").lazyload();
   const globaldata = {
     active: null,
     maxlength: null,

js/exam_list.js

@@ -2,7 +2,13 @@ $(function () {
   const globaldata = {
     active: 0,
   }
-  $(".my-nav").click(function (e) {
+  let params = lxd.parseUrl(window.location.href).query,
+    my_nav = $(".my-nav"), my_nav_lis = my_nav.find("li");
+  params["id"] >= my_nav_lis.length ? params["id"] = 0 : params["id"];
+  my_nav_lis.removeClass("active");
+  $(my_nav_lis[params["id"]]).addClass("active");
+  my_nav.click(function (e) {
+    if (e.target.className == "my-nav") return false;
     let active = Array.prototype.slice.call($(this).find("li")).indexOf(e.target);
     if (active == globaldata.active) return false;
     globaldata.active = active;
@@ -49,4 +55,8 @@ $(function () {
       }, 2000)
     })
   }
+  // 小屏幕 点击背景关闭 弹窗
+  $("#nav-sm").click(function () {
+    $(".my-province div[data-province='true']").hide();
+  })
 })

js/new_list.js

@@ -1,4 +1,6 @@
 $(function () {
+  // 图片懒加载
+  $("img").lazyload();
   // 显示区高度
   let ch = document.documentElement.clientHeight || document.body.clientHeight;
   let lock = false;
@@ -19,7 +21,7 @@ $(function () {
   function data () {
     let str = `<a target="_blank" href="https://www.baidu.com" class="list-item">
     <div class="item-img">
-      <img src="https://imgs.app.gaokaozhitongche.com/uploads/img/2021/0809/1628514522805675.png!cover2"
+      <img data-original="../imgs/app_dowload.png"
         alt="">
     </div>
     <div class="item-detail">