修改订单增加付款方式的修改

lib/pages/order_detail/order_detail.dart

@@ -111,7 +111,7 @@ class _ItemInfoWidgetState extends State < ItemInfoWidget > {
   double afterCollectingFee=0.0;//代收
   bool submitStatus = true;
   String lineId = '-1';
-   List<CompanyOfLineList>  lineList = [];
+  List<CompanyOfLineList>  lineList = [];
   @override
   void initState() {
     super.initState();
@@ -229,85 +229,7 @@ class _ItemInfoWidgetState extends State < ItemInfoWidget > {
       padding: EdgeInsets.all(ScreenUtil.getInstance().setWidth(30)),
       child: Text(str, maxLines: 100, style: TextStyle(fontSize: ScreenUtil.getInstance().setSp(30), color: Color.fromRGBO(74, 74, 74, 1)), ),
     );
-  }
-
-  Widget submitBtn(String orderNo) {
-    return GestureDetector(
-      child: Container(
-        margin: EdgeInsets.fromLTRB(ScreenUtil.getInstance().setWidth(30), ScreenUtil.getInstance().setWidth(50), ScreenUtil.getInstance().setWidth(30), ScreenUtil.getInstance().setWidth(40)),
-        height: ScreenUtil.getInstance().setHeight(88),
-        decoration: BoxDecoration(
-          borderRadius: BorderRadius.all(Radius.circular(4)),
-          color: Color.fromRGBO(37, 102, 242, 1),
-        ),
-        child: Center(
-        child:Row(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: <Widget>[
-                Offstage(
-                  offstage: submitStatus,
-                  child: SizedBox(
-                    width: ScreenUtil.getInstance().setWidth(45),
-                    height: ScreenUtil.getInstance().setHeight(45),
-                    child: Image.asset('lib/images/loading.gif'),
-                  ),
-                ),
-                Text('提交', style: TextStyle(fontSize: ScreenUtil.getInstance().setSp(36), color: Colors.white)),
-            ],
-          )
-        ),
-      ),
-      onTap: () {
-        if(!submitStatus) return;
-         if(lineList.length==1){
-            lineId = lineList[0].lineId.toString();
-          }else if(lineList.length>1){
-            showLineModal(lineList,orderNo);
-            return;
-        }
-          submitOrder(orderNo);
-      },
-    );
-  }
-   showLineModal(List<CompanyOfLineList> list,String orderNo){
-    showDialog < Null > (
-      context: context, //BuildContext对象
-      barrierDismissible: false,
-      builder: (BuildContext context) {
-        return ShowLineModal( 
-          lineList: list, childCallback: (val) {
-              lineId = val;
-             submitOrder(orderNo);
-          },
-        );
-      });
-  }
-  submitOrder(String orderNo){
-     setState(() {
-        submitStatus = false;
-      });
-      updataOrder(lineId,orderNo,afterTransportFee,afterCollectingFee,afterGoodsNumber).then((resp){
-        if(isNotError(context, resp) && this.mounted){
-          showDialog < Null > (
-          context: context, //BuildContext对象
-          barrierDismissible: false,
-          builder: (BuildContext context) {
-            return MyAlertDialog( //调用对话框
-              text: '订单修改成功！', childCallback: (val) {
-                if(val){
-                  Navigator.pop(context,true);
-                }
-              },
-            );
-          });
-        }else{
-          setState(() {
-            submitStatus = true;
-          });
-        }
-      });
-  }
- 
+  }  
 }
 
 Widget titleWidget(String iconUrl, String str) {

lib/pages/order_management_page/order_detail_page.dart

@@ -135,11 +135,11 @@ class _ItemInfoWidgetState extends State < ItemInfoWidget > {
         });
       }
     });
