TextOverflow.ellipsis,

android/app/build.gradle

@@ -58,6 +58,7 @@ android {
 //        implementation 'com.google.android.material:material:1.5.0'
         implementation('com.amap.api:3dmap:9.1.0')
         implementation('com.amap.api:location:6.1.0')
+        api 'com.alipay.sdk:alipaysdk-android:+@aar'
     }
 
     buildTypes {

android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.njyunzhi.farmer_client">
+    <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <!--允许获取精确位置，精准定位必选-->
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />

android/build.gradle

@@ -18,6 +18,7 @@ allprojects {
 //        jcenter()
         google()
         mavenCentral()
+
     }
 }
 

lib/models/entities/Address.dart

@@ -7,6 +7,7 @@ class Address {
   num? sortNo;
   String? orgId;
   num? status;
+  late bool selected; //另外加的 选择默认地址bug用
 
   Address();
 
@@ -18,7 +19,8 @@ class Address {
         ownerId = json["ownerId"],
         sortNo = json["sortNo"],
         orgId = json["orgId"],
-        status = json["status"];
+        status = json["status"],
+        selected=json["isDefault"]?? false;
 
   Map<String, dynamic> toJson() => {
         'address': address,
@@ -29,5 +31,6 @@ class Address {
         'sortNo': sortNo,
         'orgId': orgId,
         'status': status,
+        'selected': selected,
       };
 }

lib/models/entities/OrderInfoModel.dart

@@ -17,7 +17,7 @@ class OrderInfoModel {
   num? dispatchStatus;
   num? workStatus;
   num? isEvaluated;
-  num? payType;
+  String? payType;
   num? isRefund;
   String? orgId;
   String? orgName;

lib/models/entities/OrderListAll.dart

@@ -17,7 +17,7 @@ class OrderListAll {
   num? dispatchStatus;
   num? workStatus;
   num? isEvaluated;
-  num? payType;
+  String? payType;
   num? isRefund;
   String? orgId;
   String? orgName;

lib/pages/addressList/index.dart

@@ -17,8 +17,6 @@ class AddressList extends BasicPage {
   AddressController addressController = AddressController.t;
   final addressList = Rx<List<Address>>([]);
 
-
-
   @override
   void beforeShow() {
     super.beforeShow();
@@ -30,7 +28,6 @@ class AddressList extends BasicPage {
       });
       addressList(list);
       EasyLoading.dismiss();
-
     });
     if (Get.arguments != null) {
       isBack = Get.arguments['isBack'];
@@ -39,26 +36,29 @@ class AddressList extends BasicPage {
 
   void onChange(id) {
     print(id);
-    addressDefault(id.toString()).then((value) {
+    addressDefault(id).then((value) {
       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 defaultlist) {
+          if (element.isDefault == true) {
+            element.isDefault = false;
+          } else {
+            element.isDefault = true;
+          }
+        }
+        addressList(defaultlist);
+        print(addressList.value);
       });
       // final defaultlist = [...addressList.value];
-      // for (var element in addressList.value) {
+      // for (var element in defaultlist) {
       //   if (element.isDefault == true) {
-      //     element.isDefault = false;
+      //     defaultlist.selected = true;
       //   }
       // }
       // addressList(defaultlist);
       // print(addressList.value);
-
     });
-  }
+   }
 
   void onDelete(id) {
     print(id);
@@ -87,64 +87,62 @@ class AddressList extends BasicPage {
   Widget builder(BuildContext context) {
     naviTitle = '地址管理';
     return ListView(
-      children: [
-        Container(
-          padding: EdgeInsets.all(15.w),
-          child: Column(
-            //左对齐
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              Obx(
-                () => Column(
-                    children: addressList()
-                        .asMap()
-                        .keys
-                        .map(
-                          (e) => AddressCard(
-                            No: e + 1,
-                            item: addressList.value[e],
-                            isBack: isBack,
-                            onChange: () {
-                              onChange(addressList.value[e].addressId);
-                            },
-                            onEdit: () {
-                              Get.offNamed('/addAddress', arguments: {
-                                'id': addressList.value[e].addressId,
-                                'item': addressList.value[e].address.toString()
-                              });
-                            },
-                            onDelete: () {
-                              onDelete(addressList.value[e].addressId);
-                            },
-                            onBack: () {
-                              //选择地址
-                              addressController.address.value =
-                                  addressList.value[e];
-                              Get.back();
-                            },
-                          ),
-                        )
-                        .toList()),
-              ),
-              DefaultButton(
-                color: const Color(0xffffffff),
-                backColor: const Color(0xFFFF703B),
-                width: 345.w,
-                height: 49.h,
-                text: '+新增地址',
-                onPressed: () {
-                  Get.offNamed('/addAddress');
-                },
-                margin: const EdgeInsets.all(0),
-                fontSize: 20.sp,
-                radius: 24.5.w,
-              ),
-            ],
-          ),
-        ),
-      ],
-    );
+          children: [
+            Container(
+              padding: EdgeInsets.all(15.w),
+              child:
+              Obx(() =>  Column(
+                //左对齐
+                crossAxisAlignment: CrossAxisAlignment.start,
+                children: [
+                  Column(
+                      children: addressList()
+                          .asMap()
+                          .keys
+                          .map(
+                            (e) => AddressCard(
+                              No: e + 1,
+                              item: addressList.value[e],
+                              isBack: isBack,
+                              onChange: () {
+                                onChange(addressList.value[e].addressId);
+                              },
+                              onEdit: () {
+                                Get.offNamed('/addAddress', arguments: {
+                                  'id': addressList.value[e].addressId,
+                                  'item':
+                                      addressList.value[e].address.toString()
+                                });
+                              },
+                              onDelete: () {
+                                onDelete(addressList.value[e].addressId);
+                              },
+                              onBack: () {
+                                //选择地址
+                                addressController.address.value =
+                                    addressList.value[e];
+                                Get.back();
+                              },
+                            ),
+                          )
+                          .toList()),
+                  DefaultButton(
+                    color: const Color(0xffffffff),
+                    backColor: const Color(0xFFFF703B),
+                    width: 345.w,
+                    height: 49.h,
+                    text: '+新增地址',
+                    onPressed: () {
+                      Get.offNamed('/addAddress');
+                    },
+                    margin: const EdgeInsets.all(0),
+                    fontSize: 20.sp,
+                    radius: 24.5.w,
+                  ),
+                ],
+              )),
+            ),
+          ],
+        );
   }
 }
-
-

lib/pages/addressList/widget/AddressCard.dart

@@ -37,6 +37,7 @@ class _AddressCard extends State<AddressCard> {
   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(
@@ -56,43 +57,48 @@ class _AddressCard extends State<AddressCard> {
       child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
-          Row(
-            children: [
-              if (item.isDefault == true)
-                Container(
-                  margin: EdgeInsets.fromLTRB(0, 0, 5.w, 0),
-                  padding: EdgeInsets.symmetric(vertical: 1.w, horizontal: 5.w),
-                  decoration: BoxDecoration(
-                    color: const Color(0xffff0000),
-                    borderRadius: BorderRadius.all(Radius.circular(5.w)),
-                  ),
-                  child: Text(
-                    '默认地址',
-                    style: TextStyle(
-                      fontSize: 15.sp,
-                      fontWeight: FontWeight.bold,
-                      color: const Color(0xffffffff),
+          GestureDetector(
+            onTap: isBack ? onBack : () {},
+            child: Row(
+              children: [
+                if (item.isDefault == true)
+                  Container(
+                    margin: EdgeInsets.fromLTRB(0, 0, 5.w, 0),
+                    padding:
+                        EdgeInsets.symmetric(vertical: 1.w, horizontal: 5.w),
+                    decoration: BoxDecoration(
+                      color: const Color(0xffff0000),
+                      borderRadius: BorderRadius.all(Radius.circular(5.w)),
+                    ),
+                    child: Text(
+                      '默认地址',
+                      style: TextStyle(
+                        fontSize: 15.sp,
+                        fontWeight: FontWeight.bold,
+                        color: const Color(0xffffffff),
+                      ),
                     ),
                   ),
+                Text(
+                  '我的地址' + No.toString(),
+                  style:
+                      TextStyle(fontSize: 15.sp, fontWeight: FontWeight.w700),
                 ),
-              Text(
-                '我的地址' + No.toString(),
-                style: TextStyle(fontSize: 15.sp, fontWeight: FontWeight.w700),
-              ),
-            ],
+              ],
+            ),
           ),
-          GestureDetector(
-            onTap: onEdit,
-            child: Container(
-              padding: EdgeInsets.symmetric(vertical: 5.h, horizontal: 0),
-              decoration: BoxDecoration(
-                border: Border(
-                  bottom: BorderSide(
-                      width: 1.h,
-                      color: const Color(0xcc000000),
-                      style: BorderStyle.solid),
-                ),
+          Container(
+            padding: EdgeInsets.symmetric(vertical: 5.h, horizontal: 0),
+            decoration: BoxDecoration(
+              border: Border(
+                bottom: BorderSide(
+                    width: 1.h,
+                    color: const Color(0xcc000000),
+                    style: BorderStyle.solid),
               ),
+            ),
+            child: GestureDetector(
+              onTap: isBack ? onBack : () {},
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: [
@@ -111,10 +117,13 @@ class _AddressCard extends State<AddressCard> {
                       ),
                     ),
                   ),
-                  Image.asset(
-                    'images/icons/edit.png',
-                    width: 33.w,
-                    height: 33.w,
+                  GestureDetector(
+                    onTap: onEdit,
+                    child: Image.asset(
+                      'images/icons/edit.png',
+                      width: 33.w,
+                      height: 33.w,
+                    ),
                   ),
                 ],
               ),
@@ -138,7 +147,7 @@ class _AddressCard extends State<AddressCard> {
               mainAxisAlignment: MainAxisAlignment.spaceBetween,
               children: [
                 GestureDetector(
-                  onTap: onChange,
+                  // onTap: onChange,
                   child: Row(
                     children: [
                       const Text('设为默认地址'),
@@ -172,3 +181,16 @@ class _AddressCard extends State<AddressCard> {
     );
   }
 }
+
+//
+// class UseEffect extends ChangeNotifier{//这里也可以使用with来进行实现
+//   int _count = 0;//数值计算
+//
+//   int get count => _count;
+//
+//   addCount(){
+//     _count++;
+//     notifyListeners();
+//   }
+//
+// }

lib/pages/main/index.dart

@@ -30,7 +30,11 @@ class Main extends BasicPage {
         list.add(Address.fromJson(item));
       });
       addressListInfo(list);
-      addressInfoContent(addressListInfo()[0]);
+      for(var i=0; i< addressListInfo.value.length;i++){
+        if (addressListInfo.value[i].isDefault==true ){
+          addressInfoContent(addressListInfo.value[i]);
+        }
+      }
 
     });
   }
@@ -38,7 +42,8 @@ class Main extends BasicPage {
   @override
   Widget builder(BuildContext context) {
     return Obx(() => MainPage(
-          item: addressInfoContent(),
+          item: addressInfoContent.value,
         ));
   }
 }
+

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

@@ -32,7 +32,6 @@ class MainPage extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    print('itemitemitemitemitemitemitemitem$item');
     return Container(
       alignment: Alignment.center,
       child: ListView(

lib/pages/orderInfo/index.dart

@@ -276,7 +276,7 @@ Future<void> payMoney (String payType) async {
     if(payType=='wxPay'){
       final isInstall=await fluwx.isWeChatInstalled;
       if(!isInstall){
-        EasyLoading.showError('未安装微信');
+        EasyLoading.showError('请先安装微信');
         print('isInstall--------$isInstall');
         return;
       }
@@ -312,9 +312,12 @@ Future<void> payMoney (String payType) async {
         print(event.errCode);
         // 支付成功
         if (event.errCode == 0) {
-          EasyLoading.showSuccess('支付成功');
+          // EasyLoading.showSuccess('支付成功');
+          Get.snackbar('提示', "支付成功");
+
           Get.offAllNamed('/order');
         }else{
+
           EasyLoading.showError('支付失败');
         }
         // 关闭弹窗
@@ -326,10 +329,26 @@ Future<void> payMoney (String payType) async {
       print('--------------支付宝支付-----------------');
       final isInstall=await tobias.isAliPayInstalled();
       if(!isInstall){
-        EasyLoading.showError('未安装支付宝');
+        EasyLoading.showError('请先安装支付宝');
         print('isInstall------支付宝--$isInstall');
         return;
       }
+      // map["paySign"]
+      createOrder(id, "aliPay").then((value) {
+        tobias.aliPay(value).then((payResult) {
+          print("支付宝:" + payResult.toString());
+
+          if (payResult['resultStatus'] == '9000') {
+            Get.snackbar('提示', "支付成功");
+            Get.offAllNamed('/order');
+          } else {
+            EasyLoading.showError('支付失败');
+
+          }
+        });
+
+        });
+