From 564608f482b2509d37dbb52939796ef29c8d5c67 Mon Sep 17 00:00:00 2001
From: Daisy <>
Date: Thu, 7 Mar 2024 12:00:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8D=8F=E8=AE=AE=E3=80=81?=
 =?UTF-8?q?=E9=9A=90=E7=A7=81=E6=94=BF=E7=AD=96=E4=BB=A5=E6=98=8E=E7=A4=BA?=
 =?UTF-8?q?=E5=90=8C=E6=84=8F=E7=9A=84=E6=96=B9=E5=BC=8F=E5=BE=81=E5=BE=97?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8C=E6=84=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 star_lock/lib/login/login/starLock_login_logic.dart | 3 +--
 star_lock/lib/login/login/starLock_login_page.dart  | 7 ++++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/star_lock/lib/login/login/starLock_login_logic.dart b/star_lock/lib/login/login/starLock_login_logic.dart
index ccc133e6..6099423f 100644
--- a/star_lock/lib/login/login/starLock_login_logic.dart
+++ b/star_lock/lib/login/login/starLock_login_logic.dart
@@ -45,8 +45,7 @@ class StarLockLoginLogic extends BaseGetXController {
   }
 
   void _resetCanNext() {
-    state.canNext.value =
-        state.pwdIsOK && state.isEmailOrPhone && state.agree.value;
+    state.canNext.value = state.pwdIsOK && state.isEmailOrPhone;
   }
 
   @override
diff --git a/star_lock/lib/login/login/starLock_login_page.dart b/star_lock/lib/login/login/starLock_login_page.dart
index 1f55f7f3..d4be166b 100644
--- a/star_lock/lib/login/login/starLock_login_page.dart
+++ b/star_lock/lib/login/login/starLock_login_page.dart
@@ -165,7 +165,12 @@ class _StarLockLoginPageState extends State<StarLockLoginPage> {
                 isDisabled: state.canNext.value,
                 onClick: state.canNext.value
                     ? () {
-                        logic.login();
+                        if (state.agree.value == false) {
+                          logic.showToast('请先同意用户协议');
+                          return;
+                        } else {
+                          logic.login();
+                        }
                       }
                     : null)),
             SizedBox(height: 50.w),