+    showTextPaymentMehod = widget.obj.goodsPaymentMethod==1?'现付':'到付';
   }
 
   @override
   Widget build(BuildContext context) {
-    showTextPaymentMehod = widget.obj.goodsPaymentMethod==1?'现付':'到付';
     return Container(
       child: Container(
         color: Colors.white,
@@ -278,35 +278,8 @@ class _ItemInfoWidgetState extends State < ItemInfoWidget > {
       },
     );
   }
-  showPickerModal(BuildContext context, String type) {
-    List < dynamic > data = [];
-    if (type == '付款方式') {
-        data = ['现付', '到付'];
-    }
-    new Picker(
-      adapter: PickerDataAdapter < String > (pickerdata: data),
-      height: ScreenUtil.getInstance().setHeight(450),
-      confirmText: '确定',
-      confirmTextStyle: TextStyle(fontSize: ScreenUtil.getInstance().setSp(30), color: Color.fromRGBO(64, 98, 254, 1)),
-      cancelText: '取消',
-      cancelTextStyle: TextStyle(fontSize: ScreenUtil.getInstance().setSp(30), color: Color.fromRGBO(153, 153, 153, 1)),
-      headercolor: Color.fromRGBO(245, 245, 245, 1),
-      itemExtent: ScreenUtil.getInstance().setHeight(80),
-      textStyle: TextStyle(fontSize: ScreenUtil.getInstance().setSp(30), color: Color.fromRGBO(42, 42, 42, 1)),
-      changeToFirst: true,
-      hideHeader: false,
-      onConfirm: (Picker picker, List value) {
-        showTextPaymentMehod = data[value[0]];
-        if (showTextPaymentMehod == '现付') {
-          goodsPaymentMethod = 1;
-        } else {
-          goodsPaymentMethod = 2;
-        }
-      }
-    ).showModal(this.context); 
-  }
-
-   Widget _packageType(String key) {
+  
+  Widget _packageType(String key) {
     return Padding(
       padding: EdgeInsets.only(left: ScreenUtil.getInstance().setWidth(30)),
       child: Column(
@@ -340,7 +313,7 @@ class _ItemInfoWidgetState extends State < ItemInfoWidget > {
               )
             ),
             onTap: () {
-              showPickerModal(context, key);
+              showPickerModal(context);
             },
           ),
           Expanded(
@@ -353,6 +326,36 @@ class _ItemInfoWidgetState extends State < ItemInfoWidget > {
 
   }
 
+  showPickerModal(BuildContext context) {
+    List < dynamic > data =  ['现付', '到付'];
+    new Picker(
+      adapter: PickerDataAdapter < String > (pickerdata: data),
+      height: ScreenUtil.getInstance().setHeight(450),
+      confirmText: '确定',
+      confirmTextStyle: TextStyle(fontSize: ScreenUtil.getInstance().setSp(30), color: Color.fromRGBO(64, 98, 254, 1)),
+      cancelText: '取消',
+      cancelTextStyle: TextStyle(fontSize: ScreenUtil.getInstance().setSp(30), color: Color.fromRGBO(153, 153, 153, 1)),
+      headercolor: Color.fromRGBO(245, 245, 245, 1),
+      itemExtent: ScreenUtil.getInstance().setHeight(80),
+      textStyle: TextStyle(fontSize: ScreenUtil.getInstance().setSp(30), color: Color.fromRGBO(42, 42, 42, 1)),
+      changeToFirst: true,
+      hideHeader: false,
+      onConfirm: (Picker picker, List value) {
+        print(value[0]);
+        setState(() {
+           showTextPaymentMehod = data[value[0]];
+        });
+        print(showTextPaymentMehod);
+        if (showTextPaymentMehod == '现付') {
+          goodsPaymentMethod = 1;
+        } else {
+          goodsPaymentMethod = 2;
+        }
+        print(goodsPaymentMethod);
+      }
+    ).showModal(this.context); 
+  }
+
   showLineModal(List<CompanyOfLineList> list,String orderNo){
     showDialog < Null > (
       context: context, //BuildContext对象
@@ -370,7 +373,7 @@ class _ItemInfoWidgetState extends State < ItemInfoWidget > {
      setState(() {
         submitStatus = false;
       });
-      updataOrder(lineId,orderNo,afterTransportFee,afterCollectingFee,afterGoodsNumber).then((resp){
+      updataOrder(lineId,orderNo,afterTransportFee,afterCollectingFee,afterGoodsNumber,goodsPaymentMethod).then((resp){
         if(isNotError(context, resp) && this.mounted){
           showDialog < Null > (
           context: context, //BuildContext对象

lib/pages/send_express_page.dart

@@ -1096,10 +1096,14 @@ class _SendExpressPageState extends State < SendExpressPage > with AutomaticKeep
             goodsPackingId = goodsPackageList[value[0]].id;
           });
         } else if (type == '货物类型') {
-          showTextGoodsCategory = goodsCateGoryList[value[0]].name;
-          goodsCategoryId = goodsCateGoryList[value[0]].id;
+          setState(() {
+             showTextGoodsCategory = goodsCateGoryList[value[0]].name;
+              goodsCategoryId = goodsCateGoryList[value[0]].id;
+          });
         } else if (type == '付款方式') {
-          showTextPaymentMehod = data[value[0]];
+          setState(() {
+             showTextPaymentMehod = data[value[0]];
+          });
           if (showTextPaymentMehod == '现付') {
             goodsPaymentMethod = 1;
           } else {

lib/util/api.dart

@@ -170,12 +170,13 @@ Future fromStatusGetOrderList(int orderStatus, int page, String orderNo) {
 }
 
 //改单接口
-Future updataOrder(String lineId,String orderNo, double afterTransportFee, double afterCollectingFee, int afterGoodsNumber) {
+Future updataOrder(String lineId,String orderNo, double afterTransportFee, double afterCollectingFee, int afterGoodsNumber,int goodsPaymentMethod) {
   var response = Http().post('app/order/update_order', data: {
     'orderNo': orderNo,
     'afterTransportFee': afterTransportFee * 100,
     'afterCollectingFee': afterCollectingFee * 100,
-    'afterGoodsNumber': afterGoodsNumber
+    'afterGoodsNumber': afterGoodsNumber,
+    'goodsPaymentMethod':goodsPaymentMethod
   });
   return response;
 }