Merge remote-tracking branch 'origin/master'

.idea/workspace.xml

@@ -3,8 +3,6 @@
   <component name="ChangeListManager">
     <list default="true" id="82570a17-8430-4238-ae79-81bbbd2de81f" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/h_exam/exam_detail_img.html" beforeDir="false" afterPath="$PROJECT_DIR$/h_exam/exam_detail_img.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/js/exam_detail_img.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/exam_detail_img.js" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -28,15 +26,17 @@
         <counts>
           <entry key="33" value="1" />
           <entry key="gitignore" value="2" />
-          <entry key="html" value="13" />
+          <entry key="html" value="14" />
           <entry key="ico" value="1" />
+          <entry key="js" value="1" />
           <entry key="png" value="8" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="HTML" value="13" />
+          <entry key="HTML" value="14" />
           <entry key="Image" value="9" />
+          <entry key="JavaScript" value="1" />
           <entry key="PLAIN_TEXT" value="3" />
         </counts>
       </usages-collector>
@@ -44,13 +44,13 @@
         <counts>
           <entry key="gitignore" value="7" />
           <entry key="html" value="98" />
-          <entry key="txt" value="30" />
+          <entry key="txt" value="36" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
           <entry key="HTML" value="98" />
-          <entry key="PLAIN_TEXT" value="37" />
+          <entry key="PLAIN_TEXT" value="43" />
         </counts>
       </usages-collector>
     </session>
@@ -92,74 +92,67 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/xgk/xgk.html">
+        <entry file="file://$PROJECT_DIR$/h_news/news_detail.html">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="99">
-              <caret line="3" column="6" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" />
+              <caret line="25" column="9" lean-forward="true" selection-start-line="25" selection-start-column="9" selection-end-line="25" selection-end-column="9" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/index.html">
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/h_exam/exam_list.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="330">
-              <caret line="10" column="10" selection-start-line="10" selection-start-column="10" selection-end-line="10" selection-end-column="10" />
+            <state relative-caret-position="345">
+              <caret line="98" column="83" lean-forward="true" selection-start-line="98" selection-start-column="83" selection-end-line="98" selection-end-column="83" />
+              <folding>
+                <element signature="n#style#0;n#div#0;n#div#2;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/imgs/favicon.ico">
-          <provider selected="true" editor-type-id="images" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/h_news/news_list.html">
+        <entry file="file://$PROJECT_DIR$/js/components.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="297">
-              <caret line="9" column="75" selection-start-line="9" selection-start-column="75" selection-end-line="9" selection-end-column="75" />
+            <state relative-caret-position="92">
+              <caret line="4" column="10" lean-forward="true" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/h_news/news_detail.html">
+        <entry file="file://$PROJECT_DIR$/xgk/xgk.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="176">
-              <caret line="6" column="72" selection-start-line="6" selection-start-column="72" selection-end-line="6" selection-end-column="72" />
+            <state relative-caret-position="-360">
+              <caret line="61" column="30" lean-forward="true" selection-start-line="61" selection-start-column="30" selection-end-line="61" selection-end-column="30" />
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/css/components.less">
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="49">
-              <caret line="745" column="25" lean-forward="true" selection-start-line="745" selection-start-column="25" selection-end-line="745" selection-end-column="25" />
+            <state relative-caret-position="306">
+              <caret line="34" column="37" lean-forward="true" selection-start-line="34" selection-start-column="37" selection-end-line="34" selection-end-column="37" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/h_exam/exam_detail.html">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/h_exam/exam_detail_img.html">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/h_exam/exam_list.html">
+        <entry file="file://$PROJECT_DIR$/.gitignore">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="231">
-              <caret line="7" column="75" lean-forward="true" selection-start-line="7" selection-start-column="75" selection-end-line="7" selection-end-column="75" />
+            <state relative-caret-position="108">
+              <caret line="4" column="5" selection-start-line="4" selection-start-column="5" selection-end-line="4" selection-end-column="5" />
             </state>
           </provider>
         </entry>
       </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/imgs/app.png">
+          <provider selected="true" editor-type-id="images" />
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FindInProjectRecents">
@@ -174,6 +167,8 @@
       <find>创建时间</find>
       <find>imgs/app.png</find>
       <find>bg.</find>
+      <find>河南</find>
+      <find>province</find>
     </findStrings>
     <replaceStrings>
       <replace />
