Merge remote-tracking branch 'origin/master'

# Conflicts:
#	imgs/favicon.ico

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/examwin_web.iml" filepath="$PROJECT_DIR$/.idea/examwin_web.iml" />
+    </modules>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

.idea/workspace.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="82570a17-8430-4238-ae79-81bbbd2de81f" name="Default Changelist" comment="alt=大联考">
+    <list default="true" id="82570a17-8430-4238-ae79-81bbbd2de81f" name="Default Changelist" comment="index 轮播">
+      <change afterPath="$PROJECT_DIR$/.idea/modules.xml" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/h_news/new_detail.html" beforeDir="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" />
-      <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/imgs/favicon.ico" beforeDir="false" afterPath="$PROJECT_DIR$/imgs/favicon.ico" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -18,34 +17,37 @@
     <session id="739377457">
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.closed" value="3" />
-          <entry key="project.open.time.0" value="1" />
+          <entry key="project.closed" value="4" />
+          <entry key="project.open.time.0" value="2" />
           <entry key="project.open.time.1" value="1" />
-          <entry key="project.opened" value="2" />
+          <entry key="project.opened" value="3" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.open">
         <counts>
-          <entry key="html" value="9" />
-          <entry key="png" value="1" />
+          <entry key="33" value="1" />
+          <entry key="html" value="10" />
+          <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="9" />
-          <entry key="Image" value="1" />
+          <entry key="HTML" value="10" />
+          <entry key="Image" value="8" />
+          <entry key="PLAIN_TEXT" value="1" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="html" value="16" />
-          <entry key="txt" value="20" />
+          <entry key="html" value="54" />
+          <entry key="txt" value="30" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="HTML" value="16" />
-          <entry key="PLAIN_TEXT" value="20" />
+          <entry key="HTML" value="54" />
+          <entry key="PLAIN_TEXT" value="30" />
         </counts>
       </usages-collector>
     </session>
@@ -87,34 +89,19 @@
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <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="243">
-              <caret line="36" column="27" selection-start-line="36" selection-start-column="27" selection-end-line="36" selection-end-column="27" />
-              <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>
-          </provider>
-        </entry>
-      </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/h_news/news_list.html">
+        <entry file="file://$PROJECT_DIR$/33">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="271">
-              <caret line="27" column="26" lean-forward="true" selection-start-line="27" selection-start-column="26" selection-end-line="27" selection-end-column="39" />
+            <state relative-caret-position="201042">
+              <caret line="7446" column="14" selection-start-line="7446" selection-start-column="14" selection-end-line="7446" selection-end-column="14" />
             </state>
           </provider>
         </entry>
       </file>
       <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/h_news/news_detail.html">
+        <entry file="file://$PROJECT_DIR$/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="99">
-              <caret line="23" column="39" lean-forward="true" selection-start-line="23" selection-start-column="39" selection-end-line="23" selection-end-column="39" />
+            <state relative-caret-position="270">
+              <caret line="121" column="51" lean-forward="true" selection-start-line="121" selection-start-column="51" selection-end-line="121" selection-end-column="51" />
             </state>
           </provider>
         </entry>
@@ -148,9 +135,10 @@
         <option value="$PROJECT_DIR$/ngk/ngk.html" />
         <option value="$PROJECT_DIR$/xgk/xgk.html" />
         <option value="$PROJECT_DIR$/h_news/new_detail.html" />
-        <option value="$PROJECT_DIR$/index.html" />
         <option value="$PROJECT_DIR$/h_news/news_list.html" />
         <option value="$PROJECT_DIR$/h_news/news_detail.html" />
+        <option value="$PROJECT_DIR$/index.html" />
+        <option value="$PROJECT_DIR$/33" />
       </list>
     </option>
   </component>
@@ -160,11 +148,12 @@
     <detection-done>true</detection-done>
     <sorting>DEFINITION_ORDER</sorting>
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
+  <component name="ProjectFrameBounds" extendedState="6">
     <option name="x" value="-7" />
     <option name="width" value="1933" />
     <option name="height" value="1047" />
   </component>
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
@@ -181,12 +170,7 @@
             <path>
               <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="examwin_web" type="b2602c69:ProjectViewProjectNode" />
-              <item name="examwin_web" type="462c0819:PsiDirectoryNode" />
-              <item name="xgk" type="462c0819:PsiDirectoryNode" />
+              <item name="imgs" type="462c0819:PsiDirectoryNode" />
             </path>
           </expand>
           <select />
