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

src/pages/advice/AdvicePage.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <van-row class="top_row">
+    <van-row class="top_row" style="display:none">
       <!-- <van-col :span="9">
         <div style="visibility: hidden">
           <span class="title"></span>

src/pages/advice/DialysisAdviceTable.vue

@@ -96,7 +96,7 @@
       <table class="table">
         <tr>
           <th width="60px">姓名</th>
-          <th width="30px">透析号</th>
+          <th width="40px">透析号</th>
           <th width="50px">类型</th>
           <th width="110px">开始时间</th>
           <th width="140px">医嘱内容</th>
@@ -563,7 +563,7 @@ export default {
 .choice {
   border-bottom: 1px #e5e5e5 solid;
   position: fixed;
-  top: 48px;
+  top: 0;
   right: 0;
   z-index: 66;
   left: 0;
@@ -574,9 +574,9 @@ export default {
   // @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: 768px) {
+  //   top: 80px !important;
+  // }
   ul {
     @include display-flex;
     @include align-items-center;
@@ -592,7 +592,7 @@ export default {
       @include align-items-center;
       @include text-align;
       @include justify-content-between;
-      padding: 0 0 0.3rem;
+      padding: 0.3rem 0;
       font-size: 0.45rem;
       .iconfont {
         margin: 0 0.1rem;
@@ -609,14 +609,14 @@ export default {
   }
 }
 .DialysisAdvice {
-  padding-top: 75px;
+  padding-top: 36px;
   // background: #fff;
   min-height: calc(100vh - 2px);
   // @media only screen and (max-width: 812px) {
   //   padding-top: 70px !important;
   // }
   @media only screen and (min-width: 768px) {
-    padding-top: 126px !important;
+    padding-top: 60px !important;
   }
   // @media only screen and (min-width: 813px) and (max-width: 1024px) {
   //   padding-top: 118px !important;

src/pages/home/login.vue

@@ -38,7 +38,7 @@
             登录
           </button>
           <!-- <router-link to="/forgetPassword"> -->
-          <div class="newForget" @click="ok">忘记密码</div>
+          <div class="newForget" style="display:none">忘记密码</div>
           <!-- </router-link> -->
           <!-- </router-link> -->
           <!-- <div class="forget">
@@ -116,9 +116,6 @@ export default {
     },
     to: function() {
       this.$router.push({ path: "/forgetPassword" });
-    },
-    ok() {
-      Toast("程序员还在开发中");
     }
   }
 };

src/pages/main/DetailsPage.vue

@@ -1,46 +1,45 @@
 <template>
   <div class="mainBox">
     <div class="mainContent">
-      <div class="newNavigation">
-        <div class="navigation">
-          <div class="goBack">
-            <span class="back" @click="backAction()">
-              <span class="iconfont">&#xe720;</span>返回
-            </span>
-            <el-popover placement="bottom" trigger="click" :disabled="true">
-              <li slot="reference" class="name">{{ patient_name }}</li>
-            </el-popover>
-          </div>
-          <div class="nav">
-            <ul>
-              <li
-                v-for="(item, i) in ['病历', '透析', '今日']"
-                :key="i"
-                :class="index == i ? 'active' : ''"
-                @click="ClickTab(i)"
-              >
-                {{ item }}
-              </li>
-            </ul>
-          </div>
+      <div class="navigation">
+        <div class="goBack">
+          <span class="back" @click="backAction()">
+            <span class="iconfont">&#xe720;</span>返回
+          </span>
+          <el-popover placement="bottom" trigger="click" :disabled="true">
+            <li slot="reference" class="name">{{ patient_name }}</li>
+          </el-popover>
+        </div>
+        <div class="nav">
+          <ul>
+            <li
+              v-for="(item, i) in ['病历', '透析', '今日']"
+              :key="i"
+              :class="index == i ? 'active' : ''"
+              @click="ClickTab(i)"
+            >
+              {{ item }}
+            </li>
+          </ul>
+        </div>
 
-          <!-- <div @click="openPicker()" class="time">
+        <!-- <div @click="openPicker()" class="time">
                   {{pickerVisible}}<span class="iconfont">&#xe74a;</span>
         </div>-->
-          <!-- <div class="time" style="width:1.49rem;">
+        <!-- <div class="time" style="width:1.49rem;">
                   <span class="iconfont">2018-01-01&#xe74a;</span>
         </div>-->
-          <div class="print" style="float: right; display:none">
-            <el-button
-              size="mini"
-              type="primary"
-              @click="print"
-              icon="el-icon-printer"
-              >打印</el-button
-            >
-          </div>
+        <div class="print" style="float: right; display:none">
+          <el-button
+            size="mini"
+            type="primary"
+            @click="print"
+            icon="el-icon-printer"
+            >打印</el-button
+          >
         </div>
       </div>
+
       <div class="Tab">
         <CaseHistory v-show="index == 0" title="病历"></CaseHistory>
         <!--<check-tab v-show="index==1" title="化验单"></check-tab>-->
@@ -167,9 +166,6 @@ export default {
 }
 .mainContent {
   position: relative;
-  .newNavigation {
-    overflow: hidden;
-  }
   .navigation {
     @include display-flex;
     @include align-items-center;
@@ -184,6 +180,10 @@ export default {
     right: 0;
     z-index: 100;
     background: #258ffc;
+    -webkit-transform:translateZ(1px);
+-moz-transform:translateZ(1px);
+-o-transform:translateZ(1px);
+transform:translateZ(1px);
     @media only screen and (max-width: 320px) {
       display: -webkit-box;
     }

src/pages/personal/index.vue

@@ -86,7 +86,7 @@
           </div>
         </router-link>
         <!-- <router-link to="/ChangePassword"> -->
-        <div class="name" @click="okk">
+        <div class="name" style="display:none">
           <div class="left">
             <img src="../../assets/my/modification.png" alt />
             <span>修改密码</span>
@@ -151,9 +151,6 @@ export default {
     logout: function() {
       // TODO 请求退出登录接口
       this.$router.push("/");
-    },
-    okk() {
-      Toast("程序员还在开发中");
     }
   }
 };