Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.idea/workspace.xml

css/components.css

@@ -738,6 +738,12 @@ body::-webkit-scrollbar-track {
   border-radius: 10px;
   background: #eee;
 }
+#imglist p {
+  position: fixed;
+  bottom: 5px;
+  width: 100%;
+  text-align: center;
+}
 #imglist span {
   display: block;
   position: fixed;
@@ -780,6 +786,16 @@ body::-webkit-scrollbar-track {
 #imglist div .left {
   left: 50px;
 }
+@media screen and (max-width: 768px) {
+  #imglist div .left {
+    left: 10px;
+  }
+}
 #imglist div .right {
   right: 50px;
 }
+@media screen and (max-width: 768px) {
+  #imglist div .right {
+    right: 10px;
+  }
+}

css/components.less

@@ -934,6 +934,12 @@ body {
   top: 0;
   z-index: 1000;
   background-color: #fff;
+  p{
+    position: fixed;
+    bottom: 5px;
+    width: 100%;
+    text-align: center;
+  }
   span{
     display: block;
     position: fixed;
@@ -977,10 +983,16 @@ body {
 
     .left {
       left: 50px;
+      @media screen and (max-width:768px) {
+        left: 10px;
+      }
     }
 
     .right {
       right:50px;
+      @media screen and (max-width:768px) {
+        right: 10px;
+      }
     }
   }
 }

css/exam_detail_img.css

@@ -147,9 +147,6 @@
     margin-left: 0;
   }
 }
-.body .edi-body #title {
-  font-weight: bold;
-}
 .body .edi-body p {
   width: 100%;
   text-align: center;
@@ -163,19 +160,20 @@
   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: 30%;
+  width: 100%;
   margin-left: 10px;
 }
 .body .edi-body .edi-line::before {
   content: '';
   display: inline-block;
   border-bottom: 1px solid #e6e6e6;
-  width: 30%;
+  width: 100%;
   margin-right: 10px;
 }
 .body .edi-body .edi-open {

css/exam_detail_img.less

@@ -165,11 +165,7 @@
         }
       }
     }
-
-    #title {
-      font-weight: bold;
-    }
-
+   
     p {
       width: 100%;
       text-align: center;
@@ -182,18 +178,19 @@
       display: flex;
       font-size: 16px;
       justify-content: center;align-items: center;
+      white-space: nowrap;
       &::after{
         content: '';
         display: inline-block;
         border-bottom: 1px solid #e6e6e6;
-        width: 30%;
+        width: 100%;
         margin-left: 10px;
       }
       &::before{
         content: '';
         display: inline-block;
         border-bottom: 1px solid #e6e6e6;
-        width: 30%;
+        width: 100%;
         margin-right: 10px;
       }
     }

h_exam/exam_detail_img.html

@@ -129,6 +129,7 @@
         <img src="../imgs/jian.png" alt="">
         <img src="../imgs/back.png" alt="">
       </span>
+      <p>0/0</p>
     </div>
   </div>
   <!-- 分享功能 -->
@@ -153,4 +154,4 @@
   </div>
 </body>
 
-</html>
+</html>

js/components.js

@@ -479,6 +479,7 @@ $(function () {
     $("#imglist>div>img").attr("src", src);
     let newimg = new Image();
     newimg.src = src;
+    $("#imglist p").html(`${i + 1}/${imglist.length}`);
     newimg.onload = function (e) {
       w = this.width;
       h = this.height;