@@ -196,147 +180,17 @@
   </component>
   <component name="PropertiesComponent">
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="E:/wxapp/website_admin" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
     <property name="nodejs_npm_path_reset_for_default_project" value="true" />
     <property name="settings.editor.selected.configurable" value="configurable.group.appearance" />
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="E:\examwin\examwin_web\ngk" />
       <recent name="E:\examwin\examwin_web" />
+      <recent name="E:\examwin\examwin_web\ngk" />
     </key>
   </component>
-  <component name="RestoreUpdateTree" date="Moments ago" ActionInfo="_Update">
-    <UpdatedFiles>
-      <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" 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$/css/components.css</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/css/components.less</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/css/exam_detail_img.css</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/css/exam_detail_img.less</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/h_exam/exam_detail.html</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$/index.html</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/js/exam_detail_img.js</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/xgk/xgk.html</PATH>
-        </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$/h_news/new_detail.html</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/imgs/bg.png</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/imgs/pingjia/a1.png</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/imgs/pingjia/a2.png</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/imgs/pingjia/b1.png</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/imgs/pingjia/b2.png</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/imgs/pingjia/c1.png</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/imgs/pingjia/c2.png</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/js/new_detail.js</PATH>
-        </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" />
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/css/new_list.less</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/imgs/lunbo.jpg</PATH>
-        </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>
-      </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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-      <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>
-    </UpdatedFiles>
-  </component>
   <component name="RunDashboard">
     <option name="ruleStates">
       <list>
@@ -395,14 +249,28 @@
       <option name="project" value="LOCAL" />
       <updated>1629095347159</updated>
     </task>
-    <option name="localTasksCounter" value="6" />
+    <task id="LOCAL-00006" summary="index">
+      <created>1629096552953</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1629096552953</updated>
+    </task>
+    <task id="LOCAL-00007" summary="index 轮播">
+      <created>1629101739388</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1629101739388</updated>
+    </task>
+    <option name="localTasksCounter" value="8" />
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
+    <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
     <editor active="true" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13272922" />
+      <window_info active="true" 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" />
@@ -413,7 +281,7 @@
       <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 anchor="bottom" id="Version Control" order="8" weight="0.329718" />
+      <window_info anchor="bottom" id="Version Control" order="8" visible="true" 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" />
@@ -491,16 +359,14 @@
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="index" />
     <MESSAGE value="ngk  新高考" />
     <MESSAGE value="xgk  新高考" />
     <MESSAGE value="alt=大联考" />
-    <option name="LAST_COMMIT_MESSAGE" value="alt=大联考" />
+    <MESSAGE value="index" />
+    <MESSAGE value="index 轮播" />
+    <option name="LAST_COMMIT_MESSAGE" value="index 轮播" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/imgs/favicon.ico">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
     <entry file="file://$PROJECT_DIR$/xgk/xgk.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="91">
@@ -508,36 +374,53 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/h_news/new_detail.html">
-      <provider selected="true" editor-type-id="text-editor" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/imgs/app.png">
-      <provider selected="true" editor-type-id="images" />
-    </entry>
-    <entry file="file://$PROJECT_DIR$/index.html">
+    <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="243">
-          <caret line="36" column="27" selection-start-line="36" selection-start-column="27" selection-end-line="36" selection-end-column="27" />
-          <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="648">
+          <caret line="33" column="39" lean-forward="true" selection-start-line="33" selection-start-column="39" selection-end-line="33" selection-end-column="39" />
         </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="271">
-          <caret line="27" column="26" lean-forward="true" selection-start-line="27" selection-start-column="26" selection-end-line="27" selection-end-column="39" />
+        <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>
-    <entry file="file://$PROJECT_DIR$/h_news/news_detail.html">
+    <entry file="file://$PROJECT_DIR$/imgs/app.png">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/imgs/juanzi.png">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/imgs/qq.png">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/imgs/weibo.png">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <entry file="file://$PROJECT_DIR$/imgs/weixin.png">
+      <provider selected="true" editor-type-id="images" />
+    </entry>
+    <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">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="201042">
+          <caret line="7446" column="14" selection-start-line="7446" selection-start-column="14" selection-end-line="7446" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="99">
-          <caret line="23" column="39" lean-forward="true" selection-start-line="23" selection-start-column="39" selection-end-line="23" selection-end-column="39" />
+        <state relative-caret-position="270">
+          <caret line="121" column="51" lean-forward="true" selection-start-line="121" selection-start-column="51" selection-end-line="121" selection-end-column="51" />
         </state>
       </provider>
     </entry>

css/exam_detail_img.css

