From f53921fa5d3e3fa4c70a57041751d0c0cb59f9b5 Mon Sep 17 00:00:00 2001
From: Daisy <>
Date: Sat, 29 Jul 2023 10:58:26 +0800
Subject: [PATCH] =?UTF-8?q?1=EF=BC=8C=E6=9B=B4=E6=96=B0=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E3=80=81=E6=B3=A8=E5=86=8C=E3=80=81=E5=BF=98=E8=AE=B0=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E6=A8=A1=E5=9D=97UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 star_lock/images/icon_login_account.png       | Bin 0 -> 1612 bytes
 star_lock/images/icon_login_password.png      | Bin 0 -> 1481 bytes
 star_lock/images/icon_select_circle.png       | Bin 0 -> 2248 bytes
 star_lock/images/lan/lan_keys.json            |   2 +-
 .../starLock_forgetPassword_page.dart         | 162 ++++++----
 .../lib/login/login/starLock_login_page.dart  | 266 ++++++++--------
 .../register/starLock_register_page.dart      | 286 ++++++++++++------
 7 files changed, 440 insertions(+), 276 deletions(-)
 create mode 100644 star_lock/images/icon_login_account.png
 create mode 100644 star_lock/images/icon_login_password.png
 create mode 100644 star_lock/images/icon_select_circle.png

diff --git a/star_lock/images/icon_login_account.png b/star_lock/images/icon_login_account.png
new file mode 100644
index 0000000000000000000000000000000000000000..75986a0355dcf20b55dc5b73264c7d2d8c4aad0b
GIT binary patch
literal 1612
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
KMNUMnLSTZCJo*#>

literal 0
HcmV?d00001

