'.'

lib/pages/login/login.dart

@@ -10,6 +10,7 @@ import 'package:get/get.dart';
 import '../../models/entities/person.dart';
 import '../../services/user.dart';
 import '../../widgets/Cell.dart';
+import '../home/index.dart';
 
 
 class MyRouteLogin extends StatefulWidget {
@@ -19,30 +20,30 @@ class MyRouteLogin extends StatefulWidget {
 
 class _RouteLogin extends State<MyRouteLogin> {
 
-var  userInfo= AppController.t.user;
+  var  userInfo= AppController.t.user;
 
-bool isButtonEnable = true; //按钮状态  是否可点击
-String buttonText = '发送验证码'; //初始文本
-int count = 60; //初始倒计时时间
-var timer; //倒计时的计时器
-TextEditingController mController = TextEditingController();
+  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)'; //更新文本内容
-      }
+  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)'; //更新文本内容
+        }
+      });
     });
-  });
-}
+  }
 
 
 
@@ -75,12 +76,12 @@ void _initTimer() {
 
 
   void _handlePhone(e) => {
-        setState(() => {handlePhones = e})
-      };
+    setState(() => {handlePhones = e})
+  };
 
   void _handleCode(e) => {
-        setState(() => {handleCodes = e})
-      };
+    setState(() => {handleCodes = e})
+  };
 
 
 
@@ -106,9 +107,8 @@ void _initTimer() {
       if(_newValue){
         print('已同意协议');
         userLogin(handlePhones,handleCodes).then((value) {
-          userInfo(Person.fromJson(value.date.person));
-          Get.back();
-
+          userInfo(Person.fromJson(value['person']));
+          Get.off(Home());
         });
       }else{
         Fluttertoast.showToast(msg: '请阅读并同意相关隐私政策！');
@@ -122,14 +122,14 @@ void _initTimer() {
       backgroundColor: Colors.transparent,
       resizeToAvoidBottomInset: false,
       body: Container(
-      decoration: const BoxDecoration(
-        image: DecorationImage(
-          image: AssetImage("images/icon_login.png"),
-          fit: BoxFit.cover,
+        decoration: const BoxDecoration(
+          image: DecorationImage(
+            image: AssetImage("images/icon_login.png"),
+            fit: BoxFit.cover,
+          ),
         ),
-      ),
 
-      child:  Container(
+        child:  Container(
           child: Column(
             mainAxisAlignment: MainAxisAlignment.end,
             crossAxisAlignment: CrossAxisAlignment.start,
@@ -149,7 +149,7 @@ void _initTimer() {
                 ),
               ),
               Cell(
-                  // margin: EdgeInsets.symmetric(horizontal: 13.w),
+                // margin: EdgeInsets.symmetric(horizontal: 13.w),
                   margin: const EdgeInsets.fromLTRB(13, 43, 10, 0),
                   header: Text(
                     "+86",
@@ -166,7 +166,7 @@ void _initTimer() {
                     decoration: const InputDecoration(
                       isCollapsed: true,
                       contentPadding:
-                          EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+                      EdgeInsets.symmetric(vertical: 8, horizontal: 16),
                       labelText: "请输入手机号码",
                       counterText: '', //去掉计数
                       border: InputBorder.none,
@@ -194,11 +194,11 @@ void _initTimer() {
                         backgroundColor: isButtonEnable
                             ? MaterialStateProperty.all(const Color(0xFFFF703B))
                             : MaterialStateProperty.all(
-                                const Color(0xFFCBCBCB)),
+                            const Color(0xFFCBCBCB)),
                         shape: MaterialStateProperty.all(
                             const RoundedRectangleBorder(
                                 borderRadius:
-                                    BorderRadius.all(Radius.circular(10)))),
+                                BorderRadius.all(Radius.circular(10)))),
                       ),
                     ),
                   )),
@@ -223,7 +223,7 @@ void _initTimer() {
                   decoration: const InputDecoration(
                     isCollapsed: true,
                     contentPadding:
-                        EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+                    EdgeInsets.symmetric(vertical: 8, horizontal: 16),
                     labelText: "请输入验证码",
                     border: InputBorder.none,
                     floatingLabelBehavior: FloatingLabelBehavior.never,
@@ -254,11 +254,11 @@ void _initTimer() {
                     style: ButtonStyle(
                       elevation: MaterialStateProperty.all(0),
                       backgroundColor:
-                          MaterialStateProperty.all(const Color(0xFFFF703B)),
+                      MaterialStateProperty.all(const Color(0xFFFF703B)),
                       shape: MaterialStateProperty.all(
                           const RoundedRectangleBorder(
                               borderRadius:
-                                  BorderRadius.all(Radius.circular(24.4)))),
+                              BorderRadius.all(Radius.circular(24.4)))),
                     ),
                   ),
                 ),
@@ -286,10 +286,10 @@ void _initTimer() {
                             text: '文本协议/隐私政策，',
                             style: TextStyle(color: Color(0xffce3800)),
                             recognizer:
-                                TapGestureRecognizer() //踩坑。。。recognizer 是手势交互 除了我现在些的是 点击交互，其他一般都是抽象类。
-                                  ..onTap = () {
-                                    print('阅读已同意！！！');
-                                  },
+                            TapGestureRecognizer() //踩坑。。。recognizer 是手势交互 除了我现在些的是 点击交互，其他一般都是抽象类。
+                              ..onTap = () {
+                                print('阅读已同意！！！');
+                              },
                           ),
                           const TextSpan(
                               text: '确认之后选择此项',