Merge branch 'master' of http://git.shengws.com/csx/Pad_New

.postcssrc.js

@@ -14,7 +14,8 @@ module.exports = {
       selectorBlackList: [],
       replace: true,
       mediaQuery: false,
-      minPixelValue: 0
+      minPixelValue: 0,
+      exclude: /src/
     }
   }
 };

src/pages/advice/AdvicePage.vue

@@ -34,7 +34,7 @@
           </van-field>
         </div>
       </van-col>-->
-      <div class="newSearch">
+      <div class="newSearch1">
         <el-input
           prefix-icon="el-icon-search"
           v-model="search_input"
@@ -147,7 +147,7 @@ export default {
 </style>
 
 <style lang="scss">
-.newSearch {
+.newSearch1 {
   height: 1rem;
   width: 100%;
   background: #fff;

src/pages/advice/DialysisAdviceTable.vue

@@ -1,9 +1,11 @@
 <template>
   <div class="mainBox">
+    <van-sticky>
     <div class="floatLeft">
       <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
       <span class="titleName">透析医嘱</span>
     </div>
+    </van-sticky>
     <div class="choice">
       <ul>
         <el-popover placement="bottom" trigger="click" v-model="show_patient_type_selector">
@@ -547,7 +549,7 @@ export default {
 .choice {
   border-bottom: 1px #e5e5e5 solid;
   position: fixed;
-  top: 29px;
+  top: 28px;
   right: 0;
   z-index: 66;
   left: 0;
@@ -555,18 +557,18 @@ export default {
   // @media only screen and (max-width: 415px) {
   //   top: 38px !important;
   // }
-  // @media only screen and (min-width: 376px) and (max-width: 812px) {
-  //   top: 38px !important;
-  // }
-  // @media only screen and (min-width: 768px) {
-  //   top: 80px !important;
-  // }
+  @media only screen and (min-width: 416px) and (max-width: 767px) {
+    top: 38px !important;
+  }
+  @media only screen and (min-width: 768px) {
+    top: 48px !important;
+  }
   ul {
     @include display-flex;
     @include align-items-center;
     @include text-align;
     @include justify-content-between;
-    width: 90%;
+    width: 94%;
     margin: 0 auto;
     font-size: 0.32rem;
     // color: $pgh-color;

src/pages/console/managementConsole/staff_role/staffManagement/index.vue

@@ -17,6 +17,7 @@
             v-for="(item,index) in admin_user"
             :key="index"
             v-if="admin_user.length > 0"
+            @click="goEditStaff(item.user_id)"
           >
             <img v-if="item.avatar.length > 0" :src="item.avatar" alt />
             <img
@@ -26,7 +27,7 @@
             />
             <p>
               <span>{{item.user_name}}</span>
-              <i @click="goEditStaff(item.user_id)" class="iconfont icon-bianji bianji"></i>
+              <i class="iconfont icon-bianji bianji"></i>
             </p>
           </div>
         </div>
@@ -42,6 +43,7 @@
             v-for="(item,index) in del_admin_user"
             :key="index"
             v-if="del_admin_user.length > 0"
+            @click="goEditStaff(item.user_id)"
           >
             <img v-if="item.avatar.length > 0" :src="item.avatar" alt />
             <img
@@ -51,7 +53,7 @@
             />
             <p>
               <span>{{item.user_name}}</span>
-              <i @click="goEditStaff(item.user_id)" class="iconfont icon-bianji bianji"></i>
+              <i class="iconfont icon-bianji bianji"></i>
             </p>
           </div>
         </div>

src/pages/home/forgetPassword/index.vue

@@ -285,7 +285,7 @@ export default {
         float: left;
         color: #acacac;
         font-size: 1.5rem;
-        margin-left: 0.375rem;
+        // margin-left: 0.375rem;
         line-height: 3.375rem;
         width: 1.5rem;
       }
@@ -298,7 +298,7 @@ export default {
       float: left;
       color: #acacac;
       font-size: 1.5rem;
-      margin-left: 0.375rem;
+      // margin-left: 0.375rem;
       line-height: 3.375rem;
       width: 1.5rem;
     }
@@ -315,7 +315,7 @@ export default {
         float: left;
         color: #acacac;
         font-size: 1.5rem;
-        margin-left: 0.375rem;
+        // margin-left: 0.375rem;
       }
       .el-input {
         float: left;
@@ -416,6 +416,7 @@ export default {
     box-sizing: border-box;
     height: 3.375rem;
     line-height: 3.375rem;
+    color: #000;
   }
   .el-input__inner {
     border: none;
@@ -455,6 +456,7 @@ export default {
     margin-left: 2.5rem;
   }
   .dialog-footer {
+    font-size: 1rem;
     > span:nth-of-type(1) {
       color: #9b9b9b;
     }

src/pages/home/login.vue

@@ -19,6 +19,7 @@
           </el-form-item>
           <el-form-item>
             <el-input
+             class="noRight"
               placeholder="请填写密码"
               prefix-icon="el-icon-lock"
               v-model="LoginForm.psd"
@@ -214,8 +215,8 @@ export default {
   .loginTop {
     width: 100%;
     img {
-      width: 7.75rem;
-      height: 2.5rem;
+      width: 10rem;
+      height: 4rem;
       border: none;
       margin: 6.25rem auto 3.75rem;
       display: block;
@@ -303,8 +304,13 @@ export default {
     margin-bottom: 0;
   }
   .ipts {
-    .el-icon-circle-close {
-      margin-right: 0.625rem;
+    // .el-icon-circle-close {
+    //   margin-right: 0.625rem;
+    // }
+    .noRight{
+      .el-icon-circle-close {
+        margin-right: 0.625rem;
+      }
     }
     .el-input {
       display: block;
@@ -312,7 +318,7 @@ export default {
       width: 19.0625rem;
       border-bottom: 1px solid #e6e6e6;
       color: rgba(155, 155, 155, 1);
-      padding-left: 0.75rem;
+      // padding-left: 0.75rem;
       box-sizing: border-box;
       height: 3.375rem;
       line-height: 3.375rem;
@@ -321,14 +327,19 @@ export default {
     .el-input__inner {
       border: none;
       font-size: 1rem;
+      color: #000 !important;
     }
     .el-input__prefix {
       font-size: 1.5rem;
+      left: 0;
     }
     .el-input__icon {
       font-size: 1.5rem;
       line-height: 3.375rem;
     }
+    .el-input__suffix{
+      right: 0;
+    }
   }
 }
 .page_login{

src/pages/home/noPassword/index.vue

@@ -28,10 +28,8 @@
               placeholder="请填写验证码"
               v-on:input="watchNum"
             ></el-input>
-            <div>
-              <div class="getCode" @click="getVerifyCode()">
-                {{ code_btn_title }}
-              </div>
+            <div class="getCode" @click="getVerifyCode()">
+              {{ code_btn_title }}
             </div>
           </div>
         </el-form-item>
@@ -80,6 +78,7 @@
 import "@/styles/newStyle.scss";
 import { checkMobile } from "@/utils/tools";
 import { getCodeInit, getVerifyCode, loginByCode } from "@/api/login";
+import { setRem } from "@/libs/functionRem";
 export default {
   data() {
     var checkMobileRule = (rule, value, callback) => {
@@ -115,6 +114,7 @@ export default {
     };
   },
   created() {
+    setRem()
     this.GetCodeInit();
   },
   methods: {
@@ -304,7 +304,7 @@ export default {
         float: left;
         color: #acacac;
         font-size: 1.5rem;
-        margin-left: 0.375rem;
+        // margin-left: 0.375rem;
         line-height: 3.375rem;
         width: 1.5rem;
       }
@@ -321,7 +321,7 @@ export default {
         float: left;
         color: #acacac;
         font-size: 1.5rem;
-        margin-left: 0.375rem;
+        // margin-left: 0.375rem;
       }
       .el-input {
         float: left;
@@ -343,6 +343,7 @@ export default {
         background: #338afb;
         border-radius: 1.4375rem;
         font-size: 0.8125rem;
+        margin-left: 1.85rem;
       }
       .getCodetwo {
         // float: left;
@@ -421,11 +422,12 @@ export default {
   }
   .el-input {
     display: block;
-    margin: 0 auto;
+    // margin: 0 auto;
     // width: 19.0625rem;
-
-    color: rgba(155, 155, 155, 1);
-    padding-left: 0.75rem;
+    margin-left: 0.45rem;
+    color: #000;
+    // color: rgba(155, 155, 155, 1);
+    // padding-left: 0.45rem;
     box-sizing: border-box;
     height: 3.375rem;
     line-height: 3.375rem;
@@ -434,6 +436,7 @@ export default {
     border: none;
     font-size: 1rem;
     padding-left: 0;
+    color: #000;
   }
   .el-input__prefix {
     font-size: 1.5rem;

src/pages/home/register/register.vue

@@ -311,7 +311,7 @@ export default {
         float: left;
         color: #acacac;
         font-size: 1.5rem;
-        margin-left: 0.375rem;
+        // margin-left: 0.375rem;
         line-height: 3.375rem;
         width: 1.5rem;
       }
@@ -323,7 +323,7 @@ export default {
       float: left;
       color: #acacac;
       font-size: 1.5rem;
-      margin-left: 0.375rem;
+      // margin-left: 0.375rem;
       line-height: 3.375rem;
       width: 1.5rem;
     }
@@ -340,7 +340,7 @@ export default {
         float: left;
         color: #acacac;
         font-size: 1.5rem;
-        margin-left: 0.375rem;
+        // margin-left: 0.375rem;
       }
       .el-input {
         float: left;
@@ -363,6 +363,7 @@ export default {
         border-radius: 1.4375rem;
         font-size: 0.8125rem;
         // margin-top: 0.9375rem;
+        margin-left: 1.85rem;
       }
 
       .getCodetwo {
@@ -446,9 +447,10 @@ export default {
   .el-input {
     display: flex;
     align-items: center;
-    margin: 0 auto;
-    color: rgba(155, 155, 155, 1);
-    padding-left: 0.75rem;
+    // margin: 0 auto;
+    margin-left: 0.75rem;
+    color: #000;
+    // padding-left: 0.75rem;
     box-sizing: border-box;
     height: 3.375rem;
     line-height: 3.375rem;
@@ -457,6 +459,7 @@ export default {
     border: none;
     font-size: 1rem;
     padding-left: 0;
+    color: #000;
   }
   .el-input__prefix {
     font-size: 1.5rem;
@@ -464,7 +467,7 @@ export default {
   }
 
   .phoneLine {
-    .el-input__clear {
+    .el-icon-circle-close {
       margin-right: 0.625rem;
     }
     .el-input__icon {
@@ -494,6 +497,7 @@ export default {
     //   display: flex;
     //   justify-content: space-around;
     //   align-items: center;
+    font-size: 1rem;
     > span:nth-of-type(1) {
       color: #9b9b9b;
     }

src/pages/homeIndex/index.vue

@@ -530,6 +530,8 @@ export default {
 .page_homeIndex {
   .van-dropdown-menu__title {
     padding-left: 0;
+    color: #000;
+    font-size: 1rem;
   }
 }
 </style>

src/pages/main/DialysisArea.vue

@@ -87,7 +87,7 @@
           v-if="!networkStates"
           style="display: block;text-align: center"
         >
-          <p style="margin-top: 100px;font-size: 18px">
+          <p>
             网络异常，请点击重新加载
           </p>
 
@@ -525,13 +525,13 @@ export default {
 .screening {
   border-bottom: 1px #e5e5e5 solid;
   position: fixed;
-  top: 100px;
-  @media only screen and (min-width: 768px) {
-    top: 163px;
-  }
-  @media only screen and (min-width: 415px) and (max-width: 767px) {
-    top: 134px;
-  }
+  top: 3.25rem;
+  // @media only screen and (min-width: 768px) {
+  //   top: 163px;
+  // }
+  // @media only screen and (min-width: 415px) and (max-width: 767px) {
+  //   top: 134px;
+  // }
   // @media only screen and (min-width: 813px) and (max-width: 1024px) {
   //   top: 130px;
   // }
@@ -612,4 +612,10 @@ export default {
     line-height: 40px !important;
   }
 }
+.NoData{
+  p{
+    margin-top: 100px;
+    font-size: 18px
+  }
+}
 </style>

src/pages/main/RecordPage.vue

@@ -466,12 +466,15 @@ export default {
     padding-left: 0.1rem;
     @media only screen and (min-width: 768px) {
       margin-top: 1px;
+      font-size: 24px;
+      width: 0;
     }
   }
   .el-input__prefix {
     // left:1px;
     @media only screen and (min-width: 768px) {
-      left: 10px;
+      // left: 10px;
+      
     }
   }
 }

src/pages/monitoring/index.vue

@@ -519,10 +519,10 @@ export default {
   /*top: 38px !important;*/
   /*}*/
   @media only screen and (min-width: 768px) {
-    top: 80px !important;
+    top: 114px !important;
   }
   @media only screen and (min-width: 415px) and (max-width: 767px) {
-    top: 64px;
+    top: 90px;
   }
   ul {
     @include display-flex;
@@ -572,10 +572,10 @@ export default {
     padding-top: 80px !important;
   }
   @media only screen and (min-width: 415px) and (max-width: 767px) {
-    padding-top: 96px;
+    padding-top: 126px;
   }
   @media only screen and (min-width: 768px) {
-    padding-top: 120px !important;
+    padding-top: 160px !important;
   }
 }
 .mainBox {

src/pages/my/modifyPassword.vue

@@ -274,7 +274,7 @@ export default {
         float: left;
         color: #acacac;
         font-size: 1.5rem;
-        margin-left: 0.375rem;
+        // margin-left: 0.375rem;
         line-height: 3.375rem;
         width: 1.5rem;
       }
@@ -287,7 +287,7 @@ export default {
       float: left;
       color: #acacac;
       font-size: 1.5rem;
-      margin-left: 0.375rem;
+      // margin-left: 0.375rem;
       line-height: 3.375rem;
       width: 1.5rem;
     }
@@ -304,7 +304,7 @@ export default {
         float: left;
         color: #acacac;
         font-size: 1.5rem;
-        margin-left: 0.375rem;
+        // margin-left: 0.375rem;
       }
       .el-input {
         float: left;
@@ -418,7 +418,7 @@ export default {
 
   .phoneLine {
     .el-input__clear {
-      margin-right: 0.625rem;
+      // margin-right: 0.625rem;
     }
     .el-input__icon {
       line-height: 3.375rem;
@@ -444,6 +444,7 @@ export default {
     margin-left: 2.5rem;
   }
   .dialog-footer {
+    font-size:1rem;
     > span:nth-of-type(1) {
       color: #9b9b9b;
     }

src/pages/shop/index.vue

@@ -1,9 +1,11 @@
 <template>
   <div class="page_shop">
+    <van-sticky>
     <div class="shopTitle">
       <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
       <span class="titleName">商城</span>
     </div>
+    </van-sticky>
     <iframe
       src="http://shop.kuyicloud.com/app/index.php?i=2&c=entry&m=ewei_shopv2&do=mobile&wxref=mp.weixin.qq.com#wechat_redirect"
     ></iframe>

src/router/index.js

@@ -62,15 +62,15 @@ export default new Router({
           name: 'newMy',
           component: () => import('@/pages/my/index')
         },
-        // 商城
-        {
-          path: '/shop',
-          name: 'shop',
-          component: () => import('@/pages/shop/index')
-        }
+        
       ]
     },
-
+    // 商城
+    {
+      path: '/shop',
+      name: 'shop',
+      component: () => import('@/pages/shop/index')
+    },
     {
       path: '/perfectOrg',
       component: () => import('@/pages/org'),

src/styles/media.scss

@@ -1,11 +1,11 @@
 @media only screen and (max-width: 767px) {
   html {
-    font-size: 30px;
+    font-size: 30px !important;
   }
 }
 @media only screen and (min-width: 415px) and (max-width: 767px) {
   html {
-    font-size: 40px;
+    font-size: 40px !important;
   }
 }
 

src/styles/newStyle.scss

@@ -1,31 +1,8 @@
-// html,
-// body {
-//   height: 100%;
-//   background: #fff !important;
-//   color: #000 !important;
-// }
-
-@media only screen and (max-width: 415px) {
-  html,
-  body {
-    height: 100%;
-    font-size: 30px !important;
-    background: #fff !important;
-    color: #000 !important;
-  }
-}
-@media only screen and (min-width: 415px) and (max-width: 767px) {
-  html {
-    font-size: 40px !important;
-  }
-}
-@media only screen and (min-width: 768px) and (max-width: 1024px) {
-  html {
-    font-size: 50px !important;
-  }
-}
-@media only screen and (min-width: 768px) {
-  html {
-    font-size: 50px !important;
-  }
+html,
+body {
+  height: 100%;
+  background: #fff !important;
+  color: #000 !important;
 }
+
+

src/styles/reset.scss

@@ -1,7 +1,7 @@
 html {
   -webkit-text-size-adjust: 100%;
   -ms-text-size-adjust: 100%;
-  font-size: 50px !important;
+  font-size: 50px;
 }
 
 input[type="submit"],

src/styles/style.scss

@@ -1054,3 +1054,7 @@ body {
 #app {
   -webkit-overflow-scrolling: touch;
 }
+
+.van-checkbox__icon{
+  font-size: 20px;
+}

src/styles/style2.scss

@@ -0,0 +1,24 @@
+@media only screen and (max-width: 415px) {
+    html,
+    body {
+      height: 100%;
+      font-size: 30px !important;
+      background: #fff !important;
+      color: #000 !important;
+    }
+  }
+  @media only screen and (min-width: 415px) and (max-width: 767px) {
+    html {
+      font-size: 40px !important;
+    }
+  }
+  @media only screen and (min-width: 768px) and (max-width: 1024px) {
+    html {
+      font-size: 50px !important;
+    }
+  }
+  @media only screen and (min-width: 768px) {
+    html {
+      font-size: 50px !important;
+    }
+  }