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

src/pages/main/DetailsPage.vue

@@ -174,11 +174,11 @@ export default {
     @include justify-content-between;
     padding: 0.3rem 0.36rem;
     // border-bottom: 1px #e5e5e5 solid;
-    position: sticky;
+    position: fixed;
     top: 0;
     left: 0;
     right: 0;
-    z-index: 100 !important;
+    z-index: 100;
     background: #258ffc;
     @media only screen and (max-width: 320px) {
       display: -webkit-box;
@@ -191,6 +191,9 @@ export default {
       @media only screen and (min-width: 376px) and (max-width: 415px) {
         margin-right: 3.6rem;
       }
+      @media only screen and (min-width: 415px) and (max-width: 737px) {
+        margin-right: 6rem;
+      }
       @media only screen and (min-width: 768px) {
         margin-right: 4rem;
       }
@@ -222,11 +225,11 @@ export default {
     }
   }
   .Tab {
-    // padding-top: 63px;
-    // // padding-bottom: 0.25rem;
-    // @media only screen and (max-width: 812px) {
-    //   padding-top: 42px !important;
-    // }
+    padding-top: 63px;
+    // padding-bottom: 0.25rem;
+    @media only screen and (max-width: 812px) {
+      padding-top: 42px !important;
+    }
   }
 }
 .add {

src/pages/main/DialysisArea.vue

@@ -61,9 +61,8 @@
             <span class="iconfont">&#xe74a;</span>
           </li>
 
-          <li @click="mypatient()">
+          <li @click="mypatient()" :class="newMypatient == 1 ? 'active' : ''">
             我的病人
-            <span class="iconfont">&#xe74a;</span>
           </li>
         </ul>
       </div>
@@ -123,6 +122,7 @@ import { Datetime } from "vux";
 import { parseTime } from "@/utils/index";
 import { getDialysisScheduals } from "@/api/dialysis";
 import { Toast } from "vant";
+import $ from "jquery";
 
 export default {
   name: "DialysisArea",
@@ -373,6 +373,7 @@ export default {
         schedule_date: this.selected_date,
         ismypatient: this.ismypatient
       });
+      this.newMypatient = 1;
     },
     reloads: function() {
       this.reload();
@@ -402,6 +403,7 @@ export default {
         schedule_date: this.selected_date,
         ismypatient: this.ismypatient
       });
+      this.newMypatient = 0;
     },
     handleScheduleDateChange: function(date) {
       if (!this.ismypatient) {
@@ -505,6 +507,7 @@ export default {
     },
     openPicker() {
       this.$refs.picker.open();
+      this.newMypatient = 0;
     }
     // getMyPatient () {
     //   console.log('这是啥', this.zone_options_visible)
@@ -552,6 +555,19 @@ export default {
         // }
       }
     }
+    .active {
+      position: relative;
+      &::before {
+        position: absolute;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        height: 2px;
+        background: $main-color;
+        // border-bottom: 0.04rem $main-color solid;
+        content: "";
+      }
+    }
   }
 }
 .stateBox {

src/pages/main/dialog/new_order/select_advice_template_dialog.vue

@@ -261,6 +261,9 @@ export default {
   @media only screen and (max-width: 811px) {
     max-height: 11.8rem !important;
   }
+  @media only screen and (min-width: 415px) and (max-width: 737px) {
+    max-height: 14.8rem !important;
+  }
   ul {
     li {
       height: 1rem;

src/pages/main/dialog/subMenu/checkBoxSubMenu.vue

@@ -139,6 +139,9 @@ export default {
   @media only screen and (max-width: 768px) {
     max-height: 11.8rem !important;
   }
+  @media only screen and (min-width: 415px) and (max-width: 737px) {
+    max-height: 12.8rem !important;
+  }
   @media only screen and (min-width: 666px) and (max-width: 737px) {
     max-height: 8rem;
     min-height: 7rem !important;
@@ -155,6 +158,9 @@ export default {
     @media only screen and (max-width: 768px) {
       max-height: 11.8rem !important;
     }
+    @media only screen and (min-width: 415px) and (max-width: 737px) {
+      max-height: 12.8rem !important;
+    }
     li {
       height: 1.2rem;
       line-height: 1.2rem;
@@ -191,7 +197,7 @@ export default {
     min-height: 8rem !important;
   }
   @media only screen and (max-width: 767px) {
-    max-height: 16rem !important;
+    max-height: 15rem !important;
     min-height: 8rem !important;
   }
   @media only screen and (min-width: 768px) {

src/pages/main/today/detailsInfo.vue

@@ -220,6 +220,10 @@ export default {
             width: 0.8rem;
             margin-left: 4px;
           }
+          @media only screen and (min-width: 415px) and (max-width: 737px) {
+            width: 0.8rem;
+            margin-left: 0.4rem;
+          }
           @media only screen and (min-width: 768px) {
             width: 1rem;
             margin-left: 10px;

src/styles/style.scss

@@ -98,6 +98,9 @@ body {
         @media only screen and (min-width: 376px) and (max-width: 413px) {
           width: 4.2rem;
         }
+        @media only screen and (min-width: 415px) and (max-width: 737px) {
+          width: 7.6rem;
+        }
         @media only screen and (min-width: 768px) {
           width: 6.6rem;
         }
@@ -409,9 +412,9 @@ body {
   .Dialog {
     font-size: 0.36rem;
     width: 11.8rem;
-    // @media only screen and (min-width: 376px) and (max-width: 737px) {
-    //   width: 16.8rem !important;
-    // }
+    @media only screen and (min-width: 415px) and (max-width: 737px) {
+      width: 12.8rem !important;
+    }
     @media only screen and (min-width: 376px) and (max-width: 415px) {
       width: 10.8rem !important;
     }
@@ -481,6 +484,9 @@ body {
       @media only screen and (max-width: 415px) {
         height: 14.8rem !important;
       }
+      @media only screen and (min-width: 415px) and (max-width: 737px) {
+        height: 13.8rem !important;
+      }
       // @media only screen and (min-width: 666px) and (max-width: 737px) {
       //   height: 8.8rem !important;
       // }
@@ -490,6 +496,9 @@ body {
       @media only screen and (min-width: 768px) {
         height: 11.8rem !important;
       }
+      @media only screen and (min-width: 768px) {
+        height: 11.8rem !important;
+      }
       .item {
         padding: 0 0.32rem;
         border-bottom: 1px #e5e5e5 solid;