Merge branch 'wzf' of http://git.shengws.com/zhangbj/xt_pad into wzf

src/pages/advice/AdvicePage.vue

@@ -145,6 +145,9 @@ export default {
     min-width: 60px !important;
   }
 }
+</style>
+
+<style lang="scss">
 .newSearch {
   height: 1rem;
   width: 100%;
@@ -159,25 +162,22 @@ export default {
     font-size: 0.45rem;
     color: #258ffc;
   }
-}
-</style>
-
-<style lang="scss">
-.el-input {
-  height: 100%;
-  width: 85%;
-  float: left;
-}
-.el-input__inner {
-  height: 100%;
-  line-height: 1rem;
-  width: 100%;
-  border-radius: 30px;
-  border: none;
-  font-size: 0.45rem;
-}
-.el-input__icon {
-  line-height: 1rem;
-  font-size: 0.45rem;
+  .el-input {
+    height: 100%;
+    width: 85% !important;
+    float: left;
+  }
+  .el-input__inner {
+    height: 100%;
+    line-height: 1rem;
+    width: 100%;
+    border-radius: 30px;
+    border: none;
+    font-size: 0.45rem;
+  }
+  .el-input__icon {
+    line-height: 1rem;
+    font-size: 0.45rem;
+  }
 }
 </style>

src/pages/main/DialysisArea.vue

@@ -457,8 +457,8 @@ export default {
   border-bottom: 1px #e5e5e5 solid;
   position: fixed;
   top: 98px;
-  @media only screen and (min-width: 768px){
-    top:163px;
+  @media only screen and (min-width: 768px) {
+    top: 163px;
   }
   // @media only screen and (min-width: 813px) and (max-width: 1024px) {
   //   top: 130px;
@@ -525,7 +525,7 @@ export default {
 .mint-datetime-action {
   line-height: 60px;
   font-size: 0.45rem;
-  @media only screen and (max-width: 812px) {
+  @media only screen and (max-width: 768px) {
     line-height: 40px !important;
   }
 }

src/pages/main/RecordPage.vue

@@ -341,7 +341,7 @@ export default {
 <style lang="scss">
 .newInput {
   height: 100%;
-  width: 85%;
+  width: 85% !important;
   float: left;
   .el-input__inner {
     height: 100%;

src/pages/main/dialysis/CheckTab.vue

@@ -185,16 +185,18 @@ export default {
     transform: translateX(75.25px) !important;
   }
 }
-.van-tabs {
-  height: 1rem;
-}
-.van-tabs--line .van-tabs__wrap {
-  height: 1rem;
-}
-.van-tabs--line {
-  padding-top: 1rem;
-}
-.van-tab {
-  line-height: 1rem;
+.nav {
+  .van-tabs {
+    height: 1rem !important;
+  }
+  .van-tabs--line .van-tabs__wrap {
+    height: 1rem !important;
+  }
+  .van-tabs--line {
+    padding-top: 1rem !important;
+  }
+  .van-tab {
+    line-height: 1rem !important;
+  }
 }
 </style>

src/pages/monitoring/index.vue

@@ -617,24 +617,25 @@ export default {
     font-size: 0.45rem;
     color: #258ffc;
   }
+  .el-input {
+    height: 100%;
+    width: 85% !important;
+    float: left;
+  }
+  .el-input__inner {
+    height: 100%;
+    line-height: 1rem;
+    width: 100%;
+    border-radius: 30px;
+    border: none;
+    font-size: 0.45rem;
+  }
+  .el-input__icon {
+    line-height: 1rem;
+    font-size: 0.45rem;
+  }
 }
-.el-input {
-  height: 100%;
-  width: 85%;
-  float: left;
-}
-.el-input__inner {
-  height: 100%;
-  line-height: 1rem;
-  width: 100%;
-  border-radius: 30px;
-  border: none;
-  font-size: 0.45rem;
-}
-.el-input__icon {
-  line-height: 1rem;
-  font-size: 0.45rem;
-}
+
 .monitoringTable {
   .newTable {
     margin-top: 80px;