See999 vor 4 Jahren
Ursprung
Commit
8b0207e6f7

+ 4 - 2
src/main.js Datei anzeigen

@@ -56,7 +56,8 @@ import {
56 56
   Uploader,
57 57
   Radio,
58 58
   RadioGroup,
59
-  Overlay
59
+  Overlay,
60
+  Loading
60 61
   // eslint-disable-next-line no-irregular-whitespace,import/no-duplicates
61 62
 } from "vant";
62 63
 Vue.use(DropdownMenu)
@@ -92,7 +93,8 @@ Vue.use(DropdownMenu)
92 93
   .use(Uploader)
93 94
   .use(RadioGroup)
94 95
   .use(Radio)
95
-  .use(Overlay);
96
+  .use(Overlay)
97
+  .use(Loading);
96 98
 // import "@/lib/flexible.js";
97 99
 
98 100
 // main.js

+ 51 - 33
src/pages/home/login.vue Datei anzeigen

@@ -42,6 +42,11 @@
42 42
       <span class="newColor" @click="agree()">《隐私服务协议》</span>
43 43
       <span class="newColor" @click="agree1()">《用户协议》</span>
44 44
     </div>
45
+    <van-overlay :show="show" @click="show = false">
46
+      <div class="wrapper">
47
+        <van-loading size="24px" vertical>正在登录...</van-loading>
48
+      </div>
49
+    </van-overlay>
45 50
   </div>
46 51
 </template>
47 52
 
@@ -64,6 +69,7 @@ export default {
64 69
       }
65 70
     };
66 71
     return {
72
+      show: false,
67 73
       checked: true,
68 74
       tel: "",
69 75
       psd: "",
@@ -129,43 +135,49 @@ export default {
129 135
     },
130 136
 
131 137
     submitForm() {
132
-      loginByPwd(this.LoginForm.tel, hex_md5(this.LoginForm.psd)).then(rs => {
133
-        var resp = rs.data;
134
-        if (this.checked != true) {
135
-          Toast("请同意隐私服务协议");
136
-          return;
137
-        }
138
+      this.show = true;
139
+      loginByPwd(this.LoginForm.tel, hex_md5(this.LoginForm.psd))
140
+        .then(rs => {
141
+          var resp = rs.data;
142
+          if (this.checked != true) {
143
+            Toast("请同意隐私服务协议");
144
+            return;
145
+          }
138 146
 
139
-        if (resp.state == 1 && this.checked == true) {
140
-          var user = resp.data.user;
141
-          var admin = resp.data.admin;
142
-          var org = resp.data.org;
143
-          var subscibe = resp.data.subscibe;
144
-          var config_list = resp.data.config_list;
145
-          var template_info = resp.data.template_info;
146
-          var filed_list = resp.data.filed_list;
147
+          if (resp.state == 1 && this.checked == true) {
148
+            this.show = false;
149
+            var user = resp.data.user;
150
+            var admin = resp.data.admin;
151
+            var org = resp.data.org;
152
+            var subscibe = resp.data.subscibe;
153
+            var config_list = resp.data.config_list;
154
+            var template_info = resp.data.template_info;
155
+            var filed_list = resp.data.filed_list;
147 156
 
148
-          this.$store.dispatch("InitUserInfo", {
149
-            admin: admin,
150
-            user: user,
151
-            org: org,
152
-            subscibe: subscibe,
153
-            template_info: template_info,
154
-            filed_list: filed_list
155
-          });
156
-          this.$store.dispatch("SetConfigList", config_list);
157
-          this.$router.replace({ path: "/homeIndex" });
158
-        } else {
159
-          if (this.errorNum >= 2) {
160
-            this.showForgetPwdDialog();
161
-          } else {
162
-            this.errorNum = this.errorNum + 1;
163
-            this.$toast({
164
-              message: resp.msg
157
+            this.$store.dispatch("InitUserInfo", {
158
+              admin: admin,
159
+              user: user,
160
+              org: org,
161
+              subscibe: subscibe,
162
+              template_info: template_info,
163
+              filed_list: filed_list
165 164
             });
165
+            this.$store.dispatch("SetConfigList", config_list);
166
+            this.$router.replace({ path: "/homeIndex" });
167
+          } else {
168
+            if (this.errorNum >= 2) {
169
+              this.showForgetPwdDialog();
170
+            } else {
171
+              this.errorNum = this.errorNum + 1;
172
+              this.$toast({
173
+                message: resp.msg
174
+              });
175
+            }
166 176
           }
167
-        }
168
-      });
177
+        })
178
+        .catch(error => {
179
+          console.log(error);
180
+        });
169 181
     },
170 182
     showForgetPwdDialog() {
171 183
       Dialog.confirm({
@@ -259,6 +271,12 @@ export default {
259 271
     color: #fff;
260 272
     text-align: center;
261 273
   }
274
+  .wrapper {
275
+    position: fixed;
276
+    left: 50%;
277
+    top: 50%;
278
+    transform: translate(-50%, -50%);
279
+  }
262 280
 }
263 281
 
264 282
 .el-form-item__error {

+ 4 - 1
src/pages/main/RecordPage.vue Datei anzeigen

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

+ 1 - 1
src/pages/main/add_urgent_schedule.vue Datei anzeigen

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

+ 18 - 15
src/utils/request.js Datei anzeigen

@@ -1,4 +1,4 @@
1
-import axios from 'axios'
1
+import axios from "axios";
2 2
 // import { Toast } from 'mint-ui'
3 3
 import { Toast } from "vant";
4 4
 
@@ -6,16 +6,15 @@ import { Toast } from "vant";
6 6
 const service = axios.create({
7 7
   baseURL: process.env.BASE_API, // api的base_url
8 8
   timeout: 30000, // request timeout
9
-  withCredentials: true,
10
-
11
-
12
-})
9
+  withCredentials: true
10
+});
13 11
 
14 12
 // respone interceptor
15 13
 service.interceptors.response.use(
16 14
   // response => response,
17 15
   response => {
18
-    const res = response.data
16
+    const res = response.data;
17
+    console.log(res);
19 18
     if (res.state !== 1) {
20 19
       if (res.code === 6002) {
21 20
         // MessageBox.confirm('你已被登出,可以取消继续留在该页面,或者重新登录', '确定登出', {
@@ -27,21 +26,25 @@ service.interceptors.response.use(
27 26
         //     location.reload() // 为了重新实例化vue-router对象 避免bug
28 27
         //   })
29 28
         // })
30
-        Toast("登录超时")
31
-        location.reload()
32
-        return Promise.reject('error')
29
+        Toast("登录超时");
30
+        location.reload();
31
+        return Promise.reject("error");
33 32
       } else {
34
-        return response
33
+        return response;
35 34
       }
36 35
     } else {
37
-      return response
36
+      return response;
38 37
     }
39 38
   },
40 39
   error => {
41
-    if(error.message.includes('timeout')){   // 判断请求异常信息中是否含有超时timeout字符串
42
-      return Promise.reject(error);          // reject这个错误信息
40
+    console.log(error);
41
+    Toast(error.message);
42
+    if (error.message.includes("timeout")) {
43
+      // 判断请求异常信息中是否含有超时timeout字符串
44
+      return Promise.reject(error); // reject这个错误信息
43 45
     }
44 46
     return Promise.reject(error);
45
-  })
47
+  }
48
+);
46 49
 
47
-export default service
50
+export default service;