diff --git a/star_lock/images/icon_login_password.png b/star_lock/images/icon_login_password.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3bf1c7290f7a3d68e20217ebad3525caa398482
GIT binary patch
literal 1481
zcmV;)1vdJLP)<h;3K|Lk000e1NJLTq001Tc002Y?1^@s6?Ey#s00009a7bBm000XU
z000XU0RWnu7ytkTdr3q=RA_<im`zL*X&A@<Gq#gBd`trk77mSJpdSP^@jx-D5j0sz
z3Z$F(acE2$)5~(egC5qy?!i6mW%uI2y>M_7J(zMBKo4$Gw+0f+1zK9e5T$9jppASC
zDb+B@>|v)06*?cCQe*rlJ@lRDedjmt`@HY-ybmEs67*<pZjQ}nvmQYZ*jz4W7e$c)
z0JGUF)YjH6F$}ZV)YLS6^5n@yJ>wHvz!HfByRfhjT3=sx$xVKRE*t<@EEeABbdH=l
zbxJj)DzLe^Id*1d=9jIlEk*^*fshnM38zn={!Ps+DuRuUj^0^aT|H3-&=-IW4Gqal
zmoELP3oM;Zo1@X_{q5~-+CZpJa3+%}fBpLPfF>}W=dF{IllLS^x?F1XBS((F<#M65
zwG|A*000C*KsucU&-3{B@ncCif*{1RXU`6~T&{PDVCi()9En68DnVH+7F@h|5%u-;
z`##^;*uc}LPqDtfUTPQ+1QEV);X<IbwN>2RP8J(RqtW|HP&7@$=kpy11pxK+_3-(8
zplP}!m?TM;qtWR7;`TjY;c)nl>{BJx)zzi=Lg4=o=<4cHwA<d^ro-XzoqfUL@wjVk
zZB23aQ4|H1Wffmm5X-WlC`!r9zqYn^A|8(y&c{7qKPy22fYoXRNq*r02Z|&~G&VM>
zG4;y~pTTBlXI=8)sVEg+ue;CI))rHkH4*?878XKKc~<3eIn7|3o11D){XEZyK7nm)
zY^Zjcm6a8I`0znB)cg1Ev9hwF+P=U-?shmek|YW7cwDu8B9VaB3?`9Cuw*uy^+03D
zNu^TAWHO3&nM?+$R7w*R0Dm@{^^k%fsNegtBuPRf5<xPV+;=u4NkTH2L?jZ?JX-)D
z2!hL$&*z&p_XM!Bvx8VHhEytr<HwKhiItg5M%N}OXmfM3*;L3p^(vRk=~=Fl5=D_A
z34#!nO%GQDL5QT;Y|d93q*!LNIZxKs)-F{Wq*!%zb&I6MV&SU|QY?$b!jm?eZ3^;j
z<|`3rv)QJ|j*gDyYLgVp?RLK-0ida=X}a1l1sywfYzmNrxZCai3tz`_a&EVK1dzd;
zPN(oS?9RHnx<!Y>AppBFSdYhZ3)P)9&g1diF8uif#<Hwvx7(kfI&hrbZhx}-3b!YD
z@9XOusi~=1!r{VkH8nL$eSLi+yBoi_RRjWo8x%zeI2<^Rq9`E{2;3-su<vyz7z_pv
z0gj_6N(csn!TlbVtoA&5^yqg%5L~E0QH5a`{_54Mw+}K<EJHni{@f?uqJZ)NIRJ1v
zog?SYoqJNsP<2Ide0==on>TN~@?XCmD4WeTH8?o<ry65TrA`2dMx*{rCgayyU354c
zKlb$WaBA(<-}Pnn^z?8CIczDJOeReUsb;Xl(swYe(hb(!-25*pcmV4L8yFb4+uPe4
zplP}yxtyt-&h72(`S$kqp%*V+cwfGJDemm-m|;+qFvQ2soH;WU3WcuFG;P@Z!7%54
z{P^*(-a5#BDr+eLAQp>xQ>oOjk;@2_0rvX!YdRK-{UOhiVL%1x27C7G*+WzSsGx7}
zfUUH?gK5>b2X_Aa`HIC!pp4_9t*tHJ*48#8AFzhTNx*=m?C$QK3WY*fT3T8RO@j>c
zvHt%4yG91_vSTFx$Z1a@UK*mZz+Sz2MNdypS0rBQ2Ai0e7+zjp?nQ;-rEVXqBouIX
z2P~(xgKjXd*E>X#WLU*ZIjhw=<Mn#~(K5c~+C{M*Ja}-gg!6L_hvRQ8H4DSQ0AOrv
z?B?6IZ@u^o$B`r{c6WE*>g?>)RSh=;3;-r4Cx4iqpZ^H}jvhU_eC^t`p|S>)B+0Pf
j{QSIiY;5eN5o7%a$poS*m<ZB100000NkvXXu0mjf&;`Ya

literal 0
HcmV?d00001

diff --git a/star_lock/images/icon_select_circle.png b/star_lock/images/icon_select_circle.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f5448bdf9b992b7bdfe72f91da861ecc77e222c
GIT binary patch
literal 2248
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
W06I@|v{`uo0000<MNUMnLSTY5%t^=q

literal 0
HcmV?d00001

diff --git a/star_lock/images/lan/lan_keys.json b/star_lock/images/lan/lan_keys.json
index 818c2ca6..fc103269 100644
--- a/star_lock/images/lan/lan_keys.json
+++ b/star_lock/images/lan/lan_keys.json
@@ -296,7 +296,7 @@
   "whenAddingLockThePhoneMustBeNextToTheLock":"whenAddingLockThePhoneMustBeNextToTheLock",
 
   "login":"login",
-  "register":"Register",
+  "register":"register",
   "forgetPassword":"forgetPassword",
   "readAndAgree":"readAndAgree",
   "verificationCode":"verificationCode",
diff --git a/star_lock/lib/login/forgetPassword/starLock_forgetPassword_page.dart b/star_lock/lib/login/forgetPassword/starLock_forgetPassword_page.dart
index 71946a56..755aef0b 100644
--- a/star_lock/lib/login/forgetPassword/starLock_forgetPassword_page.dart
+++ b/star_lock/lib/login/forgetPassword/starLock_forgetPassword_page.dart
@@ -1,4 +1,3 @@
-
 import 'dart:async';
 
 import 'package:flutter/material.dart';
@@ -17,10 +16,12 @@ class StarLockForgetPasswordPage extends StatefulWidget {
   const StarLockForgetPasswordPage({Key? key}) : super(key: key);
 
   @override
-  State<StarLockForgetPasswordPage> createState() => _StarLockForgetPasswordPageState();
+  State<StarLockForgetPasswordPage> createState() =>
+      _StarLockForgetPasswordPageState();
 }
 
-class _StarLockForgetPasswordPageState extends State<StarLockForgetPasswordPage> {
+class _StarLockForgetPasswordPageState
+    extends State<StarLockForgetPasswordPage> {
   final TextEditingController _phoneController = TextEditingController();
   final TextEditingController _pwdController = TextEditingController();
   final TextEditingController _codeController = TextEditingController();
@@ -34,89 +35,129 @@ class _StarLockForgetPasswordPageState extends State<StarLockForgetPasswordPage>
     return Scaffold(
         resizeToAvoidBottomInset: false,
         backgroundColor: const Color(0xFFFFFFFF),
-        appBar: TitleAppBar(barTitle: "${TranslationLoader.lanKeys!.reset!.tr} ${TranslationLoader.lanKeys!.password!.tr}", haveBack:true, backgroundColor: AppColors.mainColor),
-        body:ListView(
-          padding: EdgeInsets.only(
-              top: 40.h,
-              left: 40.w,
-              right: 40.w
-          ),
+        appBar: TitleAppBar(
+            barTitle:
+                "${TranslationLoader.lanKeys!.reset!.tr}${TranslationLoader.lanKeys!.password!.tr}",
+            haveBack: true,
+            backgroundColor: AppColors.mainColor),
+        body: ListView(
+          padding: EdgeInsets.only(top: 40.h, left: 40.w, right: 40.w),
           children: [
-            LoginInput(controller: _phoneController,
-                leftWidget:Padding(
-                  padding: EdgeInsets.only(top:30.w, bottom: 20.w, right: 20.w, left: 5.w),
-                  child: Image.asset('images/main/icon_main_search.png', width: 40.w, height: 40.w,),
+            LoginInput(
+                controller: _phoneController,
+                leftWidget: Padding(
+                  padding: EdgeInsets.only(
+                      top: 30.w, bottom: 20.w, right: 20.w, left: 5.w),
+                  child: Image.asset(
+                    'images/icon_login_account.png',
+                    width: 36.w,
+                    height: 36.w,
+                  ),
                 ),
-                hintText: TranslationLoader.lanKeys!.pleaseEnterNumberOrEmail!.tr,
+                hintText:
+                    TranslationLoader.lanKeys!.pleaseEnterNumberOrEmail!.tr,
                 keyboardType: TextInputType.number,
                 inputFormatters: [
                   FilteringTextInputFormatter.allow(RegExp('[0-9]')),
                   LengthLimitingTextInputFormatter(20),
-            ]),
-            SizedBox(height: 10.w),
+                ]),
+            SizedBox(height: 10.h),
             LoginInput(
                 controller: _pwdController,
                 isPwd: true,
-                leftWidget:Padding(
-                  padding: EdgeInsets.only(top:30.w, bottom: 20.w, right: 20.w, left: 5.w),
-                  child: Image.asset('images/main/icon_main_search.png', width: 40.w, height: 40.w,),
+                leftWidget: Padding(
+                  padding: EdgeInsets.only(
+                      top: 30.w, bottom: 20.w, right: 20.w, left: 5.w),
+                  child: Image.asset(
+                    'images/icon_login_password.png',
+                    width: 36.w,
+                    height: 36.w,
+                  ),
                 ),
-                hintText: "${TranslationLoader.lanKeys!.pleaseEnter!.tr} ${TranslationLoader.lanKeys!.password!.tr}",
+                hintText:
+                    "${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}",
                 inputFormatters: [
                   LengthLimitingTextInputFormatter(20),
-            ]),
+                ]),
             SizedBox(height: 15.w),
-            Text(TranslationLoader.lanKeys!.registerPasswordTip!.tr, style: TextStyle(color: const Color(0xFF999999), fontSize: 26.sp),),
-            SizedBox(height: 10.w),
-            LoginInput(
-                controller: _pwdController,
-                isPwd: true,
-                leftWidget:Padding(
-                  padding: EdgeInsets.only(top:30.w, bottom: 20.w, right: 20.w, left: 5.w),
-                  child: Image.asset('images/main/icon_main_search.png', width: 40.w, height: 40.w,),
-                ),
-                hintText: "${TranslationLoader.lanKeys!.sure!.tr} ${TranslationLoader.lanKeys!.password!.tr}",
-                inputFormatters: [
-                  LengthLimitingTextInputFormatter(20),
-                ]
+            Text(
+              TranslationLoader.lanKeys!.registerPasswordTip!.tr,
+              style: TextStyle(
+                  color: AppColors.placeholderTextColor, fontSize: 20.sp),
             ),
             SizedBox(height: 10.w),
+            LoginInput(
+                controller: _pwdController,
+                isPwd: true,
+                leftWidget: Padding(
+                  padding: EdgeInsets.only(
+                      top: 30.w, bottom: 20.w, right: 20.w, left: 5.w),
+                  child: Image.asset(
+                    'images/icon_login_password.png',
+                    width: 36.w,
+                    height: 36.w,
+                  ),
+                ),
+                hintText:
+                    "${TranslationLoader.lanKeys!.sure!.tr}${TranslationLoader.lanKeys!.password!.tr}",
+                inputFormatters: [
+                  LengthLimitingTextInputFormatter(20),
+                ]),
+            SizedBox(height: 10.h),
             Row(
               children: [
                 Expanded(
                   child: LoginInput(
                       controller: _codeController,
                       isPwd: true,
-                      leftWidget:Padding(
-                        padding: EdgeInsets.only(top:30.w, bottom: 20.w, right: 20.w, left: 5.w),
-                        child: Image.asset('images/main/icon_main_search.png', width: 40.w, height: 40.w,),
-                      ),
-                      hintText: "${TranslationLoader.lanKeys!.pleaseEnter!.tr} ${TranslationLoader.lanKeys!.verificationCode!.tr}",
+                      leftWidget: Padding(
+                          padding: EdgeInsets.only(
+                              top: 30.w, bottom: 20.w, right: 20.w, left: 5.w),
+                          child: SizedBox(
+                            width: 36.w,
+                            height: 36.w,
+                          )
+                          // Image.asset(
+                          //   'images/main/icon_main_search.png',
+                          //   width: 40.w,
+                          //   height: 40.w,
+                          // ),
+                          ),
+                      hintText:
+                          "${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.verificationCode!.tr}",
                       inputFormatters: [
                         LengthLimitingTextInputFormatter(20),
-                  ]),
+                      ]),
+                ),
+                SizedBox(
+                  width: 20.w,
                 ),
-                SizedBox(width: 20.w,),
                 GestureDetector(
                   child: Container(
-                    width: 180.w,
+                    width: 160.w,
                     height: 60.h,
                     padding: EdgeInsets.all(5.h),
                     decoration: BoxDecoration(
                         color: AppColors.mainColor,
-                        borderRadius: BorderRadius.circular(5)
-                    ),
+                        borderRadius: BorderRadius.circular(5)),
                     child: Center(
-                      child: Text(_seconds==60?'${TranslationLoader.lanKeys!.getTip!.tr} ${TranslationLoader.lanKeys!.verificationCode!.tr}': (_seconds<10)?'0$_seconds s':'$_seconds s', textAlign:TextAlign.center, style: TextStyle(
-                        color: Colors.white,
-                        fontSize: 26.sp,
-                      )),
+                      child: Text(
+                          _seconds == 60
+                              ? '${TranslationLoader.lanKeys!.getTip!.tr}${TranslationLoader.lanKeys!.verificationCode!.tr}'
+                              : (_seconds < 10)
+                                  ? '0$_seconds s'
+                                  : '$_seconds s',
+                          textAlign: TextAlign.center,
+                          style: TextStyle(
+                            color: Colors.white,
+                            fontSize: 26.sp,
+                          )),
                     ),
                   ),
-                  onTap: (){
-                    if(_seconds==60){
+                  onTap: () {
+                    if (_seconds == 60) {
                       // _setVerify();
-                    }else{
+                    } else {
                       // Toast.show(msg: '正在获取验证码');
                     }
                   },
@@ -124,13 +165,14 @@ class _StarLockForgetPasswordPageState extends State<StarLockForgetPasswordPage>
               ],
             ),
             SizedBox(height: 50.w),
-            SubmitBtn(btnName: "${TranslationLoader.lanKeys!.reset!.tr} ${TranslationLoader.lanKeys!.password!.tr}", fontSize: 30.sp, borderRadius: 20.w, padding: EdgeInsets.only(top: 25.w, bottom: 25.w), onClick: (){
-
-            }),
+            SubmitBtn(
+                btnName:
+                    "${TranslationLoader.lanKeys!.reset!.tr}${TranslationLoader.lanKeys!.password!.tr}",
+                fontSize: 30.sp,
+                borderRadius: 20.w,
+                padding: EdgeInsets.only(top: 25.w, bottom: 25.w),
+                onClick: () {}),
           ],
-        )
-    );
+        ));
   }
-
-
-}
\ No newline at end of file
+}
diff --git a/star_lock/lib/login/login/starLock_login_page.dart b/star_lock/lib/login/login/starLock_login_page.dart
index 79eaeb87..9c2f0d62 100644
--- a/star_lock/lib/login/login/starLock_login_page.dart
+++ b/star_lock/lib/login/login/starLock_login_page.dart
@@ -1,4 +1,3 @@
-
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -25,133 +24,148 @@ class _StarLockLoginPageState extends State<StarLockLoginPage> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-      resizeToAvoidBottomInset: false,
-      backgroundColor: const Color(0xFFFFFFFF),
-      appBar: TitleAppBar(barTitle: TranslationLoader.lanKeys!.login!.tr, haveBack:true, backgroundColor: AppColors.mainColor, actionsList: [
-        TextButton(
-          child: Text(TranslationLoader.lanKeys!.register!.tr, style: const TextStyle(color: Colors.white),),
-          onPressed: (){
-            Navigator.pushNamed(context, Routers.starLockRegisterPage);
-          },),
-      ],),
-      body:ListView(
-        padding: EdgeInsets.only(
-            top: 120.h,
-            left: 40.w,
-            right: 40.w
+        resizeToAvoidBottomInset: false,
+        backgroundColor: const Color(0xFFFFFFFF),
+        appBar: TitleAppBar(
+          barTitle: TranslationLoader.lanKeys!.login!.tr,
+          haveBack: true,
+          backgroundColor: AppColors.mainColor,
+          actionsList: [
+            TextButton(
+              child: Text(
+                TranslationLoader.lanKeys!.register!.tr,
+                style: const TextStyle(color: Colors.white),
+              ),
+              onPressed: () {
+                Navigator.pushNamed(context, Routers.starLockRegisterPage);
+              },
+            ),
+          ],
         ),
-        children: [
-          Container(
-              padding: EdgeInsets.all(10.w),
-              child: Center(
-                  child: Image.asset('images/icon_main_1024.png', width: 150.w, height: 150.w)
-              )
-          ),
-          SizedBox(height: 50.w),
-          LoginInput(
-              controller: _phoneController,
-              leftWidget:Padding(
-                padding: EdgeInsets.only(top:30.w, bottom: 20.w, right: 20.w, left: 5.w),
-                child: Image.asset('images/main/icon_main_search.png', width: 40.w, height: 40.w,),
-              ),
-              hintText: TranslationLoader.lanKeys!.pleaseEnterNumberOrEmail!.tr,
-              keyboardType: TextInputType.number,
-              inputFormatters: [
-                FilteringTextInputFormatter.allow(RegExp('[0-9]')),
-                LengthLimitingTextInputFormatter(20),
-              ]
-          ),
-          SizedBox(height: 50.w),
-          LoginInput(
-              controller: _pwdController,
-              isPwd: true,
-              leftWidget:Padding(
-                padding: EdgeInsets.only(top:30.w, bottom: 20.w, right: 20.w, left: 5.w),
-                child: Image.asset('images/main/icon_main_search.png', width: 40.w, height: 40.w,),
-              ),
-              hintText: "${TranslationLoader.lanKeys!.pleaseEnter!.tr} ${TranslationLoader.lanKeys!.password!.tr}",
-              inputFormatters: [
-                LengthLimitingTextInputFormatter(20),
-              ]
-          ),
-          SizedBox(height: 20.h),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.start,
-            children: [
-              SizedBox(
-                height: 20.h,
-                width: 26.w,
-                child:  Checkbox(value: false, onChanged: (value){
-
-                })
-              ),
-              SizedBox(width: 15.w,),
-              Flexible(
-                child: RichText(
-                    text: TextSpan(
-                      text: TranslationLoader.lanKeys!.readAndAgree!.tr,
-                      style: TextStyle(
-                          color: const Color(0xff333333),
-                          fontSize: 26.sp
-                      ),
-                      children: [
-                        WidgetSpan(
-                            alignment: PlaceholderAlignment.middle,
-                            child: GestureDetector(
-                              child: Text('《${TranslationLoader.lanKeys!.userAgreement!.tr}》',style: TextStyle(
-                                  color: AppColors.mainColor,
-                                  fontSize: 26.sp
-                              )),
-                              onTap: (){
-
-                              },
-                            )
-                        ),
-                        WidgetSpan(
-                            alignment: PlaceholderAlignment.middle,
-                            child: GestureDetector(
-                              child: Text('《${TranslationLoader.lanKeys!.privacyPolicy!.tr}》',style: TextStyle(
-                                  color: AppColors.mainColor,
-                                  fontSize: 26.sp
-                              )),
-                              onTap: (){
-
-                              },
-                            )
-                        ),
-                      ],
-                    )
-                ),
-              )
-            ],
-          ),
-          SizedBox(height: 50.w),
-          SubmitBtn(btnName: TranslationLoader.lanKeys!.login!.tr, fontSize: 28.sp, borderRadius: 20.w, padding: EdgeInsets.only(top: 25.w, bottom: 25.w), onClick: (){
-
-          }),
-          SizedBox(height: 50.w),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              GestureDetector(
-                child: SizedBox(
-                  // width: 150.w,
-                  height: 50.h,
-                  // color: Colors.red,
-                  child: Center(
-                    child: Text('${TranslationLoader.lanKeys!.forgetPassword!.tr}？',style: TextStyle(fontSize: 24.sp)),
+        body: ListView(
+          padding: EdgeInsets.only(top: 120.h, left: 40.w, right: 40.w),
+          children: [
+            Container(
+                padding: EdgeInsets.all(10.w),
+                child: Center(
+                    child: Image.asset('images/icon_main_1024.png',
+                        width: 110.w, height: 110.w))),
+            SizedBox(height: 50.w),
+            LoginInput(
+                controller: _phoneController,
+                leftWidget: Padding(
+                  padding: EdgeInsets.only(
+                      top: 30.w, bottom: 20.w, right: 20.w, left: 5.w),
+                  child: Image.asset(
+                    'images/icon_login_account.png',
+                    width: 36.w,
+                    height: 36.w,
                   ),
                 ),
-                onTap: (){
-                  Navigator.pushNamed(context, Routers.starLockForgetPasswordPage);
-                },
-              )
-            ],
-          ),
-      ],
-      )
-    );
+                hintText:
+                    TranslationLoader.lanKeys!.pleaseEnterNumberOrEmail!.tr,
+                keyboardType: TextInputType.number,
+                inputFormatters: [
+                  FilteringTextInputFormatter.allow(RegExp('[0-9]')),
+                  LengthLimitingTextInputFormatter(20),
+                ]),
+            SizedBox(height: 10.h),
+            LoginInput(
+                controller: _pwdController,
+                isPwd: true,
+                leftWidget: Padding(
+                  padding: EdgeInsets.only(
+                      top: 30.w, bottom: 20.w, right: 20.w, left: 5.w),
+                  child: Image.asset(
+                    'images/icon_login_password.png',
+                    width: 36.w,
+                    height: 36.w,
+                  ),
+                ),
+                hintText:
+                    "${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}",
+                inputFormatters: [
+                  LengthLimitingTextInputFormatter(20),
+                ]),
+            SizedBox(height: 20.h),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.start,
+              children: [
+                Image.asset(
+                  'images/icon_select_circle.png',
+                  width: 28.w,
+                  height: 28.w,
+                ),
+                // SizedBox(
+                //     height: 20.h,
+                //     width: 26.w,
+                //     child: Checkbox(value: false, onChanged: (value) {})),
+                SizedBox(
+                  width: 15.w,
+                ),
+                Flexible(
+                  child: RichText(
+                      text: TextSpan(
+                    text: TranslationLoader.lanKeys!.readAndAgree!.tr,
+                    style: TextStyle(
+                        color: const Color(0xff333333), fontSize: 20.sp),
+                    children: [
+                      WidgetSpan(
+                          alignment: PlaceholderAlignment.middle,
+                          child: GestureDetector(
+                            child: Text(
+                                '《${TranslationLoader.lanKeys!.userAgreement!.tr}》',
+                                style: TextStyle(
+                                    color: AppColors.mainColor,
+                                    fontSize: 20.sp)),
+                            onTap: () {},
+                          )),
+                      WidgetSpan(
+                          alignment: PlaceholderAlignment.middle,
+                          child: GestureDetector(
+                            child: Text(
+                                '《${TranslationLoader.lanKeys!.privacyPolicy!.tr}》',
+                                style: TextStyle(
+                                    color: AppColors.mainColor,
+                                    fontSize: 20.sp)),
+                            onTap: () {},
+                          )),
+                    ],
+                  )),
+                )
+              ],
+            ),
+            SizedBox(height: 50.w),
+            SubmitBtn(
+                btnName: TranslationLoader.lanKeys!.login!.tr,
+                fontSize: 28.sp,
+                borderRadius: 20.w,
+                padding: EdgeInsets.only(top: 25.w, bottom: 25.w),
+                onClick: () {}),
+            SizedBox(height: 50.w),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.center,
+              children: [
+                GestureDetector(
+                  child: SizedBox(
+                    // width: 150.w,
+                    height: 50.h,
+                    // color: Colors.red,
+                    child: Center(
+                      child: Text(
+                          '${TranslationLoader.lanKeys!.forgetPassword!.tr}？',
+                          style: TextStyle(
+                              fontSize: 22.sp, color: AppColors.mainColor)),
+                    ),
+                  ),
+                  onTap: () {
+                    Navigator.pushNamed(
+                        context, Routers.starLockForgetPasswordPage);
+                  },
+                )
+              ],
+            ),
+          ],
+        ));
   }
