diff --git a/src/api/httpRequest3.js b/src/api/httpRequest3.js
index 81a84796..99e3086e 100644
--- a/src/api/httpRequest3.js
+++ b/src/api/httpRequest3.js
@@ -89,6 +89,8 @@ function service(options = {}) {
 				message = '接口' + message.substr(message.length - 3) + '异常'
 			} else if (message.includes('get lock')) {
 				message = '接口' + "数据库死锁"
+			}else if(message.includes('statusCode:-1')){
+				message = "当前设备无网络，请检查网络后重试"
 			}
 			reject("系统异常:" + message);
 			console.log("系统异常", message)
@@ -99,7 +101,7 @@ function service(options = {}) {
 				const networkType = res.networkType;
 				console.log("网络类型", networkType)
 				if (networkType == "none") {
-					reject("当前无网络");
+					reject("当前设备无网络，请检查网络后重试");
 				} else {
 					uni.request(options);
 				}
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index 46030461..50420dd7 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -226,14 +226,21 @@
 					title: "正在登录",
 					mask: true
 				})
-				await this.$store.dispatch('Login', logininfo);
-				// await this.$store.dispatch('GetTenantIdInfo', this.tenantName)
-				uni.hideLoading()
-				uni.setStorageSync('hasLogin', true)
-				uni.switchTab({
-					url: '/pages/index/index'
-				});
-				uni.setStorageSync('username', this.username);
+				try{
+					var result = await this.$store.dispatch('Login', logininfo);
+					// await this.$store.dispatch('GetTenantIdInfo', this.tenantName)
+					console.log(result)
+					uni.hideLoading()
+					uni.setStorageSync('hasLogin', true)
+					uni.switchTab({
+						url: '/pages/index/index'
+					});
+					uni.setStorageSync('username', this.username);
+				}catch(e){
+					uni.hideLoading()
+					this.showErrorMessage(e)
+				}
+				
 			},
 
 
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 509c9484..db0df418 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -59,16 +59,14 @@ const user = {
 						storage.setStorage(storage.constant.token,res.accessToken)
 						resolve(res)
 					}else {
-						uni.showToast({
-							title:res.msg
-						})
+						if(res.msg){
+							reject(res.msg)
+						}else {
+							reject("登录失败")
+						}
 					}
-					
 				}).catch(error => {
 					reject(error)
-					uni.showToast({
-						title:error
-					})
 				})
 			})
 		},