@@ -106,10 +106,12 @@
 .body .edi-body .edi-user .right i {
   background-color: #2382ff;
   font-size: 25px;
-  padding: 10px;
+  width: 45px;
+  height: 45px;
   border-radius: 50%;
   color: #fff;
   text-align: center;
+  line-height: 45px;
   margin-left: 10px;
 }
 @media screen and (max-width: 768px) {
@@ -175,6 +177,12 @@
   color: #777;
   margin-left: 5px;
 }
+.body .interactive .pull-left label {
+  vertical-align: middle;
+  font-size: 14px;
+  color: #777;
+  font-weight: normal;
+}
 .body .interactive h5 {
   border-bottom: 1px solid #e6e6e6;
   padding: 10px 0px;
@@ -242,9 +250,9 @@
   border: 2px solid #7aaef3;
 }
 .body .prog .flex .pro .pro-show {
+  width: 100px;
   position: absolute;
   top: 20px;
-  margin-left: 5px;
   color: #2382ff;
 }
 .body .prog .flex .button {

css/exam_detail_img.less

@@ -129,12 +129,13 @@
         i {
           background-color: @body-bg;
           font-size: 25px;
-          padding: 10px;
+          width: 45px;height: 45px;
           border-radius: 50%;
           color: #fff;
           text-align: center;
+          line-height: 45px;
           margin-left: 10px;
-
+      
           @media screen and (max-width:768px) {
             & {
               font-size: 5px;
@@ -207,6 +208,14 @@
     }
   }
   .interactive{
+    .pull-left{
+      label{
+        vertical-align: middle;
+        font-size: 14px;
+        color: #777;
+        font-weight: normal;
+      }
+    }
     h5{
       border-bottom: 1px solid #e6e6e6;
       padding: 10px 0px;
@@ -272,9 +281,9 @@
           border: 2px solid #7aaef3;
         }
         .pro-show{
+          width: 100px;
           position: absolute;
           top: 20px;
-          margin-left: 5px;
           color: @body-bg;
         }
       }

js/exam_detail_img.js

@@ -2,6 +2,15 @@ $(function () {
   const globaldata = {
     active: null,
     maxlength: null,
+    addHandler: function (element, type, handler) {
+      if (element.addEventListener) {
+        element.addEventListener(type, handler, false);
+      } else if (element.attachEvent) {
+        element.attachEvent("on" + type, handler);
+      } else {
+        element["on" + type] = handler;
+      }
+    }
   };
   // 实现跳转
   $(".my-nav").click(function (e) {
@@ -44,25 +53,42 @@ $(function () {
   // 进度条
   let showdom = $(".pro>.pro-content");
   // 显示数值
-  let pro_show = $("pro_show");
+  let pro_show = $(".pro>.pro-show");
   movedom.mousedown(function (e) {
+    $(".prog>.title").hide();
+    $(".pro>.pro-title").hide();
     startX = e.pageX;
     $(this).css('left') ? $(this).css('left') : $(this).css('left', '0px');
     let startLeft = parseInt($(this).css('left'));
-    console.log(startLeft)
     let $that = $(this);
-    $(document).mousemove(function (e) {
+    var move = 'ontouchstart' in document ? 'touchstart' : 'mousemove';
+    document.onmousemove = function (e) {
       let moveX = (e.pageX - startX) > 0 ? true : false;
       let movesection = startLeft + (e.pageX - startX);
       if (movesection >= 0 && movesection <= maxlength) {
-        let percent = (movesection / maxlength).toFixed(4) * 100 * gross;
+        let percent = (movesection / maxlength).toFixed(4) * gross;
         percent = Math.round(percent) + "分";
         let move = movesection + "px";
         showdom.css("width", move);
-        console.log(percent)
         pro_show.css("left", move).text(percent);
         $that.css("left", move)
+        window.getSelection ? window.getSelection().removeAllRanges() : document.selection.empty();
       }
-    })
-  }).mouseleave(function () { $(document).mousemove = null })
+    }
+  })
+  movedom.mouseup(function () { document.onmousemove = null })
+  movedom.mouseleave(function () { document.onmousemove = null })
+
+  // 不能实现的事件
+  function warm () {
+    alert("请在大联考App内登录后操作")
+  }
+  // $(".edi-open>span[data-click='open']").click(warm)
+  $(".edi-user").click(warm)
+  $(".choose").click(warm)
+
+  // 默认 时间
+  $(".pull-right>span").click(function () {
+    $(this).addClass('active').siblings("span").removeClass("active");
+  })
 })

xgk/xgk.html

@@ -112,4 +112,4 @@
   </div>
 </body>
 
-</html>
+</html>