-
-
 }
diff --git a/star_lock/lib/login/register/starLock_register_page.dart b/star_lock/lib/login/register/starLock_register_page.dart
index 0b162c41..ecccf893 100644
--- a/star_lock/lib/login/register/starLock_register_page.dart
+++ b/star_lock/lib/login/register/starLock_register_page.dart
@@ -1,5 +1,5 @@
-
 import 'dart:async';
+import 'dart:ffi';
 
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
@@ -22,7 +22,6 @@ class StarLockRegisterPage extends StatefulWidget {
 }
 
 class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
-
   final logic = Get.find<StarLockRegisterLogic>();
   final state = Get.find<StarLockRegisterLogic>().state;
 
@@ -34,13 +33,12 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
     return Scaffold(
         resizeToAvoidBottomInset: false,
         backgroundColor: const Color(0xFFFFFFFF),
-        appBar: TitleAppBar(barTitle: TranslationLoader.lanKeys!.register!.tr, haveBack:true, backgroundColor: AppColors.mainColor),
-        body:ListView(
-          padding: EdgeInsets.only(
-              top: 40.h,
-              left: 40.w,
-              right: 40.w
-          ),
+        appBar: TitleAppBar(
+            barTitle: TranslationLoader.lanKeys!.register!.tr,
+            haveBack: true,
+            backgroundColor: AppColors.mainColor),
+        body: ListView(
+          padding: EdgeInsets.only(top: 40.h, left: 40.w, right: 40.w),
           children: [
             topSeletCountryAndRegionWidget(),
             middleTFWidget(),
@@ -53,64 +51,73 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
                   borderRadius: 20.w,
                   padding: EdgeInsets.only(top: 25.w, bottom: 25.w),
                   isDisabled: state.canSub.value,
-                  onClick: state.canSub.value ? (){
-                    logic.register();
-                  }:null
-              );
+                  onClick: state.canSub.value
+                      ? () {
+                          logic.register();
+                        }
+                      : null);
             }),
