Browse Source

Merge branch 'dev' of http://39.106.8.246:3003/yunxing/wanda-bm-guide-h5 into dev

zhangyu 4 years ago
parent
commit
cdadae69b7
1 changed files with 96 additions and 67 deletions
  1. 96 67
      src/views/equipmentFacilities/OtherMatters.vue

+ 96 - 67
src/views/equipmentFacilities/OtherMatters.vue

@@ -572,7 +572,7 @@ export default {
   .m-popup-container {
     width: 80%;
     height: 100%;
-    padding: 55px 20px 10px 20px;
+    padding: 10px 15px;
     .m-popup {
       width: 100%;
       height: calc(100% - 81px);
@@ -590,25 +590,46 @@ export default {
         height: auto;
         // 专业系统按钮
         .system-btn-container {
-          display: flex;
-          width: 100%;
-          flex-wrap: wrap;
-          flex-flow: wrap;
-          .system-btn {
-            width: 50% !important;
-            min-width: 50% !important;
-            max-width: 50% !important;
-            height: 40px;
-            box-sizing: border-box;
-            padding: 10px 10px 10px 0;
-            .m-btn {
-              width: 100%;
-              height: 32px !important;
-              text-align: center;
-              background: #eff0f1;
-              border-radius: 2px;
+            display: flex;
+            width: 100%;
+            flex-wrap: wrap;
+            flex-flow: wrap;
+            .system-btn {
+                width: calc(33.333% - 5.34px) !important;
+                min-width: calc(33.333% - 5.34px) !important;
+                max-width: calc(33.333% - 5.34px) !important;
+                height: 32px;
+                margin-bottom: 8px;
+                box-sizing: border-box;
+                .m-btn {
+                    width: 100%;
+                    height: 32px !important;
+                    text-align: center;
+                    background: #eff0f1;
+                    border-radius: 2px;
+                    padding: 0 !important;
+                }
+            }
+            .system-btn:not(:nth-child(3n)) {
+                margin-right: 8px;
+            }
+            .self-btn {
+                width: 100% !important;
+                min-width: 100% !important;
+                max-width: 100% !important;
+                height: 50px;
+                box-sizing: border-box;
+                padding: 0;
+                margin-right: 0;
+                .m-btn {
+                    width: 100%;
+                    height: 32px !important;
+                    text-align: center;
+                    background: #eff0f1;
+                    border-radius: 2px;
+                    padding: 0 !important;
+                }
             }
-          }
         }
         .active {
           background-color: #025baa !important;
@@ -625,42 +646,46 @@ export default {
           height: 25px;
         }
         .system-btn-container {
-          display: flex;
-          width: 100%;
-          flex-wrap: wrap;
-          flex-flow: wrap;
-          .system-btn {
-            width: 33% !important;
-            min-width: 33% !important;
-            max-width: 33% !important;
-            height: 50px;
-            box-sizing: border-box;
-            padding: 5px 10px 5px 0;
-            .m-btn {
-              width: 100%;
-              height: 32px !important;
-              text-align: center;
-              background: #eff0f1;
-              border-radius: 2px;
-              padding: 0 !important;
+            display: flex;
+            width: 100%;
+            flex-wrap: wrap;
+            flex-flow: wrap;
+            .system-btn {
+                width: calc(33.333% - 5.34px) !important;
+                min-width: calc(33.333% - 5.34px) !important;
+                max-width: calc(33.333% - 5.34px) !important;
+                height: 32px;
+                margin-bottom: 8px;
+                box-sizing: border-box;
+                .m-btn {
+                    width: 100%;
+                    height: 32px !important;
+                    text-align: center;
+                    background: #eff0f1;
+                    border-radius: 2px;
+                    padding: 0 !important;
+                }
             }
-          }
-          .self-btn {
-            width: 100% !important;
-            min-width: 100% !important;
-            max-width: 100% !important;
-            height: 50px;
-            box-sizing: border-box;
-            padding: 5px 10px 5px 0;
-            .m-btn {
-              width: 100%;
-              height: 32px !important;
-              text-align: center;
-              background: #eff0f1;
-              border-radius: 2px;
-              padding: 0 !important;
+            .system-btn:not(:nth-child(3n)) {
+                margin-right: 8px;
+            }
+            .self-btn {
+                width: 100% !important;
+                min-width: 100% !important;
+                max-width: 100% !important;
+                height: 50px;
+                box-sizing: border-box;
+                padding: 0;
+                margin-right: 0;
+                .m-btn {
+                    width: 100%;
+                    height: 32px !important;
+                    text-align: center;
+                    background: #eff0f1;
+                    border-radius: 2px;
+                    padding: 0 !important;
+                }
             }
-          }
         }
         .active {
           background-color: #025baa !important;
@@ -680,21 +705,25 @@ export default {
         border-bottom: 1px solid #e6e6e6;
         margin: 20px 0;
       }
-      .footer {
-        position: absolute;
-        bottom: 30px;
-        right: 0;
-        width: 100%;
-        height: 35px;
-        display: flex;
-        justify-content: space-around;
-        .van-button {
-          width: 40%;
-          height: 100%;
-          max-width: 40%;
-          min-width: 40%;
+        .footer {
+            position: absolute;
+            bottom: 30px;
+            right: 0;
+            width: 100%;
+            height: 35px;
+            display: flex;
+            justify-content: space-between;
+            padding: 0 15px;
+            .van-button {
+                width: calc(50% - 7px) !important;
+                min-width: calc(50% - 7px) !important;
+                max-width: calc(50% - 7px) !important;
+                height: 100%;
+            }
+            .van-button:first-child {
+                margin-right: 14px;
+            }
         }
-      }
     }
   }
 }