@@ -205,10 +200,9 @@
     <sorting>DEFINITION_ORDER</sorting>
   </component>
   <component name="ProjectFrameBounds" extendedState="6">
-    <option name="x" value="-20" />
-    <option name="y" value="18" />
+    <option name="x" value="-7" />
     <option name="width" value="1933" />
-    <option name="height" value="1046" />
+    <option name="height" value="1047" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
@@ -221,18 +215,18 @@
         <subPane>
           <expand>
             <path>
-              <item name="gs_try" type="b2602c69:ProjectViewProjectNode" />
-              <item name="gs_try" type="462c0819:PsiDirectoryNode" />
+              <item name="examwin_web" type="b2602c69:ProjectViewProjectNode" />
+              <item name="examwin_web" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="gs_try" type="b2602c69:ProjectViewProjectNode" />
-              <item name="gs_try" type="462c0819:PsiDirectoryNode" />
-              <item name="css" type="462c0819:PsiDirectoryNode" />
+              <item name="examwin_web" type="b2602c69:ProjectViewProjectNode" />
+              <item name="examwin_web" type="462c0819:PsiDirectoryNode" />
+              <item name="h_exam" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
-              <item name="gs_try" type="b2602c69:ProjectViewProjectNode" />
-              <item name="gs_try" type="462c0819:PsiDirectoryNode" />
-              <item name="h_exam" type="462c0819:PsiDirectoryNode" />
+              <item name="examwin_web" type="b2602c69:ProjectViewProjectNode" />
+              <item name="examwin_web" type="462c0819:PsiDirectoryNode" />
+              <item name="js" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -249,8 +243,8 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="E:\examwin\examwin_web" />
       <recent name="E:\examwin\examwin_web\imgs" />
+      <recent name="E:\examwin\examwin_web" />
       <recent name="E:\examwin\examwin_web\h_news" />
       <recent name="E:\examwin\examwin_web\ngk" />
     </key>
@@ -269,6 +263,16 @@
           <option name="mySupportsDeletion" value="false" />
           <option name="myCanBeAbsent" value="false" />
           <option name="myId" value="UPDATED" />
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/css/components.css</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/css/components.less</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/css/exam_list.css</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/h_exam/exam_detail_img.html</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/h_exam/exam_list.html</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/h_news/news_list.html</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/js/components.js</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/js/exam_detail_img.js</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/js/exam_list.js</PATH>
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/js/new_list.js</PATH>
         </FILE-GROUP>
         <FILE-GROUP>
           <option name="myUpdateName" value="Created" />
@@ -276,6 +280,7 @@
           <option name="mySupportsDeletion" value="false" />
           <option name="myCanBeAbsent" value="false" />
           <option name="myId" value="CREATED" />
+          <PATH vcs="Git" revision="">$PROJECT_DIR$/js/jquery.lazyload.min.js</PATH>
         </FILE-GROUP>
         <FILE-GROUP>
           <option name="myUpdateName" value="Deleted" />
@@ -362,652 +367,6 @@
         <option name="myCanBeAbsent" value="false" />
         <option name="myId" value="SWITCHED" />
       </FILE-GROUP>
