From 99011a644db7359a003bbfc761cfa18603f59cdb Mon Sep 17 00:00:00 2001
From: "453530270@qq.com" <aa123456>
Date: Tue, 31 Oct 2023 14:50:16 +0800
Subject: [PATCH] 1

---
 pages/home.vue          |  2 +-
 pages/login/smscode.vue | 24 +++++++++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/pages/home.vue b/pages/home.vue
index d18e716..ad57dbb 100644
--- a/pages/home.vue
+++ b/pages/home.vue
@@ -205,7 +205,7 @@
 	
 			},
 			gotologin(){
-				this.$navTo("pages/login/index")
+				this.$navTo("pages/login/loginsms")
 			},
 			// 退出登录
 			handleLogout() {
diff --git a/pages/login/smscode.vue b/pages/login/smscode.vue
index c7fe555..dc8d6de 100644
--- a/pages/login/smscode.vue
+++ b/pages/login/smscode.vue
@@ -33,11 +33,12 @@ data() {
 	newPhone: "13800138000", // 当前显示电话
 	isReget: false, // 判断是否显示 ‘重新获取’按钮    
 	timer: null, // 定时器
-	count: 60, // 时间
+	count: 20, // 时间
 	code:"", // 验证码  
 	focus:true, // 焦点
-		// 正在加载
-		isLoading: false,
+	// 正在加载
+	isLoading: false,
+	isParty: false,
 	isCode:true // ‘确定’按钮是否禁用
 	}
 },
@@ -123,18 +124,19 @@ methods: {
 		const app = this
 		app.isLoading = true
 		store.dispatch('Login', {
-			smsCode: app.smsCode,
-			mobile: app.mobile,
-			isParty: app.isParty,
-			partyData: app.partyData
+			smsCode: app.code,
+			mobile: app.newPhone
+			// isParty: false,
+			// partyData: ""
 		  })
 		  .then(result => {
 			// 显示登录成功
 			app.$toast(result.message)
 			// 相应全局事件订阅: 刷新上级页面数据
 			uni.$emit('syncRefresh', true)
+			this.$navTo("pages/home")
 			// 跳转回原页面
-			setTimeout(() => app.onNavigateBack(1), 2000)
+			//setTimeout(() => app.onNavigateBack(1), 2000)
 		  })
 		  .catch(err => {
 			// 跳转回原页面
@@ -235,7 +237,7 @@ methods: {
 			
 		}
 	}
-	.btn{
-		background-color: #FEF2F2;
-	}
+	// .btn{
+	// 	background-color: #FEF2F2;
+	// }
 </style>
\ No newline at end of file