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/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

@@ -15,6 +15,16 @@ class AppController extends GetxController {
   final location = Rxn<LocationData>();
   final testInt = 1.obs;
 
+  // get locationStr {
+  //   if(location.value!.longitude==null){
+  //     return null;
+  //
+  //   }else{
+  //   return location.value!.longitude.toString() + "," + location.value!.latitude.toString();
+  //
+  //   }
+  // }
+
   @override
   void onInit() {
     super.onInit();

lib/pages/ArticleInfo/ArticleInfo.dart

@@ -1,27 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
-class ArticleInfo extends StatelessWidget {
-  const ArticleInfo({Key? key}) : super(key: key);
+import '../../widgets/layout/BasicPage.dart';
+
+class ArticleInfo extends BasicPage {
 
   @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      resizeToAvoidBottomInset: false,
-      appBar: AppBar(
-        elevation: 0,
-        centerTitle: true,
-        backgroundColor: Colors.white,
-        title: Text(
-          '资讯详情',
-          style: TextStyle(
-              color: Colors.black,
-              fontSize: 17.sp,
-              letterSpacing: 2,
-              fontWeight: FontWeight.bold),
-        ),
-      ),
-        body: Container(
+  Widget builder(BuildContext context) {
+    naviTitle='资讯详情';
+    return  Container(
           padding: EdgeInsets.fromLTRB(15, 30, 15, 50),
 
           child: Column(
@@ -59,7 +46,6 @@ class ArticleInfo extends StatelessWidget {
               )
             ],
           ),
-        ),
     );
 
   }

lib/pages/TabBar/widgets/home/index.dart

@@ -4,10 +4,11 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 import 'package:get/get_core/src/get_main.dart';
+import '../../../../models/app.dart';
 import '../../../../models/entities/banner.dart';
 import '../../../../services/homeAPI.dart';
 import '../../../../widgets/CarsCard.dart';
-import '../../../../widgets/Search.dart';
+import 'package:farmer_client/models/app.dart';
 import '../../../MoreCars/index.dart';
 
 class HomePage extends StatefulWidget {
@@ -17,6 +18,7 @@ class HomePage extends StatefulWidget {
   State<HomePage> createState() => _HomePageState();
 }
 
+
 class _HomePageState extends State<HomePage> {
   final CarouselController _controller = CarouselController();
   List<banner> BannerList = [];
@@ -24,6 +26,9 @@ class _HomePageState extends State<HomePage> {
   @override
   void initState() {
     super.initState();
+    final location = AppController.t.location;
+    print('location+$location');
+
     getHomeBanner('banner').then((value) {
       setState(() {
         value.forEach((item) {
@@ -31,6 +36,10 @@ class _HomePageState extends State<HomePage> {
         });
       });
     });
+
+    // getMachinery(location.value!.longitude.toString()).then((value) {
+    //   print('$value');
+    // });
   }
 
   @override

lib/pages/TabBar/widgets/home/widgets/headers.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
 
-
 class TypeHeader extends StatefulWidget {
   TypeHeader({Key? key, required this.type}) : super(key: key);
 
@@ -12,12 +11,14 @@ class TypeHeader extends StatefulWidget {
   State<TypeHeader> createState() => _TypeHeaderState();
 }
 
+
 class _TypeHeaderState extends State<TypeHeader> {
   @override
-  Widget build (BuildContext context) {
+  Widget build(BuildContext context) {
     if (widget.type) {
       return Container(
         child: Row(
+          // mainAxisAlignment: MainAxisAlignment.start,
           children: [
             Container(
               height: 32.w,
@@ -41,10 +42,10 @@ class _TypeHeaderState extends State<TypeHeader> {
                       ),
                     ),
                   ),
-        Container(
-          padding: EdgeInsets.fromLTRB(0, 0, 10, 0),
-          child: Icon(Icons.arrow_drop_down),
-        ),
+                  Container(
+                    padding: EdgeInsets.fromLTRB(0, 0, 10, 0),
+                    child: Icon(Icons.arrow_drop_down),
+                  ),
                   _initWidget(),
                 ],
               ),
@@ -54,15 +55,11 @@ class _TypeHeaderState extends State<TypeHeader> {
       );
     } else {
       return _initWidget();
-
     }
-
-
   }
 }
 //
 
-
 class _initWidget extends StatelessWidget {
   const _initWidget({Key? key}) : super(key: key);
 
@@ -76,7 +73,6 @@ class _initWidget extends StatelessWidget {
             onTap: () {
               print('点击了搜索');
               Get.toNamed('/searchPage');
-
             },
             child: Container(
               decoration: const BoxDecoration(
@@ -85,9 +81,9 @@ class _initWidget extends StatelessWidget {
                 borderRadius: BorderRadius.all(Radius.circular(25)),
               ),
               child: Row(
-                children: [
+                children: const [
                   Padding(
-                    padding: EdgeInsets.fromLTRB(15, 0, 5, 0),
+                    padding: EdgeInsets.fromLTRB(5, 0, 5, 0),
                     child: Icon(
                       Icons.search,
                       size: 19,
@@ -101,10 +97,7 @@ class _initWidget extends StatelessWidget {
                 ],
               ),
             )
-          // Search(),
-        ));
-
+            // Search(),
+            ));
   }
 }
-
-

lib/pages/login/login.dart

@@ -135,20 +135,25 @@ class _RouteLogin extends State<MyRouteLogin> {
             mainAxisAlignment: MainAxisAlignment.end,
             crossAxisAlignment: CrossAxisAlignment.start,
             children:[
-              const Text(
+              Padding(padding: EdgeInsets.fromLTRB(15, 0, 0, 5),
+              child:    const Text(
                 '您好!',
                 style: TextStyle(
                   fontWeight: FontWeight.bold,
-                  fontSize: 50,
+                  fontSize: 33,
                 ),
               ),
-              const Text(
-                '欢迎进入农户端应用！',
-                style: TextStyle(
-                  fontWeight: FontWeight.bold,
-                  fontSize: 35,
+              ),
+              Padding(padding: EdgeInsets.fromLTRB(15, 0, 0, 0),
+                child:    const Text(
+                  '欢迎进入农户端应用!',
+                  style: TextStyle(
+                    fontWeight: FontWeight.bold,
+                    fontSize: 27,
+                  ),
                 ),
               ),
+
               Cell(
                 // margin: EdgeInsets.symmetric(horizontal: 13.w),
                   margin: const EdgeInsets.fromLTRB(13, 43, 10, 0),
@@ -178,7 +183,6 @@ class _RouteLogin extends State<MyRouteLogin> {
                     },
                   ),
                   footer: SizedBox(
-                    width: 300.w,
                     child: ElevatedButton(
                       onPressed: () => {
                         setState(() {

lib/pages/orderInfo/index.dart

@@ -5,59 +5,27 @@ import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 
 import '../../widgets/OrderInfoCard.dart';
+import '../../widgets/layout/BasicPage.dart';
 
-class OrderPageInfo extends StatefulWidget {
-  const OrderPageInfo({Key? key}) : super(key: key);
+// class OrderPageInfo extends StatefulWidget {
+//   const OrderPageInfo({Key? key}) : super(key: key);
+//
+//   @override
+//   State<OrderPageInfo> createState() => _OrderPageInfoState();
+// }
 
+class OrderPageInfo extends BasicPage {
   @override
-  State<OrderPageInfo> createState() => _OrderPageInfoState();
-}
 
-class _OrderPageInfoState extends State<OrderPageInfo> {
+
   void onCancel() {
-    showDialog(
-        context: context,
-        builder: (context) {
-          return AlertDialog(content: Text("您确定要取消订单吗?"), actions: <Widget>[
-            TextButton(
-              child: Text("取消"),
-              onPressed: () {
-                print("取消");
-                Navigator.pop(context, 'Cancle');
-              },
-            ),
-            TextButton(
-                child: Text("确定"),
-                onPressed: () {
-                  // setState(() {
-                  //   addressList.remove(addressList[e]);
-                  // });
-                  Navigator.pop(context, "Ok");
-                  Fluttertoast.showToast(msg: '取消成功！');
-                  Get.offAllNamed('/');
-                })
-          ]);
-        });
+
   }
 
   @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      resizeToAvoidBottomInset: false,
-      appBar: AppBar(
-        elevation: 0,
-        centerTitle: true,
-        backgroundColor: Colors.white,
-        title: Text(
-          '订单详情',
-          style: TextStyle(
-              color: Colors.black,
-              fontSize: 17.sp,
-              letterSpacing: 2,
-              fontWeight: FontWeight.bold),
-        ),
-      ),
-      body: Column(
+  Widget builder (BuildContext context) {
+    naviTitle= '订单详情';
+    return  Column(
         children: [
           OrderInfoCard(),
           Spacer(),
@@ -109,37 +77,8 @@ class _OrderPageInfoState extends State<OrderPageInfo> {
               ],
             ),
           ),
-          // 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

@@ -1,10 +1,9 @@
-
 import 'package:farmer_client/pages/splash/widgets/countdown.dart';
 import 'package:get/get.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter/material.dart';
+import 'package:get_storage/get_storage.dart';
 
-import '../TabBar/index.dart';
 
 class SplashScreen extends StatefulWidget {
   const SplashScreen({Key? key}) : super(key: key);
@@ -14,44 +13,49 @@ class SplashScreen extends StatefulWidget {
 }
 
 class _SplashScreen extends State<SplashScreen> {
+  GetStorage box = GetStorage();
   handleOnFinish() {
-    Get.off(Home());
-    // Get.toNamed("/addressList");
+    bool isLogin = box.hasData('token');
+    if (isLogin) {
+      Get.offNamed('/');
+    } else {
+      Get.offNamed('/login');
+    }
   }
 
   @override
   Widget build(BuildContext context) {
     return Scaffold(
         body: Container(
-          decoration: const BoxDecoration(
-            image: DecorationImage(
-                image: AssetImage("images/splash.png"),
-                fit: BoxFit.cover,
-                alignment: Alignment.topCenter),
+      decoration: const BoxDecoration(
+        image: DecorationImage(
+            image: AssetImage("images/splash.png"),
+            fit: BoxFit.cover,
+            alignment: Alignment.topCenter),
+      ),
+      child: Stack(
+        children: [
+          Positioned(
+            right: 15.w,
+            top: 50.h,
+            child: countdown(3, handleOnFinish),
           ),
-          child: Stack(
-            children: [
-              Positioned(
-                right: 15.w,
-                top: 50.h,
-                child: countdown(3, handleOnFinish),
-              ),
-              Positioned(
-                bottom: 0,
-                child: Container(
-                  width: 375.w,
-                  height: 60.w,
-                  child: Center(
-                    child: Image.asset(
-                      'images/logo.png',
-                      width: 218.w,
-                      height: 50.w,
-                    ),
-                  ),
+          Positioned(
+            bottom: 0,
+            child: Container(
+              width: 375.w,
+              height: 60.w,
+              child: Center(
+                child: Image.asset(
+                  'images/logo.png',
+                  width: 218.w,
+                  height: 50.w,
                 ),
               ),
-            ],
+            ),
           ),
-        ));
+        ],
+      ),
+    ));
   }
 }