-      <FILE-GROUP>
-        <option name="myUpdateName" value="Updated from server" />
-        <option name="myStatusName" value="Changed on server" />
-        <option name="mySupportsDeletion" value="false" />
-        <option name="myCanBeAbsent" value="false" />
-        <option name="myId" value="CHANGED_ON_SERVER" />
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" value="Updated" />
-          <option name="myStatusName" value="Changed" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" value="UPDATED" />
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/.idea/workspace.xml</PATH>
-          <FILE-GROUP>
-            <option name="myUpdateName" />
-            <option name="myStatusName" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" />
-          </FILE-GROUP>
-          <FILE-GROUP>
-            <option name="myUpdateName" />
-            <option name="myStatusName" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" />
-          </FILE-GROUP>
-          <FILE-GROUP>
-            <option name="myUpdateName" />
-            <option name="myStatusName" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" />
-          </FILE-GROUP>
-          <FILE-GROUP>
-            <option name="myUpdateName" />
-            <option name="myStatusName" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" />
-          </FILE-GROUP>
-          <FILE-GROUP>
-            <option name="myUpdateName" />
-            <option name="myStatusName" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" />
-          </FILE-GROUP>
-          <FILE-GROUP>
-            <option name="myUpdateName" />
-            <option name="myStatusName" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" />
-          </FILE-GROUP>
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" value="Created" />
-          <option name="myStatusName" value="Created" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" value="CREATED" />
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/js/qrcode.min.js</PATH>
-          <FILE-GROUP>
-            <option name="myUpdateName" />
-            <option name="myStatusName" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" />
-          </FILE-GROUP>
-          <FILE-GROUP>
-            <option name="myUpdateName" />
-            <option name="myStatusName" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" />
-          </FILE-GROUP>
-          <FILE-GROUP>
-            <option name="myUpdateName" />
-            <option name="myStatusName" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" />
-          </FILE-GROUP>
-          <FILE-GROUP>
-            <option name="myUpdateName" />
-            <option name="myStatusName" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" />
-          </FILE-GROUP>
-          <FILE-GROUP>
-            <option name="myUpdateName" />
-            <option name="myStatusName" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" />
-          </FILE-GROUP>
-          <FILE-GROUP>
-            <option name="myUpdateName" />
-            <option name="myStatusName" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" />
-          </FILE-GROUP>
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" value="Deleted" />
-          <option name="myStatusName" value="Deleted" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="true" />
-          <option name="myId" value="REMOVED_FROM_REPOSITORY" />
-          <FILE-GROUP>
-            <option name="myUpdateName" />
-            <option name="myStatusName" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" />
-          </FILE-GROUP>
-          <FILE-GROUP>
-            <option name="myUpdateName" />
-            <option name="myStatusName" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" />
-          </FILE-GROUP>
-          <FILE-GROUP>
-            <option name="myUpdateName" />
-            <option name="myStatusName" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" />
-          </FILE-GROUP>
-          <FILE-GROUP>
-            <option name="myUpdateName" />
-            <option name="myStatusName" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" />
-          </FILE-GROUP>
-          <FILE-GROUP>
-            <option name="myUpdateName" />
-            <option name="myStatusName" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" />
-          </FILE-GROUP>
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" value="Restored" />
-          <option name="myStatusName" value="Will be restored" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" value="RESTORED" />
-          <FILE-GROUP>
-            <option name="myUpdateName" />
-            <option name="myStatusName" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" />
-          </FILE-GROUP>
-          <FILE-GROUP>
-            <option name="myUpdateName" />
-            <option name="myStatusName" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" />
-          </FILE-GROUP>
-          <FILE-GROUP>
-            <option name="myUpdateName" />
-            <option name="myStatusName" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" />
-          </FILE-GROUP>
-          <FILE-GROUP>
-            <option name="myUpdateName" />
-            <option name="myStatusName" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" />
-          </FILE-GROUP>
-          <FILE-GROUP>
-            <option name="myUpdateName" />
-            <option name="myStatusName" />
-            <option name="mySupportsDeletion" value="false" />
-            <option name="myCanBeAbsent" value="false" />
-            <option name="myId" />
-          </FILE-GROUP>
-        </FILE-GROUP>
-      </FILE-GROUP>
-      <FILE-GROUP>
-        <option name="myUpdateName" value="Modified" />
-        <option name="myStatusName" value="Modified" />
-        <option name="mySupportsDeletion" value="false" />
-        <option name="myCanBeAbsent" value="false" />
-        <option name="myId" value="MODIFIED" />
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-      </FILE-GROUP>
-      <FILE-GROUP>
-        <option name="myUpdateName" value="Skipped" />
-        <option name="myStatusName" value="Skipped" />
-        <option name="mySupportsDeletion" value="false" />
-        <option name="myCanBeAbsent" value="false" />
-        <option name="myId" value="SKIPPED" />
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-      </FILE-GROUP>
-      <FILE-GROUP>
-        <option name="myUpdateName" value="Merged with conflicts" />
-        <option name="myStatusName" value="Will be merged with conflicts" />
-        <option name="mySupportsDeletion" value="false" />
-        <option name="myCanBeAbsent" value="false" />
-        <option name="myId" value="MERGED_WITH_CONFLICTS" />
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-      </FILE-GROUP>
-      <FILE-GROUP>
-        <option name="myUpdateName" value="Merged with tree conflicts" />
-        <option name="myStatusName" value="Merged with tree conflicts" />
-        <option name="mySupportsDeletion" value="false" />
-        <option name="myCanBeAbsent" value="false" />
-        <option name="myId" value="MERGED_WITH_TREE_CONFLICT" />
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-      </FILE-GROUP>
-      <FILE-GROUP>
-        <option name="myUpdateName" value="Merged with property conflicts" />
-        <option name="myStatusName" value="Will be merged with property conflicts" />
-        <option name="mySupportsDeletion" value="false" />
-        <option name="myCanBeAbsent" value="false" />
-        <option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" />
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-      </FILE-GROUP>
-      <FILE-GROUP>
-        <option name="myUpdateName" value="Merged" />
-        <option name="myStatusName" value="Will be merged" />
-        <option name="mySupportsDeletion" value="false" />
-        <option name="myCanBeAbsent" value="false" />
-        <option name="myId" value="MERGED" />
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-      </FILE-GROUP>
-      <FILE-GROUP>
-        <option name="myUpdateName" value="Not in repository" />
-        <option name="myStatusName" value="Not in repository" />
-        <option name="mySupportsDeletion" value="true" />
-        <option name="myCanBeAbsent" value="false" />
-        <option name="myId" value="UNKNOWN" />
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-      </FILE-GROUP>
-      <FILE-GROUP>
-        <option name="myUpdateName" value="Locally added" />
-        <option name="myStatusName" value="Locally added" />
-        <option name="mySupportsDeletion" value="false" />
-        <option name="myCanBeAbsent" value="false" />
-        <option name="myId" value="LOCALLY_ADDED" />
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-      </FILE-GROUP>
-      <FILE-GROUP>
-        <option name="myUpdateName" value="Locally removed" />
-        <option name="myStatusName" value="Locally removed" />
-        <option name="mySupportsDeletion" value="false" />
-        <option name="myCanBeAbsent" value="false" />
-        <option name="myId" value="LOCALLY_REMOVED" />
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-      </FILE-GROUP>
-      <FILE-GROUP>
-        <option name="myUpdateName" value="Switched" />
-        <option name="myStatusName" value="Switched" />
-        <option name="mySupportsDeletion" value="false" />
-        <option name="myCanBeAbsent" value="false" />
-        <option name="myId" value="SWITCHED" />
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-        <FILE-GROUP>
-          <option name="myUpdateName" />
-          <option name="myStatusName" />
-          <option name="mySupportsDeletion" value="false" />
-          <option name="myCanBeAbsent" value="false" />
-          <option name="myId" />
-        </FILE-GROUP>
-      </FILE-GROUP>
     </UpdatedFiles>
   </component>
   <component name="RunDashboard">
