Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/workspace.xml

.idea/examwin_web.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TestRunnerService">
+    <option name="projectConfiguration" value="Twisted Trial" />
+    <option name="PROJECT_TEST_RUNNER" value="Twisted Trial" />
+  </component>
+</module>

.idea/misc.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 2.7 (carwin)" project-jdk-type="Python SDK" />
+</project>

.idea/workspace.xml

@@ -2,12 +2,8 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="82570a17-8430-4238-ae79-81bbbd2de81f" name="Default Changelist" comment="index 轮播">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css/exam_list.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/exam_list.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/css/new_list.css" beforeDir="false" afterPath="$PROJECT_DIR$/css/new_list.css" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/imgs/bg.png" beforeDir="false" afterPath="$PROJECT_DIR$/imgs/bg.png" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/js/exam_detail_img.js" beforeDir="false" afterPath="$PROJECT_DIR$/js/exam_detail_img.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/xgk/xgk.html" beforeDir="false" afterPath="$PROJECT_DIR$/xgk/xgk.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/h_news/news_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/h_news/news_detail.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/h_news/news_list.html" beforeDir="false" afterPath="$PROJECT_DIR$/h_news/news_list.html" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -19,7 +15,7 @@
     <session id="739377457">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="4" />
+          <entry key="project.closed" value="5" />
           <entry key="project.open.time.0" value="2" />
           <entry key="project.open.time.1" value="1" />
           <entry key="project.opened" value="3" />
@@ -28,14 +24,14 @@
       <usages-collector id="statistics.file.extensions.open">
         <counts>
           <entry key="33" value="1" />
-          <entry key="html" value="10" />
+          <entry key="html" value="11" />
           <entry key="ico" value="1" />
           <entry key="png" value="7" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.open">
         <counts>
-          <entry key="HTML" value="10" />
+          <entry key="HTML" value="11" />
           <entry key="Image" value="8" />
           <entry key="PLAIN_TEXT" value="1" />
         </counts>
@@ -87,85 +83,35 @@
         </counts>
       </usages-collector>
     </session>
-    <session id="-1918643531">
-      <usages-collector id="statistics.file.extensions.open">
-        <counts>
-          <entry key="ico" value="1" />
-        </counts>
-      </usages-collector>
-      <usages-collector id="statistics.file.types.open">
-        <counts>
-          <entry key="Image" value="1" />
-        </counts>
-      </usages-collector>
-    </session>
   </component>
   <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">
-          <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>
-          </provider>
-        </entry>
-      </file>
       <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="330">
-              <caret line="10" column="12" lean-forward="true" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" />
-              <folding>
-                <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#a#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
-              </folding>
+            <state relative-caret-position="459">
+              <caret line="119" column="56" lean-forward="true" selection-start-line="119" selection-start-column="56" selection-end-line="119" selection-end-column="56" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <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">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="242">
-              <caret line="9" column="77" selection-start-line="9" selection-start-column="77" selection-end-line="9" selection-end-column="77" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
         <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="74" selection-start-line="6" selection-start-column="74" selection-end-line="6" selection-end-column="74" />
+            <state relative-caret-position="315">
+              <caret line="32" column="39" lean-forward="true" selection-start-line="32" selection-start-column="39" selection-end-line="32" selection-end-column="39" />
             </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://$PROJECT_DIR$/imgs/app.png">
+          <provider selected="true" editor-type-id="images" />
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/h_exam/exam_list.html">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="429">
-              <caret line="13" column="18" selection-start-line="13" selection-start-column="18" selection-end-line="13" selection-end-column="18" />
-            </state>
-          </provider>
+        <entry file="file://$PROJECT_DIR$/imgs/bg.png">
+          <provider selected="true" editor-type-id="images" />
         </entry>
       </file>
     </leaf>
@@ -210,11 +156,10 @@
     <detection-done>true</detection-done>
     <sorting>DEFINITION_ORDER</sorting>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="-61" />
-    <option name="y" value="58" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <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">
@@ -222,38 +167,23 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
             <path>
-              <item name="gs_try" type="b2602c69:ProjectViewProjectNode" />
-              <item name="gs_try" 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" />
             </path>
             <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" />
               <item name="h_news" type="462c0819:PsiDirectoryNode" />
             </path>
-            <path>
-              <item name="gs_try" type="b2602c69:ProjectViewProjectNode" />
-              <item name="gs_try" type="462c0819:PsiDirectoryNode" />
-              <item name="imgs" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="gs_try" type="b2602c69:ProjectViewProjectNode" />
-              <item name="gs_try" type="462c0819:PsiDirectoryNode" />
-              <item name="xgk" type="462c0819:PsiDirectoryNode" />
-            </path>
           </expand>
           <select />
         </subPane>
       </pane>
