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

lib/models/addressController.dart

+
+import 'package:farmer_client/models/entities/Address.dart';
+import 'package:get/get.dart';
+
+class AddressController extends GetxController{
+  static AddressController t = Get.find();
+  final address=Rx<Address>(Address.fromJson({'address':'选择位置'}));
+}

lib/models/index.dart

 
 export 'app.dart';
 
+import 'package:farmer_client/models/addressController.dart';
 import 'package:farmer_client/models/app.dart';
 import 'package:get/get.dart';
 
   @override
   void dependencies() {
     Get.put(AppController());
+    Get.put(AddressController());
   }
 }
 

lib/pages/OrderConfirmation/index.dart

+import 'package:farmer_client/models/addressController.dart';
+import 'package:farmer_client/widgets/layout/BasicPage.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:get/get.dart';
-import 'package:get_storage/get_storage.dart';
 import 'package:intl/intl.dart';
 
-class OrderConfirmation extends StatefulWidget {
-  const OrderConfirmation({Key? key}) : super(key: key);
-
-  @override
-  State<OrderConfirmation> createState() => _OrderConfirmationState();
-}
-
-class _OrderConfirmationState extends State<OrderConfirmation> {
+class OrderConfirmation extends BasicPage {
   TextEditingController _unameController = TextEditingController();
-  TextEditingController _pwdController = TextEditingController();
   GlobalKey _formKey = GlobalKey<FormState>();
 
-  var selectDate; //选择的时间
-  var workingArea;
-  String address = '请选择详细地址';
-  @override
-  void initState() {
-    super.initState();
-    //到底哪里错了 唉
-    // if (GetStorage().read("address") != null) {
-    //   address = GetStorage().read("address").address;
-    // }
-  }
-//  20:59:59
+  final selectDate = Rx<DateTime>(DateTime.now()); //选择的时间
+  final workingArea = Rxn(0);
+  AddressController addressController = AddressController.t;
 
   @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: Form(
+  Widget builder(BuildContext context) {
+    naviTitle = '咨讯';
+    return Container(
+      height: 700.h,
+      child: Form(
         key: _formKey, //设置globalKey，用于后面获取FormState
         autovalidateMode: AutovalidateMode.onUserInteraction,
         child: Column(
                 hintText: "请输入具体面积(公顷)",
               ),
               onChanged: (e) {
-                setState(() {
-                  workingArea = e;
-                });
+                workingArea.value = e as int?;
               },
               // 校验用户名
               validator: (v) {
                             helpText: '请选择作业开始时间',
                             cancelText: '取消',
                             confirmText: '确定',
-                            initialDate: selectDate == null
+                            initialDate: selectDate.value == null
                                 ? DateTime.now()
-                                : selectDate,
+                                : selectDate.value,
                             firstDate: DateTime.now(),
                             lastDate: DateTime(2030),
                           );
-                          setState(() {
-                            selectDate = handleChnage;
-                            print('${selectDate}+');
-                          });
+                          selectDate.value = handleChnage!;
+                          print('${selectDate}+');
                         },
                         child: Text(selectDate == null
                             ? '请选择日期'
-                            : '${DateFormat("yyyy-MM-dd").format(selectDate)}'),
+                            : '${DateFormat("yyyy-MM-dd").format(selectDate.value)}'),
                       ),
                     )
                   ],
                         },
                         child: Container(
                           width: 290.w,
-                          child: Text(
-                            address,
-                            softWrap: true,
-                            maxLines: 1,
-                            textAlign: TextAlign.left,
-                            overflow: TextOverflow.ellipsis,
-                          ),
+                          child: Obx(() => Text(
+                                addressController.address.value.address
+                                    .toString(),
+                                softWrap: true,
+                                maxLines: 1,
+                                textAlign: TextAlign.left,
+                                overflow: TextOverflow.ellipsis,
+                              )),
                         ),
                       ))
                 ],
               ),
             ),