@@ -1110,14 +469,34 @@
       <option name="project" value="LOCAL" />
       <updated>1629171172051</updated>
     </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="index 轮播">
+      <created>1629171864964</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1629171864964</updated>
+    </task>
+    <task id="LOCAL-00013" summary="index 模拟考试">
+      <created>1629187230012</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1629187230012</updated>
+    </task>
+    <task id="LOCAL-00014" summary="index 模拟考试列表">
+      <created>1629193371206</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1629193371206</updated>
+    </task>
+    <option name="localTasksCounter" value="15" />
     <servers />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
-    <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15884861" />
+      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.1359275" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
       <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
@@ -1211,7 +590,9 @@
     <MESSAGE value="alt=大联考" />
     <MESSAGE value="index" />
     <MESSAGE value="index 轮播" />
-    <option name="LAST_COMMIT_MESSAGE" value="index 轮播" />
+    <MESSAGE value="index 模拟考试" />
+    <MESSAGE value="index 模拟考试列表" />
+    <option name="LAST_COMMIT_MESSAGE" value="index 模拟考试列表" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/h_news/new_detail.html" />
@@ -1244,17 +625,10 @@
     <entry file="file://$PROJECT_DIR$/imgs/bg.png">
       <provider selected="true" editor-type-id="images" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/h_news/news_detail.html">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="176">
-          <caret line="6" column="72" selection-start-line="6" selection-start-column="72" selection-end-line="6" selection-end-column="72" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/xgk/xgk.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="3" column="6" selection-start-line="3" selection-start-column="6" selection-end-line="3" selection-end-column="6" />
+        <state relative-caret-position="-360">
+          <caret line="61" column="30" lean-forward="true" selection-start-line="61" selection-start-column="30" selection-end-line="61" selection-end-column="30" />
         </state>
       </provider>
     </entry>
