diff --git a/pages/login/index.vue b/pages/login/index.vue
index e8a18c7..e46b177 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -90,7 +90,7 @@ import store from '@/store'
 		// 点击登录
 		handleLogin() {
 		  const app = this
-		  if (!app.isLoading && app.formValidationName(app.mobile)) {
+		  if (!app.isLoading && app.formValidationName(app.mobile) && app.formValidationPass(app.vpass)) {
 		    app.submitLogin()
 		  }
 		},
@@ -126,7 +126,7 @@ import store from '@/store'
 				// 显示登录成功
 				app.$toast(result.message)
 				// 到设备选择
-				this.$route("pages/verfiy/choosedev")
+				this.$navTo("pages/verfiy/choosedev")
 				
 				// 相应全局事件订阅: 刷新上级页面数据
 				// uni.$emit('syncRefresh', true)