Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/workspace.xml

h_exam/exam_detail.html

@@ -205,7 +205,7 @@
   <!-- 下载app -->
   <div id="download">
     <div class="left">
-      <img src="../imgs/app.png" alt="">
+      <img src="../imgs/app.png" alt="大联考">
       <div class=" row1">大联考
       </div>
       <div class="row2">全国中学生都在用</div>

h_exam/exam_detail_img.html

@@ -61,7 +61,7 @@
           <p class="edi-p1">更新于 2021-08-09 | 1条贡献 · 55次浏览</p>
           <p class="edi-p2"><span>语文</span> <span class="edi-p-span pull-right"><span>贡献者</span><img class="img-circle"
                 src="https://imgs.app.gaokaozhitongche.com/resource/2020062418/20200624180035_nhWd3VtqZG.png!avatar"
-                alt=""></span></p>
+                alt="大联考"></span></p>
           <div class="edi-body" data-spy="scroll" data-target="" data-offset="0">
             <div class="my-nav">
               <ul>
@@ -74,7 +74,7 @@
               <div class="left">
                 <img class="pull-left img-circle"
                   src="https://imgs.app.gaokaozhitongche.com/resource/2020062418/20200624180035_nhWd3VtqZG.png!avatar"
-                  alt="" />
+                  alt="大联考" />
                 <div>
                   <p>高考123321</p>
                   <p>共8335分试卷，已采纳5355份</p>
@@ -198,7 +198,7 @@
   <!-- 下载app -->
   <div id="download">
     <div class="left">
-      <img src="../imgs/app.png" alt="">
+      <img src="../imgs/app.png" alt="大联考">
       <div class=" row1">大联考
       </div>
       <div class="row2">全国中学生都在用</div>
@@ -207,4 +207,4 @@
   </div>
 </body>
 
-</html>
+</html>

h_exam/exam_list.html

@@ -135,7 +135,7 @@
             <div class="my-list active">
               <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>
@@ -145,7 +145,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>
@@ -155,7 +155,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>
@@ -165,7 +165,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>
@@ -175,7 +175,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>
@@ -185,7 +185,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>
@@ -195,7 +195,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>
@@ -205,7 +205,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>
@@ -215,7 +215,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>
@@ -225,7 +225,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>
@@ -238,7 +238,7 @@
             <div class="my-list ">
               <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>
@@ -248,7 +248,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>
@@ -258,7 +258,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>
@@ -268,7 +268,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>
@@ -278,7 +278,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>
@@ -288,7 +288,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>
@@ -298,7 +298,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>
@@ -308,7 +308,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>
@@ -318,7 +318,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>
@@ -328,7 +328,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>
@@ -341,7 +341,7 @@
             <div class="my-list ">
               <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>
@@ -351,7 +351,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>
@@ -361,7 +361,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>
@@ -371,7 +371,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>
@@ -391,7 +391,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>
@@ -401,7 +401,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>
@@ -411,7 +411,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>
@@ -421,7 +421,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>
@@ -431,7 +431,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>
@@ -468,7 +468,7 @@
   <!-- 下载app -->
   <div id="download">
     <div class="left">
-      <img src="../imgs/app.png" alt="">
+      <img src="../imgs/app.png" alt="大联考">
       <div class=" row1">大联考
       </div>
       <div class="row2">全国中学生都在用</div>

h_news/news_detail.html

@@ -24,12 +24,12 @@
         <div id="face" class="ha-item">
             <div class="img pull-left">
                 <!-- 网站图标 -->
-                <img src="../imgs/app.png" alt="" draggable="false">
+                <a href="../index.html"><img src="../imgs/app.png" alt="" draggable="false"></a>
                 <!--<a href="../index.html"><span>大联考</span></a>-->
             </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>
+                    <img src="../imgs/app_dowload.png" alt="大联考" draggable="false"><br>
                     <span>大联考App下载</span>
                 </a>
                 <div style="display: none;">
@@ -109,7 +109,7 @@
 <!-- 下载app -->
 <div id="download">
     <div class="left">
-        <img src="../imgs/app.png" alt="">
+        <img src="../imgs/app.png" alt="大联考">
         <div class=" row1">大联考
         </div>
         <div class="row2">全国中学生都在用</div>

h_news/news_list.html

@@ -25,11 +25,11 @@
         <div id="face" class="ha-item">
             <div class="img pull-left">
                 <!-- 网站图标 -->
-                 <img src="../imgs/app.png" alt="" draggable="false">
+                 <a href="../index.html"><img src="../imgs/app.png" alt="" draggable="false"></a>
             </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>
+                    <img src="../imgs/app_dowload.png" alt="大联考" draggable="false"><br>
                     <span>大联考App下载</span>
                 </a>
                 <div style="display: none;">
@@ -46,7 +46,7 @@
                 <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 src="../imgs/app_dowload.png" alt="大联考">
                         </div>
                         <div class="item-detail">
                             <div class="title">大联考APP热点资讯</div>
@@ -81,7 +81,7 @@
 <!-- 下载app -->
 <div id="download">
     <div class="left">
-        <img src="../imgs/app.png" alt="">
+        <img src="../imgs/app.png" alt="大联考">
         <div class=" row1">大联考
         </div>
         <div class="row2">全国中学生都在用</div>

index.html

@@ -34,8 +34,7 @@
         <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="/"><img src="./imgs/app.png" alt="" draggable="false"></a>
             </div>
             <div data-app="download" class="app pull-right">
                 <a href="http://down.gaokaoapp.net" draggable="false">
@@ -65,12 +64,6 @@
                         <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">
@@ -488,7 +481,7 @@
 <!-- 下载app -->
 <div id="download">
     <div class="left">
-        <img src="./imgs/app.png" alt="">
+        <img src="./imgs/app.png" alt="大联考">
         <div class="row1">大联考</div>
         <div class="row2">全国中学生都在用</div>
     </div>

xgk/xgk.html

@@ -65,7 +65,7 @@
           <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 src="../imgs/app_dowload.png" alt="大联考">
               </div>
               <div class="item-detail">
                 <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传;广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
@@ -101,7 +101,7 @@
   <!-- 下载app -->
   <div id="download">
     <div class="left">
-      <img src="../imgs/app.png" alt="">
+      <img src="../imgs/app.png" alt="大联考">
       <div class=" row1">大联考
       </div>
       <div class="row2">全国中学生都在用</div>