sunChengjie 1 year ago
parent
commit
6bd791c97a
2 changed files with 21 additions and 17 deletions
  1. 19 16
      src/pages/login.vue
  2. 2 1
      src/utils/request.js

+ 19 - 16
src/pages/login.vue

@@ -62,22 +62,25 @@ export default {
 				Toast('请输入登录名');
 				return;
 			}
-			const res = await employee_login({ account: this.name, password: this.password }, { emulateJSON: true })
-			// this.$http.post(this.$store.state.host + "/appSysUser/employee_login", { account: this.name, password: this.password }, { emulateJSON: true })
-			console.log(res, 'qweqwe')
-			//发送成功
-			if (res.body.result == 'success') {
-				//localStorage
-				localStorage.setItem("userId", res.body.userId);
-				localStorage.setItem("roomId", res.body.roomId);
-				localStorage.setItem("accountType", res.body.accountType);
-				localStorage.setItem("name", this.name);
-				localStorage.setItem("password", this.password);
-				this.$router.push({ path: '/' });
-			} else {
-				Toast('登录失败!');
-			}
-			Toast("发送失败!")
+			this.$http.post(this.$store.state.host + "/appSysUser/employee_login", { account: this.name, password: this.password }, { emulateJSON: true })
+			
+				.then(res => {
+					//发送成功
+					if (res.body.result == 'success') {
+						//localStorage
+						localStorage.setItem("userId", res.body.userId);
+						localStorage.setItem("roomId", res.body.roomId);
+						localStorage.setItem("accountType", res.body.accountType);
+						localStorage.setItem("name", this.name);
+						localStorage.setItem("password", this.password);
+						this.$router.push({ path: '/' });
+					} else {
+						Toast('登录失败!');
+					}
+				}, res => {
+					//发送失败
+					Toast("发送失败!")
+				})
 		}
 	}
 }

+ 2 - 1
src/utils/request.js

@@ -2,7 +2,8 @@
 import axios from 'axios';  
 // 创建请求实例  
 const instance = axios.create({  
-  baseURL: 'process.env.VUE_APP_BASE_API', // 设置接口基础路径  
+  // baseURL: 'http://47.101.145.23/tianzong', // 设置接口基础路径  
+  baseURL: process.env.VUE_APP_BASE_API, // 设置接口基础路径  
   timeout: 5000 // 设置请求超时时间  
 });