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

src/pages/home/login.vue

@@ -10,21 +10,11 @@
             <ul>
               <li>
                 <span class="iconfont">&#xe78b;</span>
-                <input
-                  placeholder="请输入手机号"
-                  type="tel"
-                  class="tel"
-                  v-model="form.mobile"
-                />
+                <input placeholder="请输入手机号" type="tel" class="tel" v-model="form.mobile" />
               </li>
               <li>
                 <span class="iconfont">&#xe6c0;</span>
-                <input
-                  placeholder="请输入密码"
-                  type="password"
-                  class="tel"
-                  v-model="form.pwd"
-                />
+                <input placeholder="请输入密码" type="password" class="tel" v-model="form.pwd" />
               </li>
             </ul>
           </div>
@@ -39,15 +29,13 @@
             :disabled="loginDisable"
           >
             登录
-          </button> -->
+          </button>-->
           <button
             class="loginBtn"
             @click="submitForm"
             :class="loginDisable ? 'disableLoginBtn' : ''"
             :disabled="loginDisable"
-          >
-            登录
-          </button>
+          >登录</button>
 
           <!-- <router-link to="/forgetPassword"> -->
           <div class="newForget" style="display:none">忘记密码</div>
@@ -57,6 +45,17 @@
           <a href="">免密码登录</a>
           <a href="">忘记密码？</a>
           </div>-->
+          <div class="agree">
+            <el-checkbox v-model="agreement">
+              我已阅读并同意
+              <!-- <router-link to="/privacyPolicy"> -->
+
+              <!-- </router-link> -->
+            </el-checkbox>
+            <!-- <router-link to="/privacyPolicy"> -->
+            <span class="agreeText" @click="agree">《隐私服务协议》</span>
+            <!-- </router-link> -->
+          </div>
         </div>
       </div>
     </div>
@@ -77,7 +76,8 @@ export default {
         mobile: "",
         pwd: ""
       },
-      checked: false
+      checked: false,
+      agreement: true
     };
   },
   computed: {
@@ -215,6 +215,9 @@ export default {
     //清除cookie
     clearCookie: function() {
       this.setCookie("", "", -1); //修改2值都为空，天数为负1天就好了
+    },
+    agree() {
+      this.$router.push({ path: "/privacyPolicy" });
     }
   }
 };
@@ -223,7 +226,7 @@ export default {
 <style rel="stylesheet/scss" lang="scss" scoped>
 .container {
   // background: $white-bg;
-  background: #f5f5f5;
+  background: #fff;
   @include box-sizing;
   position: fixed;
   width: 100%;
@@ -235,7 +238,7 @@ export default {
     width: 90%;
     height: 90%;
     margin: auto;
-    box-shadow: 0px 2px 25px 0px rgba(37, 143, 252, 0.1);
+    // box-shadow: 0px 2px 25px 0px rgba(37, 143, 252, 0.1);
     border-radius: 14px;
     background: #fff;
   }
@@ -336,5 +339,86 @@ export default {
   .remember {
     float: left;
   }
+  .agreeText {
+    color: #409eff;
+    font-size: 14px;
+  }
+}
+</style>
+
+<style lang="scss">
+.remember {
+  .el-checkbox__inner {
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
+      width: 20px;
+      height: 20px;
+    }
+    @media only screen and (min-width: 768px) {
+      width: 20px;
+      height: 20px;
+    }
+  }
+  .el-checkbox__inner::after {
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
+      left: 7px;
+      height: 12px;
+      width: 4px;
+    }
+
+    @media only screen and (min-width: 768px) {
+      left: 7px;
+      height: 12px;
+      width: 4px;
+    }
+  }
+  .el-checkbox__label {
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
+      font-size: 0.45rem;
+    }
+    @media only screen and (min-width: 768px) {
+      font-size: 0.45rem;
+    }
+  }
+}
+.agree {
+  .el-checkbox__inner {
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
+      width: 20px;
+      height: 20px;
+    }
+    @media only screen and (min-width: 768px) {
+      width: 20px;
+      height: 20px;
+    }
+  }
+  .el-checkbox__inner::after {
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
+      left: 7px;
+      height: 12px;
+      width: 4px;
+    }
+
+    @media only screen and (min-width: 768px) {
+      left: 7px;
+      height: 12px;
+      width: 4px;
+    }
+  }
+  .el-checkbox__label {
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
+      font-size: 0.45rem;
+    }
+    @media only screen and (min-width: 768px) {
+      font-size: 0.45rem;
+    }
+  }
+  .agreeText {
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
+      font-size: 0.45rem;
+    }
+    @media only screen and (min-width: 768px) {
+      font-size: 0.45rem;
+    }
+  }
 }
 </style>

src/pages/main/PatientBox.vue

@@ -26,9 +26,7 @@
           <div class="right">
             <h3 class="name">
               {{ patient.patient.name }}
-              <span class="el-icon-bell yztx" v-if="getStatus(patient)"
-                >医嘱</span
-              >
+              <span class="yztx" v-if="getStatus(patient)">医嘱</span>
               <span class="yc" v-show="isAbnormal(patient)">异常</span>
             </h3>
             <span class="num"
@@ -39,7 +37,7 @@
         </div>
         <div
           class="online"
-          style="flex:1.3;"
+          style="flex:1.1;"
           v-show="computeState(patient) != 4"
         >
           <p :class="stateColor(patient)">{{ stateText(patient) }}</p>
