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

src/pages/advice/AdvicePage.vue

@@ -152,7 +152,7 @@ export default {
   border-radius: 30px;
   .searchBtn {
     width: 14%;
-    float: left;
+    float: right;
     height: 1rem;
     line-height: 1rem;
     text-align: center;

src/pages/main/DialysisArea.vue

@@ -457,9 +457,12 @@ export default {
   border-bottom: 1px #e5e5e5 solid;
   position: fixed;
   top: 98px;
-  @media only screen and (min-width: 813px) and (max-width: 1024px) {
-    top: 130px;
+  @media only screen and (min-width: 768px){
+    top:163px;
   }
+  // @media only screen and (min-width: 813px) and (max-width: 1024px) {
+  //   top: 130px;
+  // }
   right: 0;
   z-index: 66;
   left: 0;

src/pages/main/RecordPage.vue

@@ -300,9 +300,10 @@ export default {
   width: 100%;
   background: #fff;
   border-radius: 30px;
+  overflow: hidden;
   .searchBtn {
     width: 14%;
-    float: left;
+    float: right;
     height: 1rem;
     line-height: 1rem;
     text-align: center;

src/pages/main/dialysis/CheckTab.vue

@@ -186,15 +186,15 @@ export default {
   }
 }
 .van-tabs {
-  height: 1.1rem;
+  height: 1rem;
 }
 .van-tabs--line .van-tabs__wrap {
-  height: 1.1rem;
+  height: 1rem;
 }
 .van-tabs--line {
-  padding-top: 1.1rem;
+  padding-top: 1rem;
 }
 .van-tab {
-  line-height: 1.1rem;
+  line-height: 1rem;
 }
 </style>

src/pages/main/today/detailsInfo.vue

@@ -213,8 +213,8 @@ export default {
           font-size: 0.34rem;
           font-weight: normal;
           @media only screen and (max-width: 415px) {
-            width: 1rem;
-            margin-left: 2px;
+            width: 0.8rem;
+            margin-left: 4px;
           }
           @media only screen and (min-width: 768px) {
             width: 1rem;

src/pages/monitoring/index.vue

@@ -607,9 +607,10 @@ export default {
   width: 100%;
   background: #fff;
   border-radius: 30px;
+  overflow: hidden;
   .searchBtn {
     width: 14%;
-    float: left;
+    float: right;
     height: 1rem;
     line-height: 1rem;
     text-align: center;
@@ -636,7 +637,7 @@ export default {
 }
 .monitoringTable {
   .newTable {
-    margin-top: 90px;
+    margin-top: 80px;
     @media only screen and (min-width: 768px) {
       margin-top: 140px !important;
     }

src/styles/style.scss

@@ -800,13 +800,13 @@ body {
   }
 }
 .picker-toolbar {
-  @media only screen and (max-width: 812px) {
+  @media only screen and (max-width: 768px) {
     height: 40px !important;
   }
 }
 .mint-datetime-action {
-  @media only screen and (max-width: 812px) {
-    line-height: 30px !important;
+  @media only screen and (max-width: 768px) {
+    line-height: 40px !important;
   }
 }