+            SizedBox(
+              height: 20.h,
+            ),
+            _buildBottomAgreement()
           ],
-        )
-    );
+        ));
   }
 
-  Widget topSeletCountryAndRegionWidget (){
+  Widget topSeletCountryAndRegionWidget() {
     return Column(
       children: [
-        SizedBox(height:50.h),
+        SizedBox(height: 50.h),
         Row(
           mainAxisAlignment: MainAxisAlignment.center,
           children: [
             Container(
-              width: 420.w,
+              width: 340.w,
               height: 60.h,
               // color: Colors.red,
               decoration: BoxDecoration(
                   borderRadius: BorderRadius.all(Radius.circular(30.h)),
                   border: const Border(
-                    top: BorderSide(width: 1.0, color: Color(0xffC0C0C0)),
-                    left: BorderSide(width: 1.0, color: Color(0xffC0C0C0)),
-                    right: BorderSide(width: 1.0, color: Color(0xffC0C0C0)),
-                    bottom: BorderSide(width: 1.0, color: Color(0xffC0C0C0)),
-                  )
-              ),
+                    top: BorderSide(width: 1.0, color: AppColors.greyLineColor),
+                    left:
+                        BorderSide(width: 1.0, color: AppColors.greyLineColor),
+                    right:
+                        BorderSide(width: 1.0, color: AppColors.greyLineColor),
+                    bottom:
+                        BorderSide(width: 1.0, color: AppColors.greyLineColor),
+                  )),
               child: Row(
                 children: [
                   GestureDetector(
-                    onTap: (){
-
-                    },
+                    onTap: () {},
                     child: Container(
-                        width: 210.w,
+                        width: 170.w,
                         height: 60.h,
                         // color: Colors.red,
                         decoration: BoxDecoration(
-                          color: AppColors.mainColor,
-                            borderRadius: BorderRadius.all(Radius.circular(30.h)),
+                            color: AppColors.mainColor,
+                            borderRadius:
+                                BorderRadius.all(Radius.circular(30.h)),
                             border: const Border(
-                              top: BorderSide(width: 1.0, color: Color(0xffC0C0C0)),
-                              left: BorderSide(width: 1.0, color: Color(0xffC0C0C0)),
-                              right: BorderSide(width: 1.0, color: Color(0xffC0C0C0)),
-                              bottom: BorderSide(width: 1.0, color: Color(0xffC0C0C0)),
-                            )
-                        ),
-                        child: Center(child: Text(TranslationLoader.lanKeys!.iphone!.tr, style: TextStyle(color: Colors.white),))
-                    ),
+                              top: BorderSide(
+                                  width: 1.0, color: AppColors.greyLineColor),
+                              left: BorderSide(
+                                  width: 1.0, color: AppColors.greyLineColor),
+                              right: BorderSide(
+                                  width: 1.0, color: AppColors.greyLineColor),
+                              bottom: BorderSide(
+                                  width: 1.0, color: AppColors.greyLineColor),
+                            )),
+                        child: Center(
+                            child: Text(
+                          TranslationLoader.lanKeys!.iphone!.tr,
+                          style: TextStyle(color: Colors.white),
+                        ))),
                   ),
                   Expanded(
                     child: GestureDetector(
-                      onTap: (){
-
-                      },
+                      onTap: () {},
                       child: Container(
                           height: 60.h,
                           // color: Colors.red,
@@ -123,22 +130,26 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
                           //       bottom: BorderSide(width: 1.0, color: Color(0xffC0C0C0)),
                           //     )
                           // ),
-                          child: Center(child: Text(TranslationLoader.lanKeys!.email!.tr, style: const TextStyle(color: Colors.black),))
-                      ),
+                          child: Center(
+                              child: Text(
+                            TranslationLoader.lanKeys!.email!.tr,
+                            style: const TextStyle(color: Colors.black),
+                          ))),
                     ),
                   ),
                 ],
               ),
             ),