-
             Spacer(),
             Container(
               alignment: Alignment.bottomCenter,

lib/pages/addressList/index.dart

+import 'package:farmer_client/models/addressController.dart';
 import 'package:farmer_client/models/entities/Address.dart';
 import 'package:farmer_client/pages/addressList/widget/AddressCard.dart';
 import 'package:farmer_client/widgets/DefaultButton.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
-import 'package:get_storage/get_storage.dart';
 
 class AddressList extends BasicPage {
   bool isBack = false;
+  AddressController addressController=AddressController.t;
 
   @override
   void beforeShow() {
                             onDelete(e);
                           },
                           onBack: () {
-                            if (GetStorage().read('address') == null) {
-                              GetStorage()
-                                  .write('address', addressList.value[e]);
-                            } else {
-                              GetStorage().remove('address');
-                              GetStorage()
-                                  .write('address', addressList.value[e]);
-                            }
+                            addressController.address.value=addressList.value[e];
                             Get.back();
                           },
                         ),

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

 import '../../../MoreCars/index.dart';
 
 class HomePage extends StatefulWidget {
-  const HomePage({Key? key, }) : super(key: key);
-
+  const HomePage({
+    Key? key,
+  }) : super(key: key);
 
   @override
   _HomePageState createState() => _HomePageState();
 }
 
-
 class _HomePageState extends State<HomePage> {
   final CarouselController _controller = CarouselController();
   List<Banners> bannerList = [];
 
   List<CardInfo> machineryLists = [];
 
-
-
-
   @override
   void initState() {
     super.initState();
 
   @override
   Widget build(BuildContext context) {
-
     return Container(
       alignment: Alignment.center,
       padding: EdgeInsets.fromLTRB(15.w, 0, 15.w, 0),
           ),
           Container(
             margin: EdgeInsets.fromLTRB(0, 15, 0, 0),
-            child:
-            CarouselSlider(
-              items: bannerList.map((item) => Container(
-                child: Center(
-                    child: Image.network(item.thumb.toString(),
-                        fit: BoxFit.cover, width: 350.w)),
-              )).toList(),
+            child: CarouselSlider(
+              items: bannerList
+                  .map((item) => Container(
+                        child: Center(
+                            child: Image.network(item.thumb.toString(),
+                                fit: BoxFit.cover, width: 350.w)),
+                      ))
+                  .toList(),
               options: CarouselOptions(
                 autoPlay: true,
                 enlargeCenterPage: false, //图片中心放大
                               padding: EdgeInsets.fromLTRB(0, 0, 8, 0),
                               child: Image(
                                 image:
-                                AssetImage('images/icons/carsListImga.png'),
+                                    AssetImage('images/icons/carsListImga.png'),
                                 fit: BoxFit.cover,
                                 width: 20.w,
                               ),
                     ],
                   ),
                   Column(
-                    children: machineryLists.map((item) =>CarsCard(item:item)).toList(),
+                    children: machineryLists
+                        .map((item) => CarsCard(item: item))
+                        .toList(),
                   )
-
-
-
                 ],
               )),
         ],

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

   State<TypeHeader> createState() => _TypeHeaderState();
 }
 
-
 class _TypeHeaderState extends State<TypeHeader> {
   @override
   Widget build(BuildContext context) {

lib/pages/login/login.dart

 import '../../services/user.dart';
 import '../../widgets/Cell.dart';
 
-
 class MyRouteLogin extends StatefulWidget {
   @override
   State<MyRouteLogin> createState() => _RouteLogin();
 }
 
 class _RouteLogin extends State<MyRouteLogin> {
-
-  var  userInfo= AppController.t.user;
+  var userInfo = AppController.t.user;
 
   bool isButtonEnable = true; //按钮状态  是否可点击
   String buttonText = '发送验证码'; //初始文本
   var timer; //倒计时的计时器
   TextEditingController mController = TextEditingController();
 
-//获取验证码
+  //获取验证码
   void _initTimer() {
     timer = Timer.periodic(Duration(seconds: 1), (Timer timer) {
       count--;
     });
   }
 
-
-
-
   @override
   void initState() {
     super.initState();
     ///销毁
   }
 
-// -------------逻辑分割-------------------------------------------
+  // -------------逻辑分割-------------------------------------------
   var handlePhones = '';
   var handleCodes = '';
   var userContent = {'phones': '', 'code': ''};
   bool _newValue = false;
 
-
   void _handlePhone(e) => {
-    setState(() => {handlePhones = e})
-  };
+        setState(() => {handlePhones = e})
+      };
 
   void _handleCode(e) => {
-    setState(() => {handleCodes = e})
-  };
-
+        setState(() => {handleCodes = e})
+      };
 
-
-// 获取验证码
+  // 获取验证码
   void _buttonClickListen() {
     setState(() {
       if (isButtonEnable) {
       }
     });
   }
-//登陆按钮
-  void _handelSubmit(){
-    if(handleCodes==''||handlePhones==''){
+
+  //登陆按钮
+  void _handelSubmit() {
+    if (handleCodes == '' || handlePhones == '') {
       Fluttertoast.showToast(msg: '请输入验证码或手机号！');
-    }else{
-      if(_newValue){
-        userLogin(handlePhones,handleCodes).then((value) {
+    } else {
+      if (_newValue) {
+        userLogin(handlePhones, handleCodes).then((value) {
           userInfo(Person.fromJson(value['person']));
           print('已同意协议');
 
           Get.off(Home());
         });
-      }else{
+      } else {
         Fluttertoast.showToast(msg: '请阅读并同意相关隐私政策！');
       }
     }
             fit: BoxFit.cover,
           ),
         ),
-
-        child:  Container(
+        child: Container(
           child: Column(
             mainAxisAlignment: MainAxisAlignment.end,
             crossAxisAlignment: CrossAxisAlignment.start,
-            children:[
-              Padding(padding: EdgeInsets.fromLTRB(15, 0, 0, 5),
-              child:    const Text(
-                '您好!',
-                style: TextStyle(
-                  fontWeight: FontWeight.bold,
-                  fontSize: 33,
+            children: [
+              Padding(
+                padding: EdgeInsets.fromLTRB(15, 0, 0, 5),
+                child: const Text(
+                  '您好!',
+                  style: TextStyle(
+                    fontWeight: FontWeight.bold,
+                    fontSize: 33,
+                  ),
                 ),
               ),
-              ),
-              Padding(padding: EdgeInsets.fromLTRB(15, 0, 0, 0),
-                child:    const Text(
+              Padding(
+                padding: EdgeInsets.fromLTRB(15, 0, 0, 0),
+                child: const Text(
                   '欢迎进入农户端应用!',
                   style: TextStyle(
                     fontWeight: FontWeight.bold,
                   ),
                 ),
               ),
-
               Cell(
-                // margin: EdgeInsets.symmetric(horizontal: 13.w),
+                  // margin: EdgeInsets.symmetric(horizontal: 13.w),
                   margin: const EdgeInsets.fromLTRB(13, 43, 10, 0),
                   header: Text(
                     "+86",
                     decoration: const InputDecoration(
                       isCollapsed: true,
                       contentPadding:
-                      EdgeInsets.symmetric(vertical: 8, horizontal: 16),
+                          EdgeInsets.symmetric(vertical: 8, horizontal: 16),
                       labelText: "请输入手机号码",
                       counterText: '', //去掉计数
                       border: InputBorder.none,
                         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)))),
                       ),
                     ),
                   )),
                   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,
                   },
                 ),
               ),
-
               Container(
                 height: 350.h,
                 alignment: Alignment.bottomCenter,
                     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)))),
                     ),
                   ),
                 ),
               ),
-
               Container(
                   padding: EdgeInsets.fromLTRB(10.0, 10, 10.0, 10),
                   child: Row(
                             text: '文本协议/隐私政策，',
                             style: TextStyle(color: Color(0xffce3800)),
                             recognizer:
-                            TapGestureRecognizer() //踩坑。。。recognizer 是手势交互 除了我现在些的是 点击交互，其他一般都是抽象类。
-                              ..onTap = () {
-                                Get.toNamed('/agreement');
-                              },
+                                TapGestureRecognizer() //踩坑。。。recognizer 是手势交互 除了我现在些的是 点击交互，其他一般都是抽象类。
+                                  ..onTap = () {
+                                    Get.toNamed('/agreement');
+                                  },
                           ),
                           const TextSpan(
                               text: '确认之后选择此项',

lib/pages/search/index.jsx.dart

         decoration: const BoxDecoration(
           color: Colors.white,
         ),
-        child: ListView(children: [
+        child: Column(children: [
           Container(
             width: 345.w,
             height: 34.h,