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

.gitignore

@@ -16,4 +16,4 @@ selenium-debug.log
 *.njsproj
 *.sln
 .svn
-.dist
+.dist

.postcssrc.js

@@ -1,10 +1,10 @@
 // https://github.com/michael-ciniawsky/postcss-load-config
 
 module.exports = {
-  "plugins": {
+  plugins: {
     "postcss-import": {},
     "postcss-url": {},
     // to edit target browsers: use "browserslist" field in package.json
-    "autoprefixer": {}
+    autoprefixer: {}
   }
-}
+};

src/main.js

@@ -55,7 +55,9 @@ import {
   Switch,
   Uploader,
   Radio,
-  RadioGroup
+  RadioGroup,
+  Overlay,
+  Loading
   // eslint-disable-next-line no-irregular-whitespace,import/no-duplicates
 } from "vant";
 Vue.use(DropdownMenu)
@@ -90,7 +92,9 @@ Vue.use(DropdownMenu)
   .use(Switch)
   .use(Uploader)
   .use(RadioGroup)
-  .use(Radio);
+  .use(Radio)
+  .use(Overlay)
+  .use(Loading);
 // import "@/lib/flexible.js";
 
 // main.js

src/pages/home/login.vue

@@ -42,6 +42,11 @@
       <span class="newColor" @click="agree()">《隐私服务协议》</span>
       <span class="newColor" @click="agree1()">《用户协议》</span>
     </div>
+    <van-overlay :show="show" @click="show = false">
+      <div class="wrapper">
+        <van-loading size="24px" vertical>正在登录...</van-loading>
+      </div>
+    </van-overlay>
   </div>
 </template>
 