@@ -1270,22 +644,32 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="10" column="10" selection-start-line="10" selection-start-column="10" selection-end-line="10" selection-end-column="10" />
+        <state relative-caret-position="306">
+          <caret line="34" column="37" lean-forward="true" selection-start-line="34" selection-start-column="37" selection-end-line="34" selection-end-column="37" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/h_exam/exam_list.html">
+    <entry file="file://$PROJECT_DIR$/h_news/news_detail.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="231">
-          <caret line="7" column="75" lean-forward="true" selection-start-line="7" selection-start-column="75" selection-end-line="7" selection-end-column="75" />
+        <state relative-caret-position="99">
+          <caret line="25" column="9" lean-forward="true" selection-start-line="25" selection-start-column="9" selection-end-line="25" selection-end-column="9" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/css/components.less">
+    <entry file="file://$PROJECT_DIR$/js/components.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="92">
+          <caret line="4" column="10" lean-forward="true" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/h_exam/exam_list.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="49">
-          <caret line="745" column="25" lean-forward="true" selection-start-line="745" selection-start-column="25" selection-end-line="745" selection-end-column="25" />
+        <state relative-caret-position="345">
+          <caret line="98" column="83" lean-forward="true" selection-start-line="98" selection-start-column="83" selection-end-line="98" selection-end-column="83" />
+          <folding>
+            <element signature="n#style#0;n#div#0;n#div#2;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>

h_exam/exam_detail.html

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

h_exam/exam_detail_img.html

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

h_exam/exam_list.html

@@ -8,7 +8,7 @@
   <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>
