LoginStyle

lib/main.dart

@@ -1,12 +1,5 @@
 
-<<<<<<< HEAD
-import 'package:farmer_client/models/Store.dart';
-import 'package:farmer_client/pages/home.dart';
-import 'package:farmer_client/pages/login/login.dart';
 import 'package:farmer_client/widgets/CarsCard.dart';
-import 'package:farmer_client/widgets/OrderInfoCard.dart';
-=======
->>>>>>> aab895cc95471d4dfd7cb90d05a35ccceb52c4e0
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
@@ -39,16 +32,9 @@ class MyApp extends StatelessWidget {
         return GetMaterialApp(
           initialRoute: '/splash',
           defaultTransition: Transition.native,
-<<<<<<< HEAD
-          getPages: [
-            // GetPage(name: '/home', page: () => OrderPage() ),
-            GetPage(name: '/home', page: () => box.hasData('token') ? Home() : MyRouteLogin()),
-          ],
-=======
           routingCallback: routingCallback,
           initialBinding: AppBindings(),
           getPages: pages,
->>>>>>> aab895cc95471d4dfd7cb90d05a35ccceb52c4e0
         );
       },
     );

lib/models/Store.dart

@@ -0,0 +1 @@
+// TODO Implement this library.

lib/models/app.dart

@@ -11,7 +11,7 @@ class AppController extends GetxController {
   // 有了这句, 可以直接 AppController.t 调用
   static AppController t = Get.find();
 
-  final user = Person().obs;
+  final user = Rx<Person>(Person());
   final location = Rxn<LocationData>();
   final testInt = 1.obs;
 

lib/pages/home.dart

@@ -0,0 +1 @@
+// TODO Implement this library.

lib/pages/login/login.dart

@@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 
+import '../../models/entities/person.dart';
 import '../../services/user.dart';
 import '../../widgets/Cell.dart';
 
@@ -37,6 +38,35 @@ class MyRouteLogin extends StatefulWidget {
 }
 
 class _RouteLogin extends State<MyRouteLogin> {
+
+var  userInfo= AppController.t.user;
+
+bool isButtonEnable = true; //按钮状态  是否可点击
+String buttonText = '发送验证码'; //初始文本
+int count = 60; //初始倒计时时间
+var timer; //倒计时的计时器
+TextEditingController mController = TextEditingController();
+
+//获取验证码
+void _initTimer() {
+  timer = Timer.periodic(Duration(seconds: 1), (Timer timer) {
+    count--;
+    setState(() {
+      if (count == 0) {
+        timer.cancel(); //倒计时结束取消定时器
+        isButtonEnable = true; //按钮可点击
+        count = 60; //重置时间
+        buttonText = '发送验证码'; //重置按钮文本
+      } else {
+        buttonText = '重新发送($count)'; //更新文本内容
+      }
+    });
+  });
+}
+
+
+
+
   @override
   void initState() {
     super.initState();
@@ -47,28 +77,6 @@ class _RouteLogin extends State<MyRouteLogin> {
     print(location);
   }
 
-  bool isButtonEnable = true; //按钮状态  是否可点击
-  String buttonText = '发送验证码'; //初始文本
-  int count = 60; //初始倒计时时间
-  var timer; //倒计时的计时器
-  TextEditingController mController = TextEditingController();
-
-  void _initTimer() {
-    timer = Timer.periodic(Duration(seconds: 1), (Timer timer) {
-      count--;
-      setState(() {
-        if (count == 0) {
-          timer.cancel(); //倒计时结束取消定时器
-          isButtonEnable = true; //按钮可点击
-          count = 60; //重置时间
-          buttonText = '发送验证码'; //重置按钮文本
-        } else {
-          buttonText = '重新发送($count)'; //更新文本内容
-        }
-      });
-    });
-  }
-
   @override
   void dispose() {
     timer?.cancel(); //销毁计时器
@@ -82,6 +90,9 @@ class _RouteLogin extends State<MyRouteLogin> {
 // -------------逻辑分割-------------------------------------------
   var handlePhones = '';
   var handleCodes = '';
+  var userContent = {'phones': '', 'code': ''};
+  bool _newValue = false;
+
 
   void _handlePhone(e) => {
         setState(() => {handlePhones = e})
@@ -91,19 +102,9 @@ class _RouteLogin extends State<MyRouteLogin> {
         setState(() => {handleCodes = e})
       };
 
-  var userContent = {'phones': '', 'code': ''};
 
-  void phoneUser() => {
-        setState(() {
-          userContent['phones'] = handlePhones;
-          userContent['code'] = handleCodes;
-        }),
-        print('我输入的信息：${userContent}，手机号：${userContent['phones']}')
-      };
-
-  bool _checkValue = false;
-  bool _newValue = false;
 
+// 获取验证码
   void _buttonClickListen() {
     setState(() {
       if (isButtonEnable) {
@@ -113,13 +114,28 @@ class _RouteLogin extends State<MyRouteLogin> {
           getSMSCaptch(handlePhones);
         } else {
           Fluttertoast.showToast(msg: '请正确输入手机号！');
-
         }
-
         print('获取验证码按钮222222');
       }
     });
   }
+//登陆按钮
+  void _handelSubmit(){
+    if(handleCodes==''||handlePhones==''){
+      Fluttertoast.showToast(msg: '请输入验证码或手机号！');
+    }else{
+      if(_newValue){
+        print('已同意协议');
+        userLogin(handlePhones,handleCodes).then((value) {
+          userInfo(Person.fromJson(value.date.person));
+          Get.back();
+
+        });
+      }else{
+        Fluttertoast.showToast(msg: '请阅读并同意相关隐私政策！');
+      }
+    }
+  }
 
   @override
   Widget build(BuildContext context) {
@@ -153,7 +169,6 @@ class _RouteLogin extends State<MyRouteLogin> {
                   fontSize: 35,
                 ),
               ),
-
               Cell(
                   // margin: EdgeInsets.symmetric(horizontal: 13.w),
                   margin: const EdgeInsets.fromLTRB(13, 43, 10, 0),
@@ -187,21 +202,7 @@ class _RouteLogin extends State<MyRouteLogin> {
                     child: ElevatedButton(
                       onPressed: () => {
                         setState(() {
-                          // _buttonClickListen();
-                          setState(() {
-                            if (isButtonEnable) {
-                              if (handlePhones != '') {
-                                isButtonEnable = false; //按钮状态标记
-                                _initTimer();
-                                getSMSCaptch(handlePhones);
-                              } else {
-                                Fluttertoast.showToast(msg: '请正确输入手机号！');
-                              }
-
-                              print('获取验证码按钮222222');
-                            }
-                          });
-
+                          _buttonClickListen();
                         })
                       },
                       child: Text(
@@ -222,8 +223,6 @@ class _RouteLogin extends State<MyRouteLogin> {
                       ),
                     ),
                   )),
-//          --------------FractionalOffset API--------------
-
               Cell(
                 // margin: EdgeInsets.symmetric(horizontal: 13.w),
                 margin: const EdgeInsets.fromLTRB(13, 16, 10, 0),
@@ -264,16 +263,7 @@ class _RouteLogin extends State<MyRouteLogin> {
                   height: 49.h,
                   child: ElevatedButton(
                     onPressed: () {
-                      if(handleCodes==''||handlePhones==''){
-                        Fluttertoast.showToast(msg: '请输入验证码或手机号！');
-                      }else{
-                        if(_newValue){
-                          print('已同意协议');
-                          userLogin(handlePhones,handleCodes);
-                        }else{
-                          Fluttertoast.showToast(msg: '请阅读并同意相关隐私政策！');
-                        }
-                      }
+                      _handelSubmit();
                     },
                     child: const Text(
                       "登陆",
@@ -310,7 +300,7 @@ class _RouteLogin extends State<MyRouteLogin> {
                           }),
                       RichText(
                         text: TextSpan(children: <InlineSpan>[
-                          TextSpan(
+                          const TextSpan(
                               text: '请认真查看',
                               style: TextStyle(color: Color(0xff2a2a2a))),
                           TextSpan(
@@ -322,7 +312,7 @@ class _RouteLogin extends State<MyRouteLogin> {
                                     print('阅读已同意！！！');
                                   },
                           ),
-                          TextSpan(
+                          const TextSpan(
                               text: '确认之后选择此项',
                               style: TextStyle(color: Color(0xff2a2a2a))),
                         ]),

lib/pages/splash/splash.dart

@@ -9,7 +9,6 @@ class SplashScreen extends StatelessWidget {
   handleOnFinish () {
     Get.off(Home(), routeName: '/');
   }
-
   @override
   Widget build(BuildContext context) {
     return countdown(3, handleOnFinish);

lib/services/user.dart

@@ -18,15 +18,15 @@ Future getSMSCaptch(String phone) async {
   });
 }
 
-<<<<<<< HEAD
-
 //登陆
 Future userLogin(String userName,String password) async {
-  return request('/login', options: Options(method: 'POST'), data: { 'userName': userName,'password':password }, ).catchError((error)=>{ Fluttertoast.showToast(
-  msg: error.error['message']
+  return request('/login', options: Options(method: 'POST'),
+    data: { 'userName': userName, 'password': password},).catchError((error) =>
+  { Fluttertoast.showToast(
+      msg: error.error['message']
   ),});
-=======
+}
+
 Future getCurrent() async {
   return request('/person/current');
->>>>>>> aab895cc95471d4dfd7cb90d05a35ccceb52c4e0
 }

pubspec.lock

@@ -237,21 +237,21 @@ packages:
     dependency: "direct main"
     description:
       name: location
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.3.0"
   location_platform_interface:
     dependency: transitive
     description:
       name: location_platform_interface
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.3.0"
   location_web:
     dependency: transitive
     description:
       name: location_web
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.1"
   logging: