不保存页面状态，删除发件页跳转订单详情的拒收和签收功能，发件电话模糊匹配添加省市区和地址智能填充

lib/home_page.dart

@@ -16,7 +16,7 @@ class HomePage extends StatefulWidget {
   _HomePageState createState() => _HomePageState();
 }
 
-class _HomePageState extends State < HomePage > with SingleTickerProviderStateMixin {
+class _HomePageState extends State < HomePage >  {
 
   int _currentIndex = 0;
   List < Widget > pageList = [
@@ -36,10 +36,12 @@ class _HomePageState extends State < HomePage > with SingleTickerProviderStateMi
      ScreenUtil.instance = ScreenUtil(width: 750, height: 1334,allowFontScaling:false)..init(context);
     return
     Scaffold(
-      body: IndexedStack(
-        index: _currentIndex,
-        children: pageList
-      ),
+      body:pageList[_currentIndex],
+       
+      // IndexedStack(
+      //   index: _currentIndex,
+      //   children: pageList
+      // ),
       bottomNavigationBar: BottomNavigationBar(
         currentIndex: _currentIndex,
         type: BottomNavigationBarType.fixed,

lib/pages/order_management_page.dart

@@ -624,7 +624,11 @@ class _QueryWidgetState extends State < QueryWidget > {
                           builder: (BuildContext context) {
                             return OrderDetailPage(orderNo: obj.orderNo);
                           })
-                      );
+                      ).then((resp){
+                        if(resp==true){
+                          switchOrderFromStatus(orderStatus, page);
+                        }
+                      });
                     } else {
                       return;
                     }

lib/pages/order_management_page/order_detail_page.dart

@@ -184,8 +184,12 @@ class _ItemInfoWidgetState extends State < ItemInfoWidget > {
                                     afterGoodsNumber =int.parse(value);
                                   }else if(key=='运费'){
                                     afterTransportFee =double.parse(value);
+                                    String temp = afterTransportFee.toStringAsFixed(1);
+                                    afterTransportFee = double.parse(temp);
                                   }else if(key=='代收'){
                                     afterCollectingFee =double.parse(value);
+                                     String temp = afterCollectingFee.toStringAsFixed(1);
+                                     afterCollectingFee = double.parse(temp);
                                   }
                                 },
                               ),

lib/pages/send_express_page.dart

@@ -48,9 +48,12 @@ class _SendExpressPageState extends State < SendExpressPage > with AutomaticKeep
   TextEditingController receiptCompanyPhoneController = TextEditingController();
   TextEditingController receiptCompanyNameController = TextEditingController();
 
-  TextEditingController sendCompanyAddreddController = TextEditingController();
+  TextEditingController sendCompanyAddressController = TextEditingController();
   TextEditingController receiptCompanyAddressController = TextEditingController();
 
+ 
+  
+
   List < dynamic > goodsCateGoryList = [];
   List < dynamic > goodsPackageList = [];
   //请求字段-------------------------
@@ -211,9 +214,9 @@ class _SendExpressPageState extends State < SendExpressPage > with AutomaticKeep
       });
     });
 