+  <title>模拟考试-大联考网页版</title>
   <script>
     var _hmt = _hmt || [];
     (function () {
@@ -74,317 +74,47 @@
       <div class="col">
         <div class="body">
           <div class="my-nav">
-            <ul>
-              <li class="active">高三试题</li>
-              <li>高二试题</li>
-              <li>高一试题</li>
+            <ul class="grade">
+              <li class="grade active">高三试题</li>
+              <li class="grade">高二试题</li>
+              <li class="grade">高一试题</li>
             </ul>
           </div>
           <div class="ke">
             <!-- 高三 -->
-            <div class="my-list active">
+            <div class="my-list exam active">
               <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
                 <div class="item-img">
                   <img src="../imgs/app_dowload.png" alt="大联考">
                 </div>
                 <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传;广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
+                  <div class="title">高三模拟考试</div>
                   <div class="province">广东</div>
                   <div class="time">高考动态<span>2021-04-21</span></div>
                 </div>
               </a>
             </div>
             <!-- 高二 -->
-            <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="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传;广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
+            <div class="my-list exam">
               <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
                 <div class="item-img">
                   <img src="../imgs/app_dowload.png" alt="大联考">
                 </div>
                 <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
+                  <div class="title">高二模拟考试</div>
                   <div class="province">广东</div>
                   <div class="time">高考动态<span>2021-04-21</span></div>
                 </div>
               </a>
             </div>
             <!-- 高一 -->
-            <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="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传;广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
-              <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
-                <div class="item-img">
-                  <img src="../imgs/app_dowload.png" alt="大联考">
-                </div>
-                <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
-                  <div class="province">广东</div>
-                  <div class="time">高考动态<span>2021-04-21</span></div>
-                </div>
-              </a>
+            <div class="my-list exam">
               <a target="_blank" href="http://www.gaokaoapp.net" class="list-item">
                 <div class="item-img">
                   <img src="../imgs/app_dowload.png" alt="大联考">
                 </div>
                 <div class="item-detail">
-                  <div class="title">广东省警察学院：从未委托任何个人或机构进行招生宣传</div>
+                  <div class="title">高一模拟考试</div>
                   <div class="province">广东</div>
                   <div class="time">高考动态<span>2021-04-21</span></div>
                 </div>
@@ -418,7 +148,7 @@
   <!-- 下载app -->
   <div id="download">
     <div class="left">
-      <img src="../imgs/app.png" alt="大联考">
+      <img src="../imgs/app2.png" alt="大联考">
       <div class=" row1">大联考
       </div>
       <div class="row2">全国中学生都在用</div>
@@ -427,4 +157,4 @@
   </div>
 </body>
 
-</html>
+</html>

h_news/news_detail.html

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

h_news/news_list.html

@@ -5,8 +5,8 @@
   <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小程序。">
+  <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>热点资讯-大联考网页版</title>
   <script src="../js/jquery.js"></script>
@@ -93,7 +93,7 @@
   <!-- 下载app -->
   <div id="download">
     <div class="left">
-      <img src="../imgs/app.png" alt="大联考">
+      <img src="../imgs/app2.png" alt="大联考">
       <div class=" row1">大联考
       </div>
       <div class="row2">全国中学生都在用</div>
@@ -104,4 +104,4 @@
   </div>
 </body>
 
-</html>
+</html>

index.html

@@ -67,8 +67,8 @@
           </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 class="nav-ul monikaoshi">
+              <li class="nav-li monikaoshi"><a href="#" target="_blank" draggable="false">模拟考试</a></li>
             </ul>
           </div>
         </div>
@@ -89,16 +89,10 @@
           <li class="nav-sm-li xingaokao"><a href="#" target="_blank" draggable="false">新高考</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>
-        </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>
+        <ul class="nav-sm-ul monikaoshi">
+          <li class="nav-sm-li monikaoshi"><a href="/" target="_blank" draggable="false">模拟考试</a></li>
         </ul>
       </li>
     </ul>
@@ -153,39 +147,6 @@
               </div>
             </div>
           </div>
-          <!-- 网页第二行 -->
-          <div class="row row-style">
-            <div class="title-style">
-              <h4 class="h4"><i class="glyphicon glyphicon-book"></i>热门专题</h4>
-              <div class="content-style">
-                <div class="scroll-style">
-                  <!-- @图片标题横轴滚动 -->
-                  <ul id="imgsrcoll">
-                    <li class="scroll-li-style"><a title="数学一轮复习专题" href="#" target="_blank" draggable="false"><img
-                          src="#" alt="数学一轮复习专题" draggable="false">
-                        <h5 class="title">数学一轮复习专题</h5>
-                      </a></li>
-                    <li class="scroll-li-style"><a title="英语一轮复习专题" href="#" target="_blank" draggable="false"><img
-                          src="#" alt="英语一轮复习专题" draggable="false">
-                        <h5 class="title">英语一轮复习专题</h5>
-                      </a></li>
-                    <li class="scroll-li-style"><a title="政治一轮复习专题" href="#" target="_blank" draggable="false"><img
-                          src="#" alt="政治一轮复习专题" draggable="false">
-                        <h5 class="title">政治一轮复习专题</h5>
-                      </a></li>
-                    <li class="scroll-li-style"><a title="地理一轮复习专题" href="" target="_blank" draggable="false"><img
-                          src="#" alt="地理一轮复习专题" draggable="false">
-                        <h5 class="title">地理一轮复习专题</h5>
-                      </a></li>
-                    <li class="scroll-li-style"><a title="历史一轮复习专题" href="#" target="_blank" draggable="false"><img
-                          src="#" alt="历史一轮复习专题" draggable="false">
-                        <h5 class="title">历史一轮复习专题</h5>
-                      </a></li>
-                  </ul>
-                </div>
-              </div>
-            </div>
-          </div>
           <!-- @类型模板 -->
           <!-- 网页第三行 -->
           <div class="row row-style">
@@ -195,7 +156,7 @@
                 <div class="col col-sm-4 col-sm-12">
                   <div class="hotspot flex-item-style">
                     <h4 class=".h4">
-                      <a target="_blank" href="./h_exam/g3.html">
+                      <a target="_blank" href="./h_exam/exam_list.html?id=0">
                         <span class="a">
                           高三考试
                         </span>
@@ -209,7 +170,7 @@
                 </div>
                 <div class="col col-sm-4 col-sm-12">
                   <div class="hotspot flex-item-style">
-                    <h4 class=".h4"><a target="_blank" href="./h_exam/g2.html"><span class="a">
+                    <h4 class=".h4"><a target="_blank" href="./h_exam/exam_list.html?id=1"><span class="a">
                           高二考试
                         </span><span>更多</span></a>
                     </h4>
@@ -222,7 +183,7 @@
                 </div>
                 <div class="col col-sm-4 col-sm-12">
                   <div class="hotspot flex-item-style">
-                    <h4 class=".h4"><a target="_blank" href="./h_exam/g1.html"><span class="a">
+                    <h4 class=".h4"><a target="_blank" href="./h_exam/exam_list.html?id=2"><span class="a">
                           高一考试
                         </span><span>更多</span></a>
                     </h4>
@@ -245,7 +206,7 @@
                 <div class="col col-sm-4 col-sm-12">
                   <div class="hotspot flex-item-style">
                     <h4 class=".h4"><a target="_blank" href="./h_news/news_list.html"><span class="a">
-                          高三考试
+                          专题1
                         </span><span>更多</span></a>
                     </h4>
                     <ul>