@@ -64,6 +69,7 @@ export default {
       }
     };
     return {
+      show: false,
       checked: true,
       tel: "",
       psd: "",
@@ -129,43 +135,49 @@ export default {
     },
 
     submitForm() {
-      loginByPwd(this.LoginForm.tel, hex_md5(this.LoginForm.psd)).then(rs => {
-        var resp = rs.data;
-        if (this.checked != true) {
-          Toast("请同意隐私服务协议");
-          return;
-        }
+      this.show = true;
+      loginByPwd(this.LoginForm.tel, hex_md5(this.LoginForm.psd))
+        .then(rs => {
+          var resp = rs.data;
+          if (this.checked != true) {
+            Toast("请同意隐私服务协议");
+            return;
+          }
 
-        if (resp.state == 1 && this.checked == true) {
-          var user = resp.data.user;
-          var admin = resp.data.admin;
-          var org = resp.data.org;
-          var subscibe = resp.data.subscibe;
-          var config_list = resp.data.config_list;
-          var template_info = resp.data.template_info;
-          var filed_list = resp.data.filed_list;
+          if (resp.state == 1 && this.checked == true) {
+            this.show = false;
+            var user = resp.data.user;
+            var admin = resp.data.admin;
+            var org = resp.data.org;
+            var subscibe = resp.data.subscibe;
+            var config_list = resp.data.config_list;
+            var template_info = resp.data.template_info;
+            var filed_list = resp.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 {
-          if (this.errorNum >= 2) {
-            this.showForgetPwdDialog();
-          } else {
-            this.errorNum = this.errorNum + 1;
-            this.$toast({
-              message: resp.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({ path: "/homeIndex" });
+          } else {
+            if (this.errorNum >= 2) {
+              this.showForgetPwdDialog();
+            } else {
+              this.errorNum = this.errorNum + 1;
+              this.$toast({
+                message: resp.msg
+              });
+            }
           }
-        }
-      });
+        })
+        .catch(error => {
+          console.log(error);
+        });
     },
     showForgetPwdDialog() {
       Dialog.confirm({
@@ -259,6 +271,12 @@ export default {
     color: #fff;
     text-align: center;
   }
+  .wrapper {
+    position: fixed;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+  }
 }
 
 .el-form-item__error {

src/pages/homeIndex/index.vue

@@ -4,28 +4,33 @@
       <div class="homeTitle">
         <div class="homeTitleLeft" style="visibility: hidden" v-if="isCreateOrg == false">
           <van-dropdown-menu>
-            <van-dropdown-item @change="changeOrg" v-model="value1" :options="org_arr"/>
+            <van-dropdown-item @change="changeOrg" v-model="value1" :options="org_arr" />
           </van-dropdown-menu>
         </div>
-        <div class="homeTitleLeft"  v-if="isCreateOrg == true">
+        <div class="homeTitleLeft" v-if="isCreateOrg == true">
           <van-dropdown-menu>
-            <van-dropdown-item @change="changeOrg" v-model="value1" :options="org_arr"/>
+            <van-dropdown-item @change="changeOrg" v-model="value1" :options="org_arr" />
           </van-dropdown-menu>
         </div>
         <div class="homeTitleRight">
           <i class="iconfont icon-sousuo search1" @click="toSearch"></i>
           <!--<van-icon class="iconOne" name="comment-o"/>-->
-          <van-icon class="iconOne" name="add-o" @click="toCreateOrg"/>
+          <van-icon name="plus" class="iconOne" @click="toCreateOrg" />
         </div>
       </div>
     </van-sticky>
     <div class="banner">
       <van-swipe class="my-swipe" :autoplay="3000" indicator-color="white">
-        <van-swipe-item v-for="(banner, index) in this.banners" @click="jump(banner.url)" :key="index">
+        <van-swipe-item
+          v-for="(banner, index) in this.banners"
+          @click="jump(banner.url)"
+          :key="index"
+        >
           <img :src="banner.thumb" alt />
         </van-swipe-item>
       </van-swipe>
     </div>
+    <van-overlay :show="show" @click="show = false" />
     <!--<div class="noticeBox">-->
     <!--<i class="iconfont icon-public-notice notice"></i>-->
     <!--<div class="noticeNews">-->
@@ -45,29 +50,31 @@
     <!--</div>-->
     <div class="background1"></div>
 
-    <div class="management" v-if="this.$store.getters.user.admin.id ==  this.$store.getters.user.org.creator&&this.isCreateOrg">
+    <div
+      class="management"
+      v-if="this.$store.getters.user.admin.id ==  this.$store.getters.user.org.creator&&this.isCreateOrg"
+    >
       <div class="managementTitle">
         <div class="managementName">
           管理控制台
           <span>（仅管理员可见）</span>
         </div>
         <div class="setting" @click="toConsole()">
-          <van-icon name="setting-o"/>
-          管理
+          <van-icon name="setting-o" />管理
         </div>
       </div>
       <div class="managementBox">
         <div class="managementOne" @click="toStaffManage()">
-          <img src="../../assets/images/M1.png" alt/>员工管理
+          <img src="../../assets/images/M1.png" alt />员工管理
         </div>
         <div class="managementOne" @click="toRoleManage()">
-          <img src="../../assets/images/M2.png" alt/>权限管理
+          <img src="../../assets/images/M2.png" alt />权限管理
         </div>
         <div class="managementOne" @click="toConfigCenter()">
-          <img src="../../assets/images/M3.png" alt/>配置中心
+          <img src="../../assets/images/M3.png" alt />配置中心
         </div>
         <div class="managementOne" @click="toOrgSetting()">
-          <img src="../../assets/images/M4.png" alt/>机构设置
+          <img src="../../assets/images/M4.png" alt />机构设置
         </div>
       </div>
     </div>
@@ -75,22 +82,25 @@
     <div class="management" v-if="!this.isCreateOrg">
       <div class="managementTitle">
         <div class="managementName">
-          管理控制台<span>（仅管理员可见）</span>
+          管理控制台
+          <span>（仅管理员可见）</span>
+        </div>
+        <div class="setting">
+          <van-icon name="setting-o" />管理
         </div>
-        <div class="setting"><van-icon name="setting-o" />管理</div>
       </div>
       <div class="managementBox">
         <div class="managementOne" @click="toStaffManage()">
-          <img src="../../assets/images/M1.png" alt="" />员工管理
+          <img src="../../assets/images/M1.png" alt />员工管理
         </div>
         <div class="managementOne" @click="toRoleManage()">
-          <img src="../../assets/images/M2.png" alt="" />权限管理
+          <img src="../../assets/images/M2.png" alt />权限管理
         </div>
         <div class="managementOne" @click="toConfigCenter()">
-          <img src="../../assets/images/M3.png" alt="" />配置中心
+          <img src="../../assets/images/M3.png" alt />配置中心
         </div>
         <div class="managementOne" @click="toOrgSetting()">
-          <img src="../../assets/images/M4.png" alt="" />机构设置
+          <img src="../../assets/images/M4.png" alt />机构设置
         </div>
       </div>
     </div>
@@ -101,8 +111,14 @@
         <!--<div class="applicationService">+ 更多应用</div>-->
       </div>
       <div class="applicationBox">
-        <div v-for="(item, index) in this.apps" :key="index"  :class="item.open_status == 1? 'applicationOne':'applicationOne opacity'" @click="jumpApp(item)">
-          <img :src="item.url" alt/>{{item.name}}
+        <div
+          v-for="(item, index) in this.apps"
+          :key="index"
+          :class="item.open_status == 1? 'applicationOne':'applicationOne opacity'"
+          @click="jumpApp(item)"
+        >
+          <img :src="item.url" alt />
+          {{item.name}}
         </div>
       </div>
     </div>
@@ -120,6 +136,7 @@ import { setRem } from "@/libs/functionRem";
 export default {
   data() {
     return {
+      show: true,
       value1: 0,
       isCreateOrg: false,
       org_arr: [],
@@ -437,6 +454,10 @@ export default {
     opacity: 0.5;
     filter: alpha(opacity=40);
   }
+  .van-overlay {
+    top: 3.125rem;
+    z-index: 9;
+  }
 }
 </style>
 <style lang="scss">

src/pages/main/RecordPage.vue

@@ -14,7 +14,10 @@
           </router-link>-->
           <i class="iconfont icon-zuojiantou jiantou" @click="$router.go(-1)"></i>
           <span class="titleName">透析记录</span>
-          <van-icon class="icons" name="ellipsis" @click="show = true" />
+          <router-link to="/add_urgent_schedule">
+            <p class="order">临时排班</p>
+          </router-link>
+          <!-- <van-icon class="icons" name="ellipsis" @click="show = true" /> -->
         </div>
         <van-popup v-model="show" closeable position="top" :style="{ height: '200px' }">
           <div class="popupContent">

src/pages/main/add_urgent_schedule.vue

@@ -113,7 +113,7 @@
         </van-row>
       </div>
     </div>
-    <side-bar :active_index="0"></side-bar>
+    <!-- <side-bar :active_index="0"></side-bar> -->
     <van-popup v-model="show_patient_picker" position="bottom" class="popup">
       <van-picker :columns="patients" value-key="name" @change="didChangePatient"></van-picker>
     </van-popup>

src/pages/my/index.vue

@@ -6,7 +6,7 @@
           <img v-if="roleInfo.avatar != ''" :src="roleInfo.avatar" alt />
           <img
             v-if="roleInfo.avatar == ''"
-            src="../../assets/images/default_avatar.jpg"
+            src="../../assets/images/mydefault.png"
             alt
           />
         </div>
@@ -34,7 +34,7 @@
       <router-link to="/ElectronicSignature">
         <div class="myInfo1">
           <div class="myInfoLeft">
-            <img src="../../assets/images/myIcon1.png" alt />
+            <img src="../../assets/images/myIcon9.png" alt />
             <p>电子签名</p>
           </div>
           <van-icon class="arrow" name="arrow" />
@@ -230,7 +230,7 @@ export default {
       width: 4.375rem;
       height: 4.375rem;
       background: rgba(50, 50, 50, 1);
-      border: 2px solid rgba(255, 255, 255, 1);
+      // border: 2px solid rgba(255, 255, 255, 1);
       border-radius: 50%;
       img {
         border-radius: 50%;

src/pages/my/myInfo.vue

@@ -11,7 +11,7 @@
           <img v-if="roleInfo.avatar != ''" :src="roleInfo.avatar" alt />
           <img
             v-if="roleInfo.avatar == ''"
-            src="../../assets/images/default_avatar.jpg"
+            src="../../assets/images/mydefault.png"
             alt
           />
           <van-icon class="arrow" name="arrow" />

src/utils/request.js

@@ -1,4 +1,4 @@
-import axios from 'axios'
+import axios from "axios";
 // import { Toast } from 'mint-ui'
 import { Toast } from "vant";
 
@@ -6,16 +6,15 @@ import { Toast } from "vant";
 const service = axios.create({
   baseURL: process.env.BASE_API, // api的base_url
   timeout: 30000, // request timeout
-  withCredentials: true,
-
-
-})
+  withCredentials: true
+});
 
 // respone interceptor
 service.interceptors.response.use(
   // response => response,
   response => {
-    const res = response.data
+    const res = response.data;
+    console.log(res);
     if (res.state !== 1) {
       if (res.code === 6002) {
         // MessageBox.confirm('你已被登出，可以取消继续留在该页面，或者重新登录', '确定登出', {
@@ -27,21 +26,25 @@ service.interceptors.response.use(
         //     location.reload() // 为了重新实例化vue-router对象 避免bug
         //   })
         // })
-        Toast("登录超时")
-        location.reload()
-        return Promise.reject('error')
+        Toast("登录超时");
+        location.reload();
+        return Promise.reject("error");
       } else {
-        return response
+        return response;
       }
     } else {
-      return response
+      return response;
     }
   },
   error => {
-    if(error.message.includes('timeout')){   // 判断请求异常信息中是否含有超时timeout字符串
-      return Promise.reject(error);          // reject这个错误信息
+    console.log(error);
+    Toast(error.message);
+    if (error.message.includes("timeout")) {
+      // 判断请求异常信息中是否含有超时timeout字符串
+      return Promise.reject(error); // reject这个错误信息
     }
     return Promise.reject(error);
-  })
+  }
+);
 
-export default service
+export default service;