-
           ],
         ),
-        SizedBox(height:60.h),
+        SizedBox(height: 60.h),
         GestureDetector(
           onTap: () async {
             Navigator.pushNamed(context, Routers.seletCountryRegionPage);
-            var result = await Navigator.pushNamed(context, Routers.seletCountryRegionPage);
-            logic.state.countryCode.value = (result as Map<String, dynamic>)['code'];
+            var result = await Navigator.pushNamed(
+                context, Routers.seletCountryRegionPage);
+            logic.state.countryCode.value =
+                (result as Map<String, dynamic>)['code'];
             logic.state.countryId.value = result["countryId"];
             // print("路由返回值: ${result}, countryCode:${logic.state.countryCode} ,countryId:${logic.state.countryId}");
           },
@@ -148,27 +159,42 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
             // padding: EdgeInsets.only(left:20.w, right: 10.w, top: 20.w, bottom: 20.w),
             child: Row(
               children: [
-                SizedBox(width:5.w),
-                Expanded(child: Text(TranslationLoader.lanKeys!.countryAndRegion!.tr, style: TextStyle(fontSize: 26.sp))),
-                SizedBox(width:20.w),
+                SizedBox(width: 5.w),
+                Expanded(
+                    child: Text(TranslationLoader.lanKeys!.countryAndRegion!.tr,
+                        style: TextStyle(
+                            fontSize: 26.sp, color: AppColors.blackColor))),
+                SizedBox(width: 20.w),
                 Row(
                   mainAxisAlignment: MainAxisAlignment.end,
                   children: [
-                    Text("中国+86", textAlign: TextAlign.end, style: TextStyle(fontSize: 26.sp),)
+                    Text(
+                      "中国+86",
+                      textAlign: TextAlign.end,
+                      style: TextStyle(
+                          fontSize: 26.sp, color: AppColors.blackColor),
+                    )
                   ],
                 ),
-                SizedBox(width:5.w),
-                Image.asset('images/icon_right.png', width: 50.w, height: 50.w,),
+                SizedBox(width: 5.w),
+                Image.asset(
+                  'images/icon_right.png',
+                  width: 50.w,
+                  height: 50.w,
+                ),
               ],
             ),
           ),
         ),
