Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/workspace.xml
#	h_exam/exam_detail.html

css/exam_detail.less

@@ -0,0 +1,67 @@
+.new3 .body {
+  padding: 0 5px;
+  margin-top: 90px;
+}
+.new3 .body h4 {
+  font-weight: 500;
+}
+.new3 .body .title {
+  color: #777;
+  margin: 5px 0;
+}
+.new3 .body .list .list-flex {
+  margin: 10px  0;
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+.new3 .body .list .list-flex .list-item {
+  border-radius: 5px;
+  flex: 1;
+  padding: 10px;
+  margin-right: 20px;
+  box-shadow: 0 0 5px #d6d6d6;
+}
+.new3 .body .list .list-flex .list-item:hover {
+  cursor: pointer;
+}
+@media screen and (max-width: 768px) {
+  .new3 .body .list .list-flex .list-item {
+    margin-right: 5px;
+  }
+}
+.new3 .body .list .list-flex .list-item h4 {
+  font-weight: 600;
+}
+.new3 .body .list .list-flex .list-item .p {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.new3 .body .list .list-flex .list-item .p .blue {
+  color: #2382ff;
+}
+.new3 .body .list .list-flex .list-item .p a:hover {
+  color: #777;
+}
+.new3 .body .list .list-flex > .list-item:last-child {
+  margin: 0 0 0 20px;
+}
+@media screen and (max-width: 768px) {
+  .new3 .body .list .list-flex > .list-item:last-child {
+    margin: 0 0 0 5px;
+  }
+}
+.alert-msg {
+  margin: 10px 0;
+  padding: 10px;
+  background-color: #eee;
+  border-radius: 5px;
+  vertical-align: middle;
+  text-align: center;
+}
+#toast .toast-content{
+ img{
+   padding: 1px;
+ }
+}

h_exam/exam_detail.html

@@ -57,8 +57,8 @@
       <div class="col">
         <div class="body">
           <h4>2021昭通高二期中考试</h4>
-          <div class="click-dom title">2021-07*13 11:19 gaokao <img
-              src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAAvElEQVQ4T62S0REBQRBE32UgA0K4DJxIkIEMkIEQiAQZCIEMZEA9tVO13NVZdfpzd3p6umcqBqBK3Akw/6HPAbgG+QTsfShooNACaHJyU0CMEsX+Sx4BjnVJEk6jiqiTrXt6aylvgDWgHYlHYJaKH8AWsKZz7EHKpZm9KbsivZbCTOpY1Q6YAoYh7Ky/gD79F1o7A6sgR5p+CI/AgJbZ8UTqCry2kZM/R/bixsAtNWtZ6iPHBDbpxDdyb4BPRs4uEGqrWgcAAAAASUVORK5CYII="/>评论
+          <div class="title click-dom">2021-07*13 11:19 gaokao <img
+              src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA8AAAAPCAYAAAA71pVKAAAAvElEQVQ4T62S0REBQRBE32UgA0K4DJxIkIEMkIEQiAQZCIEMZEA9tVO13NVZdfpzd3p6umcqBqBK3Akw/6HPAbgG+QTsfShooNACaHJyU0CMEsX+Sx4BjnVJEk6jiqiTrXt6aylvgDWgHYlHYJaKH8AWsKZz7EHKpZm9KbsivZbCTOpY1Q6YAoYh7Ky/gD79F1o7A6sgR5p+CI/AgJbZ8UTqCry2kZM/R/bixsAtNWtZ6iPHBDbpxDdyb4BPRs4uEGqrWgcAAAAASUVORK5CYII=" />评论
           </div>
           <p class="alert-msg"><i class="glyphicon glyphicon-volume-up"></i>
             欢迎投稿试题、答案，采纳得下载币，可以下载其他收费试题！投稿试题速度快，我们更新答案速度更快！</p>
@@ -207,7 +207,7 @@
   <div id="toast">
     <div data-width="300" data-height="320" class="toast-content">
       <p>请<a style="color: #2382ff;" href="http://down.gaokaoapp.net">下载大联考APP</a>，或微信扫一扫二维码，打开“大联考APP”小程序，进行投稿。</p>
-      <img src="../imgs/app.jpg" alt="">
+      <img src="../imgs/wx_code.jpg" alt="" />
     </div>
   </div>
   <!-- 下载app -->

js/exam_detail.js

@@ -0,0 +1,18 @@
+$(function () {
+  let list_flex = $(".list .list-flex");
+  Array.from(list_flex).forEach(item => {
+    let list_item = $(item).find(".list-item");
+    list_item.click(function () {
+      if (!$(this).data("href")) {
+        $(this).find(".p>div").click(function () {
+          $("#toast").addClass("show")
+        })
+        return false;
+      };
+      window.location.href = $(this).data("href");
+    })
+    if (list_item.length == 1) {
+      $(item).append(`<div style="visibility:hidden" class="list-item"></div>`);
+    }
+  })
+})