Merge branch 'master' of http://git.ycjcjy.com/nanyang/farmer_client

lib/components/UI/DefaultButton.dart

@@ -0,0 +1,89 @@
+import 'package:flutter/material.dart';
+
+
+
+class DefaultButton extends StatefulWidget {
+  //点击回调
+  final GestureTapCallback onPressed;
+  final String text;
+  final EdgeInsetsGeometry margin;
+  final double width;
+  final double height;
+  final double? fontSize;
+  final Color backColor;
+  final Color color;
+
+  EdgeInsetsGeometry marginDefault =
+  const EdgeInsets.fromLTRB(0, 90.0, 0, 30); //按钮默认的margin值
+
+  DefaultButton({
+    Key? key,
+    required this.onPressed,
+    required this.text,
+    required this.margin,
+    required this.width,
+    required this.height,
+    this.fontSize,
+    required this.backColor,
+    required this.color,
+  }) : super(key: key);
+
+  @override
+  State createState() {
+    if (margin == null) {
+      return _DefaultButtonState(onPressed, text, marginDefault,width,height,fontSize,backColor,color);
+    }
+    return _DefaultButtonState(onPressed, text, margin,width,height,fontSize,backColor,color);
+  }
+}
+
+class _DefaultButtonState extends State<DefaultButton> {
+  //点击回调
+  final GestureTapCallback onPressed;
+  final String text;
+  final EdgeInsetsGeometry margin;
+  final double width;
+  final double height;
+  final double? fontSize;
+  final Color backColor;
+  final Color color;
+  _DefaultButtonState(
+      this.onPressed,
+      this.text,
+      this.margin,
+      this.width,
+      this.height,
+      this.fontSize,
+      this.backColor,
+      this.color
+      );
+
+  @override
+  Widget build(BuildContext context) {
+    Widget _SectionBtn = Container(
+      margin: margin,
+      child: SizedBox(
+        width: width,
+        height: height,
+        child: RaisedButton(
+          color: backColor,
+          disabledColor: const Color(0xF5F6F7ff),
+          disabledTextColor: const Color(0xF5F6F7ff),
+          colorBrightness: Brightness.dark,
+          shape:
+          RoundedRectangleBorder(borderRadius: BorderRadius.circular(5.0)),
+          child: Text(text,style:  TextStyle(
+              fontSize: fontSize,
+              color: color,
+          ),),
+          textColor: Colors.white,
+          onPressed: onPressed,
+        ),
+      ),
+    );
+
+    return _SectionBtn;
+  }
+
+}
+

lib/main.dart

@@ -1,4 +1,5 @@
 