-        Container(height: 0.5.h, color: Colors.grey,)
+        Container(
+          height: 0.5.h,
+          color: Colors.grey,
+        )
       ],
     );
   }
 
-  Widget middleTFWidget (){
+  Widget middleTFWidget() {
     return Column(
       children: [
         LoginInput(
@@ -177,17 +203,21 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
               print("3333333:${v}");
               logic.checkNext(state.phoneOrEmailController);
             },
-            leftWidget:Padding(
-              padding: EdgeInsets.only(top:30.w, bottom: 20.w, right: 20.w, left: 5.w),
-              child: Image.asset('images/main/icon_main_search.png', width: 40.w, height: 40.w,),
+            leftWidget: Padding(
+              padding: EdgeInsets.only(
+                  top: 30.w, bottom: 20.w, right: 20.w, left: 5.w),
+              child: Image.asset(
+                'images/icon_login_account.png',
+                width: 40.w,
+                height: 40.w,
+              ),
             ),
             hintText: TranslationLoader.lanKeys!.pleaseEnterNumberOrEmail!.tr,
             keyboardType: TextInputType.number,
             inputFormatters: [
               FilteringTextInputFormatter.allow(RegExp('[0-9]')),
               LengthLimitingTextInputFormatter(20),
-            ]
-        ),
+            ]),
         SizedBox(height: 10.w),
         LoginInput(
             controller: state.pwdController,
@@ -195,17 +225,26 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
               logic.checkNext(state.pwdController);
             },
             isPwd: true,
-            leftWidget:Padding(
-              padding: EdgeInsets.only(top:30.w, bottom: 20.w, right: 20.w, left: 5.w),
-              child: Image.asset('images/main/icon_main_search.png', width: 40.w, height: 40.w,),
+            leftWidget: Padding(
+              padding: EdgeInsets.only(
+                  top: 30.w, bottom: 20.w, right: 20.w, left: 5.w),
+              child: Image.asset(
+                'images/icon_login_password.png',
+                width: 40.w,
+                height: 40.w,
+              ),
             ),
-            hintText: "${TranslationLoader.lanKeys!.pleaseEnter!.tr} ${TranslationLoader.lanKeys!.password!.tr}",
+            hintText:
+                "${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.password!.tr}",
             inputFormatters: [
               LengthLimitingTextInputFormatter(20),
-            ]
-        ),
+            ]),
         SizedBox(height: 15.w),