-    sendCompanyAddreddController.addListener(() {
+    sendCompanyAddressController.addListener(() {
       setState(() {
-        sendCompanyAddress = sendCompanyAddreddController.text;
+        sendCompanyAddress = sendCompanyAddressController.text;
       });
     });
     receiptCompanyAddressController.addListener(() {
@@ -614,7 +617,7 @@ class _SendExpressPageState extends State < SendExpressPage > with AutomaticKeep
                     SizedBox(
                       width: ScreenUtil.getInstance().setWidth(500),
                       child: TextField(
-                        controller: type == 'send' ? sendCompanyAddreddController : receiptCompanyAddressController,
+                        controller: type == 'send' ? sendCompanyAddressController : receiptCompanyAddressController,
                         textAlign: TextAlign.end,
                         decoration: InputDecoration(
                           border: InputBorder.none
@@ -761,7 +764,6 @@ class _SendExpressPageState extends State < SendExpressPage > with AutomaticKeep
           showError(errStr);
           return;
         }
-        return;
         setState(() {
           submitStatus = false;
         });
@@ -895,12 +897,32 @@ class _SendExpressPageState extends State < SendExpressPage > with AutomaticKeep
                 sendCompanyPhoneController.text = obj.uzerPhone;
                 sendCompanyCodeController.text = obj.companyCode;
                 sendCompanyNameController.text = obj.companyName;
+
+                sendPCA = obj.provinceName + ' ' + obj.cityName + ' ' + ' ' + obj.areaName;
+                sendCompanyProvinceName = obj.provinceName;
+                sendCompanyProvinceCode = obj.provinceCode;
+                sendCompanyCityName = obj.cityName;
+                sendCompanyCityCode = obj.cityCode;
+                sendCompanyAreaName = obj.areaName;
+                sendCompanyAreaCode = obj.areaCode;
+
+                sendCompanyAddressController.text = obj.address;
               } else {
                 receiptCompanyPhone = obj.uzerPhone;
                 receiptCompanyName = obj.companyName;
                 receiptCompanyPhoneController.text = obj.uzerPhone;
                 receiptCompanyNameController.text = obj.companyName;
                 receiptCompanyId = obj.id.toString();
+
+                getPCA = obj.provinceName + ' ' + obj.cityName + ' ' + ' ' + obj.areaName;
+                receiptCompanyProvinceName = obj.provinceName;
+                receiptCompanyProvinceCode = obj.provinceCode;
+                receiptCompanyCityName = obj.cityName;
+                receiptCompanyCityCode = obj.cityCode;
+                receiptCompanyAreaName = obj.areaName;
+                receiptCompanyAreaCode = obj.areaCode;
+
+                receiptCompanyAddressController.text = obj.address;
               }
               setState(() {
                 FocusScope.of(context).requestFocus(FocusNode());

lib/pages/send_express_page/order_detail_page.dart

@@ -141,72 +141,6 @@ class _OrderDetailState extends State < OrderDetail > {
                       print("作废");
                     },
                   ),
-                  GestureDetector(
-                    child: Offstage(
-                      offstage: false,
-                      child: Container(
-                        width: ScreenUtil.getInstance().setWidth(94),
-                        height: ScreenUtil.getInstance().setHeight(48),
-                        decoration: BoxDecoration(
-                          color: Color.fromRGBO(239, 243, 249, 1),
-                          borderRadius: BorderRadius.all(Radius.circular(4.0))
-                        ),
-                        child: Center(
-                          child: Text('拒收', style: TextStyle(fontSize: ScreenUtil.getInstance().setSp(24), color: Color.fromRGBO(64, 98, 254, 1))),
-                        ),
-                      ),
-                    ),
-                    onTap: () {
-                      showDialog < Null > (
-                        context: context, //BuildContext对象
-                        barrierDismissible: false,
-                        builder: (BuildContext context) {
-                          return new LoadingDialog( //调用对话框
-                            text: '是否确认拒收', childCallback: (val) {
-                              if (val) {
-                               myUpdataOrder(4);
-                              } else {
-                                return;
-                              }
-                            },
-                          );
-                        });
-                      print("拒收");
-                    },
-                  ),
-                  GestureDetector(
-                    child: Offstage(
-                      offstage: false,
-                      child: Container(
-                        width: ScreenUtil.getInstance().setWidth(94),
-                        height: ScreenUtil.getInstance().setHeight(48),
-                        decoration: BoxDecoration(
-                          color: Color.fromRGBO(239, 243, 249, 1),
-                          borderRadius: BorderRadius.all(Radius.circular(4.0))
-                        ),
-                        child: Center(
-                          child: Text('签收', style: TextStyle(fontSize: ScreenUtil.getInstance().setSp(24), color: Color.fromRGBO(64, 98, 254, 1))),
-                        ),
-                      ),
-                    ),
-                    onTap: () {
-                      showDialog < Null > (
-                        context: context, //BuildContext对象
-                        barrierDismissible: false,
-                        builder: (BuildContext context) {
-                          return new LoadingDialog( //调用对话框
-                            text: '是否确认签收', childCallback: (val) {
-                              if (val) {
-                               myUpdataOrder(3);
-                              } else {
-                                return;
-                              }
-                            },
-                          );
-                        });
-                      print("签收");
-                    },
-                  ),
                   GestureDetector(
                     child: Offstage(
                       offstage: false,
@@ -232,8 +166,19 @@ class _OrderDetailState extends State < OrderDetail > {
                               if (val) {
                                 print(val);
                                 Navigator.push(context, MaterialPageRoute(builder: (context) {
-                                  return OrderDetailPage(orderNo: '123456', );
-                                }));
+                                  return OrderDetailPage(orderNo: '${data.orderNo}', );
+                                })).then((resp){
+                                  if(resp==true){
+                                    getOrderDetail(widget.orderId).then((resp) {
+                                      if (isNotError(context, resp)) {
+                                        OrderDetailObj orderDetailObj = OrderDetailObj.fromJson(resp.data);
+                                        setState(() {
+                                          data = orderDetailObj.data;
+                                        });
+                                      }
+                                    });
+                                  }
+                                });
                               } else {
                                 return;
                               }

lib/util/config.dart

@@ -1,6 +1,6 @@
 class Config{
-  String baseUrl = "https://logistics.5fire.tech/";
-  //String baseUrl='http://192.168.100.9:8866/';
+  //String baseUrl = "https://logistics.5fire.tech/";
+  String baseUrl='http://192.168.100.11:8866/';
   int connectTimeout = 30000;
   int receiveTimeout = 30000;
 }

lib/util/request.dart

@@ -76,7 +76,7 @@ class Http {
       }
       return e;
     }
-    //print(response.data);
+    print(response.data);
     return response;
   }