+import 'package:farmer_client/widgets/CarsCard.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:get_storage/get_storage.dart';
@@ -59,7 +60,7 @@ class MyApp extends StatelessWidget {
 }
 
 class MyHomePage extends StatefulWidget {
-  const MyHomePage({Key? key, required this.title}) : super(key: key);
+  const MyHomePage({Key? key,}) : super(key: key);
 
   // This widget is the home page of your application. It is stateful, meaning
   // that it has a State object (defined below) that contains fields that affect
@@ -70,7 +71,7 @@ class MyHomePage extends StatefulWidget {
   // used by the build method of the State. Fields in a Widget subclass are
   // always marked "final".
 
-  final String title;
+  // final String title;
 
   @override
   State<MyHomePage> createState() => _MyHomePageState();
@@ -82,14 +83,6 @@ class _MyHomePageState extends State<MyHomePage> {
 
   @override
   Widget build(BuildContext context) {
-
-    ScreenUtil.init(context,
-        deviceSize: Size(
-            MediaQuery.of(context).size.width,
-            MediaQuery.of(context).size.height),
-        designSize: const Size(375, 812),
-        minTextAdapt: true,
-        orientation: Orientation.portrait);
     // var find = Get.find(tag: 'user');
 
     // This method is rerun every time setState is called, for instance as done
@@ -103,7 +96,7 @@ class _MyHomePageState extends State<MyHomePage> {
         backgroundColor: Colors.amber,
         // Here we take the value from the MyHomePage object that was created by
         // the App.build method, and use it to set our appbar title.
-        title: Text(widget.title),
+        title: Text('widget.title'),
       ),
       body: Center(
         // Center is a layout widget. It takes a single child and positions it
@@ -124,7 +117,7 @@ class _MyHomePageState extends State<MyHomePage> {
           // axis because Columns are vertical (the cross axis would be
           // horizontal).
           mainAxisAlignment: MainAxisAlignment.center,
-          children: const <Widget>[
+          children:  <Widget>[
 
             // Text(
             //   '$_counter',
@@ -147,13 +140,9 @@ class _MyHomePageState extends State<MyHomePage> {
             //     );
             //   },
             // ),
-            // CarsCard(item: CarItem(
-            //     name:'元神第二个收割机',
-            //   distance:8.8,
-            //   price:270.6,
-            // )),
+            CarsCard(),
             // Search()
-            OrderListCard()
+            // OrderListCard()
           ],
         ),
       ),

lib/models/Store.dart

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

lib/models/User.dart

@@ -0,0 +1,15 @@
+
+import 'package:farmer_client/models/entities/person.dart';
+import 'package:get/get.dart';
+
+class User extends GetxController {
+  Person? _person;
+  Person? get person => _person;
+  set person (Person? p) {
+    _person = p;
+    update();
+  }
+
+  bool get isLogin => _person != null;
+
+}

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/models/entities/person.dart

@@ -9,7 +9,7 @@ class Person {
   String? phone;
   String? userId;
   int? status;
-  DateTime? createDate;
+  String? createDate;
 
   Person ();
 

lib/pages/TabBar/Information_page.dart

@@ -0,0 +1,11 @@
+import 'package:flutter/material.dart';
+
+class InformationPage extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    // TODO: implement build
+    return Scaffold(
+      body: Center(child: Text('资讯')),
+    );
+  }
+}

lib/pages/TabBar/Mine_page.dart

@@ -0,0 +1,11 @@
+import 'package:flutter/material.dart';
+
+class MinePage extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    // TODO: implement build
+    return Scaffold(
+      body: Center(child: Text('我的')),
+    );
+  }
+}

lib/pages/TabBar/Orders_page.dart

@@ -0,0 +1,11 @@
+import 'package:flutter/material.dart';
+
+class OrdersPage extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    // TODO: implement build
+    return Scaffold(
+      body: Center(child: Text('订单')),
+    );
+  }
+}

lib/pages/TabBar/home_page.dart

@@ -0,0 +1,10 @@
+import 'package:flutter/material.dart';
+
+class HomePage extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      body: Center(child: Text('首页')),
+    );
+  }
+}

lib/pages/TabBar/index_page.dart

@@ -0,0 +1,71 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/cupertino.dart';
+import 'home_page.dart';
+import 'Information_page.dart';
+import 'Mine_page.dart';
+import 'Orders_page.dart';
+
+class IndexPage extends StatefulWidget {
+  _IndexPageState createState() => _IndexPageState();
+}
+
+class _IndexPageState extends State<IndexPage> {
+
+
+  final List<BottomNavigationBarItem> bottomTabs = [
+     BottomNavigationBarItem(
+      icon: Icon(CupertinoIcons.home),
+      title: Text('首页'),
+    ),
+     BottomNavigationBarItem(
+      icon: Icon(CupertinoIcons.search),
+      title: Text('资讯'),
+
+    ),
+     BottomNavigationBarItem(
+      icon: Icon(CupertinoIcons.shopping_cart),
+      title: Text('订单'),
+
+    ),
+     BottomNavigationBarItem(
+      icon: Icon(CupertinoIcons.profile_circled),
+      title: Text('我的'),
+    ),
+  ];
+
+  final List tabBodies = [
+    HomePage(),
+    InformationPage(),
+    OrdersPage(),
+    MinePage(),
+  ];
+
+  int currentIndex = 0;
+  var currentPage;
+
+  @override
+  void initState() {
+    super.initState();
+    currentPage = tabBodies[currentIndex];
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // TODO: implement build
+    return Scaffold(
+      backgroundColor: Color.fromRGBO(244, 245, 245, 1),
+      bottomNavigationBar: BottomNavigationBar(
+        type: BottomNavigationBarType.fixed,
+        currentIndex: currentIndex,
+        items: bottomTabs,
+        onTap: (index){
+          setState(() {
+            currentIndex = index;
+            currentPage = tabBodies[currentIndex];
+          });
+        },
+      ),
+      body: currentPage,
+    );
+  }
+}

lib/pages/TabBar/member_page.dart

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

lib/pages/home.dart

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

lib/pages/login/login.dart

@@ -7,29 +7,10 @@ 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';
 