@@ -344,7 +342,7 @@ export default {
         height: 1rem;
         border-radius: 50%;
         float: left;
-        margin: 0 0.3rem 0 0;
+        margin: 0 0.2rem 0 0;
       }
       .right {
         float: left;
@@ -357,6 +355,9 @@ export default {
           @media only screen and (max-width: 415px) {
             font-size: 0.45rem;
           }
+          @media only screen and (min-width: 416px) and (max-width: 767px) {
+            font-size: 0.4rem;
+          }
           .yc {
             background: #ff7979;
             color: #fff;
@@ -455,7 +456,7 @@ export default {
   padding: 3px 10px;
   background-color: #f56c6c;
   color: #fff;
-  border-radius: 15px;
+  border-radius: 3px;
   font-size: 0.32rem;
   @media only screen and (max-width: 415px) {
     font-size: 0.34rem !important;

src/pages/main/dialog/OrdersDialog.vue

@@ -1402,9 +1402,12 @@
 }
 .table {
   width: 1200px;
-  @media only screen and (max-width: 767px) {
+  @media only screen and (max-width: 415px) {
       width: 850px;
     }
+    @media only screen and (min-width: 415px) and (max-width: 767px) {
+      width: 1000px;
+    }
   tr {
     th {
       background: $main-color;

src/pages/main/dialog/TwoMenu.vue

@@ -150,7 +150,7 @@ export default {
   @media only screen and (max-width: 812px) {
     min-height: 8rem !important;
   }
-  @media only screen and (min-width: 415px) and (max-width: 737px) {
+  @media only screen and (min-width: 415px) and (max-width: 767px) {
     max-height: 12.6rem !important;
   }
   ul {

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

@@ -18,12 +18,7 @@
         <div style="overflow: hidden;">
           <div class="cell" style="margin-top: 0;">
             <label>医嘱类型</label>
-            <el-input
-              class="typeInput"
-              ref="advice_type"
-              value="临时"
-              disabled
-            ></el-input>
+            <el-input class="typeInput" ref="advice_type" value="临时" disabled></el-input>
           </div>
           <div class="cell" style="margin-top: 0;">
             <label>开始时间</label>
@@ -43,11 +38,7 @@
             <label>开嘱时间 {{ record_date_str }}</label>
           </div>
         </div>
-        <div
-          id="newDialogContent"
-          class="DialogContent choose"
-          style="height: 6.2rem;"
-        >
+        <div id="newDialogContent" class="DialogContent choose" style="height: 6.2rem;">
           <div class="newAddTable">
             <table class="table">
               <tr>
@@ -70,20 +61,16 @@
                 >
                   <td
                     style="text-align: left; padding-left: 5px; padding-right: 5px;"
-                  >
-                    {{ advice.title }}
-                  </td>
-                  <td v-if="advice.advice_desc">
-                    {{ advice.advice_desc }}{{ advice.drug_spec_unit }}
-                  </td>
+                  >{{ advice.title }}</td>
+                  <td v-if="advice.advice_desc">{{ advice.advice_desc }}{{ advice.drug_spec_unit }}</td>
                   <td v-if="advice.prescribing_number">
                     {{ advice.prescribing_number
                     }}{{ advice.prescribing_number_unit }}
                   </td>
                   <td v-else></td>
-                  <td v-if="advice.single_dose">
-                    {{ advice.single_dose }} {{ advice.single_dose_unit }}
-                  </td>
+                  <td
+                    v-if="advice.single_dose"
+                  >{{ advice.single_dose }} {{ advice.single_dose_unit }}</td>
                   <td v-else></td>
                   <td>{{ advice.delivery_way }}</td>
                   <td>{{ advice.execution_frequency }}</td>
@@ -100,12 +87,8 @@
                 >
                   <td
                     style="text-align: left; padding-right: 5px; padding-left: 25px;"
-                  >
-                    {{ subdrug.title }}
-                  </td>
-                  <td>
-                    {{ subdrug.advice_desc }} {{ subdrug.drug_spec_unit }}
-                  </td>
+                  >{{ subdrug.title }}</td>
+                  <td>{{ subdrug.advice_desc }} {{ subdrug.drug_spec_unit }}</td>
                   <td>
                     <span v-if="subdrug.prescribing_number">
                       {{ subdrug.prescribing_number
@@ -250,6 +233,11 @@ export default {
       parseTime(this.start_time, "{y}-{m}-{d} {h}:{i}") + ":00";
   },
   methods: {
+    ok() {
+      // alert(1);
+      // this.$refs.start_time_picker.close();
+      console.log(this.$refs.start_time_picker);
+    },
     backAction: function() {
       this.$emit("back-action");
     },
@@ -386,6 +374,7 @@ export default {
     didSelectStartTime: function(time) {
       this.start_time_str = parseTime(time, "{y}-{m}-{d} {h}:{i}") + ":00";
       console.log(".");
+      console.log(this.$refs.start_time_picker);
     },
     didSelectTemplateAdvice: function(resp_advices) {
       this.show_dialog_key = 0;

src/router/index.js

@@ -1,7 +1,6 @@
 import Vue from "vue";
 import Router from "vue-router";
 
-
 Vue.use(Router);
 
 export default new Router({
@@ -75,6 +74,11 @@ export default new Router({
       path: "/changePassword",
       name: "changePassword",
       component: () => import("@/pages/personal/ChangePassword")
+    },
+    {
+      path: "/privacyPolicy",
+      name: "privacyPolicy",
+      component: () => import("@/pages/home/privacyPolicy")
     }
   ]
 });