-        Text(TranslationLoader.lanKeys!.registerPasswordTip!.tr, style: TextStyle(color: const Color(0xFF999999), fontSize: 26.sp),),
+        Text(
+          TranslationLoader.lanKeys!.registerPasswordTip!.tr,
+          style:
+              TextStyle(color: AppColors.placeholderTextColor, fontSize: 20.sp),
+        ),
         SizedBox(height: 10.w),
         LoginInput(
             controller: state.sureController,
@@ -213,15 +252,20 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
               logic.checkNext(state.sureController);
             },
             isPwd: true,
-            leftWidget:Padding(
-              padding: EdgeInsets.only(top:30.w, bottom: 20.w, right: 20.w, left: 5.w),
-              child: Image.asset('images/main/icon_main_search.png', width: 40.w, height: 40.w,),
+            leftWidget: Padding(
+              padding: EdgeInsets.only(
+                  top: 30.w, bottom: 20.w, right: 20.w, left: 5.w),
+              child: Image.asset(
+                'images/icon_login_password.png',
+                width: 40.w,
+                height: 40.w,
+              ),
             ),
-            hintText: "${TranslationLoader.lanKeys!.sure!.tr} ${TranslationLoader.lanKeys!.password!.tr}",
+            hintText:
+                "${TranslationLoader.lanKeys!.sure!.tr}${TranslationLoader.lanKeys!.password!.tr}",
             inputFormatters: [
               LengthLimitingTextInputFormatter(20),
-            ]
-        ),
+            ]),
         SizedBox(height: 10.w),
         Row(
           children: [
@@ -232,17 +276,28 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
                   onchangeAction: (v) {
                     logic.checkNext(state.codeController);
                   },
-                  leftWidget:Padding(
-                    padding: EdgeInsets.only(top:30.w, bottom: 20.w, right: 20.w, left: 5.w),
-                    child: Image.asset('images/main/icon_main_search.png', width: 40.w, height: 40.w,),
+                  leftWidget: Padding(
+                    padding: EdgeInsets.only(
+                        top: 30.w, bottom: 20.w, right: 20.w, left: 5.w),
+                    child: SizedBox(
+                      width: 36.w,
+                      height: 36.w,
+                    ),
+                    // Image.asset(
+                    //   'images/main/icon_main_search.png',
+                    //   width: 40.w,
+                    //   height: 40.w,
+                    // ),
                   ),
-                  hintText: "${TranslationLoader.lanKeys!.pleaseEnter!.tr} ${TranslationLoader.lanKeys!.verificationCode!.tr}",
+                  hintText:
+                      "${TranslationLoader.lanKeys!.pleaseEnter!.tr}${TranslationLoader.lanKeys!.verificationCode!.tr}",
                   inputFormatters: [
                     LengthLimitingTextInputFormatter(20),
-                  ]
-              ),
+                  ]),
+            ),
+            SizedBox(
+              width: 20.w,
             ),
-            SizedBox(width: 20.w,),
             GestureDetector(
               child: Container(
                 width: 180.w,
@@ -250,20 +305,26 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
                 padding: EdgeInsets.all(5.h),
                 decoration: BoxDecoration(
                     color: AppColors.mainColor,
-                    borderRadius: BorderRadius.circular(5)
-                ),
+                    borderRadius: BorderRadius.circular(5)),
                 child: Center(
-                  child: Text(_seconds==60?'${TranslationLoader.lanKeys!.getTip!.tr} ${TranslationLoader.lanKeys!.verificationCode!.tr}': (_seconds<10)?'0$_seconds s':'$_seconds s', textAlign:TextAlign.center, style: TextStyle(
-                    color: Colors.white,
-                    fontSize: 26.sp,
-                  )),
+                  child: Text(
+                      _seconds == 60
+                          ? '${TranslationLoader.lanKeys!.getTip!.tr}${TranslationLoader.lanKeys!.verificationCode!.tr}'
+                          : (_seconds < 10)
+                              ? '0$_seconds s'
+                              : '$_seconds s',
+                      textAlign: TextAlign.center,
+                      style: TextStyle(
+                        color: Colors.white,
+                        fontSize: 26.sp,
+                      )),
                 ),
               ),
-              onTap: (){
+              onTap: () {
                 Navigator.pushNamed(context, Routers.safetyVerificationPage);
-                if(_seconds==60){
+                if (_seconds == 60) {
                   // _setVerify();
-                }else{
+                } else {
                   // Toast.show(msg: '正在获取验证码');
                 }
               },
@@ -274,4 +335,51 @@ class _StarLockRegisterPageState extends State<StarLockRegisterPage> {
       ],
     );
   }
+
+  Widget _buildBottomAgreement() {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.start,
+      children: [
+        Image.asset(
+          'images/icon_select_circle.png',
+          width: 28.w,
+          height: 28.w,
+        ),
+        // SizedBox(
+        //     height: 20.h,
+        //     width: 26.w,
+        //     child: Checkbox(value: false, onChanged: (value) {})),
+        SizedBox(
+          width: 15.w,
+        ),
+        Flexible(
+          child: RichText(
+              text: TextSpan(
+            text: TranslationLoader.lanKeys!.readAndAgree!.tr,
+            style: TextStyle(color: const Color(0xff333333), fontSize: 20.sp),
+            children: [
+              WidgetSpan(
+                  alignment: PlaceholderAlignment.middle,
+                  child: GestureDetector(
+                    child: Text(
+                        '《${TranslationLoader.lanKeys!.userAgreement!.tr}》',
+                        style: TextStyle(
+                            color: AppColors.mainColor, fontSize: 20.sp)),
+                    onTap: () {},
+                  )),
+              WidgetSpan(
+                  alignment: PlaceholderAlignment.middle,
+                  child: GestureDetector(
+                    child: Text(
+                        '《${TranslationLoader.lanKeys!.privacyPolicy!.tr}》',
+                        style: TextStyle(
+                            color: AppColors.mainColor, fontSize: 20.sp)),
+                    onTap: () {},
+                  )),
+            ],
+          )),
+        )
+      ],
+    );
+  }
 }