0

lib/pages/background.dart

@@ -4,9 +4,11 @@ import 'package:flutter/material.dart';
 /// Time       : 08/24/2023 Thursday
 /// Author     : liuyuqi.gov@msn.cn
 class Background extends StatelessWidget {
-  Widget child;
-  String topImg, bottomImg;
-  Background(
+  
+  final Widget child;
+  final String topImg, bottomImg;
+
+  const Background(
       {super.key,
       required this.child,
       this.topImg = "assets/images/main_top.png",

lib/pages/login_page.dart

@@ -80,7 +80,7 @@ class LoginForm extends StatelessWidget {
             cursorColor: kPrimaryColor,
             onSaved: (email) {},
             decoration: const InputDecoration(
-              hintText: "Your email",
+              hintText: "邮箱账户",
               prefixIcon: Padding(
                 padding: EdgeInsets.all(defaultPadding),
                 child: Icon(Icons.person),
@@ -94,7 +94,7 @@ class LoginForm extends StatelessWidget {
               obscureText: true,
               cursorColor: kPrimaryColor,
               decoration: const InputDecoration(
-                hintText: "Your password",
+                hintText: "密码",
                 prefixIcon: Padding(
                   padding: EdgeInsets.all(defaultPadding),
                   child: Icon(Icons.lock),
@@ -108,7 +108,7 @@ class LoginForm extends StatelessWidget {
             child: ElevatedButton(
               onPressed: () {},
               child: Text(
-                "Login".toUpperCase(),
+                "登录",
               ),
             ),
           ),

lib/pages/welcome/welcome_page.dart

@@ -4,6 +4,7 @@ import 'package:flutter_auth/pages/login_page.dart';
 import 'package:flutter_auth/pages/register/register_page.dart';
 import 'package:flutter_auth/pages/welcome/welcome_image.dart';
 import 'package:flutter_auth/pages/background.dart';
+import 'package:flutter_auth/routes.dart';
 import 'package:flutter_auth/views/responsive.dart';
 
 /// Description: welcome page
@@ -74,9 +75,10 @@ class _WelcomePageState extends State<WelcomePage> {
           child: ElevatedButton(
             child: const Text("登录"),
             onPressed: () {
-              Navigator.push(context, MaterialPageRoute(builder: (context) {
-                return const LoginPage();
-              }));
+              // Navigator.push(context, MaterialPageRoute(builder: (context) {
+              //   return const LoginPage();
+              // }));
+              Routes.go(context, Routes.login);
             },
           ),
         ),
@@ -85,9 +87,7 @@ class _WelcomePageState extends State<WelcomePage> {
         ),
         ElevatedButton(
           onPressed: () {
-            Navigator.push(context, MaterialPageRoute(builder: (context) {
-              return const RegisterPage();
-            }));
+            Routes.go(context, Routes.register);
           },
           style: ElevatedButton.styleFrom(
               backgroundColor: kPrimaryLightColor, elevation: 0),

lib/views/already_have_an_account_check.dart

@@ -1,8 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_auth/models/config.dart';
 
+/// Description: 账户是否已注册，注册了显示登录
+/// Time       : 08/24/2023 Thursday
+/// Author     : liuyuqi.gov@msn.cn
 class AlreadyHaveAnAccountCheck extends StatelessWidget {
+  /// 账户是否已登录
   final bool login;
+
+  /// 跳转
   final Function? press;
   const AlreadyHaveAnAccountCheck({
     Key? key,
@@ -16,13 +22,13 @@ class AlreadyHaveAnAccountCheck extends StatelessWidget {
       mainAxisAlignment: MainAxisAlignment.center,
       children: <Widget>[
         Text(
-          login ? "Don’t have an Account ? " : "Already have an Account ? ",
+          login ? "还没账户 ? " : "已有账户 ? ",
           style: const TextStyle(color: kPrimaryColor),
         ),
         GestureDetector(
           onTap: press as void Function()?,
           child: Text(
-            login ? "Sign Up" : "Sign In",
+            login ? "注册" : "登录",
             style: const TextStyle(
               color: kPrimaryColor,
               fontWeight: FontWeight.bold,