'.'

lib/pages/OrderConfirmation/index.dart

@@ -1,8 +1,8 @@
-import 'package:flutter/cupertino.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 {
@@ -19,8 +19,15 @@ class _OrderConfirmationState extends State<OrderConfirmation> {
 
   var selectDate; //选择的时间
   var workingArea;
-
-
+  String address = '请选择详细地址';
+  @override
+  void initState() {
+    super.initState();
+    //到底哪里错了 唉
+    // if (GetStorage().read("address") != null) {
+    //   address = GetStorage().read("address").address;
+    // }
+  }
 //  20:59:59
 
   @override
@@ -76,9 +83,9 @@ class _OrderConfirmationState extends State<OrderConfirmation> {
                 floatingLabelBehavior: FloatingLabelBehavior.never,
                 hintText: "请输入具体面积(公顷)",
               ),
-              onChanged: (e){
+              onChanged: (e) {
                 setState(() {
-                  workingArea=e;
+                  workingArea = e;
                 });
               },
               // 校验用户名
@@ -173,11 +180,14 @@ class _OrderConfirmationState extends State<OrderConfirmation> {
                   Padding(
                       padding: EdgeInsets.fromLTRB(10, 0, 0, 0),
                       child: GestureDetector(
-                        onTap: () {},
+                        onTap: () {
+                          Get.toNamed('/addressList',
+                              arguments: {'isBack': true});
+                        },
                         child: Container(
                           width: 290.w,
                           child: Text(
-                            '请选择详细地址',
+                            address,
                             softWrap: true,
                             maxLines: 1,
                             textAlign: TextAlign.left,
@@ -189,7 +199,6 @@ class _OrderConfirmationState extends State<OrderConfirmation> {
               ),
             ),
 
-            // 登录按钮
             Spacer(),
             Container(
               alignment: Alignment.bottomCenter,
@@ -199,9 +208,10 @@ class _OrderConfirmationState extends State<OrderConfirmation> {
                 child: ElevatedButton(
                   onPressed: () {
                     if ((_formKey.currentState as FormState).validate()) {
-                      var a={selectDate,workingArea};
+                      var a = {selectDate, workingArea};
                       print('我确定了$a');
                       //验证通过提交数据
+                      Get.toNamed('/orderPageInfo');
                     }
                   },
                   child: const Text(
@@ -260,7 +270,3 @@ class _OrderConfirmationState extends State<OrderConfirmation> {
     );
   }
 }
-
-
-
-

lib/pages/addressList/index.dart

@@ -5,7 +5,7 @@ import 'package:flutter/material.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 StatefulWidget {
   const AddressList({Key? key}) : super(key: key);
@@ -15,6 +15,15 @@ class AddressList extends StatefulWidget {
 }
 
 class _AddressList extends State<AddressList> {
+  bool isBack = false;
+
+  @override
+  void initState() {
+    super.initState();
+    if (Get.arguments != null) {
+      isBack = Get.arguments['isBack'];
+    }
+  }
 
   List<Address> addressList = [
     Address.fromJson({'address': '777', 'isDefault': false}),
@@ -31,31 +40,29 @@ class _AddressList extends State<AddressList> {
       addressList[index].isDefault = true;
     });
   }
-  void onDelete(index){
+
+  void onDelete(index) {
     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: '删除成功！');
-                    })
-              ]);
+          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: '删除成功！');
+                })
+          ]);
         });
   }
 
@@ -91,15 +98,26 @@ class _AddressList extends State<AddressList> {
                           (e) => AddressCard(
                             No: e + 1,
                             item: addressList[e],
+                            isBack: isBack,
                             onChange: () {
                               onChange(e);
                             },
                             onEdit: () {
-                              Get.toNamed('/addAddress',arguments: {'item':addressList[e]});
+                              Get.toNamed('/addAddress',
+                                  arguments: {'item': addressList[e]});
                             },
                             onDelete: () {
                               onDelete(e);
                             },
+                            onBack: () {
+                              if(GetStorage().read('address')==null) {
+                                GetStorage().write('address', addressList[e]);
+                              }else {
+                                GetStorage().remove('address');
+                                GetStorage().write('address', addressList[e]);
+                              }
+                              Get.back();
+                            },
                           ),
                         )
                         .toList()),

lib/pages/addressList/widget/AddressCard.dart

@@ -6,30 +6,37 @@ import 'package:get/get_rx/src/rx_typedefs/rx_typedefs.dart';
 class AddressCard extends StatefulWidget {
   final Address item;
   final int No;
+  final bool isBack;
   final GestureTapCallback onChange;
   final GestureTapCallback onDelete;
   final GestureTapCallback onEdit;
-  AddressCard(
+  final GestureTapCallback onBack;
+  const AddressCard(
       {Key? key,
       required this.item,
       required this.No,
+      required this.isBack,
       required this.onChange,
       required this.onDelete,
-      required this.onEdit})
+      required this.onEdit,
+      required this.onBack})
       : super(key: key);
 
   @override
   _AddressCard createState() =>