-// class Login extends GetView<User> {
-//
-//   int _countdown = 60;
-//
-//   @override
-//   Widget build(BuildContext context) {
-//     // controller.person
-//     return StatefulBuilder(builder: (context, setState) {
-//
-//       setState(() {
-//         _countdown -= 1;
-//       });
-//
-//       return Text("data");
-//     });
-//   }
-//
-//
-//
-// }
 
 class MyRouteLogin extends StatefulWidget {
   @override
@@ -37,6 +18,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 +57,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 +70,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 +82,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) {
@@ -114,17 +95,33 @@ class _RouteLogin extends State<MyRouteLogin> {
         } 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) {
-    return Container(
-      width: 250,
-      height: 250,
+    return Scaffold(
+      backgroundColor: Colors.transparent,
+      resizeToAvoidBottomInset: false,
+      body: Container(
       decoration: const BoxDecoration(
         image: DecorationImage(
           image: AssetImage("images/icon_login.png"),
@@ -132,9 +129,7 @@ class _RouteLogin extends State<MyRouteLogin> {
         ),
       ),
 
-      child: Scaffold(
-        backgroundColor: Colors.transparent, //把scaffold的背景色改成透明
-        body: Center(
+      child:  Container(
           child: Column(
             mainAxisAlignment: MainAxisAlignment.end,
             crossAxisAlignment: CrossAxisAlignment.start,
@@ -153,7 +148,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 +181,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 +202,6 @@ class _RouteLogin extends State<MyRouteLogin> {
                       ),
                     ),
                   )),
-//          --------------FractionalOffset API--------------
-
               Cell(
                 // margin: EdgeInsets.symmetric(horizontal: 13.w),
                 margin: const EdgeInsets.fromLTRB(13, 16, 10, 0),
@@ -264,15 +242,7 @@ class _RouteLogin extends State<MyRouteLogin> {
                   height: 49.h,
                   child: ElevatedButton(
                     onPressed: () {
-                      if(handleCodes==''||handlePhones==''){
-                        Fluttertoast.showToast(msg: '请输入验证码或手机号！');
-                      }else{
-                        if(_newValue){
-                          print('已同意协议');
-                        }else{
-                          Fluttertoast.showToast(msg: '请阅读并同意相关隐私政策！');
-                        }
-                      }
+                      _handelSubmit();
                     },
                     child: const Text(
                       "登陆",
@@ -282,6 +252,7 @@ class _RouteLogin extends State<MyRouteLogin> {
                           fontWeight: FontWeight.bold),
                     ),
                     style: ButtonStyle(
+                      elevation: MaterialStateProperty.all(0),
                       backgroundColor:
                           MaterialStateProperty.all(const Color(0xFFFF703B)),
                       shape: MaterialStateProperty.all(
@@ -293,7 +264,7 @@ class _RouteLogin extends State<MyRouteLogin> {
                 ),
               ),
 
-              Padding(
+              Container(
                   padding: EdgeInsets.fromLTRB(10.0, 10, 10.0, 10),
                   child: Row(
                     children: <Widget>[
@@ -308,7 +279,7 @@ class _RouteLogin extends State<MyRouteLogin> {
                           }),
                       RichText(
                         text: TextSpan(children: <InlineSpan>[
-                          TextSpan(
+                          const TextSpan(
                               text: '请认真查看',
                               style: TextStyle(color: Color(0xff2a2a2a))),
                           TextSpan(
@@ -320,7 +291,7 @@ class _RouteLogin extends State<MyRouteLogin> {
                                     print('阅读已同意！！！');
                                   },
                           ),
-                          TextSpan(
+                          const TextSpan(
                               text: '确认之后选择此项',
                               style: TextStyle(color: Color(0xff2a2a2a))),
                         ]),

lib/pages/main/index.dart

@@ -0,0 +1,39 @@
+import 'package:farmer_client/pages/main/widgets/UserAddress.dart';
+import 'package:farmer_client/pages/main/widgets/UserInfo.dart';
+import 'package:flutter/material.dart';
+
+
+class MainPage extends StatefulWidget {
+  const MainPage({Key? key}) : super(key: key);
+
+  @override
+  State<MainPage> createState() => _MainPageState();
+}
+
+class _MainPageState extends State<MainPage> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      resizeToAvoidBottomInset: false,
+      appBar:  AppBar(
+        title:  Text('我的'),
+        leading:  Icon(Icons.arrow_back_ios),
+        backgroundColor: Color(0xff4ceebe),
+        // backgroundColor: Colors.transparent,
+        centerTitle: true,
+
+      ),
+      body:Container(
+        alignment: Alignment.center,
+        child:   Column(
+          children: [
+            UserInfo(),
+            UserAddress()
+          ],
+        ),
+      )
+
+
+    );
+  }
+}

lib/pages/main/widgets/UserAddress.dart

@@ -0,0 +1,98 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class UserAddress extends StatelessWidget {
+  const UserAddress({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+        alignment: Alignment.center,
+        height: 123.w,
+        width: 345.w,
+        margin: EdgeInsets.fromLTRB(0, 15.w, 0, 15.w),
+        decoration: BoxDecoration(
+          borderRadius: BorderRadius.circular(30),
+          color: Colors.white,
+          boxShadow: [
+            BoxShadow(
+              blurRadius: 10, //阴影范围
+              spreadRadius: 0.1, //阴影浓度
+              color: Colors.grey.withOpacity(0.2), //阴影颜色
+            ),
+          ],
+        ),
+        child: Column(
+          children: [
+            Container(
+                margin: EdgeInsets.fromLTRB(0, 30.w, 0, 20.w),
+                alignment: Alignment.topLeft,
+                decoration: const BoxDecoration(
+                    border: Border(
+                        left: BorderSide(width: 5, color: Color(0xff000000)
+                            // 0x17000000
+                            ))),
+                child: Padding(
+                  padding: EdgeInsets.fromLTRB(12.w, 0, 0, 0),
+                  child: Text(
+                    '地址信息',
+                    style: TextStyle(
+                      color: Color(0xff333333),
+                      fontWeight: FontWeight.bold,
+                      fontSize: 17.sp,
+                    ),
+                  ),
+                )),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                Container(
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Padding(
+                        padding: EdgeInsets.fromLTRB(17.w, 0, 10.w, 0),
+                        child: Image(
+                          image: AssetImage('images/gpsImgae.png'),
+                          width: 12.w,
+                        ),
+                      ),
+                      Container(
+                        width: 260,
+                        child: GestureDetector(
+                          child: Text(
+                            '请填写详细地址请填写详细地址请填写详细地址',
+                            softWrap: true,
+                            maxLines: 1,
+                            textAlign: TextAlign.left,
+                            overflow: TextOverflow.ellipsis,
+                            style: TextStyle(
+                              fontWeight: FontWeight.bold,
+                              fontSize: 17,
+                            ),
+                          ),
+                          onTap: () {
+                            print('修改地址');
+                          },
+                        ),
+                      )
+                    ],
+                  ),
+                ),
+                Container(
+                  alignment: Alignment.center,
+                  padding: EdgeInsets.fromLTRB(0, 0, 30.w, 0),
+                  child: Text(
+                    '>>',
+                    style: TextStyle(
+                      fontWeight: FontWeight.bold,
+                      fontSize: 17,
+                    ),
+                  ),
+                ),
+              ],
+            ),
+          ],
+        ));
+  }
+}

lib/pages/main/widgets/UserInfo.dart

@@ -0,0 +1,109 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class UserInfo extends StatelessWidget {
+  const UserInfo({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      alignment: Alignment.center,
+      height: 173.w,
+      width: 345.w,
+      decoration: BoxDecoration(
+        image: const DecorationImage(
+          image: AssetImage("images/mineBack.png"),
+          fit: BoxFit.cover,
+        ),
+        borderRadius: BorderRadius.circular(10),
+      ),
+      child: Stack(
+        fit: StackFit.expand,
+        children: [
+          Positioned(
+            top: 0,
+            right: 0,
+            child: Container(
+                alignment: Alignment.center,
+                height: 24.w,
+                width: 90.w,
+                decoration: const BoxDecoration(
+                  borderRadius: BorderRadius.only(
+                      bottomLeft: Radius.circular(20),
+                      topRight: Radius.circular(20)),
+                  color: Color(0x30000000),
+                ),
+                child: GestureDetector(
+                  child: const Text(
+                    '修改个人信息',
+                    style: TextStyle(color: Colors.white),
+                  ),
+                  onTap: () {
+                    print('修改个人信息');
+                  },
+                )),
+          ),
+          Row(
+            children: [
+              Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                children: [
+                  Container(
+                    decoration: BoxDecoration(
+                      shape: BoxShape.circle,
+                      border: Border.all(
+                        color: Colors.white,
+                        width: 2,
+                      ),
+                    ),
+                    margin: EdgeInsets.fromLTRB(30, 0, 15, 0),
+                    alignment: Alignment.center,
+                    child: Image.asset(
+                      "images/userMoren.png",
+                      width: 63.w,
+                    ),
+                  ),
+                ],
+              ),
+              Container(
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    Container(
+                      margin: EdgeInsets.fromLTRB(0, 0, 0, 10),
+                      child: Text(
+                        '符西西',
+                        style: TextStyle(
+                          color: Colors.white,
+                          fontSize: 17,
+                        ),
+                      ),
+                    ),
+                    Container(
+                      margin: EdgeInsets.fromLTRB(0, 10, 0, 0),
+                      child: Text(
+                        '17775000245',
+                        style: TextStyle(
+                          color: Colors.white,
+                          fontSize: 17,
+                        ),
+                      ),
+                    ),
+                    // const Text(
+                    //      '点击登陆',
+                    //      style: TextStyle(
+                    //        color: Colors.white,
+                    //        fontSize: 17,
+                    //      ),
+                    //    ),
+                  ],
+                ),
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}

lib/pages/order/index.dart

@@ -0,0 +1,70 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+import '../../widgets/OrderInfoCard.dart';
+
+
+
+
+
+class OrderPage extends StatefulWidget {
+  const OrderPage({Key? key}) : super(key: key);
+
+  @override
+  State<OrderPage> createState() => _OrderPageState();
+}
+
+class _OrderPageState extends State<OrderPage> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      resizeToAvoidBottomInset: false,
+      appBar:  AppBar(
+        title:  Text('订单'),
+        leading:  Icon(Icons.arrow_back_ios),
+        backgroundColor: Color(0xff2b9270),
+        // backgroundColor: Colors.transparent,
+        centerTitle: true,
+
+      ),
+      body:      Column(
+        children: [
+          OrderInfoCard(),
+
+          Container(
+            height: 130.h,
+            margin: EdgeInsets.only(top: 20.0, bottom: 0.0),
+            alignment: Alignment.bottomCenter,
+            child: SizedBox(
+              width: 315.w,
+              height: 49.h,
+              child: ElevatedButton(
+                onPressed: () {
+                  // _handelSubmit();
+                  print('用户点击了支付啊阿松大撒地方');
+                },
+                child: const Text(
+                  "支付",
+                  style: TextStyle(
+                      fontSize: 18,
+                      color: Colors.white,
+                      fontWeight: FontWeight.bold),
+                ),
+                style: ButtonStyle(
+                  elevation: MaterialStateProperty.all(0),
+                  backgroundColor:
+                  MaterialStateProperty.all(const Color(0xFFFF703B)),
+                  shape: MaterialStateProperty.all(
+                      const RoundedRectangleBorder(
+                          borderRadius:
+                          BorderRadius.all(Radius.circular(24.4)))),
+                ),
+              ),
+            ),
+          ),
+        ],
+      ),
+    );
+
+  }
+}

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/routes/middleWares.dart

@@ -11,6 +11,6 @@ void routingCallback (routing) {
   if (!isLogin && !isSplashScreen && !isLoginPage) {
     // addPostFrameCallback 作用是等当前帧绘制完成之后再加载
     // https://github.com/jonataslaw/getx/issues/262
-    SchedulerBinding.instance?.addPostFrameCallback((_) => Get.toNamed('/login'));
+    SchedulerBinding.instance?.addPostFrameCallback((_) => Get.offNamed('/login'));
   }
 }

lib/routes/pages.dart

@@ -1,9 +1,12 @@
 
 import 'package:get/get.dart';
-import '../pages/index.dart';
+import '../pages/index.dart';//Home
+import '../pages/main/index.dart';
+import '../pages/order/index.dart';
+import '../widgets/OrderInfoCard.dart';
 
 List<GetPage> pages = [
-  GetPage(name: '/', page: () =>  Home()),
-  GetPage(name: '/splash', page: () => SplashScreen()),
-  GetPage(name: '/login', page: () =>  MyRouteLogin()),
+  GetPage(name: '/', page: () =>  MainPage()),
+  // GetPage(name: '/splash', page: () => SplashScreen()),
+  // GetPage(name: '/login', page: () =>  MyRouteLogin()),
 ];

lib/services/user.dart

@@ -6,8 +6,7 @@ import 'package:fluttertoast/fluttertoast.dart';
 
 
 Future getSMSCaptch(String phone) async {
-  return request('/sms-captcha', options: Options(method: 'POST'), queryParameters: { 'phone': phone })
-      .then((value) {
+  return request('/sms-captcha', options: Options(method: 'POST'), queryParameters: { 'phone': phone }).then((value) {
     Fluttertoast.showToast(
         msg: '验证码发送成功！'
     );
@@ -19,6 +18,15 @@ Future getSMSCaptch(String phone) async {
   });
 }
 
+//登陆
+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']
+  ),});
+}
+
 Future getCurrent() async {
   return request('/person/current');
 }

lib/utils/Request.dart

@@ -52,7 +52,7 @@ Dio createRequest() {
       try {
         var data = response.data as Map<String, dynamic>;
         if (null != data['token']) {
-          GetStorage().write('token', data['token']);
+          GetStorage().write('token', data['token']); //取数据
         }
       } catch (e) {
         //

lib/widgets/CarsCard.dart

@@ -2,29 +2,23 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
-
-class CarItem {
-  late String name ;
-  late num? price ;
-  late num? distance ;
-
-
-  CarItem({ required this.name,this.price,this.distance});
-
-
-}
-
+// class CarItem {
+//   late String name;
+//   late num? price;
+//   late num? distance;
+//   CarItem({required this.name, this.price, this.distance});
+// }
 
 class CarsCard extends StatelessWidget {
-  final CarItem item;
-
+  // final CarItem item;
 
-  const CarsCard({Key? key, required this.item,}) : super(key: key);
+  // const CarsCard({
+  //   Key? key,
+  //   required this.item,
+  // }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-
-
     return Container(
       decoration: BoxDecoration(
         color: Color(0xfff2f2f2),
@@ -46,8 +40,8 @@ class CarsCard extends StatelessWidget {
               verticalDirection: VerticalDirection.up,
               children: <Widget>[
                 Container(
-                  child:  Text(
-                    item.name,
+                  child: Text(
+                    '联合收割机GB01235-0B',
                     style: TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
                   ),
                 ),
@@ -89,7 +83,7 @@ class CarsCard extends StatelessWidget {
                     height: 44.h, //+10
                     child: ElevatedButton(
                       onPressed: () {
-                        print('点我去预约${item.name}');
+                        print('点我去预约');
                       },
                       child: const Text(
                         "预约",

lib/widgets/OrderInfoCard.dart

@@ -0,0 +1,210 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_screenutil/flutter_screenutil.dart';
+
+class OrderInfoCard extends StatelessWidget {
+  const OrderInfoCard({Key? key}) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      width: 345.w,
+      height: 484.5.h,
+      margin: EdgeInsets.fromLTRB(15.w, 17.w, 15.w, 0),
+      decoration: BoxDecoration(
+        color: Colors.white,
+        //设置四周圆角 角度
+        borderRadius: BorderRadius.all(Radius.circular(2.0)),
+        //设置四周边框
+        boxShadow: [
+          BoxShadow(
+            blurRadius: 10, //阴影范围
+            spreadRadius: 0.1, //阴影浓度
+            color: Colors.grey.withOpacity(0.2), //阴影颜色
+          ),
+        ],
+      ),
+      child: Column(
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Container(
+              margin: EdgeInsets.fromLTRB(15.w, 0, 0, 0),
+              child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Container(
+                    padding: EdgeInsets.fromLTRB(0, 15, 0, 20),
+                    width: 314.w,
+                    decoration: const BoxDecoration(
+                        border: Border(
+                            bottom:
+                                BorderSide(width: 0.5, color: Color(0x20000000)
+                                    // 0x17000000
+                                    ))),
+                    child: RichText(
+                      text: const TextSpan(children: <InlineSpan>[
+                        TextSpan(
+                            text: '订单编号：',
+                            style: TextStyle(
+                                color: Color(0xff666666),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                        TextSpan(
+                            text: 'XUHUI12345',
+                            style: TextStyle(
+                                color: Color(0xff222222),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                      ]),
+                    ),
+                  ),
+                  Padding(
+                    padding: EdgeInsets.fromLTRB(0, 20, 0, 15),
+                    child: RichText(
+                      text: const TextSpan(children: <InlineSpan>[
+                        TextSpan(
+                            text: '农机名称：',
+                            style: TextStyle(
+                                color: Color(0xff666666),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                        TextSpan(
+                            text: '老李家收割机MVGV-005',
+                            style: TextStyle(
+                                color: Color(0xff222222),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                      ]),
+                    ),
+                  ),
+                  Padding(
+                    padding: EdgeInsets.fromLTRB(0, 0, 0, 15),
+                    child: RichText(
+                      text: const TextSpan(children: <InlineSpan>[
+                        TextSpan(
+                            text: '作业面积：',
+                            style: TextStyle(
+                                color: Color(0xff666666),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                        TextSpan(
+                            text: '1',
+                            style: TextStyle(
+                                color: Color(0xff222222),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                      ]),
+                    ),
+                  ),
+                  Padding(
+                    padding: EdgeInsets.fromLTRB(0, 0, 0, 15),
+                    child: RichText(
+                      text: const TextSpan(children: <InlineSpan>[
+                        TextSpan(
+                            text: '需求时间：',
+                            style: TextStyle(
+                                color: Color(0xff666666),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                        TextSpan(
+                            text: '2018-08-21',
+                            style: TextStyle(
+                                color: Color(0xff222222),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                      ]),
+                    ),
+                  ),
+                  Padding(
+                    padding: EdgeInsets.fromLTRB(0, 0, 0, 20),
+                    child: RichText(
+                      text: const TextSpan(children: <InlineSpan>[
+                        TextSpan(
+                            text: '下单时间：',
+                            style: TextStyle(
+                                color: Color(0xff666666),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                        TextSpan(
+                            text: '2022-04-13',
+                            style: TextStyle(
+                                color: Color(0xff222222),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                      ]),
+                    ),
+                  ),
+                  Padding(
+                    padding: EdgeInsets.fromLTRB(0, 0, 0, 20),
+                    child: RichText(
+                      text: TextSpan(children: <InlineSpan>[
+                        TextSpan(
+                            text: '订单状态：',
+                            style: TextStyle(
+                                color: Color(0xff666666),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                        TextSpan(
+                            text: '待付款',
+                            style: TextStyle(
+                                color: Color(0xff51D4FF),
+                                fontSize: 16,
+                                fontWeight: FontWeight.bold)),
+                      ]),
+                    ),
+                  ),
+                  Container(
+                      padding: EdgeInsets.fromLTRB(0, 20, 0, 0),
+                      width: 314.w,
+                      decoration: const BoxDecoration(
+                          border: Border(
+                              top: BorderSide(
+                                  width: 0.8, color: Color(0x20000000)
+                                  // 0x17000000
+                                  ))),
+                      child: Column(
+                        children: [
+                          Row(
+                            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                            children: [
+                              Text('费用：',
+                                  style: TextStyle(
+                                      color: Color(0xff666666),
+                                      fontSize: 16,
+                                      fontWeight: FontWeight.bold)),
+                              Text('8880',
+                                  style: TextStyle(
+                                      color: Color(0xffB61515),
+                                      fontSize: 16,
+                                      fontWeight: FontWeight.bold)),
+                            ],
+                          ),
+                          Padding(padding: EdgeInsets.fromLTRB(0, 30, 0, 0),
+                            child:  Row(
+                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                              children: [
+                                Text('状态：',
+                                    style: TextStyle(
+                                        color: Color(0xff666666),
+                                        fontSize: 16,
+                                        fontWeight: FontWeight.bold)),
+                                Text('待付款',
+                                    style: TextStyle(
+                                        color: Color(0xff51D4FF),
+                                        fontSize: 16,
+                                        fontWeight: FontWeight.bold)),
+                              ],
+                            ),
+
+                          ),
+
+                        ],
+                      )),
+                ],
+              )),
+
+        ],
+      ),
+
+    );
+  }
+}

lib/widgets/OrderListCard.dart

@@ -106,7 +106,7 @@ class OrderListCard extends StatelessWidget {
                       child: RichText(
                         text: const TextSpan(children: <InlineSpan>[
                           TextSpan(
-                              text: '需求数量：',
+                              text: '作业面积：',
                               style: TextStyle(
                                   color: Color(0xff666666),
                                   fontSize: 16,

pubspec.lock

@@ -5,140 +5,140 @@ packages:
     dependency: transitive
     description:
       name: _fe_analyzer_shared
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "38.0.0"
   analyzer:
     dependency: transitive
     description:
       name: analyzer
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.4.1"
   args:
     dependency: transitive
     description:
       name: args
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.3.0"
   async:
     dependency: transitive
     description:
       name: async
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.8.2"
   boolean_selector:
     dependency: transitive
     description:
       name: boolean_selector
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
   build:
     dependency: transitive
     description:
       name: build
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.2.1"
   build_config:
     dependency: transitive
     description:
       name: build_config
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.0"
   characters:
     dependency: transitive
     description:
       name: characters
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
   charcode:
     dependency: transitive
     description:
       name: charcode
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.1"
   checked_yaml:
     dependency: transitive
     description:
       name: checked_yaml
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.1"
   clock:
     dependency: transitive
     description:
       name: clock
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
   collection:
     dependency: transitive
     description:
       name: collection
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.15.0"
   convert:
     dependency: transitive
     description:
       name: convert
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.1"
   crypto:
     dependency: transitive
     description:
       name: crypto
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.0.1"
   cupertino_icons:
     dependency: "direct main"
     description:
       name: cupertino_icons
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.4"
   dart_style:
     dependency: transitive
     description:
       name: dart_style
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.2.2"
   dio:
     dependency: "direct main"
     description:
       name: dio
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.0.6"
   fake_async:
     dependency: transitive
     description:
       name: fake_async
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
   ffi:
     dependency: transitive
     description:
       name: ffi
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.2"
   file:
     dependency: transitive
     description:
       name: file
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "6.1.2"
   flutter:
@@ -150,14 +150,14 @@ packages:
     dependency: "direct dev"
     description:
       name: flutter_lints
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.4"
   flutter_screenutil:
     dependency: "direct main"
     description:
       name: flutter_screenutil
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "5.4.0"
   flutter_test:
@@ -171,213 +171,213 @@ packages:
     source: sdk
     version: "0.0.0"
   fluttertoast:
-    dependency: "direct dev"
+    dependency: "direct main"
     description:
       name: fluttertoast
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "8.0.9"
   get:
     dependency: "direct main"
     description:
       name: get
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.6.1"
   get_storage:
     dependency: "direct main"
     description:
       name: get_storage
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.3"
   glob:
     dependency: transitive
     description:
       name: glob
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.2"
   http_parser:
     dependency: transitive
     description:
       name: http_parser
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.0.0"
   js:
     dependency: transitive
     description:
       name: js
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.6.3"
   json_annotation:
     dependency: transitive
     description:
       name: json_annotation
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.4.0"
   json_serializable:
     dependency: "direct main"
     description:
       name: json_serializable
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "6.1.5"
   lints:
     dependency: transitive
     description:
       name: lints
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.1"
   location:
     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:
     dependency: transitive
     description:
       name: logging
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.2"
   matcher:
     dependency: transitive
     description:
       name: matcher
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.12.11"
   material_color_utilities:
     dependency: transitive
     description:
       name: material_color_utilities
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.1.3"
   meta:
     dependency: transitive
     description:
       name: meta
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.7.0"
   package_config:
     dependency: transitive
     description:
       name: package_config
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.2"
   path:
     dependency: transitive
     description:
       name: path
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.0"
   path_provider:
     dependency: transitive
     description:
       name: path_provider
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.9"
   path_provider_android:
     dependency: transitive
     description:
       name: path_provider_android
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.12"
   path_provider_ios:
     dependency: transitive
     description:
       name: path_provider_ios
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.8"
   path_provider_linux:
     dependency: transitive
     description:
       name: path_provider_linux
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.5"
   path_provider_macos:
     dependency: transitive
     description:
       name: path_provider_macos
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.5"
   path_provider_platform_interface:
     dependency: transitive
     description:
       name: path_provider_platform_interface
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.3"
   path_provider_windows:
     dependency: transitive
     description:
       name: path_provider_windows
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.5"
   platform:
     dependency: transitive
     description:
       name: platform
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.0"
   plugin_platform_interface:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.2"
   process:
     dependency: transitive
     description:
       name: process
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "4.2.4"
   pub_semver:
     dependency: transitive
     description:
       name: pub_semver
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.1"
   pubspec_parse:
     dependency: transitive
     description:
       name: pubspec_parse
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
   sky_engine:
@@ -389,98 +389,98 @@ packages:
     dependency: transitive
     description:
       name: source_gen
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.1"
   source_helper:
     dependency: transitive
     description:
       name: source_helper
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.1"
   source_span:
     dependency: transitive
     description:
       name: source_span
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
       name: stack_trace
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.10.0"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
   string_scanner:
     dependency: transitive
     description:
       name: string_scanner
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
   term_glyph:
     dependency: transitive
     description:
       name: term_glyph
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
   test_api:
     dependency: transitive
     description:
       name: test_api
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.4.8"
   typed_data:
     dependency: transitive
     description:
       name: typed_data
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.3.0"
   vector_math:
     dependency: transitive
     description:
       name: vector_math
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.1"
   watcher:
     dependency: transitive
     description:
       name: watcher
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.1"
   win32:
     dependency: transitive
     description:
       name: win32
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "2.5.1"
   xdg_directories:
     dependency: transitive
     description:
       name: xdg_directories
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.0+1"
   yaml:
     dependency: transitive
     description:
       name: yaml
-      url: "https://pub.flutter-io.cn"
+      url: "https://pub.dartlang.org"
     source: hosted
     version: "3.1.0"
 sdks:

pubspec.yaml

@@ -39,6 +39,7 @@ dependencies:
   dio: ^4.0.6
   flutter_screenutil: ^5.3.1
   get_storage: ^2.0.3
+  fluttertoast: ^8.0.9
   location: ^4.3.0
 
 dev_dependencies:
@@ -79,6 +80,8 @@ flutter:
     - images/cars.png
     - images/gpsImgae.png
     - images/ordersLeft.png
+    - images/mineBack.png
+    - images/userMoren.png
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware.