20210821 8-37 修改

.idea/workspace.xml

@@ -1,7 +1,9 @@
 <?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="" />
+    <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" />
+    </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -94,18 +96,18 @@
     <session id="-1918643531">
       <usages-collector id="statistics.file.extensions.edit">
         <counts>
-          <entry key="txt" value="55" />
+          <entry key="txt" value="66" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.file.types.edit">
         <counts>
-          <entry key="PLAIN_TEXT" value="55" />
+          <entry key="PLAIN_TEXT" value="66" />
         </counts>
       </usages-collector>
       <usages-collector id="statistics.lifecycle.project">
         <counts>
-          <entry key="project.open.time.23" value="1" />
-          <entry key="project.opened" value="1" />
+          <entry key="project.open.time.23" value="2" />
+          <entry key="project.opened" value="2" />
         </counts>
       </usages-collector>
     </session>
@@ -157,7 +159,7 @@
         <entry file="file://$PROJECT_DIR$/css/components.less">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="66">
-              <caret line="706" column="14" lean-forward="true" selection-start-line="706" selection-start-column="14" selection-end-line="706" selection-end-column="14" />
+              <caret line="706" column="14" selection-start-line="706" selection-start-column="14" selection-end-line="706" selection-end-column="14" />
             </state>
           </provider>
         </entry>
@@ -251,7 +253,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -273,6 +274,7 @@
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -291,118 +293,6 @@
       <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$/.idea/workspace.xml</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/h_exam/exam_detail.html</PATH>
-          <PATH vcs="Git" revision="">$PROJECT_DIR$/h_exam/exam_list.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" />
-        </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>
-        <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>
@@ -699,13 +589,21 @@
       <option name="project" value="LOCAL" />
       <updated>1629540890203</updated>
     </task>
-    <option name="localTasksCounter" value="40" />
+    <task id="LOCAL-00040" summary="20210821 8-37 修改">
+      <created>1629679058696</created>
+      <option name="number" value="00040" />
+      <option name="presentableId" value="LOCAL-00040" />
+      <option name="project" value="LOCAL" />
+      <updated>1629679058696</updated>
+    </task>
+    <option name="localTasksCounter" value="41" />
     <servers />
   </component>
   <component name="ToolWindowManager">
     <frame x="-120" y="34" width="1933" height="899" extended-state="0" />
+    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.16550988" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.16711159" />
       <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" />
@@ -815,7 +713,8 @@
     <MESSAGE value="20210821 16-51" />
     <MESSAGE value="20210821 17-30" />
     <MESSAGE value="20210821 16-00" />
-    <option name="LAST_COMMIT_MESSAGE" value="20210821 16-00" />
+    <MESSAGE value="20210821 8-37 修改" />
+    <option name="LAST_COMMIT_MESSAGE" value="20210821 8-37 修改" />
   </component>
   <component name="editorHistoryManager">
     <entry file="file://$PROJECT_DIR$/h_news/new_detail.html" />
@@ -921,7 +820,7 @@
     <entry file="file://$PROJECT_DIR$/css/components.less">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="66">
-          <caret line="706" column="14" lean-forward="true" selection-start-line="706" selection-start-column="14" selection-end-line="706" selection-end-column="14" />
+          <caret line="706" column="14" selection-start-line="706" selection-start-column="14" selection-end-line="706" selection-end-column="14" />
         </state>
       </provider>
     </entry>

h_exam/exam_detail.html

@@ -61,7 +61,7 @@
           </div>
           <p class="alert-msg"><i class="glyphicon glyphicon-volume-up"></i>
 
-            </p>
+          </p>
           <div class="list">
             <div class="list-flex">
               <!--添加 data-href 跳转  -->
@@ -170,9 +170,7 @@
             <div class="comment">
               <!-- 功能 用户图片 昵称 言论  回复功能 点赞功能 -->
               <!-- <div class="nocomment">说说你对套卷的看法吧！</div> -->
-              <div id="detail">
-
-              </div>
+              <div id="detail"></div>
               <div class="loading">正在加载中....</div>
               <div class="nodata">到底了</div>
             </div>
@@ -219,4 +217,4 @@
   </div>
 </body>
 
-</html>
+</html>

js/exam_detail_img.js

@@ -35,22 +35,24 @@ $(function () {
   $("[data-click='open']").click(function () {
     let bool = $(this).data("open");
     if (!bool) {
-      $(this).data("open", true).children("span").text("收起阅读全部").parent().children("i").removeClass("glyphicon-chevron-down").addClass("glyphicon-chevron-up").parent().parent().parent().addClass("edi-body-height");
+      $("#toast").show();
+      // $(this).data("open", true).children("span").text("收起阅读全部").parent().children("i").removeClass("glyphicon-chevron-down").addClass("glyphicon-chevron-up").parent().parent().parent().addClass("edi-body-height");
     } else {
       $(this).data("open", false).children("span").text("展开阅读全部").parent().children("i").removeClass("glyphicon-chevron-up").addClass("glyphicon-chevron-down").parent().parent().parent().removeClass("edi-body-height");
     }
   })
 
-  // 不能实现的事件
-  function warm () {
-    alert("请在大联考App内登录后操作")
-  }
-  // $(".edi-open>span[data-click='open']").click(warm)
-  $(".edi-user").click(warm)
-  $(".choose").click(warm)
+  // // 不能实现的事件
+  // 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");
-  })
+  // $(".pull-right>span").click(function () {
+  //   $(this).addClass('active').siblings("span").removeClass("active");
+  // })
+
 })

js/exam_list.js

@@ -5,16 +5,19 @@ $(function () {
   }
   let params = lxd.parseUrl(window.location.href).query,
     my_nav = $(".my-nav"), my_nav_lis = my_nav.find("li"), id = params["id"] || 0;
-  my_nav_lis.removeClass("active");
-  $(my_nav_lis[id]).addClass("active");
-  let grade = $(my_nav_lis[id]).data("id"), lock = false, currentPage = 3, totalPage = 3, type = $(my_nav_lis[id]);
+  if (id < my_nav_lis.length) {
+    my_nav_lis.removeClass("active");
+    $(my_nav_lis[id]).addClass("active");
+  }
+  let grade = $(my_nav_lis[id]).data("id"), lock = false, currentPage = 3, totalPage = 3, type = $(my_nav_lis[id]), zlock = "数据加载中...";
   my_nav.click(function (e) {
     if (e.target.className == "my-nav") return false;
     let active = Array.prototype.slice.call($(this).find("li")).indexOf(e.target);
     if (active == globaldata.active) return false;
-    $(".my-loading").html("数据加载中...").hide();
     globaldata.active = active;
     type = $(e.target);
+    z_lock = type.data("zlock") || zlock;
+    $(".my-loading").html(z_lock).hide();
     currentPage = type.data("currentPage") || 3;
     totalPage = type.data("totalPage") || 3;
     grade = type.data("id");
@@ -43,6 +46,7 @@ $(function () {
       data({ currentPage, area, grade }).then(res => { totalPage = res.totalPage; currentPage++; type.data("totalPage", res.totalPage); type.data("currentPage", currentPage); lock = res.lock; $(".my-loading").hide(); })
     }
     if (c == 0 && currentPage > totalPage) {
+      type.data("zlock", "已经没有可以加载的数据了")
       type.data("lock", true)
       $(".my-loading").html("已经没有可以加载的数据了").show();
     }