Sfoglia il codice sorgente

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

xiaoming_global 5 anni fa
parent
commit
63b5da0723

+ 1 - 1
src/pages/advice/AdvicePage.vue Vedi File

152
   border-radius: 30px;
152
   border-radius: 30px;
153
   .searchBtn {
153
   .searchBtn {
154
     width: 14%;
154
     width: 14%;
155
-    float: left;
155
+    float: right;
156
     height: 1rem;
156
     height: 1rem;
157
     line-height: 1rem;
157
     line-height: 1rem;
158
     text-align: center;
158
     text-align: center;

+ 5 - 2
src/pages/main/DialysisArea.vue Vedi File

457
   border-bottom: 1px #e5e5e5 solid;
457
   border-bottom: 1px #e5e5e5 solid;
458
   position: fixed;
458
   position: fixed;
459
   top: 98px;
459
   top: 98px;
460
-  @media only screen and (min-width: 813px) and (max-width: 1024px) {
461
-    top: 130px;
460
+  @media only screen and (min-width: 768px){
461
+    top:163px;
462
   }
462
   }
463
+  // @media only screen and (min-width: 813px) and (max-width: 1024px) {
464
+  //   top: 130px;
465
+  // }
463
   right: 0;
466
   right: 0;
464
   z-index: 66;
467
   z-index: 66;
465
   left: 0;
468
   left: 0;

+ 2 - 1
src/pages/main/RecordPage.vue Vedi File

300
   width: 100%;
300
   width: 100%;
301
   background: #fff;
301
   background: #fff;
302
   border-radius: 30px;
302
   border-radius: 30px;
303
+  overflow: hidden;
303
   .searchBtn {
304
   .searchBtn {
304
     width: 14%;
305
     width: 14%;
305
-    float: left;
306
+    float: right;
306
     height: 1rem;
307
     height: 1rem;
307
     line-height: 1rem;
308
     line-height: 1rem;
308
     text-align: center;
309
     text-align: center;

+ 4 - 4
src/pages/main/dialysis/CheckTab.vue Vedi File

186
   }
186
   }
187
 }
187
 }
188
 .van-tabs {
188
 .van-tabs {
189
-  height: 1.1rem;
189
+  height: 1rem;
190
 }
190
 }
191
 .van-tabs--line .van-tabs__wrap {
191
 .van-tabs--line .van-tabs__wrap {
192
-  height: 1.1rem;
192
+  height: 1rem;
193
 }
193
 }
194
 .van-tabs--line {
194
 .van-tabs--line {
195
-  padding-top: 1.1rem;
195
+  padding-top: 1rem;
196
 }
196
 }
197
 .van-tab {
197
 .van-tab {
198
-  line-height: 1.1rem;
198
+  line-height: 1rem;
199
 }
199
 }
200
 </style>
200
 </style>

+ 2 - 2
src/pages/main/today/detailsInfo.vue Vedi File

213
           font-size: 0.34rem;
213
           font-size: 0.34rem;
214
           font-weight: normal;
214
           font-weight: normal;
215
           @media only screen and (max-width: 415px) {
215
           @media only screen and (max-width: 415px) {
216
-            width: 1rem;
217
-            margin-left: 2px;
216
+            width: 0.8rem;
217
+            margin-left: 4px;
218
           }
218
           }
219
           @media only screen and (min-width: 768px) {
219
           @media only screen and (min-width: 768px) {
220
             width: 1rem;
220
             width: 1rem;

+ 3 - 2
src/pages/monitoring/index.vue Vedi File

607
   width: 100%;
607
   width: 100%;
608
   background: #fff;
608
   background: #fff;
609
   border-radius: 30px;
609
   border-radius: 30px;
610
+  overflow: hidden;
610
   .searchBtn {
611
   .searchBtn {
611
     width: 14%;
612
     width: 14%;
612
-    float: left;
613
+    float: right;
613
     height: 1rem;
614
     height: 1rem;
614
     line-height: 1rem;
615
     line-height: 1rem;
615
     text-align: center;
616
     text-align: center;
636
 }
637
 }
637
 .monitoringTable {
638
 .monitoringTable {
638
   .newTable {
639
   .newTable {
639
-    margin-top: 90px;
640
+    margin-top: 80px;
640
     @media only screen and (min-width: 768px) {
641
     @media only screen and (min-width: 768px) {
641
       margin-top: 140px !important;
642
       margin-top: 140px !important;
642
     }
643
     }

+ 3 - 3
src/styles/style.scss Vedi File

800
   }
800
   }
801
 }
801
 }
802
 .picker-toolbar {
802
 .picker-toolbar {
803
-  @media only screen and (max-width: 812px) {
803
+  @media only screen and (max-width: 768px) {
804
     height: 40px !important;
804
     height: 40px !important;
805
   }
805
   }
806
 }
806
 }
807
 .mint-datetime-action {
807
 .mint-datetime-action {
808
-  @media only screen and (max-width: 812px) {
809
-    line-height: 30px !important;
808
+  @media only screen and (max-width: 768px) {
809
+    line-height: 40px !important;
810
   }
810
   }
811
 }
811
 }
812
 
812