Merge remote-tracking branch 'origin/master'

css/exam_detail_img.less

@@ -0,0 +1,356 @@
+.header {
+  max-width: 768px;
+  margin-left: calc(50vw - 389px);
+}
+@media screen and (max-width: 768px) {
+  .header {
+    margin: auto;
+  }
+}
+.header .container {
+  max-width: 768px ;
+}
+.body {
+  margin: auto;
+  margin-top: 90px;
+  max-width: 768px;
+  box-sizing: border-box;
+}
+@media screen and (max-width: 768px) {
+  .body {
+    padding: 5px;
+  }
+}
+.body h4 {
+  font-weight: 600;
+}
+.body .edi-a {
+  display: block;
+  background-color: #f5f5f5;
+  padding: 10px;
+  margin: 5px 0px;
+  border-radius: 5px;
+  color: #777;
+  position: relative;
+}
+.body .edi-a span {
+  display: block !important;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  width: calc(100% - 16px);
+}
+.body .edi-a i {
+  color: #ccc;
+  position: absolute;
+  right: 10px;
+  top: 12px;
+}
+.body .edi-p1 {
+  font-size: 12px;
+  color: #777;
+  line-height: 50px;
+  margin: 0;
+}
+.body .edi-p2 {
+  color: #999;
+  padding-bottom: 25px;
+  border-bottom: 8px solid #f5f5f5;
+}
+.body .edi-p2 > span:first-child {
+  display: inline-block;
+  padding: 5px 5px 0px 5px;
+  border-radius: 15px 15px 5px 5px;
+  background-color: #f5f5f5;
+}
+.body .edi-p2 .edi-p-span {
+  padding: 5px 0px 0px;
+}
+.body .edi-p2 .edi-p-span span {
+  margin-right: 20px;
+  font-size: 12px;
+}
+.body .edi-p2 .edi-p-span img {
+  width: 20px;
+  height: 20px;
+}
+.body .edi-body {
+  position: relative;
+  padding-bottom: 50px;
+  overflow: hidden;
+}
+.body .edi-body .fixed {
+  position: fixed;
+  top: 0;
+  width: 100%;
+  background-color: #fff;
+  border-bottom: 0;
+  padding-bottom: 10px;
+}
+@media screen and (max-width: 768px) {
+  .body .edi-body .fixed {
+    top: 80px;
+  }
+}
+.body .edi-body .edi-user {
+  margin-top: 10px;
+  padding: 10px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+@media screen and (max-width: 768px) {
+  .body .edi-body .edi-user {
+    padding: 10px 0px;
+  }
+}
+.body .edi-body .edi-user .left {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+}
+.body .edi-body .edi-user .left img {
+  width: 50px;
+  height: 50px;
+  margin: 0 10px;
+}
+@media screen and (max-width: 768px) {
+  .body .edi-body .edi-user .left img {
+    width: 30px;
+    height: 30px;
+    margin-left: 0px;
+    margin-right: 5px;
+  }
+}
+.body .edi-body .edi-user .left div p {
+  text-align: start;
+  margin: 5px 0;
+}
+@media screen and (max-width: 768px) {
+  .body .edi-body .edi-user .left div p {
+    margin: 0;
+  }
+}
+.body .edi-body .edi-user .left div > p:last-child {
+  font-size: 12px;
+  color: #999;
+}
+.body .edi-body .edi-user .right i {
+  background-color: #03C762;
+  font-size: 25px;
+  width: 45px;
+  height: 45px;
+  border-radius: 50%;
+  color: #fff;
+  text-align: center;
+  line-height: 45px;
+  margin-left: 10px;
+}
+@media screen and (max-width: 768px) {
+  .body .edi-body .edi-user .right i {
+    font-size: 5px;
+    margin-left: 0;
+  }
+}
+.body .edi-body p {
+  width: 100%;
+  text-align: center;
+}
+.body .edi-body p img {
+  width: 100%;
+}
+.body .edi-body .edi-line {
+  color: #f03;
+  display: flex;
+  font-size: 16px;
+  justify-content: center;
+  align-items: center;
+  white-space: nowrap;
+}
+.body .edi-body .edi-line::after {
+  content: '';
+  display: inline-block;
+  border-bottom: 1px solid #e6e6e6;
+  width: 100%;
+  margin-left: 10px;
+}
+.body .edi-body .edi-line::before {
+  content: '';
+  display: inline-block;
+  border-bottom: 1px solid #e6e6e6;
+  width: 100%;
+  margin-right: 10px;
+}
+.body .edi-body .edi-open {
+  width: 100%;
+  text-align: center;
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0, #fff 100%);
+  position: absolute;
+  bottom: 0px;
+  padding-top: 50px;
+}
+.body .edi-body .edi-open span {
+  display: inline-block;
+  border-radius: 30px;
+  background-color: #eef5ff;
+  padding: 6px 20px;
+  color: #03C762;
+}
+.body .edi-body .edi-open span i {
+  margin-left: 5px;
+}
+.body .edi-body-height {
+  height: auto;
+}
+.body .edi-footer {
+  margin-top: 50px;
+  text-align: center;
+  color: #777;
+}
+.body .edi-footer .choose {
+  width: 300px;
+  margin: auto;
+  display: flex;
+  justify-content: space-around;
+  align-items: center;
+}
+.body .edi-footer .choose .img {
+  width: 66px;
+  color: #000;
+}
+.body .edi-footer .choose .img img {
+  width: 100%;
+}
+.body .edi-footer .choose .img span {
+  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;
+  margin: 5px 0px;
+}
+.body .interactive .pull-right .active {
+  color: #000;
+}
+.body .interactive .pull-right span {
+  color: #777;
+}
+.body .interactive .alert {
+  clear: both;
+}
+.body .prog {
+  background-color: #eef5ff;
+  border-radius: 5px;
+  padding: 20px;
+  position: relative;
+}
+@media screen and (max-width: 768px) {
+  .body .prog {
+    padding: 20px 5px;
+  }
+}
+.body .prog .title {
+  color: #03C762;
+  position: absolute;
+  top: 10px;
+}
+.body .prog .flex {
+  height: 50px;
+  box-sizing: border-box;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.body .prog .flex .pro {
+  width: 100%;
+  max-width: 50%;
+  min-width: 200px;
+  box-sizing: border-box;
+  height: 5px;
+  border-radius: 5px;
+  background-color: #fff;
+  margin-right: 20px;
+  position: relative;
+}
+.body .prog .flex .pro .pro-title {
+  position: absolute;
+  right: 0px;
+  top: -20px;
+  color: #999;
+}
+.body .prog .flex .pro .pro-content {
+  width: 0%;
+  height: 100%;
+  background-color: #03C762;
+}
+.body .prog .flex .pro .icon {
+  position: absolute;
+  width: 30px;
+  height: 30px;
+  box-sizing: border-box;
+  background-color: #fff;
+  text-align: center;
+  line-height: 27px;
+  border-radius: 50%;
+  top: -12px;
+  border: 2px solid #7aaef3;
+}
+.body .prog .flex .pro .pro-show {
+  width: 100px;
+  position: absolute;
+  top: 20px;
+  color: #03C762;
+}
+.body .prog .flex .button {
+  width: 80px;
+  line-height: 40px;
+  text-align: center;
+  color: #fff;
+  background-color: #7aaef3;
+  border-radius: 10px;
+  box-sizing: border-box;
+}
+
+/* 二维码下载 */
+.body{
+  .exam-code{
+    &::before{
+      content: "更多参考答案，请下载大联考app；或者微信扫描，打开“大联考APP”小程序进行查看。";
+      text-align: center;
+      display: block;
+      color: #777;
+      padding-bottom: 10px;
+    }
+    margin: 20px 0;
+    ul{
+      margin: 0;padding:0;
+      display: flex;justify-content: space-around;align-items: center;
+      list-style: none;
+      li{
+        ul{
+          display: block;
+          max-width: 200px;
+          max-height: 200px;
+          min-width: 100px;
+          min-height: 100px;
+          box-sizing: border-box;
+          padding: 20px;
+          li{
+            text-align: center;
+            img{
+             width: 100%;
+            }
+
+          }
+        }
+      }
+    }
+  }
+}

css/search.less

@@ -0,0 +1,105 @@
+.body {
+  margin-top: 90px;
+  .search{
+    display: flex;
+    flex-wrap: nowrap;
+    align-items: center;
+    .my-search{
+     div  {
+       max-width: 600px;
+       width: 500px;
+      @media screen and (max-width:768px) {
+        &{
+          max-width:300px;
+          width: 100%;
+        }
+      }
+     }
+    }
+    .button{
+      margin-left: 5px;
+      width: 60px;
+      background-color: #03c762;
+      text-align: center;
+      letter-spacing: 5px;
+      line-height: 34px;
+      color: #fff;
+      border-radius: 5px;
+    }
+  }
+  .content {
+    p {
+      color: #777;
+    }
+
+    ul {
+      list-style: none;
+      padding: 0;
+
+      li {
+        padding: 10px 0;
+
+        a {
+          &:hover {
+            color: #777;
+          }
+
+          h5 {
+            font-size: 18px;
+            line-height: 22px;
+            color: #2440b3;
+            font-weight: 500;
+            display: -webkit-box;
+            -webkit-box-orient: vertical;
+            -webkit-line-clamp: 2;
+            overflow: hidden;
+            margin: 5px 0;
+            @media screen and (max-width:768px) {
+              font-size: 15px;
+            }
+          }
+
+          .flex {
+            display: flex;
+            justify-content: flex-start;
+            align-items: flex-start;
+          }
+
+          img {
+            max-width: 140px;
+            border-radius: 5px;
+          }
+
+          img.flex-item {
+            margin-right: 10px;
+          }
+
+          .flex-item {
+            .label{
+              padding: 3px 5px;
+              color: #999;
+              font-weight: normal;
+              background-color: #f5f5f5;
+            }
+            &>p:nth-child(2) {
+              color: #777;
+            }
+
+            ;
+
+            p {
+              color: black;
+              margin-bottom: 5px;
+            }
+          }
+        }
+      }
+    }
+  }
+  .pagination{
+    .active>a{
+      background-color: #03c762;
+      border: 1px solid #03c762;
+    }
+  }
+}

h_exam/exam_detail.html

@@ -72,13 +72,6 @@
                   <div class="blue">查看答案</div>
                 </div>
               </div>
-              <div data-href="" class="list-item">
-                <h4>微课数学</h4>
-                <div class="p">
-                  <div>投稿试题</div>
-                  <div>投稿答案</div>
-                </div>
-              </div>
             </div>
             <div class="list-flex">
               <div data-href="http://www.gaokaoapp.net" class="list-item">
@@ -88,13 +81,6 @@
                   <div class="blue">查看答案</div>
                 </div>
               </div>
-              <div data-href="http://www.gaokaoapp.net" class="list-item">
-                <h4>英语</h4>
-                <div class="p">
-                  <div>投稿试题</div>
-                  <div>投稿答案</div>
-                </div>
-              </div>
             </div>
             <div class="list-flex">
               <div data-href="http://www.gaokaoapp.net" class="list-item">
@@ -112,38 +98,6 @@
                 </div>
               </div>
             </div>
-            <div class="list-flex">
-              <div data-href="http://www.gaokaoapp.net" class="list-item">
-                <h4>地理</h4>
-                <div class="p">
-                  <div>投稿试题</div>
-                  <div>投稿答案</div>
-                </div>
-              </div>
-              <div data-href="http://www.gaokaoapp.net" class="list-item">
-                <h4>物理</h4>
-                <div class="p">
-                  <div>投稿试题</div>
-                  <div>投稿答案</div>
-                </div>
-              </div>
-            </div>
-            <div class="list-flex">
-              <div data-href="http://www.gaokaoapp.net" class="list-item">
-                <h4>化学</h4>
-                <div class="p">
-                  <div>投稿试题</div>
-                  <div>投稿答案</div>
-                </div>
-              </div>
-              <!-- <div data-href="http://www.gaokaoapp.net" class="list-item">
-                <h4>生物</h4>
-                <div class="p">
-                  <div >投稿试题</div>
-                  <div >投稿答案</div>
-                </div>
-              </div> -->
-            </div>
           </div>
           <p class="foot">诚实做人、诚信考试！请勿购买考试答案，避免上当受骗！</p>
           <!-- 点赞 阅读数 -->

js/exam_detail.js

@@ -10,9 +10,10 @@ $(function () {
     window.location.href = url;
   }
   Array.from(list_flex).forEach(item => {
-    let list_item = $(item).find(".list-item,.blue");
+    let list_item = $(item).find(".list-item,.p>div");
     list_item.click(href);
-    if (list_item.length == 1) {
+    let list = $(item).find(".list-item");
+    if (list.length == 1) {
       $(item).append(`<div style="visibility:hidden" class="list-item"></div>`);
     }
   })