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

src/api/login.js

@@ -87,3 +87,11 @@ export function login() {
 
 
 
+
+export function createOrg(params) {
+  return request({
+    url: '/m/api/org/create',
+    method: 'post',
+    params:params,
+  })
+}

src/api/patient/patient.js

@@ -229,11 +229,6 @@ export function getDryWeightDetail(id, params) {
 }
 
 export function GetLongDialysisRecord(id, limit, page, startime, endtime) {
-  console.log('id', id)
-  console.log('limit', limit)
-  console.log('page', page)
-  console.log('startime', startime)
-  console.log('endtime', endtime)
   const params = {
     id: id,
     limit: limit,
@@ -247,3 +242,11 @@ export function GetLongDialysisRecord(id, limit, page, startime, endtime) {
     params: params
   })
 }
+
+export function GetPatientDetail(id, params) {
+  return request({
+    url: '/m/api/patient/getpatientdetail?id=' + id,
+    method: 'get',
+    params: params
+  })
+}

src/kya_pages/login/login.vue

@@ -31,7 +31,7 @@
       </div>
       <p class="forget" @click="toForgetPassword()">忘记密码?</p>
       <div class="login" @click="ToLogin()" v-show="loginshow">登录</div>
-      <div class="login3"  @click="ToLogin()" v-show="loginshowtwo">登录</div>
+      <div class="login3" @click="ToLogin()" v-show="loginshowtwo">登录</div>
       <div class="login2">
         <p @click="noPassword()">免密码登录</p>
         <p class="register" @click="ToRegister()">快速注册</p>
@@ -42,33 +42,33 @@
 
 <script>
 // import { ToLogin } from "@/api/micro/micro";
-import { hex_md5 } from '@/utils/md5'
-import { checkMobile } from '@/utils/tools'
+import { hex_md5 } from "@/utils/md5";
+import { checkMobile } from "@/utils/tools";
 export default {
-  data () {
+  data() {
     var checkMobileRule = (rule, value, callback) => {
       if (!checkMobile(value)) {
-        callback(new Error('请填写正确的手机号'))
+        callback(new Error("请填写正确的手机号"));
       } else {
-        callback()
+        callback();
       }
-    }
+    };
     return {
-      tel: '',
-      psd: '',
+      tel: "",
+      psd: "",
       LoginForm: {
-        tel: '',
-        psd: ''
+        tel: "",
+        psd: ""
       },
       loginshow: false,
       loginshowtwo: true,
       rules: {
         tel: [
-          { required: true, message: '手机号码不能为空' },
+          { required: true, message: "手机号码不能为空" },
           { validator: checkMobileRule }
         ]
       }
-    }
+    };
   },
   methods: {
     // ToLogin() {
@@ -90,45 +90,43 @@ export default {
     //     this.$message.error("账号或密码错误");
     //   }
     // });
-  //  },
-    watchNum () {
-      if (this.LoginForm.tel === '' || this.LoginForm.psd === '') {
-        this.loginshow = false
-        this.loginshowtwo = true
+    //  },
+    watchNum() {
+      if (this.LoginForm.tel === "" || this.LoginForm.psd === "") {
+        this.loginshow = false;
+        this.loginshowtwo = true;
       } else {
-        this.loginshow = true
-        this.loginshowtwo = false
+        this.loginshow = true;
+        this.loginshowtwo = false;
       }
       if (this.LoginForm.psd.length < 6) {
-        this.loginshow = false
-        this.loginshowtwo = true
+        this.loginshow = false;
+        this.loginshowtwo = true;
       }
       if (this.LoginForm.psd.length > 6) {
-        this.loginshow = true
-        this.loginshowtwo = false
+        this.loginshow = true;
+        this.loginshowtwo = false;
       }
     },
-    ToLogin () {
-
-      this.$router.push({ path: '/myIndex'})
-
+    ToLogin() {
+      this.$router.push({ path: "/homeIndex" });
     },
-    ToRegister () {
-      this.$router.push('/register')
+    ToRegister() {
+      this.$router.push("/register");
     },
-    toForgetPassword () {
-      this.$router.push('/forgetpassword')
+    toForgetPassword() {
+      this.$router.push("/forgetpassword");
     },
-    noPassword () {
-      this.$router.push('/nopassword')
+    noPassword() {
+      this.$router.push("/nopassword");
     },
 
-    change (val) {
-      this.LoginForm.tel = val.replace(/[^0-9]+/g, '')
+    change(val) {
+      this.LoginForm.tel = val.replace(/[^0-9]+/g, "");
     }
   },
-  created () {}
-}
+  created() {}
+};
 </script>
 
 <style lang="scss" scoped>

src/libs/functionRem.js

@@ -0,0 +1,28 @@
+export function setRem() {
+  const baseSize = 32;
+  // 设置 rem 函数
+  function setRem() {
+    const scale = document.documentElement.clientWidth / 750;
+    document.documentElement.style.fontSize =
+      baseSize * Math.min(scale, 2) + "px";
+    //   // 320 默认大小16px; 320px = 20rem ;每个元素px基础上/16
+    //   let htmlWidth =
+    //     document.documentElement.clientWidth || document.body.clientWidth;
+    //   //得到html的Dom元素
+    //   let htmlDom = document.getElementsByTagName("html")[0];
+    //   //设置根元素字体大小
+    //   htmlDom.style.fontSize = htmlWidth / 23.4375 + "px";
+  }
+  // 初始化
+  setRem();
+  // 改变窗口大小时重新设置 rem
+  window.onresize = function() {
+    setRem();
+  };
+}
+
+export function setHeight() {
+  document.documentElement.style.height = 100 + "%";
+  document.body.style.height = 100 + "%";
+  document.body.style.color = "#000";
+}

src/pages/allCourseManagement/index.vue

@@ -27,8 +27,10 @@
   </div>
 </template>
 <script>
+import "../../styles/resetStyle.scss";
 import { getCouseManagementDetail } from "@/api/patient/patient";
 import { uParseTime } from "@/utils/tools";
+import { setRem, setHeight } from "@/libs/functionRem";
 export default {
   data() {
     return {
@@ -39,7 +41,8 @@ export default {
         title: "",
         user_name: ""
       },
-      id: 0
+      id: 0,
+      active: 0
     };
   },
   methods: {
@@ -61,10 +64,16 @@ export default {
       return uParseTime(time, "{y}-{m}-{d}");
     },
     toReturn() {
-      this.$router.push("/patientdetail?patientid=" + this.id);
+      this.$router.push(
+        "/patientdetail?patientid=" + this.id + "&active=" + this.active
+      );
     }
   },
   created() {
+    console.log(this.$route.query);
+    this.active = parseInt(this.$route.query.active);
+    setRem();
+    setHeight();
     var id = this.$route.query.id;
     this.getCouseManagementDetail(id);
     var patientid = this.$route.query.patientid;

src/pages/allDryWeight/index.vue

@@ -21,13 +21,16 @@
   </div>
 </template>
 <script>
+import "../../styles/resetStyle.scss";
 import { getDryWeightDetail } from "@/api/patient/patient";
 import { uParseTime } from "@/utils/tools";
+import { setRem, setHeight } from "@/libs/functionRem";
 export default {
   data() {
     return {
       drydetail: {},
-      patientid: 0
+      patientid: 0,
+      active: 0
     };
   },
   methods: {
@@ -45,10 +48,15 @@ export default {
       return uParseTime(time, "{y}-{m}-{d}");
     },
     toReturn() {
-      this.$router.push("/patientdetail?patientid=" + this.patientid);
+      this.$router.push(
+        "/patientdetail?patientid=" + this.patientid + "&active=" + this.active
+      );
     }
   },
   created() {
+    this.active = parseInt(this.$route.query.active);
+    setRem();
+    setHeight();
     var id = this.$route.query.id;
     console.log("id", id);
     var patientid = this.$route.query.patientid;

src/pages/doctorAdvice/components/CourseManagement.vue

@@ -15,9 +15,18 @@
           </div>
         </div>
       </div>
-      <div class="adviceBox">
-        <van-list v-model="loading" finished-text="没有更多了" @load="onLoad" :finished="finished">
-          <div class="adviceOne" v-for="(item, index) in this.courseManagement" :key="item.id">
+      <div class="adviceBox" v-show="showOne">
+        <van-list
+          v-model="loading"
+          finished-text="没有更多了"
+          @load="onLoad"
+          :finished="finished"
+        >
+          <div
+            class="adviceOne"
+            v-for="(item, index) in this.courseManagement"
+            :key="item.id"
+          >
             <div class="adviceTitle">
               <p>{{ getTime(item.record_time) }}</p>
               <van-icon
@@ -43,6 +52,9 @@
           </div>
         </van-list>
       </div>
+      <div class="noimgBox" v-show="showTwo">
+        <img src="../../../assets/images/none.png" alt />
+      </div>
     </div>
     <div class="add">
       <div style="display: flex;align-items: center;">
@@ -52,10 +64,23 @@
 
     <!-- 弹出层 -->
     <div>
-      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
-        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
+      <van-popup
+        v-model="typeShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
+        <van-picker
+          show-toolbar
+          :columns="columns"
+          @cancel="onCancel"
+          @confirm="onConfirm"
+        />
       </van-popup>
-      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
+      <van-popup
+        v-model="startShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
         <van-datetime-picker
           v-model="currentDate"
           type="date"
@@ -88,7 +113,11 @@
 </template>
 
 <script>
-import { getCourseManagement, DeleteCouseManage } from "@/api/patient/patient";
+import {
+  getCourseManagement,
+  DeleteCouseManage,
+  getPatientDetail
+} from "@/api/patient/patient";
 import { uParseTime } from "@/utils/tools";
 import Vue from "vue";
 import { Dialog } from "vant";
@@ -118,7 +147,9 @@ export default {
       patientid: 0,
       list: [],
       patient_id: 0,
-      patient_index: 0
+      patient_index: 0,
+      showOne: true,
+      showTwo: false
     };
   },
   methods: {
@@ -226,6 +257,23 @@ export default {
     },
     toCourseDetail(id) {
       this.$router.push("/coursedetail?id=" + id);
+    },
+    getPatientDetail(patientid) {
+      getPatientDetail(patientid).then(response => {
+        if (response.data.state === 1) {
+          var patientDetail = response.data.data.patientDetail;
+          if (patientDetail.blood_patients == 0) {
+            this.showOne = false;
+            this.showTwo = true;
+          }
+          if (patientDetail.blood_patients == 1) {
+            this.showOne = true;
+            this.showTwo = false;
+          }
+          console.log("病人详情", patientDetail);
+          this.patientName = patientDetail.name;
+        }
+      });
     }
   },
   created() {
@@ -233,6 +281,7 @@ export default {
     this.patientid = patientid;
     console.log("干体重id", patientid);
     this.getCourseManagement(patientid);
+    this.getPatientDetail(patientid);
   }
 };
 </script>
@@ -241,7 +290,6 @@ export default {
 .courseManagement {
   height: 100%;
   overflow-y: auto;
-  background: #fff;
   .toolBox {
     display: flex;
     height: 3.125rem;
@@ -316,6 +364,15 @@ export default {
     color: #5b98ff;
     margin-top: 0.625rem;
   }
+  .noimgBox {
+    margin-top: 40%;
+    img {
+      width: 6.25rem;
+      height: 6.25rem;
+      margin: 0 auto;
+      display: block;
+    }
+  }
   .add {
     position: fixed;
     bottom: 0;

src/pages/doctorAdvice/components/DialysisRecord.vue

@@ -21,12 +21,22 @@
           </div>
         </div>
       </div>
-      <div class="adviceBox">
-        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+
+      <div class="adviceBox" v-show="showOne">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+        >
           <div class="adviceOne" v-for="item in 3" :key="index">
             <div class="adviceTitle">
               <p>2019.09.01</p>
-              <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
+              <van-icon
+                class="ellipsis"
+                name="ellipsis"
+                @click="newShow = true"
+              />
             </div>
             <div class="orderContent">
               <p>透析模式：HD</p>
@@ -42,6 +52,10 @@
           </div>
         </van-list>
       </div>
+
+      <div class="noimgBox" v-show="showTwo">
+        <img src="../../../assets/images/none.png" alt />
+      </div>
     </div>
     <div class="add">
       <div style="display: flex;align-items: center;">
@@ -51,10 +65,23 @@
 
     <!-- 弹出层 -->
     <div>
-      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
-        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
+      <van-popup
+        v-model="typeShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
+        <van-picker
+          show-toolbar
+          :columns="columns"
+          @cancel="onCancel"
+          @confirm="onConfirm"
+        />
       </van-popup>
-      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
+      <van-popup
+        v-model="startShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
         <van-datetime-picker
           v-model="currentDate"
           type="date"
@@ -74,12 +101,18 @@
           @cancel="endShow = false"
         />
       </van-popup>
-      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @cancel="onCancel" />
+      <van-action-sheet
+        v-model="newShow"
+        :actions="actions"
+        cancel-text="取消"
+        @cancel="onCancel"
+      />
     </div>
   </div>
 </template>
 
 <script>
+import { getPatientDetail } from "@/api/patient/patient";
 export default {
   data() {
     return {
@@ -105,7 +138,9 @@ export default {
       minDate: new Date(1970, 0, 1),
       maxDate: new Date(2025, 10, 1),
       currentDate: new Date(),
-      actions: [{ name: "编辑" }, { name: "删除" }]
+      actions: [{ name: "编辑" }, { name: "删除" }],
+      showOne: true,
+      showTwo: false
     };
   },
   methods: {
@@ -145,7 +180,28 @@ export default {
 
       this.endTime = `${year}-${month}-${day}`;
       this.endShow = false;
+    },
+    getPatientDetail(patientid) {
+      getPatientDetail(patientid).then(response => {
+        if (response.data.state === 1) {
+          var patientDetail = response.data.data.patientDetail;
+          if (patientDetail.blood_patients == 0) {
+            this.showOne = false;
+            this.showTwo = true;
+          }
+          if (patientDetail.blood_patients == 1) {
+            this.showOne = true;
+            this.showTwo = false;
+          }
+          console.log("病人详情", patientDetail);
+          this.patientName = patientDetail.name;
+        }
+      });
     }
+  },
+  created() {
+    var patientid = this.$route.query.patientid;
+    this.getPatientDetail(patientid);
   }
 };
 </script>
@@ -154,7 +210,6 @@ export default {
 .DialysisRecord {
   height: 100%;
   overflow-y: auto;
-  background: #fff;
   .toolBox {
     display: flex;
     height: 3.125rem;
@@ -221,6 +276,15 @@ export default {
     color: #5b98ff;
     margin-top: 0.625rem;
   }
+  .noimgBox {
+    margin-top: 40%;
+    img {
+      width: 6.25rem;
+      height: 6.25rem;
+      margin: 0 auto;
+      display: block;
+    }
+  }
   .add {
     position: fixed;
     bottom: 0;

src/pages/doctorAdvice/components/DoctorManagement.vue

@@ -21,12 +21,22 @@
           </div>
         </div>
       </div>
-      <div class="adviceBox">
-        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+
+      <div class="adviceBox" v-show="showOne">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+        >
           <div class="adviceOne" v-for="item in 3" :key="item">
             <div class="adviceTitle">
               <p>2019.09.01</p>
-              <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
+              <van-icon
+                class="ellipsis"
+                name="ellipsis"
+                @click="newShow = true"
+              />
             </div>
             <div class="statOrder">
               <div class="statOrderTitle">
@@ -62,6 +72,10 @@
           </div>
         </van-list>
       </div>
+
+      <div class="noimgBox" v-show="showTwo">
+        <img src="../../../assets/images/none.png" alt />
+      </div>
     </div>
     <div class="add">
       <div style="display: flex;align-items: center;">
@@ -71,11 +85,24 @@
 
     <!-- 弹出层 -->
     <div>
-      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
-        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
+      <van-popup
+        v-model="typeShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
+        <van-picker
+          show-toolbar
+          :columns="columns"
+          @cancel="onCancel"
+          @confirm="onConfirm"
+        />
       </van-popup>
 
-      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
+      <van-popup
+        v-model="startShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
         <van-datetime-picker
           v-model="currentDate"
           type="date"
@@ -95,7 +122,12 @@
           @cancel="endShow = false"
         />
       </van-popup>
-      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @cancel="onCancel" />
+      <van-action-sheet
+        v-model="newShow"
+        :actions="actions"
+        cancel-text="取消"
+        @cancel="onCancel"
+      />
     </div>
   </div>
 </template>
@@ -128,7 +160,9 @@ export default {
         limit: 10,
         page: 1
       },
-      total: ""
+      total: "",
+      showOne: true,
+      showTwo: false
     };
   },
   methods: {
@@ -204,6 +238,14 @@ export default {
       getPatientDetail(patientid).then(response => {
         if (response.data.state === 1) {
           var patientDetail = response.data.data.patientDetail;
+          if (patientDetail.blood_patients == 0) {
+            this.showOne = false;
+            this.showTwo = true;
+          }
+          if (patientDetail.blood_patients == 1) {
+            this.showOne = true;
+            this.showTwo = false;
+          }
           console.log("病人详情", patientDetail);
           this.patientName = patientDetail.name;
         }
@@ -236,7 +278,7 @@ export default {
     justify-content: space-around;
     align-items: center;
     .toolOne {
-      width: 5.625rem;
+      width: 6.25rem;
       height: 1.875rem;
       background: rgba(246, 246, 246, 1);
       border-radius: 5px;
@@ -304,6 +346,15 @@ export default {
     color: #5b98ff;
     margin-top: 0.625rem;
   }
+  .noimgBox {
+    margin-top: 40%;
+    img {
+      width: 6.25rem;
+      height: 6.25rem;
+      margin: 0 auto;
+      display: block;
+    }
+  }
   .add {
     position: fixed;
     bottom: 0;

src/pages/doctorAdvice/components/DryWeight.vue

@@ -15,8 +15,14 @@
           </div>
         </div>
       </div>
-      <div class="adviceBox">
-        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+
+      <div class="adviceBox" v-show="showOne">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+        >
           <div
             class="adviceOne"
             v-for="(item, index) in dryweight"
@@ -24,19 +30,11 @@
           >
             <div class="adviceTitle">
               <p>{{ getTime(item.ctime) }}</p>
-<<<<<<< .mine
-              <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
-
-
-
-
-=======
               <van-icon
                 class="ellipsis"
                 name="ellipsis"
-                @click="DeleteDryWeight(item.id, index)"
+                @click="DeleteDryWeightOne(item.id, index)"
               />
->>>>>>> .theirs
             </div>
             <div class="statOrder">
               <div class="weightContent">
@@ -51,6 +49,10 @@
           </div>
         </van-list>
       </div>
+
+      <div class="noimgBox" v-show="showTwo">
+        <img src="../../../assets/images/none.png" alt />
+      </div>
     </div>
     <div class="add">
       <div style="display: flex;align-items: center;">
@@ -60,64 +62,6 @@
 
     <!-- 弹出层 -->
     <div>
-<<<<<<< .mine
-      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
-        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
-      </van-popup>
-      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
-        <van-datetime-picker
-          v-model="currentDate"
-          type="date"
-          :min-date="minDate"
-          :max-date="maxDate"
-          @confirm="getstartTime"
-          @cancel="startShow = false"
-        />
-      </van-popup>
-      <van-popup v-model="endShow" position="bottom" :style="{ height: '40%' }">
-        <van-datetime-picker
-          v-model="currentDate"
-          type="date"
-          :min-date="minDate"
-          :max-date="maxDate"
-          @confirm="getstartTime2"
-          @cancel="endShow = false"
-        />
-      </van-popup>
-=======
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
->>>>>>> .theirs
-<<<<<<< .mine
-      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @cancel="onCancel" />
-
-
-
-
-
-
-=======
       <van-action-sheet
         v-model="newShow"
         :actions="actions"
@@ -125,13 +69,16 @@
         @cancel="onCancel"
         @select="onDeleteConfirm"
       />
->>>>>>> .theirs
     </div>
   </div>
 </template>
 
 <script>
-import { getDryWeight, DeleteDryWeight } from "@/api/patient/patient";
+import {
+  getDryWeight,
+  DeleteDryWeight,
+  getPatientDetail
+} from "@/api/patient/patient";
 import { uParseTime } from "@/utils/tools";
 import { Dialog } from "vant";
 const moment = require("moment");
@@ -162,7 +109,9 @@ export default {
       finished: false,
       typeShow: false,
       dry_id: 0,
-      dry_index: 0
+      dry_index: 0,
+      showOne: true,
+      showTwo: false
     };
   },
   methods: {
@@ -253,12 +202,10 @@ export default {
       // return uParseTime(time, "{y}-{m}-{d} {h}:{i}:{s}");
       return uParseTime(time, "{y}-{m}-{d}");
     },
-    DeleteDryWeight(id, index) {
+    DeleteDryWeightOne(id, index) {
       this.newShow = true;
       this.dry_id = id;
       this.dry_index = index;
-      console.log("id", this.dry_id);
-      console.log("下标", this.dry_index);
     },
     onDeleteConfirm(value) {
       console.log("value是多少", value);
@@ -284,6 +231,23 @@ export default {
     getDryWeightDetail(id) {
       var patientid = this.$route.query.patientid;
       this.$router.push("/dryweight?id=" + id + "&patientid=" + patientid);
+    },
+    getPatientDetail(patientid) {
+      getPatientDetail(patientid).then(response => {
+        if (response.data.state === 1) {
+          var patientDetail = response.data.data.patientDetail;
+          if (patientDetail.blood_patients == 0) {
+            this.showOne = false;
+            this.showTwo = true;
+          }
+          if (patientDetail.blood_patients == 1) {
+            this.showOne = true;
+            this.showTwo = false;
+          }
+          console.log("病人详情", patientDetail);
+          this.patientName = patientDetail.name;
+        }
+      });
     }
   },
   created() {
@@ -291,6 +255,7 @@ export default {
     console.log("干体重id", patientid);
     this.getDryWeight(patientid);
     this.patient_id = patientid;
+    this.getPatientDetail(patientid);
   }
 };
 </script>
@@ -299,7 +264,6 @@ export default {
 .DryWeight {
   height: 100%;
   overflow-y: auto;
-  background: #fff;
   .toolBox {
     display: flex;
     height: 3.125rem;
@@ -377,6 +341,15 @@ export default {
     color: #5b98ff;
     margin-top: 0.625rem;
   }
+  .noimgBox {
+    margin-top: 40%;
+    img {
+      width: 6.25rem;
+      height: 6.25rem;
+      margin: 0 auto;
+      display: block;
+    }
+  }
   .add {
     position: fixed;
     bottom: 0;

src/pages/doctorAdvice/components/Education.vue

@@ -15,14 +15,26 @@
           </div>
         </div>
       </div>
-      <div class="adviceBox">
-        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+      <div class="adviceBox" v-show="showOne">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+        >
           <div class="adviceOne" v-for="item in 3" :key="index">
             <div class="adviceTitle">
               <p>2019.09.01</p>
-              <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
+              <van-icon
+                class="ellipsis"
+                name="ellipsis"
+                @click="newShow = true"
+              />
             </div>
             <div class="statOrder">
+              <div class="statOrderTitle">
+                <span>宣教标题</span>
+              </div>
               <div class="orderContent">
                 <p>
                   病历书写基本规范2010》第二十二条规定：“病程记录
@@ -40,6 +52,10 @@
           </div>
         </van-list>
       </div>
+
+      <div class="noimgBox" v-show="showTwo">
+        <img src="../../../assets/images/none.png" alt />
+      </div>
     </div>
     <div class="add">
       <div style="display: flex;align-items: center;">
@@ -49,10 +65,23 @@
 
     <!-- 弹出层 -->
     <div>
-      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
-        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
+      <van-popup
+        v-model="typeShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
+        <van-picker
+          show-toolbar
+          :columns="columns"
+          @cancel="onCancel"
+          @confirm="onConfirm"
+        />
       </van-popup>
-      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
+      <van-popup
+        v-model="startShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
         <van-datetime-picker
           v-model="currentDate"
           type="date"
@@ -72,12 +101,18 @@
           @cancel="endShow = false"
         />
       </van-popup>
-      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @cancel="onCancel" />
+      <van-action-sheet
+        v-model="newShow"
+        :actions="actions"
+        cancel-text="取消"
+        @cancel="onCancel"
+      />
     </div>
   </div>
 </template>
 
 <script>
+import { getPatientDetail } from "@/api/patient/patient";
 export default {
   data() {
     return {
@@ -89,7 +124,9 @@ export default {
       minDate: new Date(1970, 0, 1),
       maxDate: new Date(2025, 10, 1),
       currentDate: new Date(),
-      actions: [{ name: "编辑" }, { name: "删除" }]
+      actions: [{ name: "编辑" }, { name: "删除" }],
+      showOne: true,
+      showTwo: false
     };
   },
   methods: {
@@ -129,7 +166,28 @@ export default {
 
       this.endTime = `${year}-${month}-${day}`;
       this.endShow = false;
+    },
+    getPatientDetail(patientid) {
+      getPatientDetail(patientid).then(response => {
+        if (response.data.state === 1) {
+          var patientDetail = response.data.data.patientDetail;
+          if (patientDetail.blood_patients == 0) {
+            this.showOne = false;
+            this.showTwo = true;
+          }
+          if (patientDetail.blood_patients == 1) {
+            this.showOne = true;
+            this.showTwo = false;
+          }
+          console.log("病人详情", patientDetail);
+          this.patientName = patientDetail.name;
+        }
+      });
     }
+  },
+  created() {
+    var patientid = this.$route.query.patientid;
+    this.getPatientDetail(patientid);
   }
 };
 </script>
@@ -138,7 +196,6 @@ export default {
 .education {
   height: 100%;
   overflow-y: auto;
-  background: #fff;
   .toolBox {
     display: flex;
     height: 3.125rem;
@@ -195,7 +252,6 @@ export default {
   .orderContent {
     font-size: 0.875rem;
     color: rgba(49, 50, 52, 1);
-    margin-top: 0.625rem;
     p {
       line-height: 1.125rem;
     }
@@ -214,6 +270,15 @@ export default {
     color: #5b98ff;
     margin-top: 0.625rem;
   }
+  .noimgBox {
+    margin-top: 40%;
+    img {
+      width: 6.25rem;
+      height: 6.25rem;
+      margin: 0 auto;
+      display: block;
+    }
+  }
   .add {
     position: fixed;
     bottom: 0;

src/pages/doctorAdvice/components/Inspection.vue

@@ -21,12 +21,22 @@
           </div>
         </div>
       </div>
-      <div class="adviceBox">
-        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+
+      <div class="adviceBox" v-show="showOne">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+        >
           <div class="adviceOne" v-for="item in 3" :key="index">
             <div class="adviceTitle">
               <p>2019.09.01</p>
-              <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
+              <van-icon
+                class="ellipsis"
+                name="ellipsis"
+                @click="newShow = true"
+              />
             </div>
             <div class="orderContent">
               <p>血常规</p>
@@ -38,6 +48,10 @@
           </div>
         </van-list>
       </div>
+
+      <div class="noimgBox" v-show="showTwo">
+        <img src="../../../assets/images/none.png" alt />
+      </div>
     </div>
     <div class="add">
       <div style="display: flex;align-items: center;">
@@ -47,10 +61,23 @@
 
     <!-- 弹出层 -->
     <div>
-      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
-        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
+      <van-popup
+        v-model="typeShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
+        <van-picker
+          show-toolbar
+          :columns="columns"
+          @cancel="onCancel"
+          @confirm="onConfirm"
+        />
       </van-popup>
-      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
+      <van-popup
+        v-model="startShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
         <van-datetime-picker
           v-model="currentDate"
           type="date"
@@ -70,12 +97,18 @@
           @cancel="endShow = false"
         />
       </van-popup>
-      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @cancel="onCancel" />
+      <van-action-sheet
+        v-model="newShow"
+        :actions="actions"
+        cancel-text="取消"
+        @cancel="onCancel"
+      />
     </div>
   </div>
 </template>
 
 <script>
+import { getPatientDetail } from "@/api/patient/patient";
 export default {
   data() {
     return {
@@ -101,7 +134,9 @@ export default {
       minDate: new Date(1970, 0, 1),
       maxDate: new Date(2025, 10, 1),
       currentDate: new Date(),
-      actions: [{ name: "编辑" }, { name: "删除" }]
+      actions: [{ name: "编辑" }, { name: "删除" }],
+      showOne: true,
+      showTwo: false
     };
   },
   methods: {
@@ -141,7 +176,28 @@ export default {
 
       this.endTime = `${year}-${month}-${day}`;
       this.endShow = false;
+    },
+    getPatientDetail(patientid) {
+      getPatientDetail(patientid).then(response => {
+        if (response.data.state === 1) {
+          var patientDetail = response.data.data.patientDetail;
+          if (patientDetail.blood_patients == 0) {
+            this.showOne = false;
+            this.showTwo = true;
+          }
+          if (patientDetail.blood_patients == 1) {
+            this.showOne = true;
+            this.showTwo = false;
+          }
+          console.log("病人详情", patientDetail);
+          this.patientName = patientDetail.name;
+        }
+      });
     }
+  },
+  created() {
+    var patientid = this.$route.query.patientid;
+    this.getPatientDetail(patientid);
   }
 };
 </script>
@@ -150,7 +206,6 @@ export default {
 .inspection {
   height: 100%;
   overflow-y: auto;
-  background: #fff;
   .toolBox {
     display: flex;
     height: 3.125rem;
@@ -214,6 +269,15 @@ export default {
     color: #5b98ff;
     margin-top: 0.625rem;
   }
+  .noimgBox {
+    margin-top: 40%;
+    img {
+      width: 6.25rem;
+      height: 6.25rem;
+      margin: 0 auto;
+      display: block;
+    }
+  }
   .add {
     position: fixed;
     bottom: 0;

src/pages/doctorAdvice/components/LongDialysis.vue

@@ -15,7 +15,8 @@
           </div>
         </div>
       </div>
-      <div class="adviceBox">
+
+      <div class="adviceBox" v-show="showOne">
         <van-list
           v-model="loading"
           :finished="finished"
@@ -113,6 +114,10 @@
           </div>
         </van-list>
       </div>
+
+      <div class="noimgBox" v-show="showTwo">
+        <img src="../../../assets/images/none.png" alt />
+      </div>
     </div>
     <div class="add">
       <div style="display: flex;align-items: center;">
@@ -169,7 +174,7 @@
 </template>
 
 <script>
-import { GetLongDialysisRecord } from "@/api/patient/patient";
+import { GetLongDialysisRecord, getPatientDetail } from "@/api/patient/patient";
 import { uParseTime } from "@/utils/tools";
 import Vue from "vue";
 import { Dialog } from "vant";
@@ -222,7 +227,9 @@ export default {
       blood_access_option: [],
       dialysisrecord: [],
       list: [],
-      patient_id: ""
+      patient_id: "",
+      showOne: true,
+      showTwo: false
     };
   },
   methods: {
@@ -396,6 +403,23 @@ export default {
           return this.blood_access_option[i].name;
         }
       }
+    },
+    getPatientDetail(patientid) {
+      getPatientDetail(patientid).then(response => {
+        if (response.data.state === 1) {
+          var patientDetail = response.data.data.patientDetail;
+          if (patientDetail.blood_patients == 0) {
+            this.showOne = false;
+            this.showTwo = true;
+          }
+          if (patientDetail.blood_patients == 1) {
+            this.showOne = true;
+            this.showTwo = false;
+          }
+          console.log("病人详情", patientDetail);
+          this.patientName = patientDetail.name;
+        }
+      });
     }
   },
   created() {
@@ -403,6 +427,7 @@ export default {
     this.patient_id = patientid;
     console.log("长期透析处方", patientid);
     this.GetLongDialysisRecord(patientid);
+    this.getPatientDetail(patientid);
     this.blood_access_option = this.$store.getters.blood_access;
     console.log("血管通路", this.blood_access_option);
     this.anticoagulantsSet = this.$store.getters.anticoagulants_set;
@@ -426,10 +451,9 @@ export default {
   .toolBox {
     display: flex;
     height: 3.125rem;
-    justify-content: space-around;
     align-items: center;
     .toolOne {
-      width: 5.625rem;
+      width: 6.25rem;
       height: 1.875rem;
       background: rgba(246, 246, 246, 1);
       border-radius: 5px;
@@ -439,6 +463,7 @@ export default {
       display: flex;
       align-items: center;
       justify-content: space-around;
+      margin-left: 0.8125rem;
     }
   }
   .adviceBox {
@@ -489,6 +514,15 @@ export default {
     color: #5b98ff;
     margin-top: 0.625rem;
   }
+  .noimgBox {
+    margin-top: 40%;
+    img {
+      width: 6.25rem;
+      height: 6.25rem;
+      margin: 0 auto;
+      display: block;
+    }
+  }
   .add {
     position: fixed;
     bottom: 0;

src/pages/doctorAdvice/components/RescueRecord.vue

@@ -15,14 +15,26 @@
           </div>
         </div>
       </div>
-      <div class="adviceBox">
-        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+      <div class="adviceBox" v-show="showOne">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+        >
           <div class="adviceOne" v-for="item in 3" :key="index">
             <div class="adviceTitle">
               <p>2019.09.01</p>
-              <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
+              <van-icon
+                class="ellipsis"
+                name="ellipsis"
+                @click="newShow = true"
+              />
             </div>
             <div class="statOrder">
+              <div class="statOrderTitle">
+                <span>抢救标题</span>
+              </div>
               <div class="orderContent">
                 <p>
                   病历书写基本规范2010》第二十二条规定：“病程记录
@@ -40,6 +52,9 @@
           </div>
         </van-list>
       </div>
+      <div class="noimgBox" v-show="showTwo">
+        <img src="../../../assets/images/none.png" alt />
+      </div>
     </div>
     <div class="add">
       <div style="display: flex;align-items: center;">
@@ -49,10 +64,23 @@
 
     <!-- 弹出层 -->
     <div>
-      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
-        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
+      <van-popup
+        v-model="typeShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
+        <van-picker
+          show-toolbar
+          :columns="columns"
+          @cancel="onCancel"
+          @confirm="onConfirm"
+        />
       </van-popup>
-      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
+      <van-popup
+        v-model="startShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
         <van-datetime-picker
           v-model="currentDate"
           type="date"
@@ -72,12 +100,18 @@
           @cancel="endShow = false"
         />
       </van-popup>
-      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @cancel="onCancel" />
+      <van-action-sheet
+        v-model="newShow"
+        :actions="actions"
+        cancel-text="取消"
+        @cancel="onCancel"
+      />
     </div>
   </div>
 </template>
 
 <script>
+import { getPatientDetail } from "@/api/patient/patient";
 export default {
   data() {
     return {
@@ -89,7 +123,9 @@ export default {
       minDate: new Date(1970, 0, 1),
       maxDate: new Date(2025, 10, 1),
       currentDate: new Date(),
-      actions: [{ name: "编辑" }, { name: "删除" }]
+      actions: [{ name: "编辑" }, { name: "删除" }],
+      showOne: true,
+      showTwo: false
     };
   },
   methods: {
@@ -129,7 +165,29 @@ export default {
 
       this.endTime = `${year}-${month}-${day}`;
       this.endShow = false;
+    },
+    getPatientDetail(patientid) {
+      getPatientDetail(patientid).then(response => {
+        if (response.data.state === 1) {
+          var patientDetail = response.data.data.patientDetail;
+          if (patientDetail.blood_patients == 0) {
+            this.showOne = false;
+            this.showTwo = true;
+          }
+          if (patientDetail.blood_patients == 1) {
+            this.showOne = true;
+            this.showTwo = false;
+          }
+          console.log("病人详情", patientDetail);
+          this.patientName = patientDetail.name;
+        }
+      });
     }
+  },
+  created() {
+    var patientid = this.$route.query.patientid;
+    console.log("病人id能否获取", patientid);
+    this.getPatientDetail(patientid);
   }
 };
 </script>
@@ -138,7 +196,6 @@ export default {
 .rescueRecord {
   height: 100%;
   overflow-y: auto;
-  background: #fff;
   .toolBox {
     display: flex;
     height: 3.125rem;
@@ -193,7 +250,6 @@ export default {
     margin: 0.625rem 0;
   }
   .orderContent {
-    margin-top: 0.625rem;
     font-size: 0.875rem;
     color: rgba(49, 50, 52, 1);
     p {
@@ -214,6 +270,15 @@ export default {
     color: #5b98ff;
     margin-top: 0.625rem;
   }
+  .noimgBox {
+    margin-top: 40%;
+    img {
+      width: 6.25rem;
+      height: 6.25rem;
+      margin: 0 auto;
+      display: block;
+    }
+  }
   .add {
     position: fixed;
     bottom: 0;

src/pages/doctorAdvice/components/Scheduling.vue

@@ -21,12 +21,21 @@
           </div>
         </div>
       </div>
-      <div class="adviceBox">
-        <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+      <div class="adviceBox" v-show="showOne">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+        >
           <div class="adviceOne" v-for="item in 3" :key="index">
             <div class="adviceTitle">
               <p>2019.09.01</p>
-              <van-icon class="ellipsis" name="ellipsis" @click="newShow = true" />
+              <van-icon
+                class="ellipsis"
+                name="ellipsis"
+                @click="newShow = true"
+              />
             </div>
             <div class="orderContent">
               <p>班次：HD</p>
@@ -38,6 +47,9 @@
           </div>
         </van-list>
       </div>
+      <div class="noimgBox" v-show="showTwo">
+        <img src="../../../assets/images/none.png" alt />
+      </div>
     </div>
     <div class="add">
       <div style="display: flex;align-items: center;">
@@ -47,10 +59,23 @@
 
     <!-- 弹出层 -->
     <div>
-      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
-        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
+      <van-popup
+        v-model="typeShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
+        <van-picker
+          show-toolbar
+          :columns="columns"
+          @cancel="onCancel"
+          @confirm="onConfirm"
+        />
       </van-popup>
-      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
+      <van-popup
+        v-model="startShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
         <van-datetime-picker
           v-model="currentDate"
           type="date"
@@ -70,87 +95,116 @@
           @cancel="endShow = false"
         />
       </van-popup>
-      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @cancel="onCancel" />
+      <van-action-sheet
+        v-model="newShow"
+        :actions="actions"
+        cancel-text="取消"
+        @cancel="onCancel"
+      />
+      </div>
     </div>
   </div>
 </template>
 
 <script>
+import { getPatientDetail } from '@/api/patient/patient'
 export default {
-  data() {
+  data () {
     return {
       newShow: false,
       typeShow: false,
       startShow: false,
       endShow: false,
-      type: "请选择",
+      type: '请选择',
       columns: [
-        "杭州",
-        "宁波",
-        "温州",
-        "嘉兴",
-        "湖州",
-        "杭州",
-        "宁波",
-        "温州",
-        "嘉兴",
-        "湖州"
+        '杭州',
+        '宁波',
+        '温州',
+        '嘉兴',
+        '湖州',
+        '杭州',
+        '宁波',
+        '温州',
+        '嘉兴',
+        '湖州'
       ],
-      startTime: "请选择",
-      endTime: "请选择",
+      startTime: '请选择',
+      endTime: '请选择',
       minDate: new Date(1970, 0, 1),
       maxDate: new Date(2025, 10, 1),
       currentDate: new Date(),
-      actions: [{ name: "编辑" }, { name: "删除" }]
-    };
+      actions: [{ name: '编辑' }, { name: '删除' }],
+      showOne: true,
+      showTwo: false
+    }
   },
   methods: {
-    onCancel() {
-      this.typeShow = false;
+    onCancel () {
+      this.typeShow = false
     },
-    onConfirm(value) {
-      this.type = value;
-      this.typeShow = false;
+    onConfirm (value) {
+      this.type = value
+      this.typeShow = false
     },
-    getstartTime(value) {
-      console.log(value);
-      let year = value.getFullYear();
-      let month = value.getMonth() + 1;
-      let day = value.getDate();
+    getstartTime (value) {
+      console.log(value)
+      let year = value.getFullYear()
+      let month = value.getMonth() + 1
+      let day = value.getDate()
       if (month >= 1 && month <= 9) {
-        month = `0${month}`;
+        month = `0${month}`
       }
       if (day >= 1 && day <= 9) {
-        day = `0${day}`;
+        day = `0${day}`
       }
 
-      this.startTime = `${year}-${month}-${day}`;
-      this.startShow = false;
+      this.startTime = `${year}-${month}-${day}`
+      this.startShow = false
     },
-    getstartTime2(value) {
-      console.log(value);
-      let year = value.getFullYear();
-      let month = value.getMonth() + 1;
-      let day = value.getDate();
+    getstartTime2 (value) {
+      console.log(value)
+      let year = value.getFullYear()
+      let month = value.getMonth() + 1
+      let day = value.getDate()
       if (month >= 1 && month <= 9) {
-        month = `0${month}`;
+        month = `0${month}`
       }
       if (day >= 1 && day <= 9) {
-        day = `0${day}`;
+        day = `0${day}`
       }
 
-      this.endTime = `${year}-${month}-${day}`;
-      this.endShow = false;
+      this.endTime = `${year}-${month}-${day}`
+      this.endShow = false
+    },
+    getPatientDetail (patientid) {
+      getPatientDetail(patientid).then(response => {
+        if (response.data.state === 1) {
+          var patientDetail = response.data.data.patientDetail
+          if (patientDetail.blood_patients == 0) {
+            this.showOne = false
+            this.showTwo = true
+          }
+          if (patientDetail.blood_patients == 1) {
+            this.showOne = true
+            this.showTwo = false
+          }
+          console.log('病人详情', patientDetail)
+          this.patientName = patientDetail.name
+        }
+      })
     }
+  },
+  created () {
+    var patientid = this.$route.query.patientid
+    this.getPatientDetail(patientid)
   }
-};
+}
 </script>
 
 <style lang="scss" scoped>
 .scheduling {
   height: 100%;
   overflow-y: auto;
-  background: #fff;
   .toolBox {
     display: flex;
     height: 3.125rem;
@@ -217,6 +271,15 @@ export default {
     color: #5b98ff;
     margin-top: 0.625rem;
   }
+  .noimgBox {
+    margin-top: 40%;
+    img {
+      width: 6.25rem;
+      height: 6.25rem;
+      margin: 0 auto;
+      display: block;
+    }
+  }
   .add {
     position: fixed;
     bottom: 0;

src/pages/doctorAdvice/components/deviceManagement.vue

@@ -45,10 +45,23 @@
 
     <!-- 弹出层 -->
     <div>
-      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
-        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
+      <van-popup
+        v-model="typeShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
+        <van-picker
+          show-toolbar
+          :columns="columns"
+          @cancel="onCancel"
+          @confirm="onConfirm"
+        />
       </van-popup>
-      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
+      <van-popup
+        v-model="startShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
         <van-datetime-picker
           v-model="currentDate"
           type="date"
@@ -68,7 +81,12 @@
           @cancel="endShow = false"
         />
       </van-popup>
-      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @cancel="onCancel" />
+      <van-action-sheet
+        v-model="newShow"
+        :actions="actions"
+        cancel-text="取消"
+        @cancel="onCancel"
+      />
     </div>
   </div>
 </template>
@@ -154,7 +172,7 @@ export default {
     height: 3.125rem;
     align-items: center;
     .toolOne {
-      width: 5.625rem;
+      width: 6.25rem;
       height: 1.875rem;
       background: rgba(246, 246, 246, 1);
       border-radius: 5px;

src/pages/doctorAdvice/components/medicationPlan.vue

@@ -45,10 +45,23 @@
 
     <!-- 弹出层 -->
     <div>
-      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
-        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
+      <van-popup
+        v-model="typeShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
+        <van-picker
+          show-toolbar
+          :columns="columns"
+          @cancel="onCancel"
+          @confirm="onConfirm"
+        />
       </van-popup>
-      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
+      <van-popup
+        v-model="startShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
         <van-datetime-picker
           v-model="currentDate"
           type="date"
@@ -68,7 +81,12 @@
           @cancel="endShow = false"
         />
       </van-popup>
-      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @cancel="onCancel" />
+      <van-action-sheet
+        v-model="newShow"
+        :actions="actions"
+        cancel-text="取消"
+        @cancel="onCancel"
+      />
     </div>
   </div>
 </template>
@@ -154,7 +172,7 @@ export default {
     height: 3.125rem;
     align-items: center;
     .toolOne {
-      width: 5.625rem;
+      width: 6.25rem;
       height: 1.875rem;
       background: rgba(246, 246, 246, 1);
       border-radius: 5px;

src/pages/doctorAdvice/components/recoverNotes.vue

@@ -45,10 +45,23 @@
 
     <!-- 弹出层 -->
     <div>
-      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
-        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
+      <van-popup
+        v-model="typeShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
+        <van-picker
+          show-toolbar
+          :columns="columns"
+          @cancel="onCancel"
+          @confirm="onConfirm"
+        />
       </van-popup>
-      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
+      <van-popup
+        v-model="startShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
         <van-datetime-picker
           v-model="currentDate"
           type="date"
@@ -68,7 +81,12 @@
           @cancel="endShow = false"
         />
       </van-popup>
-      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @cancel="onCancel" />
+      <van-action-sheet
+        v-model="newShow"
+        :actions="actions"
+        cancel-text="取消"
+        @cancel="onCancel"
+      />
     </div>
   </div>
 </template>
@@ -154,7 +172,7 @@ export default {
     height: 3.125rem;
     align-items: center;
     .toolOne {
-      width: 5.625rem;
+      width: 6.25rem;
       height: 1.875rem;
       background: rgba(246, 246, 246, 1);
       border-radius: 5px;

src/pages/doctorAdvice/components/signsRecord.vue

@@ -51,10 +51,23 @@
 
     <!-- 弹出层 -->
     <div>
-      <van-popup v-model="typeShow" position="bottom" :style="{ height: '40%' }">
-        <van-picker show-toolbar :columns="columns" @cancel="onCancel" @confirm="onConfirm" />
+      <van-popup
+        v-model="typeShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
+        <van-picker
+          show-toolbar
+          :columns="columns"
+          @cancel="onCancel"
+          @confirm="onConfirm"
+        />
       </van-popup>
-      <van-popup v-model="startShow" position="bottom" :style="{ height: '40%' }">
+      <van-popup
+        v-model="startShow"
+        position="bottom"
+        :style="{ height: '40%' }"
+      >
         <van-datetime-picker
           v-model="currentDate"
           type="date"
@@ -74,7 +87,12 @@
           @cancel="endShow = false"
         />
       </van-popup>
-      <van-action-sheet v-model="newShow" :actions="actions" cancel-text="取消" @cancel="onCancel" />
+      <van-action-sheet
+        v-model="newShow"
+        :actions="actions"
+        cancel-text="取消"
+        @cancel="onCancel"
+      />
     </div>
   </div>
 </template>
@@ -161,7 +179,7 @@ export default {
     justify-content: space-around;
     align-items: center;
     .toolOne {
-      width: 5.625rem;
+      width: 6.25rem;
       height: 1.875rem;
       background: rgba(246, 246, 246, 1);
       border-radius: 5px;

src/pages/doctorAdvice/index.vue

@@ -6,7 +6,7 @@
         {{ patientName }}
         <van-icon name="arrow-down" />
       </div>
-      <p>基本信息</p>
+      <p @click="toEditPatient">基本信息</p>
     </div>
     <van-tabs v-model="active" sticky>
       <van-sticky>
@@ -83,29 +83,29 @@
 </template>
 
 <script>
-import '../../styles/resetStyle.scss'
-import DoctorManagement from '@/pages/doctorAdvice/components/DoctorManagement'
-import DryWeight from '@/pages/doctorAdvice/components/DryWeight'
-import CourseManagement from '@/pages/doctorAdvice/components/CourseManagement'
-import RescueRecord from '@/pages/doctorAdvice/components/RescueRecord'
-import Inspection from '@/pages/doctorAdvice/components/Inspection'
-import LongDialysis from '@/pages/doctorAdvice/components/LongDialysis'
-import DialysisRecord from '@/pages/doctorAdvice/components/DialysisRecord'
-import Scheduling from '@/pages/doctorAdvice/components/Scheduling'
-import Education from '@/pages/doctorAdvice/components/Education'
-import signsRecord from '@/pages/doctorAdvice/components/signsRecord'
-import recoverNotes from '@/pages/doctorAdvice/components/recoverNotes'
-import medicationPlan from '@/pages/doctorAdvice/components/medicationPlan'
-import deviceManagement from '@/pages/doctorAdvice/components/deviceManagement'
-import { uParseTime } from '@/utils/tools'
+import "../../styles/resetStyle.scss";
+import DoctorManagement from "@/pages/doctorAdvice/components/DoctorManagement";
+import DryWeight from "@/pages/doctorAdvice/components/DryWeight";
+import CourseManagement from "@/pages/doctorAdvice/components/CourseManagement";
+import RescueRecord from "@/pages/doctorAdvice/components/RescueRecord";
+import Inspection from "@/pages/doctorAdvice/components/Inspection";
+import LongDialysis from "@/pages/doctorAdvice/components/LongDialysis";
+import DialysisRecord from "@/pages/doctorAdvice/components/DialysisRecord";
+import Scheduling from "@/pages/doctorAdvice/components/Scheduling";
+import Education from "@/pages/doctorAdvice/components/Education";
+import signsRecord from "@/pages/doctorAdvice/components/signsRecord";
+import recoverNotes from "@/pages/doctorAdvice/components/recoverNotes";
+import medicationPlan from "@/pages/doctorAdvice/components/medicationPlan";
+import deviceManagement from "@/pages/doctorAdvice/components/deviceManagement";
+import { uParseTime } from "@/utils/tools";
 import {
   getPatientDetail,
   getBloodDialysisPatientTwo,
   ToSearch
-} from '@/api/patient/patient'
-const moment = require('moment')
-let pinyin = require('js-pinyin')
-pinyin.setOptions({ checkPolyphone: false, charCase: 0 })
+} from "@/api/patient/patient";
+const moment = require("moment");
+let pinyin = require("js-pinyin");
+pinyin.setOptions({ checkPolyphone: false, charCase: 0 });
 export default {
   components: {
     DoctorManagement,
@@ -122,142 +122,143 @@ export default {
     medicationPlan,
     deviceManagement
   },
-  data () {
+  data() {
     return {
       show: false,
       show1: false,
       active: 0,
       title: [
-        '医嘱',
-        '长期透析处方',
-        '透析记录',
-        '干体重',
-        '检验检查',
-        '病程记录',
-        '抢救记录',
-        '排班信息',
-        '宣教信息',
-        '体征记录',
-        '康复笔记',
-        '用药管理',
-        '设备管理'
+        "医嘱",
+        "长期透析处方",
+        "透析记录",
+        "干体重",
+        "检验检查",
+        "病程记录",
+        "抢救记录",
+        "排班信息",
+        "宣教信息",
+        "体征记录",
+        "康复笔记",
+        "用药管理",
+        "设备管理"
       ],
 
-      searchVal: '',
-      startTime: moment(new Date()).format('YYYY-MM-DD'),
-      endTime: moment(new Date()).format('YYYY-MM-DD'),
+      searchVal: "",
+      startTime: moment(new Date()).format("YYYY-MM-DD"),
+      endTime: moment(new Date()).format("YYYY-MM-DD"),
       show1: false,
       show2: false,
       currentDate1: new Date(),
       currentDate2: new Date(),
       show3: false,
-      actions: [{ name: '编辑' }, { name: '删除' }],
-      time: '2016-10-2',
+      actions: [{ name: "编辑" }, { name: "删除" }],
+      time: "2016-10-2",
       patientForm: {
-        name: '',
-        sex: '',
-        age: '',
-        dialysis_no: '',
-        avatar: ''
+        name: "",
+        sex: "",
+        age: "",
+        dialysis_no: "",
+        avatar: ""
       },
       doctorAdvice: [],
       yiShow: false,
       meiShow: false,
       bingShow: false,
       aiShow: false,
-      doctor_name: '',
-      value: '',
-      patientName: '',
+      doctor_name: "",
+      value: "",
+      patientName: "",
       cityNameList: [
         {
           id: 101,
-          name: '北京市',
+          name: "北京市",
           pid: 1,
           code: 0
         },
         {
           id: 10101,
-          name: '天津市',
+          name: "天津市",
           pid: 10001,
           code: 0
         },
         {
           id: 20101,
-          name: '石家庄市',
+          name: "石家庄市",
           pid: 20001,
           code: 130100
         }
       ],
       FirstPin: [
-        'A',
-        'B',
-        'C',
-        'D',
-        'E',
-        'F',
-        'G',
-        'H',
-        'J',
-        'K',
-        'L',
-        'M',
-        'N',
-        'P',
-        'Q',
-        'R',
-        'S',
-        'T',
-        'W',
-        'X',
-        'Y',
-        'Z'
+        "A",
+        "B",
+        "C",
+        "D",
+        "E",
+        "F",
+        "G",
+        "H",
+        "J",
+        "K",
+        "L",
+        "M",
+        "N",
+        "P",
+        "Q",
+        "R",
+        "S",
+        "T",
+        "W",
+        "X",
+        "Y",
+        "Z"
       ],
       firstNameTwo: {},
       limit: 10,
       page: 1,
-      patient: []
-    }
+      patient: [],
+      patient_id: ""
+    };
   },
   methods: {
-    changeActive (index) {
-      this.active = index
-      this.show1 = false
+    changeActive(index) {
+      this.active = index;
+      this.show1 = false;
     },
 
     // sadas
-    showPopup (index) {
+    showPopup(index) {
       if (index === 1) {
-        this.show1 = true
+        this.show1 = true;
       } else if (index === 2) {
-        this.show2 = true
+        this.show2 = true;
       }
     },
-    chooseStartTime (value) {
-      this.startTime = moment(value).format('YYYY-MM-DD')
-      var patientid = this.$route.query.patientid
-      var orgid = this.$route.query.orgid
-      this.GetDoctroAdvice(patientid, orgid, this.startTime)
-      this.show1 = false
+    chooseStartTime(value) {
+      this.startTime = moment(value).format("YYYY-MM-DD");
+      var patientid = this.$route.query.patientid;
+      var orgid = this.$route.query.orgid;
+      this.GetDoctroAdvice(patientid, orgid, this.startTime);
+      this.show1 = false;
     },
-    chooseEndTime (value) {
-      this.endTime = moment(value).format('YYYY-MM-DD')
-      var patientid = this.$route.query.patientid
-      var orgid = this.$route.query.orgid
-      this.GetDoctroAdvice(patientid, orgid, this.endTime)
-      this.show2 = false
+    chooseEndTime(value) {
+      this.endTime = moment(value).format("YYYY-MM-DD");
+      var patientid = this.$route.query.patientid;
+      var orgid = this.$route.query.orgid;
+      this.GetDoctroAdvice(patientid, orgid, this.endTime);
+      this.show2 = false;
     },
-    onClick (index) {
+    onClick(index) {
       if (index === 1) {
-        this.show3 = true
+        this.show3 = true;
       } else if (index === 2) {
-        this.show3 = true
+        this.show3 = true;
       }
     },
-    RecordTime (time) {
+    RecordTime(time) {
       // return uParseTime(time, '{y}-{m}-{d} {h}:{i}:{s}')
-      return uParseTime(time, '{y}-{m}-{d}')
+      return uParseTime(time, "{y}-{m}-{d}");
     },
-    GetDoctroAdvice (patientid, orgid) {
+    GetDoctroAdvice(patientid, orgid) {
       GetDoctroAdvice(
         patientid,
         orgid,
@@ -266,150 +267,154 @@ export default {
         this.searchVal
       ).then(response => {
         if (response.data.state === 1) {
-          var doctoradvice = response.data.data.doctoradvice
-          this.doctorAdvice = doctoradvice
-          var patients = response.data.data.patients
-          this.patientForm.name = patients.name
-          this.patientForm.age = patients.age
-          this.patientForm.avatar = patients.avatar
-          var diseases = response.data.data.diseases
+          var doctoradvice = response.data.data.doctoradvice;
+          this.doctorAdvice = doctoradvice;
+          var patients = response.data.data.patients;
+          this.patientForm.name = patients.name;
+          this.patientForm.age = patients.age;
+          this.patientForm.avatar = patients.avatar;
+          var diseases = response.data.data.diseases;
           for (let index = 0; index < diseases.length; index++) {
             if (diseases[index].disease_id === 2) {
-              this.yiShow = true
+              this.yiShow = true;
             }
             if (diseases[index].disease_id === 3) {
-              this.bingShow = true
+              this.bingShow = true;
             }
             if (diseases[index].disease_id === 4) {
-              this.aiShow = true
+              this.aiShow = true;
             }
 
             if (diseases[index].disease_id === 6) {
-              this.meiShow = true
+              this.meiShow = true;
             }
           }
           if (patients.gender === 1) {
-            this.patientForm.sex = '男'
+            this.patientForm.sex = "男";
           }
           if (patients.gender === 2) {
-            this.patientForm.sex = '女'
+            this.patientForm.sex = "女";
           }
-          this.patientForm.dialysis_no = patients.dialysis_no
-          var role = response.data.data.role
-          this.doctor_name = role.user_name
+          this.patientForm.dialysis_no = patients.dialysis_no;
+          var role = response.data.data.role;
+          this.doctor_name = role.user_name;
         }
-      })
+      });
     },
-    watchNum () {
-      var patientid = this.$route.query.patientid
-      var orgid = this.$route.query.orgid
+    watchNum() {
+      var patientid = this.$route.query.patientid;
+      var orgid = this.$route.query.orgid;
       toSeacherDoctorAdvice(patientid, orgid, this.searchVal).then(response => {
         if (response.data.state === 1) {
-          var doctorAdvice = response.data.data.doctoradvice
-          this.doctorAdvice = doctoradvice
+          var doctorAdvice = response.data.data.doctoradvice;
+          this.doctorAdvice = doctoradvice;
         }
-      })
+      });
     },
-    deleteDoctorAdvice (id, index) {
+    deleteDoctorAdvice(id, index) {
       deleteDoctorAdvice(id, index).then(response => {
         if (response.data.state === 1) {
-          var msg = response.data.data.msg
-          this.doctorAdvice.splice(index, 1)
+          var msg = response.data.data.msg;
+          this.doctorAdvice.splice(index, 1);
         }
-      })
+      });
     },
-    toReturn () {
-      this.$router.push('/patients')
+    toReturn() {
+      this.$router.push("/patients");
     },
-    getPatientDetail (patientid) {
+    getPatientDetail(patientid) {
       getPatientDetail(patientid).then(response => {
         if (response.data.state === 1) {
-          var patientDetail = response.data.data.patientDetail
-          console.log('病人详情', patientDetail)
-          this.patientName = patientDetail.name
+          var patientDetail = response.data.data.patientDetail;
+          console.log("病人详情", patientDetail);
+          this.patientName = patientDetail.name;
         }
-      })
+      });
     },
-    getBloodDialysisPatientTwo () {
+    getBloodDialysisPatientTwo() {
       getBloodDialysisPatientTwo(this.page, this.limit).then(response => {
-        var patient = response.data.data.patient
-        this.patient = patient
-        let cityNameList = []
+        var patient = response.data.data.patient;
+        this.patient = patient;
+        let cityNameList = [];
         for (let p in patient) {
-          cityNameList.push(patient[p].name)
+          cityNameList.push(patient[p].name);
         }
-        let firstName = {}
+        let firstName = {};
         this.FirstPin.forEach(item => {
-          firstName[item] = []
+          firstName[item] = [];
           cityNameList.forEach(el => {
-            let first = pinyin.getFullChars(el).substring(0, 1)
+            let first = pinyin.getFullChars(el).substring(0, 1);
             if (first == item) {
-              firstName[item].push(el)
+              firstName[item].push(el);
             }
-          })
-          this.firstNameTwo = firstName
+          });
+          this.firstNameTwo = firstName;
           // 判断非空
-          let newObj = {}
+          let newObj = {};
           Object.keys(this.firstNameTwo).map((item, index) => {
             if (this.firstNameTwo[item].length != 0) {
-              newObj[item] = this.firstNameTwo[item]
+              newObj[item] = this.firstNameTwo[item];
             }
-          })
-          this.firstNameTwo = newObj
-        })
-      })
+          });
+          this.firstNameTwo = newObj;
+        });
+      });
     },
-    onSearch (val) {
+    onSearch(val) {
       ToSearch(val).then(response => {
         if (response.data.state === 1) {
-          var search = response.data.data.search
-          console.log('search', search)
-          let cityNameList = []
+          var search = response.data.data.search;
+          console.log("search", search);
+          let cityNameList = [];
           for (let p in search) {
-            cityNameList.push(search[p].name)
+            cityNameList.push(search[p].name);
           }
-          let firstName = {}
+          let firstName = {};
           this.FirstPin.forEach(item => {
-            firstName[item] = []
+            firstName[item] = [];
             cityNameList.forEach(el => {
-              let first = pinyin.getFullChars(el).substring(0, 1)
+              let first = pinyin.getFullChars(el).substring(0, 1);
               if (first == item) {
-                firstName[item].push(el)
+                firstName[item].push(el);
               }
-            })
-            this.firstNameTwo = firstName
+            });
+            this.firstNameTwo = firstName;
             // 判断非空
-            let newObj = {}
+            let newObj = {};
             Object.keys(this.firstNameTwo).map((item, index) => {
               if (this.firstNameTwo[item].length != 0) {
-                newObj[item] = this.firstNameTwo[item]
+                newObj[item] = this.firstNameTwo[item];
               }
-            })
-            this.firstNameTwo = newObj
-          })
+            });
+            this.firstNameTwo = newObj;
+          });
         }
-      })
+      });
     },
-    onCancel () {},
-    chooseCity (val) {
-      this.value = val
+    onCancel() {},
+    chooseCity(val) {
+      this.value = val;
       for (let i = 0; i < this.patient.length; i++) {
         if (this.value === this.patient[i].name) {
-          var id = this.patient[i].id
-          this.show = false
-          this.$router.push('/patientdetail?patientid=' + id)
-          this.patientName = this.value
+          var id = this.patient[i].id;
+          this.show = false;
+          this.$router.push("/patientdetail?patientid=" + id);
+          this.patientName = this.value;
         }
       }
+    },
+    toEditPatient() {
+      this.$router.push("/editPatient?patientid=" + this.patient_id);
     }
   },
-  created () {
-    var patientid = this.$route.query.patientid
-    console.log('patientid', patientid)
-    this.getPatientDetail(patientid)
-    this.getBloodDialysisPatientTwo()
+  created() {
+    var patientid = this.$route.query.patientid;
+    console.log("patientid", patientid);
+    this.patient_id = patientid;
+    this.getPatientDetail(patientid);
+    this.getBloodDialysisPatientTwo();
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>
@@ -448,7 +453,7 @@ export default {
   .wap {
     font-size: 1.875rem;
     line-height: 44px;
-    color: #cccccc;
+    color: #5b5b5b;
   }
   .titleBox {
     padding: 0 1.25rem 1.25rem;
@@ -476,12 +481,5 @@ export default {
     display: flex;
     align-items: center;
   }
-  .van-tabs__line {
-    background: #5b98ff;
-  }
-  .van-tabs {
-    background: #fff;
-    height: 100%;
-  }
 }
 </style>

src/pages/home/createOrg/index.vue

@@ -74,6 +74,8 @@
 </template>
 
 <script>
+  import {createOrg} from "@/api/login";
+  import {Toast} from 'vant'
 
   export default {
     components: {},
@@ -4263,7 +4265,34 @@
         window.location.href = "tel://075586526342";
       },createOrg(){
         this.orgForm.org_type = this.type_name.split("-")[1]
-        console.log( this.orgForm)
+        Toast.loading({forbidClick: true, duration: 0})
+        createOrg(this.orgForm).then(response => {
+          if (response.data.state === 1) {
+            Toast.success("创建成功")
+
+            var user = response.data.data.user;
+            var admin = response.data.data.admin;
+            var org = response.data.data.org;
+            var subscibe = response.data.data.subscibe;
+            var config_list = response.data.data.config_list;
+            var template_info = response.data.data.template_info;
+            var filed_list = response.data.data.filed_list;
+            this.$store.dispatch("InitUserInfo", {
+              admin: admin,
+              user: user,
+              org: org,
+              subscibe: subscibe,
+              template_info: template_info,
+              filed_list: filed_list
+            });
+            this.$store.dispatch("SetConfigList", config_list);
+            this.$router.replace({ path: "/homeIndex" });
+          }else{
+            Toast.fail(response.data.msg)
+          }
+        });
+
+
 
       }
     },

src/pages/home/forgetPassword/index.vue

@@ -11,7 +11,7 @@
             <i class="el-icon-mobile mobile"></i>
             <el-input
               class="phoneInput"
-              placeholder="请输入手机号码"
+              placeholder="请填写手机号码"
               v-model="forgetForm.phone"
               v-on:input="watchNum"
               maxlength="11"
@@ -24,11 +24,12 @@
             <i class="iconfont icon-dunpai dunpai"></i>
             <el-input
               v-model="forgetForm.code"
-              placeholder="请输入验证码"
+              placeholder="请填写验证码"
               v-on:input="watchNum"
             ></el-input>
-            <div class="getCode" @click="getVerifyCode()">{{code_btn_title}}</div>
-
+            <div class="getCode" @click="getVerifyCode()">
+              {{ code_btn_title }}
+            </div>
           </div>
         </el-form-item>
         <el-form-item>
@@ -37,7 +38,7 @@
             <el-input
               class="phoneInput"
               v-model="psd"
-              placeholder="请输入密码"
+              placeholder="请填写新密码"
               show-password
               clearable
             ></el-input>
@@ -72,9 +73,8 @@
 
 <script>
 // import { getCode, NextStep } from "@/api/login/login";
-import {
-  getCodeInit,getVerifyCode,forgetPassWord
-} from '@/api/login'
+import "@/styles/newStyle.scss";
+import { getCodeInit, getVerifyCode, forgetPassWord } from "@/api/login";
 import { checkMobile } from "@/utils/tools";
 import { hex_md5 } from "@/utils/md5";
 
@@ -94,7 +94,7 @@ export default {
       contact: false,
       count_downing: false,
       count_down: 0,
-      aespass:"",
+      aespass: "",
       forgetForm: {
         phone: "",
         code: ""
@@ -112,35 +112,35 @@ export default {
       codeshowtwo: true
     };
   },
-  created(){
-    this.GetCodeInit()
+  created() {
+    this.GetCodeInit();
   },
   methods: {
-    modifyAndLogin(){
+    modifyAndLogin() {
       if (this.forgetForm.phone.trim().length == 0) {
         this.$toast({
-          message:"手机号码不能为空!"
+          message: "手机号码不能为空!"
         });
-        return
+        return;
       }
       if (!checkMobile(this.forgetForm.phone)) {
         this.$toast({
-          message:"请填写正确的手机号码!"
+          message: "请填写正确的手机号码!"
         });
-        return
+        return;
       }
       if (this.forgetForm.code.trim().length == 0) {
         this.$toast({
-          message:"验证码不能为空!"
+          message: "验证码不能为空!"
         });
-        return
+        return;
       }
 
       let params = {
         mobile: this.forgetForm.phone,
         code: this.forgetForm.code,
-        password: hex_md5(this.psd),
-      }
+        password: hex_md5(this.psd)
+      };
       forgetPassWord(params).then(response => {
         if (response.data.state === 1) {
           var user = response.data.data.user;
@@ -152,7 +152,7 @@ export default {
           var filed_list = response.data.data.filed_list;
 
           this.$store.dispatch("InitUserInfo", {
-            admin:admin,
+            admin: admin,
             user: user,
             org: org,
             subscibe: subscibe,
@@ -160,45 +160,43 @@ export default {
             filed_list: filed_list
           });
           this.$store.dispatch("SetConfigList", config_list);
-          this.$router.replace("/myIndex")
-
-          }
-      })
+          this.$router.replace("/homeIndex");
+        }
+      });
     },
-    GetCodeInit(){
+    GetCodeInit() {
       getCodeInit().then(response => {
         if (response.data.state === 1) {
-          this.aespass = response.data.data.aespass
-
+          this.aespass = response.data.data.aespass;
         }
-      })
+      });
     },
     getVerifyCode() {
       if (this.forgetForm.phone.length == 0) {
         this.$toast({
-          message:"手机号码不能为空!"
+          message: "手机号码不能为空!"
         });
-        return
+        return;
       }
       if (!checkMobile(this.forgetForm.phone)) {
         this.$toast({
-          message:"请填写正确的手机号码!"
+          message: "请填写正确的手机号码!"
         });
-        return
+        return;
       }
 
       if (!this.count_downing) {
         let parms = {
           phone: this.forgetForm.phone,
-          aespass: this.aespass,
-        }
+          aespass: this.aespass
+        };
         getVerifyCode(parms).then(response => {
           if (response.data.state === 1) {
             this.count_downing = true;
             this.count_down = 61;
             this.countDown();
           }
-        })
+        });
       }
     },
 

src/pages/home/index.vue

@@ -112,6 +112,8 @@
 </template>
 
 <script>
+import "../../styles/newStyle.scss";
+import { setRem } from "@/libs/functionRem";
 export default {
   data() {
     return {
@@ -138,6 +140,7 @@ export default {
   created() {
     const id = this.$route.query.id;
     // this.getAllOrgName(id);
+    setRem();
   }
 };
 </script>

src/pages/home/login.vue

@@ -8,7 +8,7 @@
         <el-form ref="LoginForm" :model="LoginForm" :rules="rules">
           <el-form-item required prop="tel">
             <el-input
-              placeholder="请输入手机号码"
+              placeholder="请填写手机号码"
               prefix-icon="el-icon-mobile"
               v-model="LoginForm.tel"
               clearable
@@ -19,7 +19,7 @@
           </el-form-item>
           <el-form-item>
             <el-input
-              placeholder="请输入密码"
+              placeholder="请填写密码"
               prefix-icon="el-icon-lock"
               v-model="LoginForm.psd"
               show-password
@@ -38,22 +38,21 @@
       </div>
     </div>
     <div class="agreeBox">
-      <van-checkbox v-model="checked" shape="square"
-      >我已阅读并同意</van-checkbox
+      <van-checkbox v-model="checked" shape="square" icon-size="14px"
+        >我已阅读并同意</van-checkbox
       ><span class="newColor" @click="agree()">《隐私服务协议》</span
-    ><span class="newColor" @click="agree1()">《用户协议》</span>
+      ><span class="newColor" @click="agree1()">《用户协议》</span>
     </div>
   </div>
 </template>
 
-
-
-
 <script>
+import "../../styles/newStyle.scss";
 import { loginByPwd } from "@/api/login";
 import { hex_md5 } from "@/utils/md5";
 import { Toast } from "vant";
 import { checkMobile } from "@/utils/tools";
+import { setRem } from "@/libs/functionRem";
 
 export default {
   name: "Home",
@@ -90,6 +89,8 @@ export default {
   },
 
   created() {
+    setRem();
+    window.callJsFunction = this.callJsFunction
   },
 
   methods: {
@@ -123,7 +124,6 @@ export default {
       }
     },
 
-
     submitForm() {
       loginByPwd(this.LoginForm.tel, hex_md5(this.LoginForm.psd)).then(rs => {
         var resp = rs.data;
@@ -141,7 +141,7 @@ export default {
           var filed_list = resp.data.filed_list;
 
           this.$store.dispatch("InitUserInfo", {
-            admin:admin,
+            admin: admin,
             user: user,
             org: org,
             subscibe: subscibe,
@@ -149,37 +149,38 @@ export default {
             filed_list: filed_list
           });
           this.$store.dispatch("SetConfigList", config_list);
-          this.$router.replace({ path: "/myIndex" });
+          this.$router.replace({ path: "/homeIndex" });
+
         } else {
           this.$toast({
             message: resp.msg
           });
         }
       });
-    }, agree() {
+    },
+    agree() {
       this.$router.push({ path: "/privacy" });
     },
     agree1() {
       this.$router.push({ path: "/userAgreement" });
     }
-
   }
 };
 </script>
 
 <style lang="scss" scoped>
-  .page_login {
-    overflow: hidden;
-    height: 100%;
+.page_login {
+  overflow: hidden;
+  height: 100%;
   .loginTop {
     width: 100%;
-  img {
-    width: 7.75rem;
-    height: 2.5rem;
-    border: none;
-    margin: 6.25rem auto 3.75rem;
-    display: block;
-  }
+    img {
+      width: 7.75rem;
+      height: 2.5rem;
+      border: none;
+      margin: 6.25rem auto 3.75rem;
+      display: block;
+    }
   }
   .loginBottom {
     width: 23.4375rem;
@@ -198,9 +199,9 @@ export default {
     font-size: 0.8125rem;
     margin: 3.75rem auto 0;
 
-  .newColor {
-    color: #338afb;
-  }
+    .newColor {
+      color: #338afb;
+    }
   }
   .login {
     width: 19.25rem;
@@ -215,15 +216,15 @@ export default {
   .login2 {
     margin-top: 1.75rem;
     font-size: 0.8125rem;
-    color: rgba(81, 119, 238, 1);
-  > p:first-child {
-    float: left;
-    margin-left: 3rem;
-  }
-  .register {
-    margin-left: 17.4375rem;
     color: #1a8cff;
-  }
+    > p:first-child {
+      float: left;
+      margin-left: 3rem;
+    }
+    .register {
+      margin-left: 17.4375rem;
+      color: #1a8cff;
+    }
   }
   .login3 {
     width: 19.25rem;
@@ -235,51 +236,51 @@ export default {
     color: #fff;
     text-align: center;
   }
-  }
+}
 
-  .el-form-item__error {
-    margin-left: 2.5rem;
-  }
-  .el-button--medium {
-    padding: 0;
-  }
+.el-form-item__error {
+  margin-left: 2.5rem;
+}
+.el-button--medium {
+  padding: 0;
+}
 
-  .el-message {
-    min-width: 20rem;
-  }
+.el-message {
+  min-width: 20rem;
+}
 </style>
 <style lang="scss">
-  .loginBottom {
+.loginBottom {
   .el-form-item {
     margin-bottom: 0;
   }
   .ipts {
-  .el-icon-circle-close {
-    margin-right: 0.625rem;
-  }
-  .el-input {
-    display: block;
-    margin: 0 auto;
-    width: 19.0625rem;
-    border-bottom: 1px solid #e6e6e6;
-    color: rgba(155, 155, 155, 1);
-    padding-left: 0.75rem;
-    box-sizing: border-box;
-    height: 3.375rem;
-    line-height: 3.375rem;
-    font-size: 1rem;
-  }
-  .el-input__inner {
-    border: none;
-    font-size: 1rem;
-  }
-  .el-input__prefix {
-    font-size: 1.5rem;
-  }
-  .el-input__icon {
-    font-size: 1.5rem;
-    line-height: 3.375rem;
-  }
-  }
+    .el-icon-circle-close {
+      margin-right: 0.625rem;
+    }
+    .el-input {
+      display: block;
+      margin: 0 auto;
+      width: 19.0625rem;
+      border-bottom: 1px solid #e6e6e6;
+      color: rgba(155, 155, 155, 1);
+      padding-left: 0.75rem;
+      box-sizing: border-box;
+      height: 3.375rem;
+      line-height: 3.375rem;
+      font-size: 1rem;
+    }
+    .el-input__inner {
+      border: none;
+      font-size: 1rem;
+    }
+    .el-input__prefix {
+      font-size: 1.5rem;
+    }
+    .el-input__icon {
+      font-size: 1.5rem;
+      line-height: 3.375rem;
+    }
   }
+}
 </style>

src/pages/home/noJoinedGroup/index.vue

@@ -18,48 +18,48 @@
   </div>
 </template>
 <script>
-  import {login} from '@/api/login';
+import "@/styles/newStyle.scss";
+import { login } from "@/api/login";
 
-  export default {
-    data() {
-      return {
-      };
+export default {
+  data() {
+    return {};
+  },
+  methods: {
+    goCreateOrg() {
+      this.$router.push("/createorg");
     },
-    methods: {
-      goCreateOrg(){
-        this.$router.push("/createorg")
-      },goHome(){
-        login().then(response => {
-          if (response.data.state === 1) {
-            var user = response.data.data.user;
-            var admin = response.data.data.admin;
-            var org = response.data.data.org;
-            var subscibe = response.data.data.subscibe;
-            var config_list = response.data.data.config_list;
-            var template_info = response.data.data.template_info;
-            var filed_list = response.data.data.filed_list;
-            this.$store.dispatch("InitUserInfo", {
-              admin:admin,
-              user: user,
-              org: org,
-              subscibe: subscibe,
-              template_info: template_info,
-              filed_list: filed_list
-            });
-            this.$store.dispatch("SetConfigList", config_list);
-            this.$router.replace("/myIndex")
-          }else{
-            this.$toast({
-              message:response.data.msg
-            });
-          }
-        })
-      }
-    },
-  };
+    goHome() {
+      login().then(response => {
+        if (response.data.state === 1) {
+          var user = response.data.data.user;
+          var admin = response.data.data.admin;
+          var org = response.data.data.org;
+          var subscibe = response.data.data.subscibe;
+          var config_list = response.data.data.config_list;
+          var template_info = response.data.data.template_info;
+          var filed_list = response.data.data.filed_list;
+          this.$store.dispatch("InitUserInfo", {
+            admin: admin,
+            user: user,
+            org: org,
+            subscibe: subscibe,
+            template_info: template_info,
+            filed_list: filed_list
+          });
+          this.$store.dispatch("SetConfigList", config_list);
+          this.$router.replace("/homeIndex");
+        } else {
+          this.$toast({
+            message: response.data.msg
+          });
+        }
+      });
+    }
+  }
+};
 </script>
 
-
 <style lang="scss" scoped>
 .page_noJoinedGroup {
   height: 100%;

src/pages/home/noPassword/index.vue

@@ -11,7 +11,7 @@
             <i class="el-icon-mobile mobile"></i>
             <el-input
               class="phoneInput"
-              placeholder="请输入手机号码"
+              placeholder="请填写手机号码"
               v-model="NoPassForm.phone"
               v-on:input="watchNum"
               :maxlength="11"
@@ -25,13 +25,14 @@
             <el-input
               class="yzm"
               v-model="NoPassForm.code"
-              placeholder="请输入验证码"
+              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>
-
           </div>
         </el-form-item>
       </el-form>
@@ -41,7 +42,7 @@
     </div>
     <div class="logintwo" v-show="loginshowtwo">登录</div>
     <div class="agreeBox">
-      <van-checkbox v-model="checked" shape="square"
+      <van-checkbox v-model="checked" shape="square" icon-size="14px"
         >我已阅读并同意</van-checkbox
       ><span class="newColor" @click="agree()">《隐私服务协议》</span
       ><span class="newColor" @click="agree1()">《用户协议》</span>
@@ -71,10 +72,9 @@
 </template>
 
 <script>
+import "@/styles/newStyle.scss";
 import { checkMobile } from "@/utils/tools";
-import {
-  getCodeInit,getVerifyCode,loginByCode
-} from '@/api/login'
+import { getCodeInit, getVerifyCode, loginByCode } from "@/api/login";
 export default {
   data() {
     var checkMobileRule = (rule, value, callback) => {
@@ -109,46 +109,43 @@ export default {
       codeshowtwo: true
     };
   },
-  created(){
-    this.GetCodeInit()
+  created() {
+    this.GetCodeInit();
   },
   methods: {
-    GetCodeInit(){
+    GetCodeInit() {
       getCodeInit().then(response => {
         if (response.data.state === 1) {
-          this.aespass = response.data.data.aespass
-
+          this.aespass = response.data.data.aespass;
         }
-      })
+      });
     },
     getVerifyCode() {
       if (this.NoPassForm.phone.length == 0) {
         this.$toast({
-          message:"手机号码不能为空!"
+          message: "手机号码不能为空!"
         });
-        return
+        return;
       }
       if (!checkMobile(this.NoPassForm.phone)) {
         this.$toast({
-          message:"请填写正确的手机号码!"
+          message: "请填写正确的手机号码!"
         });
-        return
+        return;
       }
 
-
-
       if (!this.count_downing) {
         let parms = {
           phone: this.NoPassForm.phone,
-          aespass: this.aespass,
-        }
+          aespass: this.aespass
+        };
         getVerifyCode(parms).then(response => {
           if (response.data.state === 1) {
             this.count_downing = true;
             this.count_down = 61;
             this.countDown();
           }
-        })
+        });
       }
     },
     countDown: function() {
@@ -167,61 +164,57 @@ export default {
       window.location.href = "tel://075586526342";
     },
     NoPassToLogin(formName) {
-
       this.$refs[formName].validate(valid => {
         if (valid) {
           if (this.NoPassForm.phone.length == 0) {
             this.$toast({
-              message:"手机号码不能为空!"
+              message: "手机号码不能为空!"
             });
-            return
+            return;
           }
           if (!checkMobile(this.NoPassForm.phone)) {
             this.$toast({
-              message:"请填写正确的手机号码!"
+              message: "请填写正确的手机号码!"
             });
-            return
+            return;
           }
           if (this.NoPassForm.code.length == 0) {
             this.$toast({
-              message:"验证码不能为空!"
+              message: "验证码不能为空!"
             });
-            return
+            return;
           }
 
-
           let params = {
             mobile: this.NoPassForm.phone,
             code: this.NoPassForm.code
-          }
-          loginByCode(params).then(
-            response => {
-              if (response.data.state === 1) {
-                var user = response.data.data.user;
-                var admin = response.data.data.admin;
-                var org = response.data.data.org;
-                var subscibe = response.data.data.subscibe;
-                var config_list = response.data.data.config_list;
-                var template_info = response.data.data.template_info;
-                var filed_list = response.data.data.filed_list;
+          };
+          loginByCode(params).then(response => {
+            if (response.data.state === 1) {
+              var user = response.data.data.user;
+              var admin = response.data.data.admin;
+              var org = response.data.data.org;
+              var subscibe = response.data.data.subscibe;
+              var config_list = response.data.data.config_list;
+              var template_info = response.data.data.template_info;
+              var filed_list = response.data.data.filed_list;
 
-                this.$store.dispatch("InitUserInfo", {
-                  admin:admin,
-                  user: user,
-                  org: org,
-                  subscibe: subscibe,
-                  template_info: template_info,
-                  filed_list: filed_list
-                });
-                this.$store.dispatch("SetConfigList", config_list);
-                this.$router.replace("/myIndex")
-              } else {
-                this.$toast({
-                  message: resp.data.msg
-                });
-              }
+              this.$store.dispatch("InitUserInfo", {
+                admin: admin,
+                user: user,
+                org: org,
+                subscibe: subscibe,
+                template_info: template_info,
+                filed_list: filed_list
+              });
+              this.$store.dispatch("SetConfigList", config_list);
+              this.$router.replace("/homeIndex");
+            } else {
+              this.$toast({
+                message: resp.data.msg
+              });
             }
-          );
+          });
         }
       });
     },
@@ -244,7 +237,8 @@ export default {
     },
     change(val) {
       this.NoPassForm.phone = val.replace(/[^0-9]+/g, "");
-    },agree() {
+    },
+    agree() {
       this.$router.push({ path: "/privacy" });
     },
     agree1() {

src/pages/home/register/name.vue

@@ -11,7 +11,7 @@
         <span class="problem">请问你的姓名是？</span>
       </div>
       <div class="inputBox">
-        <van-field v-model="name" placeholder="请输入用户名"/>
+        <van-field v-model="name" placeholder="请输入用户名" />
       </div>
       <div class="next" @click="setName()">下一步</div>
     </div>
@@ -19,44 +19,44 @@
 </template>
 
 <script>
-  import {setName} from '@/api/login';
-
-  export default {
-    data() {
-      return {
-        name: '',
+import "../../../styles/newStyle.scss";
+import { setName } from "@/api/login";
+import { setRem } from "@/libs/functionRem";
+
+export default {
+  data() {
+    return {
+      name: ""
+    };
+  },
+  created() {
+    setRem();
+  },
+  methods: {
+    setName() {
+      if (this.name.trim().length == 0) {
+        this.$message.error("名字不能为空!");
+        return;
+      }
+      let params = {
+        name: this.name
       };
-    },
-    methods: {
-        setName(){
-          if(this.name.trim().length == 0){
-            this.$message.error("名字不能为空!");
-            return
-          }
-          let params = {
-            name : this.name
-          }
-          setName(params).then(
-            response => {
-              if (response.data.state === 1) {
-                this.$router.replace("/join")
-              } else {
-                this.$message.error(response.data.msg);
-              }
-            }
-          );
+      setName(params).then(response => {
+        if (response.data.state === 1) {
+          this.$router.replace("/join");
+        } else {
+          this.$message.error(response.data.msg);
         }
-
-
-    },
-  };
+      });
+    }
+  }
+};
 </script>
 
-
 <style lang="scss" scoped>
-  .page_getName {
-    height: 100%;
-    overflow: hidden;
+.page_getName {
+  height: 100%;
+  overflow: hidden;
 
   .getNameTitle {
     height: 3.125rem;
@@ -97,6 +97,9 @@
   .inputBox {
     border-bottom: 1px solid #e8e8e8;
     margin-top: 1.25rem;
+    .van-cell {
+      padding: 10px 0.75rem;
+    }
   }
 
   .next {
@@ -110,6 +113,5 @@
     color: #fff;
     margin-top: 3.125rem;
   }
-
-  }
+}
 </style>

src/pages/home/register/register.vue

@@ -10,7 +10,7 @@
           <div class="phoneLine">
             <i class="el-icon-mobile mobile"></i>
             <el-input
-              placeholder="请输入手机号码"
+              placeholder="请填写手机号码"
               v-model="registerForm.phone"
               v-on:input="watchNum"
               maxlength="11"
@@ -23,10 +23,12 @@
             <i class="iconfont icon-dunpai dunpai"></i>
             <el-input
               v-model="registerForm.code"
-              placeholder="请输入验证码"
+              placeholder="请填写验证码"
               v-on:input="watchNum"
             ></el-input>
-            <div class="getCode" @click="getVerifyCode()">{{code_btn_title}}</div>
+            <div class="getCode" @click="getVerifyCode()">
+              {{ code_btn_title }}
+            </div>
             <!-- <el-button class="getCode" :type="count_downing ? 'info' : 'primary'" :disabled="count_downing" @click="getCodeAction" v-show="codeshow">{{ code_btn_title }}</el-button>
             <el-button class="getCodetwo" :type="count_downing ? 'info' : 'primary'" :disabled="count_downing" v-show="codeshowtwo">{{ code_btn_title }}</el-button>-->
           </div>
@@ -38,7 +40,7 @@
               v-model="registerForm.password"
               show-password
               clearable
-              placeholder="请输入密码"
+              placeholder="请填写密码"
             ></el-input>
           </div>
         </el-form-item>
@@ -61,7 +63,7 @@
     </div>
     <div class="logintwo" v-show="loginshowtwo">下一步</div>
     <div class="agreeBox">
-      <van-checkbox v-model="checked" shape="square"
+      <van-checkbox v-model="checked" shape="square" icon-size="14px"
         >我已阅读并同意</van-checkbox
       ><span class="newColor">《隐私服务协议》</span
       ><span class="newColor">《用户协议》</span>
@@ -91,8 +93,10 @@
 </template>
 
 <script>
+import "@/styles/newStyle.scss";
 import { checkMobile, checkPassWordTwo } from "@/utils/tools";
-import {getCodeInit,getVerifyCode,register} from '@/api/login';
+import { getCodeInit, getVerifyCode, register } from "@/api/login";
+
 import { hex_md5 } from "@/utils/md5";
 
 export default {
@@ -140,47 +144,46 @@ export default {
       loginshowtwo: false,
       codeshow: false,
       codeshowtwo: true,
-      aespass:"",
+      aespass: ""
     };
   },
-  created(){
-    this.GetCodeInit()
+  created() {
+    this.GetCodeInit();
   },
   methods: {
-    GetCodeInit(){
+    GetCodeInit() {
       getCodeInit().then(response => {
         if (response.data.state === 1) {
-          this.aespass = response.data.data.aespass
-
+          this.aespass = response.data.data.aespass;
         }
-      })
+      });
     },
     getVerifyCode() {
       if (this.registerForm.phone.length == 0) {
         this.$toast({
-          message:"手机号码不能为空!"
+          message: "手机号码不能为空!"
         });
-        return
+        return;
       }
       if (!checkMobile(this.registerForm.phone)) {
         this.$toast({
-          message:"请填写正确的手机号码!"
+          message: "请填写正确的手机号码!"
         });
-        return
+        return;
       }
 
       if (!this.count_downing) {
         let parms = {
           phone: this.registerForm.phone,
-          aespass: this.aespass,
-        }
+          aespass: this.aespass
+        };
         getVerifyCode(parms).then(response => {
           if (response.data.state === 1) {
             this.count_downing = true;
             this.count_down = 61;
             this.countDown();
           }
-        })
+        });
       }
     },
 
@@ -217,11 +220,11 @@ export default {
           let params = {
             mobile: this.registerForm.phone,
             password: hex_md5(this.psd),
-            code: this.registerForm.code,
-          }
+            code: this.registerForm.code
+          };
           register(params).then(response => {
             if (response.data.state === 1) {
-              this.$router.push("/setname")
+              this.$router.push("/setname");
             } else {
               this.$toast({
                 message: response.data.msg

src/pages/home/verifyToken.vue

@@ -5,43 +5,49 @@
 </template>
 
 <script>
-  import {
-    isLogin,
-  } from '@/api/login'
+import { setRem } from "@/libs/functionRem";
+import { isLogin } from "@/api/login";
 
-  export default {
-    name: "verifyToken",
-    created() {
-      isLogin().then(response => {
-        if (response.data.state === 1) {
-          var data = response.data.data
-          if(data.isLogin){ //登录
-            var admin = data.admin;
-            var user = data.user;
-            var org = data.org;
-            var subscibe = data.subscibe;
-            var config_list = data.config_list;
-            var template_info = data.template_info;
-            var filed_list = data.filed_list;
-            this.$store.dispatch("InitUserInfo", {
-              admin:admin,
-              user: user,
-              org: org,
-              subscibe: subscibe,
-              template_info: template_info,
-              filed_list: filed_list
-            });
-            this.$store.dispatch("SetConfigList", config_list);
-            this.$router.replace("/myIndex")
-          }else{ //未登录
-            this.$router.replace("/login")
-          }
+export default {
+  name: "verifyToken",
+  created() {
+    window.callJsFunction = this.callJsFunction
+    setRem();
+    isLogin().then(response => {
+      if (response.data.state === 1) {
+        var data = response.data.data;
+        if (data.isLogin) {
+          //登录
+          var admin = data.admin;
+          var user = data.user;
+          var org = data.org;
+          var subscibe = data.subscibe;
+          var config_list = data.config_list;
+          var template_info = data.template_info;
+          var filed_list = data.filed_list;
+          this.$store.dispatch("InitUserInfo", {
+            admin: admin,
+            user: user,
+            org: org,
+            subscibe: subscibe,
+            template_info: template_info,
+            filed_list: filed_list
+          });
+          this.$store.dispatch("SetConfigList", config_list);
+          this.$router.replace("/homeIndex");
+        } else {
+          //未登录
+          this.$router.replace("/login");
         }
-      })
+      }
+    });
+  },methods:{
+    callJsFunction(cookieStr) {
+      console.log(cookieStr)
+
     }
-  }
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

src/pages/homeIndex/index.vue

@@ -33,20 +33,20 @@
     </div>
     <div class="noticeBox">
       <i class="iconfont icon-public-notice notice"></i>
-      <div class="noticeNews">
-        <div>
-          今日上机：
-          <span>6&ensp;人</span>
-        </div>
-        <div>
-          今日透析：
-          <span>6&ensp;人</span>
-        </div>
-        <div>
-          今日生日：
-          <span>6&ensp;人</span>
-        </div>
-      </div>
+      <!--<div class="noticeNews">-->
+        <!--<div>-->
+          <!--今日上机：-->
+          <!--<span>6&ensp;人</span>-->
+        <!--</div>-->
+        <!--<div>-->
+          <!--今日透析：-->
+          <!--<span>6&ensp;人</span>-->
+        <!--</div>-->
+        <!--<div>-->
+          <!--今日生日：-->
+          <!--<span>6&ensp;人</span>-->
+        <!--</div>-->
+      <!--</div>-->
     </div>
     <div class="background1"></div>
     <div class="management">
@@ -131,6 +131,7 @@
 // import "../libs/rem.js";
 import "../../libs/rem.js";
 import "../../styles/newStyle.scss";
+import { setRem } from "@/libs/functionRem";
 export default {
   data() {
     return {
@@ -148,26 +149,9 @@ export default {
     }
   },
   created() {
-    const baseSize = 32;
-    // 设置 rem 函数
-    function setRem() {
-      const scale = document.documentElement.clientWidth / 750;
-      document.documentElement.style.fontSize =
-        baseSize * Math.min(scale, 2) + "px";
-      //   // 320 默认大小16px; 320px = 20rem ;每个元素px基础上/16
-      //   let htmlWidth =
-      //     document.documentElement.clientWidth || document.body.clientWidth;
-      //   //得到html的Dom元素
-      //   let htmlDom = document.getElementsByTagName("html")[0];
-      //   //设置根元素字体大小
-      //   htmlDom.style.fontSize = htmlWidth / 23.4375 + "px";
-    }
-    // 初始化
+    Toast("请同意隐私服务协议");
+
     setRem();
-    // 改变窗口大小时重新设置 rem
-    window.onresize = function() {
-      setRem();
-    };
   }
 };
 </script>

src/pages/patientManagement/index.vue

@@ -18,7 +18,12 @@
       </div>
     </van-sticky>
     <div class="patientBox">
-      <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+      <van-list
+        v-model="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="onLoad"
+      >
         <div
           class="patientOne"
           v-for="item in patients"
@@ -34,7 +39,9 @@
 </template>
 
 <script>
+import "../../styles/resetStyle.scss";
 import { getBloodDialysisPatient } from "@/api/patient/patient";
+import { setRem, setHeight } from "@/libs/functionRem";
 export default {
   data() {
     return {
@@ -74,7 +81,7 @@ export default {
       getBloodDialysisPatient(this.page, this.limit).then(response => {
         if (response.data.state == 1) {
           var patient = response.data.data.patient;
-          // console.log("病人信息", patient);
+          console.log("病人信息", patient);
           this.patients = patient;
           var total = response.data.data.total;
           this.total = total;
@@ -108,27 +115,8 @@ export default {
     }
   },
   created() {
-    const baseSize = 32;
-    // 设置 rem 函数
-    function setRem() {
-      const scale = document.documentElement.clientWidth / 750;
-      document.documentElement.style.fontSize =
-        baseSize * Math.min(scale, 2) + "px";
-      //   // 320 默认大小16px; 320px = 20rem ;每个元素px基础上/16
-      //   let htmlWidth =
-      //     document.documentElement.clientWidth || document.body.clientWidth;
-      //   //得到html的Dom元素
-      //   let htmlDom = document.getElementsByTagName("html")[0];
-      //   //设置根元素字体大小
-      //   htmlDom.style.fontSize = htmlWidth / 23.4375 + "px";
-    }
-    // 初始化
     setRem();
-    // 改变窗口大小时重新设置 rem
-    window.onresize = function() {
-      setRem();
-    };
-
+    setHeight();
     this.getBloodDialysisPatient();
   }
 };
@@ -149,7 +137,7 @@ export default {
   .jiantou {
     font-size: 1.5rem;
     font-weight: 600;
-    margin-right: 3rem;
+    margin-right: 2rem;
   }
   .titleName {
     font-size: 1.125rem;

src/pages/patientManagement/patientManagement.vue

@@ -64,10 +64,12 @@
 </template>
 
 <script>
+import "../../styles/resetStyle.scss";
 import { getBloodDialysisPatient } from "@/api/patient/patient";
 import Slow from "@/pages/patientManagement/components/Slow";
 import Member from "@/pages/patientManagement/components/Member";
 import Blood from "@/pages/patientManagement/components/Blood";
+import { setRem, setHeight } from "@/libs/functionRem";
 export default {
   components: {
     Slow,
@@ -152,26 +154,8 @@ export default {
     }
   },
   created() {
-    const baseSize = 32;
-    // 设置 rem 函数
-    function setRem() {
-      const scale = document.documentElement.clientWidth / 750;
-      document.documentElement.style.fontSize =
-        baseSize * Math.min(scale, 2) + "px";
-      //   // 320 默认大小16px; 320px = 20rem ;每个元素px基础上/16
-      //   let htmlWidth =
-      //     document.documentElement.clientWidth || document.body.clientWidth;
-      //   //得到html的Dom元素
-      //   let htmlDom = document.getElementsByTagName("html")[0];
-      //   //设置根元素字体大小
-      //   htmlDom.style.fontSize = htmlWidth / 23.4375 + "px";
-    }
-    // 初始化
     setRem();
-    // 改变窗口大小时重新设置 rem
-    window.onresize = function() {
-      setRem();
-    };
+    setHeight();
     this.getBloodDialysisPatient();
   }
 };
@@ -192,11 +176,12 @@ export default {
   .jiantou {
     font-size: 1.5rem;
     font-weight: 600;
-    margin-right: 3rem;
+    margin-right: 2rem;
   }
   .titleName {
     font-size: 1.125rem;
     font-weight: 600;
+    color: #000;
   }
   .iconBox {
     display: flex;

src/pages/patients/addPatient.vue

@@ -46,7 +46,6 @@
             <van-checkbox-group v-model="result" @change="changeMode">
               <van-checkbox name="1" shape="square">血透患者</van-checkbox>
               <van-checkbox name="2" shape="square">慢病患者</van-checkbox>
-              <!--              <van-checkbox name="c" shape="square">电商患者</van-checkbox>-->
               <van-checkbox name="3" shape="square">会员患者</van-checkbox>
             </van-checkbox-group>
           </div>
@@ -432,7 +431,7 @@ export default {
       this.show2 = false;
     },
     changeMode(val) {
-      alert(val);
+      // alert(val);
       if (val == 1) {
         getBloodPatientInfo(this.patientForm.phone).then(response => {
           if (response.data.state === 1) {
@@ -610,7 +609,6 @@ export default {
       }
 
       for (let i = 0; i < this.result.length; i++) {
-        console.log("判断成立马", this.result[i]);
         if (this.result[i] == 1) {
           this.patientForm.bloodPatient = 1;
         }

src/permission.js

@@ -8,8 +8,8 @@ router.beforeEach((to, from, next) => {
   // 线上注释
   //   next()
   //   return
-  console.log(store.getters.user.user.id)
-  if (store.getters.user.user.id == 0) {
+  console.log(store.getters.user.admin)
+  if (store.getters.user.admin == null) {
     if (loginWhiteList.indexOf(to.path) !== -1) {
       next();
     } else {

src/router/index.js

@@ -46,13 +46,10 @@ export default new Router({
     },
     // 首页
     {
-      path: '/myIndex',
-      name: 'myIndex',
-      component: () => import('@/pages/home/index'),
-      children: [{
-        path: '/homeIndex',
-        component: () => import('@/pages/homeIndex/index.vue')
-      }]
+      path: '/homeIndex',
+      name: 'Home',
+      component: () => import('@/pages/homeIndex/index')
+
     },
     // 患者中心
     {
@@ -78,6 +75,12 @@ export default new Router({
       name: 'dryweight',
       component: () => import('@/pages/allDryWeight/index')
     },
+    // 基本信息
+    {
+      path: '/editPatient',
+      name: 'editPatient',
+      component: () => import('@/pages/patients/editPatient')
+    },
     //
     {
       path: '/patientdetail',

src/styles/newStyle.scss

@@ -1,4 +1,6 @@
 html,
 body {
   height: 100%;
+  background: #fff;
+  color: #000;
 }