TextOverflow.ellipsis,

lib/pages/addAddress/index.dart

@@ -78,12 +78,12 @@ class AddAddress extends BasicPage {
                 if (text == '') {
                   addressSave(address().address.toString()).then((value) {
                     Fluttertoast.showToast(msg: '添加地址成功！');
-                    Get.back();
+                    Get.offNamed('/addressList');
                   });
                 } else {
                   addressUpdate(id, address().address.toString()).then((value) {
                     Fluttertoast.showToast(msg: '修改地址成功！');
-                    Get.back();
+                    Get.offNamed('/addressList');
                   });
                 }
               }

lib/pages/addressList/index.dart

@@ -17,11 +17,12 @@ class AddressList extends BasicPage {
   AddressController addressController = AddressController.t;
   final addressList = Rx<List<Address>>([]);
 
+
+
   @override
   void beforeShow() {
     super.beforeShow();
     EasyLoading.show(status: '数据加载中...');
-
     getAddress().then((value) {
       final list = <Address>[];
       value['records'].forEach((item) {
@@ -39,13 +40,23 @@ class AddressList extends BasicPage {
   void onChange(id) {
     print(id);
     addressDefault(id.toString()).then((value) {
-      final defaultlist = [...addressList()];
-      for (var element in addressList()) {
-        if (element.isDefault == true) {
-          element.isDefault = false;
-        }
-      }
-      addressList(defaultlist);
+      getAddress().then((value) {
+        final list = <Address>[];
+        value['records'].forEach((item) {
+          list.add(Address.fromJson(item));
+        });
+        addressList(list);
+        EasyLoading.dismiss();
+      });
+      // final defaultlist = [...addressList.value];
+      // for (var element in addressList.value) {
+      //   if (element.isDefault == true) {
+      //     element.isDefault = false;
+      //   }
+      // }
+      // addressList(defaultlist);
+      // print(addressList.value);
+
     });
   }
 
@@ -94,10 +105,10 @@ class AddressList extends BasicPage {
                             item: addressList.value[e],
                             isBack: isBack,
                             onChange: () {
-                              onChange(addressList()[e].addressId);
+                              onChange(addressList.value[e].addressId);
                             },
                             onEdit: () {
-                              Get.toNamed('/addAddress', arguments: {
+                              Get.offNamed('/addAddress', arguments: {
                                 'id': addressList.value[e].addressId,
                                 'item': addressList.value[e].address.toString()
                               });
@@ -120,9 +131,9 @@ class AddressList extends BasicPage {
                 backColor: const Color(0xFFFF703B),
                 width: 345.w,
                 height: 49.h,
-                text: '+新增收货地址',
+                text: '+新增地址',
                 onPressed: () {
-                  Get.toNamed('/addAddress');
+                  Get.offNamed('/addAddress');
                 },
                 margin: const EdgeInsets.all(0),
                 fontSize: 20.sp,
@@ -135,3 +146,5 @@ class AddressList extends BasicPage {
     );
   }
 }
+
+

lib/pages/login/login.dart

@@ -276,7 +276,13 @@ class _RouteLogin extends State<MyRouteLogin> {
                       //   child:Text('文本协议/隐私政策',style: TextStyle(fontSize:15.sp,color: Color(0xffce3800))),
                       // ),
                       Text('请认真查看',style: TextStyle(fontSize:14.sp,color: Color(0xff2a2a2a))),
-                      Text('文本协议/隐私政策',style: TextStyle(fontSize:14.sp,color: Color(0xffce3800))),
+                      GestureDetector(
+                        onTap: (){
+                          Get.toNamed('/agreement');
+                        },
+                        child:  Text('文本协议/隐私政策',style: TextStyle(fontSize:14.sp,color: Color(0xffce3800))),
+
+                      ),
                       Text('，确认之后选择此项',style: TextStyle(fontSize:14.sp,color: Color(0xff2a2a2a))),
                       // RichText(
                       //   text: TextSpan(children: <InlineSpan>[

lib/pages/machinery/detail/widgets/detail.dart

@@ -47,7 +47,7 @@ Widget page(
 
 Widget _content(BuildContext context, VoidCallback? handleClick, CardInfo item,
     List<ContentImageList> contentItem, String km) {
-  return Column(
+  return ListView(
     children: [
       summary(item: item, km: km),
       _sectionHead('农机详情'),

lib/pages/machinery/map/widgets/detail.dart

@@ -43,7 +43,7 @@ Widget page(
 
 Widget _content(
     BuildContext context, VoidCallback? handleClick, CardInfo item, String km) {
-  return Column(
+  return ListView(
     children: [
       summary(item: item, km: km),
       RoundButton(

lib/pages/machinery/widgets/DefLayout.dart

@@ -25,7 +25,12 @@ class DefLayout extends StatelessWidget {
       decoration: BoxDecoration(
           color: Colors.white,
           borderRadius: BorderRadius.vertical(top: Radius.circular(_border))),
-      child: child,
+      child:child,
+      // ListView(
+      //   children: [
+      //     child,
+      //   ],
+      // )
     );
   }
 
@@ -38,9 +43,9 @@ class DefLayout extends StatelessWidget {
         SizedBox(
           width: width,
           height: headHeight,
-          child: head,
+          child:head,
         ),
-        ...children,
+        ...children
       ],
     );
   }

lib/pages/main/index.dart

@@ -23,13 +23,14 @@ class Main extends BasicPage {
     EasyLoading.show(status: '数据加载中...');
 
     getAddress().then((value) {
+      EasyLoading.dismiss();
+
       List<Address> list = [];
       value['records'].forEach((item) {
         list.add(Address.fromJson(item));
       });
       addressListInfo(list);
       addressInfoContent(addressListInfo()[0]);
-      EasyLoading.dismiss();
 
     });
   }

lib/pages/main/widgets/main/index.dart

@@ -15,6 +15,7 @@ class MainPage extends StatelessWidget {
 
   GetStorage box = GetStorage();
 
+
   void _userOut() {
     modal.showDialog(
         title: '提示',
@@ -31,6 +32,7 @@ class MainPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    print('itemitemitemitemitemitemitemitem$item');
     return Container(
       alignment: Alignment.center,
       child: ListView(

lib/pages/main/widgets/main/widgets/UserAddress.dart

@@ -67,7 +67,7 @@ class UserAddress extends StatelessWidget {
                           width: 240.w,
 
                           child: Text(
-                            item != null ? item.address.toString() : '请设置详细地址！',
+                            item.address != null ? item.address.toString() : '请设置详细地址！',
                             softWrap: true,
                             maxLines: 1,
                             textAlign: TextAlign.left,

lib/pages/order/index.dart

@@ -35,7 +35,6 @@ class OrderPage extends BasicPage {
     print(params['pageNum']);
     getOrderList(params).then((value) {
       maxSum = value['total'];
-
       List<OrderListAll> list = [];
       value['records'].forEach((item) {
         list.add(OrderListAll.fromJson(item));
@@ -83,6 +82,7 @@ class OrderPage extends BasicPage {
       EasyRefresh(
         controller: _controller,
         firstRefresh: true,
+        header: ClassicalHeader(refreshingText:'刷新中...',refreshedText: '刷新成功',refreshFailedText:'异常'),
         onRefresh: () async {
           await Future.delayed(Duration(seconds: 1), () {
             print("下拉刷新-----");
@@ -112,10 +112,8 @@ class OrderPage extends BasicPage {
           ): NullCard(text: '您还没有新的订单！'),
         ),
       )
-
             ),
   )
-
         ],
       ) ,
     );

lib/pages/orderInfo/index.dart

@@ -9,6 +9,7 @@ import 'package:fluttertoast/fluttertoast.dart';
 import 'package:get/get.dart';
 import 'package:farmer_client/widgets/Modal.dart' as modal;
 import 'package:fluwx/fluwx.dart' as fluwx;
+import 'package:tobias/tobias.dart' as tobias;
 
 import '../../models/entities/OrderInfoModel.dart';
 import '../../services/orderAPI.dart';
@@ -171,7 +172,7 @@ class OrderPageInfo extends BasicPage {
                                       id, evalStars.value, evalText.value)
                                   .then((value) {
                                 Fluttertoast.showToast(msg: '评价成功！');
-                                Get.offNamed('/order');
+                                Get.offAllNamed('/order');
                               });
                             } else {
                               Fluttertoast.showToast(msg: '请完整选择评分或输入评价内容');
@@ -201,7 +202,7 @@ class OrderPageInfo extends BasicPage {
                               onConfirm: () => {
                                     orderRefund(id).then((value) {
                                       Fluttertoast.showToast(msg: '退单成功！');
-                                      Get.offNamed('/order');
+                                      Get.offAllNamed('/order');
                                     }),
                                   });
                         },
@@ -227,7 +228,7 @@ class OrderPageInfo extends BasicPage {
                                   onConfirm: () => {
                                         orderRefund(id).then((value) {
                                           Fluttertoast.showToast(msg: '退单成功！');
-                                          Get.offNamed('/order');
+                                          Get.offAllNamed('/order');
                                         }),
                                       });
                             },
@@ -265,7 +266,7 @@ class _BottomWidget extends StatelessWidget {
         onConfirm: () => {
               orderDelete(id).then((value) {
                 Fluttertoast.showToast(msg: '订单取消成功！');
-                Get.offNamed('/order');
+                Get.offAllNamed('/order');
               })
             });
   }
@@ -303,9 +304,7 @@ Future<void> payMoney (String payType) async {
         })
         .catchError((onError){
           print("payWithWeChat错误--------${onError}");
-        })
-        ;
-
+        });
       });
 
 // 监听支付结果
@@ -314,11 +313,9 @@ Future<void> payMoney (String payType) async {
         // 支付成功
         if (event.errCode == 0) {
           EasyLoading.showSuccess('支付成功');
-          Get.offNamed('/order');
-
+          Get.offAllNamed('/order');
         }else{
           EasyLoading.showError('支付失败');
-
         }
         // 关闭弹窗
       });
@@ -327,6 +324,14 @@ Future<void> payMoney (String payType) async {
       return;
     }else if(payType=='aliPay'){
       print('--------------支付宝支付-----------------');
+      final isInstall=await tobias.isAliPayInstalled();
+      if(!isInstall){
+        EasyLoading.showError('未安装支付宝');
+        print('isInstall------支付宝--$isInstall');
+        return;
+      }
+
+
 
     }
 

lib/utils/Request.dart

@@ -30,7 +30,7 @@ final client = GetPlatform.isAndroid ? 'android' : 'ios';
 Dio createRequest() {
   var options = BaseOptions(
     baseUrl: 'https://machine.njyunzhi.com/api/' + client + '/farmer',
-    // baseUrl: 'http://192.168.89.147:7080/api/' + client + '/farmer',
+    // baseUrl: 'http://192.168.89.25:7080/api/' + client + '/farmer',
     connectTimeout: 5000,
     receiveTimeout: 3000,
   );

pubspec.lock

@@ -544,6 +544,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.4.8"
+  tobias:
+    dependency: "direct main"
+    description:
+      name: tobias
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.4.0+2"
   typed_data:
     dependency: transitive
     description:

pubspec.yaml

@@ -53,6 +53,7 @@ dependencies:
   flutter_easyloading: ^3.0.3
   flutter_easyrefresh: ^2.2.1 #下拉刷新上拉加载
   fluwx: ^3.9.0 #微信支付
+  tobias: ^2.4.0 #支付宝支付
 
 #  flutter_bmflocation: ^3.1.0+1