-      _AddressCard(item, No, onChange, onDelete, onEdit);
+      _AddressCard(item, No, onChange, onDelete, onEdit, isBack, onBack);
 }
 
 class _AddressCard extends State<AddressCard> {
   final Address item;
   final int No;
+  final bool isBack;
   final GestureTapCallback onChange;
   final GestureTapCallback onDelete;
   final GestureTapCallback onEdit;
-  _AddressCard(this.item, this.No, this.onChange, this.onDelete, this.onEdit);
+  final GestureTapCallback onBack;
+  _AddressCard(this.item, this.No, this.onChange, this.onDelete, this.onEdit,
+      this.isBack, this.onBack);
   @override
   Widget build(BuildContext context) {
     return Container(
@@ -81,7 +88,7 @@ class _AddressCard extends State<AddressCard> {
               decoration: BoxDecoration(
                 border: Border(
                   bottom: BorderSide(
-                      width: 0.5.h,
+                      width: 1.h,
                       color: const Color(0xcc000000),
                       style: BorderStyle.solid),
                 ),
@@ -113,39 +120,53 @@ class _AddressCard extends State<AddressCard> {
               ),
             ),
           ),
-          Row(
-            mainAxisAlignment: MainAxisAlignment.spaceBetween,
-            children: [
-              GestureDetector(
-                onTap: onChange,
-                child: Row(
-                  children: [
-                    const Text('设为默认地址'),
-                    Radio<bool>(
-                        value: true,
-                        activeColor: const Color(0xFFFF703B),
-                        groupValue: item.isDefault,
-                        onChanged: (value){
-                          onChange();
-                        }),
-                  ],
+          if (isBack)
+            GestureDetector(
+              onTap: onBack,
+              child: Container(
+                width: 315.w,
+                margin: EdgeInsets.fromLTRB(0, 5.w, 0, 0),
+                child: Text(
+                  '选择此地址',
+                  style:
+                      TextStyle(fontSize: 17.sp, fontWeight: FontWeight.w800),
                 ),
               ),
-              GestureDetector(
-                onTap: onDelete,
-                child: Row(
-                  children: [
-                    const Text('删除'),
-                    Image.asset(
-                      'images/icons/delete.png',
-                      width: 25.w,
-                      height: 25.w,
-                    ),
-                  ],
+            ),
+          if (!isBack)
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                GestureDetector(
+                  onTap: onChange,
+                  child: Row(
+                    children: [
+                      const Text('设为默认地址'),
+                      Radio<bool>(
+                          value: true,
+                          activeColor: const Color(0xFFFF703B),
+                          groupValue: item.isDefault,
+                          onChanged: (value) {
+                            onChange();
+                          }),
+                    ],
+                  ),
                 ),
-              ),
-            ],
-          ),
+                GestureDetector(
+                  onTap: onDelete,
+                  child: Row(
+                    children: [
+                      const Text('删除'),
+                      Image.asset(
+                        'images/icons/delete.png',
+                        width: 25.w,
+                        height: 25.w,
+                      ),
+                    ],
+                  ),
+                ),
+              ],
+            ),
         ],
       ),
     );

lib/pages/orderInfo/index.dart

@@ -1,11 +1,11 @@
+import 'package:farmer_client/widgets/DefaultButton.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:fluttertoast/fluttertoast.dart';
+import 'package:get/get.dart';
 
 import '../../widgets/OrderInfoCard.dart';
 
-
-
-
 class OrderPageInfo extends StatefulWidget {
   const OrderPageInfo({Key? key}) : super(key: key);
 
@@ -14,6 +14,32 @@ class OrderPageInfo extends StatefulWidget {
 }
 
 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(
@@ -31,44 +57,89 @@ class _OrderPageInfoState extends State<OrderPageInfo> {
               fontWeight: FontWeight.bold),
         ),
       ),
-      body:      Column(
+      body: Column(
         children: [
           OrderInfoCard(),
-
+          Spacer(),
           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),
+            margin: EdgeInsets.fromLTRB(15.w, 0, 15.w, 50.h),
+            child: Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+              children: [
+                GestureDetector(
+                  onTap: () {
+                    onCancel();
+                  },
+                  child: Container(
+                    width: 150.w,
+                    height: 49.h,
+                    decoration: BoxDecoration(
+                        color: const Color(0xffffffff),
+                        border: Border.all(
+                            color: const Color(0xFFFF703B),
+                            width: 1.w,
+                            style: BorderStyle.solid),
+                        borderRadius:
+                            BorderRadius.all(Radius.circular(24.5.w))),
+                    child: Center(
+                      child: Text(
+                        '取消',
+                        style: TextStyle(
+                            fontSize: 20.sp,
+                            color: const Color(0xFFFF703B),
+                            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)))),
+                DefaultButton(
+                  color: const Color(0xffffffff),
+                  backColor: const Color(0xFFFF703B),
+                  width: 150.w,
+                  height: 49.h,
+                  text: '支付',
+                  onPressed: () {
+                    Fluttertoast.showToast(msg: '支付成功！');
+                    Get.offAllNamed('/');
+                  },
+                  margin: const EdgeInsets.all(0),
+                  fontSize: 20.sp,
+                  radius: 24.5.w,
                 ),
-              ),
+              ],
             ),
           ),
+          // 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/routes/pages.dart

@@ -1,10 +1,12 @@
 
 import 'package:farmer_client/pages/ArticleInfo/ArticleInfo.dart';
+import 'package:farmer_client/pages/OrderConfirmation/index.dart';
 import 'package:farmer_client/pages/aboutUs/index.dart';
 import 'package:farmer_client/pages/addAddress/index.dart';
 import 'package:farmer_client/pages/addressList/index.dart';
 import 'package:farmer_client/pages/agreement/index.dart';
 import 'package:farmer_client/pages/feedback/index.dart';
+import 'package:farmer_client/pages/orderInfo/index.dart';
 import 'package:farmer_client/pages/userInfo/index.dart';
 import 'package:get/get.dart';
 import '../pages/index.dart';
@@ -13,7 +15,7 @@ import '../pages/index.dart';
 List<GetPage> pages = [
   GetPage(name: '/', page: () =>  Home()),
   GetPage(name: '/ArticleInfo', page: () =>  ArticleInfo()),//资讯详情
-  GetPage(name: '/splash', page: () => MachineryDetailPage()),//SplashScreen
+  GetPage(name: '/splash', page: () => SplashScreen()),//SplashScreen
   GetPage(name: '/login', page: () =>  MyRouteLogin()),
   GetPage(name: '/addressList', page: () =>  AddressList()),
   GetPage(name: '/addAddress', page: () =>  AddAddress()),
@@ -22,4 +24,6 @@ List<GetPage> pages = [
   GetPage(name: '/aboutUs', page: () =>  AboutUs()),
   GetPage(name: '/agreement', page: () =>  Agreement()),
   GetPage(name: '/feedback', page: () =>  Feedback()),
+  GetPage(name: '/orderConfirmation', page: () =>  OrderConfirmation()),
+  GetPage(name: '/orderPageInfo', page: () =>  OrderPageInfo()),
 ];

lib/widgets/CarsCard.dart

@@ -90,8 +90,6 @@ class CarsCard extends StatelessWidget {
                     child: ElevatedButton(
                       onPressed: () {
                         Get.to(OrderConfirmation());
-                        print('点我去预约');
-
                       },
                       child: const Text(
                         "预约",

lib/widgets/Search.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 
-
 class Search extends StatefulWidget {
   const Search({Key? key}) : super(key: key);
 
@@ -10,20 +9,18 @@ class Search extends StatefulWidget {
 }
 
 class _SearchState extends State<Search> {
-
   @override
   Widget build(BuildContext context) {
-    return LayoutBuilder(builder: (BuildContext context, BoxConstraints constraints){
-      return  Column(
+    return LayoutBuilder(
+        builder: (BuildContext context, BoxConstraints constraints) {
+      return Column(
         children: [
           Container(
-            decoration: BoxDecoration(
-              color: Colors.white
-            ),
-      width: constraints.maxWidth,
-      height: 34,
-      alignment: Alignment.center,
-      child:  TextField(
+            decoration: BoxDecoration(color: Colors.white),
+            width: constraints.maxWidth,
+            height: 34,
+            alignment: Alignment.center,
+            child: TextField(
               onChanged: (value) {
                 print('打一个字我搜索一下$value');
               },
@@ -31,17 +28,22 @@ class _SearchState extends State<Search> {
                 FocusScope.of(context).requestFocus(FocusNode());
                 print('点击键盘搜索');
               },
-              style: const TextStyle(fontSize: 15, color: Colors.black, textBaseline: TextBaseline.alphabetic),
+              style: const TextStyle(
+                  fontSize: 15,
+                  color: Colors.black,
+                  textBaseline: TextBaseline.alphabetic),
               decoration: const InputDecoration(
                 isDense: true,
                 prefixIcon: Padding(
                   padding: EdgeInsets.only(left: 0),
-                  child:  Icon(Icons.search,),
+                  child: Icon(
+                    Icons.search,
+                  ),
                 ),
                 fillColor: Color(0x30cccccc),
                 filled: true,
                 border: OutlineInputBorder(borderSide: BorderSide.none),
-      contentPadding: EdgeInsets.all(0),
+                contentPadding: EdgeInsets.all(0),
                 enabledBorder: OutlineInputBorder(
                     borderSide: BorderSide(color: Color(0x00FF0000)),
                     borderRadius: BorderRadius.all(Radius.circular(100))),
@@ -49,14 +51,11 @@ class _SearchState extends State<Search> {
                 hintStyle: TextStyle(
                   textBaseline: TextBaseline.alphabetic, //用于提示文字对齐
                 ),
-
               ),
-
             ),
           ),
         ],
       );
     });
-
   }
 }

pubspec.lock

@@ -68,7 +68,7 @@ packages:
     dependency: "direct main"
     description:
       name: carousel_slider
-      url: "https://pub.dartlang.org"
+      url: "https://pub.flutter-io.cn"
     source: hosted
     version: "4.0.0"
   characters: