Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/workspace.xml

js/components.js

@@ -522,4 +522,13 @@ $(function () {
     $("body").css({ "overflow-y": "scroll" })
     imglistdom.hide()
   });
+  // 拖动
+  $("#imglist>div>img")[0].addEventListener("mousewheel", function (e) {
+    e = e || window.event;
+    if (e.wheelDelta == 120) {
+      scale(-0.5)
+    } else {
+      scale(0.5)
+    }
+  })
 })

js/exam_list.js

@@ -4,10 +4,7 @@ $(function () {
     active: 0,
   }
   let params = lxd.parseUrl(window.location.href).query,
-    my_nav = $(".my-nav"), my_nav_lis = my_nav.find("li"), id = 0;
-  Array.from(my_nav_lis).forEach((item, index) => {
-    params["grade"] == $(item).data("id") ? id = index : '';
-  })
+    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]);