-      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -265,6 +195,7 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="E:\examwin\examwin_web\h_news" />
       <recent name="E:\examwin\examwin_web" />
       <recent name="E:\examwin\examwin_web\ngk" />
     </key>
@@ -341,21 +272,14 @@
       <option name="project" value="LOCAL" />
       <updated>1629101739388</updated>
     </task>
-    <task id="LOCAL-00008" summary="index 轮播">
-      <created>1629102754121</created>
-      <option name="number" value="00008" />
-      <option name="presentableId" value="LOCAL-00008" />
-      <option name="project" value="LOCAL" />
-      <updated>1629102754121</updated>
-    </task>
-    <option name="localTasksCounter" value="9" />
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-61" y="58" width="1933" height="1046" extended-state="0" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.15750134" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.1337953" />
       <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" />
@@ -366,11 +290,11 @@
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
       <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
-      <window_info active="true" anchor="bottom" id="Version Control" order="8" visible="true" weight="0.40455532" />
+      <window_info anchor="bottom" id="Version Control" order="8" weight="0.40455532" />
       <window_info anchor="bottom" id="Database Changes" order="9" show_stripe_button="false" />
       <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
       <window_info anchor="bottom" id="Terminal" order="11" weight="0.3264642" />
-      <window_info anchor="bottom" id="Python Console" order="12" weight="0.329718" />
+      <window_info active="true" anchor="bottom" id="Python Console" order="12" visible="true" weight="0.329718" />
       <window_info anchor="right" id="Commander" order="0" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -454,23 +378,16 @@
   <component name="editorHistoryManager">
     <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="91">
+          <caret line="7" selection-start-line="7" selection-end-line="9" selection-end-column="75" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/h_news/new_detail.html" />
-    <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="74" selection-start-line="6" selection-start-column="74" selection-end-line="6" selection-end-column="74" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/h_news/news_list.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="242">
-          <caret line="9" column="77" selection-start-line="9" selection-start-column="77" selection-end-line="9" selection-end-column="77" />
+        <state relative-caret-position="405">
+          <caret line="15" column="54" lean-forward="true" selection-start-line="15" selection-start-column="54" selection-end-line="15" selection-end-column="54" />
         </state>
       </provider>
     </entry>
@@ -492,22 +409,23 @@
     <entry file="file://$PROJECT_DIR$/imgs/app_dowload.png">
       <provider selected="true" editor-type-id="images" />
     </entry>
+    <entry file="file://$PROJECT_DIR$/imgs/favicon.ico">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
     <entry file="file://$PROJECT_DIR$/33" />
     <entry file="file://$PROJECT_DIR$/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="330">
-          <caret line="10" column="12" lean-forward="true" selection-start-line="10" selection-start-column="12" selection-end-line="10" selection-end-column="12" />
-          <folding>
-            <element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
-            <element signature="n#style#0;n#a#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
-          </folding>
+        <state relative-caret-position="459">
+          <caret line="119" column="56" lean-forward="true" selection-start-line="119" selection-start-column="56" selection-end-line="119" selection-end-column="56" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/imgs/favicon.ico">
-      <provider selected="true" editor-type-id="images" />
+    <entry file="file://$PROJECT_DIR$/h_news/news_detail.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="315">
+          <caret line="32" column="39" lean-forward="true" selection-start-line="32" selection-start-column="39" selection-end-line="32" selection-end-column="39" />
+        </state>
+      </provider>
     </entry>
   </component>
 </project>

h_news/news_detail.html

@@ -37,7 +37,7 @@
                 <!--<a href="../index.html"><span>大联考</span></a>-->
             </div>
             <div data-app="download" class="app pull-right">
-                <a href="http://down.gaokaoapp.net" draggable="false">
+                <a href="http://app.gaokaoapp.net" draggable="false">
                     <img src="../imgs/app_dowload.png" alt="大联考" draggable="false"><br>
                     <span>大联考App下载</span>
                 </a>

h_news/news_list.html

@@ -37,7 +37,7 @@
                  <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">
+                <a href="http://app.gaokaoapp.net" draggable="false">
                     <img src="../imgs/app_dowload.png" alt="大联考" draggable="false"><br>
                     <span>大联考App下载</span>
                 </a>

index.html

@@ -37,7 +37,7 @@
                 <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">
+                <a href="http://app.gaokaoapp.net" draggable="false">
                     <img src="./imgs/app_dowload.png" alt="大联考App下载" draggable="false"><br>
                     <span>大联考App下载</span>
                 </a>