订单管理，功能样式

lib/pages/order_management_page.dart

@@ -255,15 +255,17 @@ class _QueryWidgetState extends State < QueryWidget > {
               Expanded(
                 child: Container(
                   padding: EdgeInsets.fromLTRB(ScreenUtil.getInstance().setWidth(20), ScreenUtil.getInstance().setWidth(20), ScreenUtil.getInstance().setWidth(20), 0),
-                  child: orderList.length == 0 ? Center(
-                    child: Text('暂无订单')
+                  child: orderList == null ? Center(
+                    child: _getMoreWidget()
+                  ) : orderList.length == 0 ? Center(
+                    child: Text('暂无订单'),
                   ) :
                   ListView.builder(
                     controller: _scrollController,
                     itemCount: orderList.length + 1,
                     itemBuilder: (BuildContext context, int index) {
                       if (index < orderList.length) {
-                        return _cardWiget(orderList[index]);
+                        return _cardWiget(orderList[index], index);
                       }
                       if (hasNextPage) {
                         return _getMoreWidget();
@@ -316,286 +318,79 @@ class _QueryWidgetState extends State < QueryWidget > {
       ],
     );
   }
-  Widget _cardWiget(FromStatusGetOrderList obj) {
+  Widget _cardWiget(FromStatusGetOrderList obj, int index) {
     Map < int, String > statusMap = {
       1: '待取货',
       2: '运途中',
       3: '已签收',
       4: '拒收'
     };
-    return GestureDetector(
-      child: Card(
-        color: Colors.white,
-        child: Container(
-          padding: EdgeInsets.fromLTRB(ScreenUtil.getInstance().setWidth(30), ScreenUtil.getInstance().setWidth(30), ScreenUtil.getInstance().setWidth(30), ScreenUtil.getInstance().setWidth(20)),
-          child: Column(
-            children: < Widget > [
-              Padding(
-                padding: EdgeInsets.only(bottom: ScreenUtil.getInstance().setHeight(30)),
-                child: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: < Widget > [
-                    Text('订单号：${obj.orderNo}', style: TextStyle(fontSize: ScreenUtil.getInstance().setSp(24), color: Color.fromRGBO(102, 102, 102, 1)), ),
-                    Text('${statusMap[obj.orderStatus]}', style: TextStyle(fontSize: ScreenUtil.getInstance().setSp(24), color: Color.fromRGBO(126, 211, 33, 1)), ),
-                  ],
-                )
-              ),
-              Padding(
-                padding: EdgeInsets.only(bottom: ScreenUtil.getInstance().setHeight(20)),
-                child: Row(
-                  children: < Widget > [
-                    Text('${obj.sendCompanyName} --> ${obj.receiptCompanyName}', style: TextStyle(fontSize: ScreenUtil.getInstance().setSp(30)), ),
-                  ],
-                )
-              ),
-              Padding(
-                padding: EdgeInsets.only(bottom: ScreenUtil.getInstance().setHeight(15)),
-                child: Row(
-                  children: < Widget > [
-                    SizedBox(
-                      width: ScreenUtil.getInstance().setWidth(355),
-                      child: Text('货物名称：${obj.goods}', style: TextStyle(fontSize: ScreenUtil.getInstance().setSp(24), color: Color.fromRGBO(155, 155, 155, 1)), ),
-                    ),
-                    Text('代收款：${obj.goodsAgencyFund/100}元', style: TextStyle(fontSize: ScreenUtil.getInstance().setSp(24), color: Color.fromRGBO(155, 155, 155, 1)), ),
-                  ],
-                ),
-              ),
-              Padding(
-                padding: EdgeInsets.only(bottom: ScreenUtil.getInstance().setHeight(30)),
-                child: Row(
-                  children: < Widget > [
-                    SizedBox(
-                      width: ScreenUtil.getInstance().setWidth(355),
-                      child: Text('货物件数：${obj.goodsQuantity}件', style: TextStyle(fontSize: ScreenUtil.getInstance().setSp(24), color: Color.fromRGBO(155, 155, 155, 1)), ),
-                    ),
-                    Text('运费：${obj.goodsFreight/100}元', style: TextStyle(fontSize: ScreenUtil.getInstance().setSp(24), color: Color.fromRGBO(155, 155, 155, 1)), ),
-                  ],
-                ),
-              ),
-              Padding(
-                padding: EdgeInsets.only(bottom: ScreenUtil.getInstance().setHeight(20)),
-                child: Container(
-                  height: ScreenUtil.getInstance().setHeight(1),
-                  color: Color.fromRGBO(223, 223, 223, 1),
-                ),
-              ),
-              Row(
+    return Card(
+      color: Colors.white,
+      child: Container(
+        padding: EdgeInsets.fromLTRB(ScreenUtil.getInstance().setWidth(30), ScreenUtil.getInstance().setWidth(30), ScreenUtil.getInstance().setWidth(30), ScreenUtil.getInstance().setWidth(20)),
+        child: Column(
+          children: < Widget > [
+            Padding(
+              padding: EdgeInsets.only(bottom: ScreenUtil.getInstance().setHeight(30)),
+              child: Row(
                 mainAxisAlignment: MainAxisAlignment.spaceBetween,
                 children: < Widget > [
-                  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) {
-                                //widget.callback(widget.index);
-                              } 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) {
-                                //widget.callback(widget.index);
-                              } 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) {
-                                //widget.callback(widget.index);
-                              } 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) {
-                                //widget.callback(widget.index);
-                              } 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) {
-                                print(val);
-                                Navigator.push(context, MaterialPageRoute(builder: (context) {
-                                  return OrderDetailPage(orderNo: obj.orderNo, );
-                                }));
-                              } else {
-                                return;
-                              }
-                            },
-                          );
-                        });
-                      print("改单");
-                    },
+                  Text('订单号：${obj.orderNo}', style: TextStyle(fontSize: ScreenUtil.getInstance().setSp(24), color: Color.fromRGBO(102, 102, 102, 1)), ),
+                  Text('${statusMap[obj.orderStatus]}', style: TextStyle(fontSize: ScreenUtil.getInstance().setSp(24), color: Color.fromRGBO(126, 211, 33, 1)), ),
+                ],
+              )
+            ),
+            Padding(
+              padding: EdgeInsets.only(bottom: ScreenUtil.getInstance().setHeight(20)),
+              child: Row(
+                children: < Widget > [
+                  Text('${obj.sendCompanyName} --> ${obj.receiptCompanyName}', style: TextStyle(fontSize: ScreenUtil.getInstance().setSp(30)), ),
+                ],
+              )
+            ),
+            Padding(
+              padding: EdgeInsets.only(bottom: ScreenUtil.getInstance().setHeight(15)),
+              child: Row(
+                children: < Widget > [
+                  SizedBox(
+                    width: ScreenUtil.getInstance().setWidth(355),
+                    child: Text('货物名称：${obj.goods}', style: TextStyle(fontSize: ScreenUtil.getInstance().setSp(24), color: Color.fromRGBO(155, 155, 155, 1)), ),
                   ),
-                  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) {
-                                //widget.callback(widget.index);
-                              } else {
-                                return;
-                              }
-                            },
-                          );
-                        });
-                      print("打印");
-                    },
+                  Text('代收款：${obj.goodsAgencyFund/100}元', style: TextStyle(fontSize: ScreenUtil.getInstance().setSp(24), color: Color.fromRGBO(155, 155, 155, 1)), ),
+                ],
+              ),
+            ),
+            Padding(
+              padding: EdgeInsets.only(bottom: ScreenUtil.getInstance().setHeight(30)),
+              child: Row(
+                children: < Widget > [
+                  SizedBox(
+                    width: ScreenUtil.getInstance().setWidth(355),
+                    child: Text('货物件数：${obj.goodsQuantity}件', style: TextStyle(fontSize: ScreenUtil.getInstance().setSp(24), color: Color.fromRGBO(155, 155, 155, 1)), ),
                   ),
+                  Text('运费：${obj.goodsFreight/100}元', style: TextStyle(fontSize: ScreenUtil.getInstance().setSp(24), color: Color.fromRGBO(155, 155, 155, 1)), ),
                 ],
-              )
-            ],
-          ),
-        )
-      ),
-      onTap: () {
-
-      },
+              ),
+            ),
+            Padding(
+              padding: EdgeInsets.only(bottom: ScreenUtil.getInstance().setHeight(20)),
+              child: Container(
+                height: ScreenUtil.getInstance().setHeight(1),
+                color: Color.fromRGBO(223, 223, 223, 1),
+              ),
+            ),
+            orderStatus == 1 ? _status1Fun(obj, index) : orderStatus == 2 ? _status2Fun(obj, index) : _status3Fun(obj, index)
+          ],
+        ),
+      )
     );
   }
 
   switchOrderFromStatus(int orderStatus, int page) {
+    setState(() {
+      orderList = null;
+    });
     fromStatusGetOrderList(orderStatus, page).then((resp) {
       if (isNotError(context, resp)) {
         FromStatusGetOrderObj tempObj = FromStatusGetOrderObj.fromJson(resp.data);
@@ -621,6 +416,292 @@ class _QueryWidgetState extends State < QueryWidget > {
     });
   }
 
+  Widget _status1Fun(FromStatusGetOrderList obj, int index) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: < Widget > [
+        InkWell(
+          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) {
+                      //widget.callback(widget.index);
+                    } else {
+                      return;
+                    }
+                  },
+                );
+              });
+            print("作废");
+          },
+        ),
+        InkWell(
+          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) {
+                      Navigator.push(
+                        context,
+                        MaterialPageRoute(
+                          builder: (BuildContext context) {
+                            return OrderDetailPage(orderNo: obj.orderNo);
+                          })
+                      ).then((resp) {
+                        if (resp == true) {
+                          orderList.removeAt(index);
+                          if (orderList.length < 4) {
+                            if (hasNextPage) {
+                              setState(() {
+                                page = ++page;
+                              });
+                              getMoreOrder(orderStatus, page);
+                            }
+                          }
+                        }
+                      });
+                    } else {
+                      return;
+                    }
+                  },
+                );
+              });
+            print("寄件");
+          },
+        ),
+      ],
+    );
+  }
+  Widget _status2Fun(FromStatusGetOrderList obj, int index) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.spaceBetween,
+      children: < Widget > [
+        InkWell(
+          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) {
+                      //widget.callback(widget.index);
+                    } else {
+                      return;
+                    }
+                  },
+                );
+              });
+            print("作废");
+          },
+        ),
+        InkWell(
+          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) {
+                      //widget.callback(widget.index);
+                    } else {
+                      return;
+                    }
+                  },
+                );
+              });
+            print("拒收");
+          },
+        ),
+        InkWell(
+          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) {
+                      //widget.callback(widget.index);
+                    } else {
+                      return;
+                    }
+                  },
+                );
+              });
+            print("签收");
+          },
+        ),
+        InkWell(
+          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) {
+                      Navigator.push(
+                        context,
+                        MaterialPageRoute(
+                          builder: (BuildContext context) {
+                            return OrderDetailPage(orderNo: obj.orderNo);
+                          })
+                      );
+                    } else {
+                      return;
+                    }
+                  },
+                );
+              });
+            print("改单");
+          },
+        ),
+        InkWell(
+          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) {
+                      //widget.callback(widget.index);
+                    } else {
+                      return;
+                    }
+                  },
+                );
+              });
+            print("打印");
+          },
+        ),
+      ],
+    );
+  }
+  Widget _status3Fun(FromStatusGetOrderList obj, int index) {
+    return Row(
+      mainAxisAlignment: MainAxisAlignment.end,
+      children: < Widget > [
+        InkWell(
+          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) {
+                      //widget.callback(widget.index);
+                    } else {
+                      return;
+                    }
+                  },
+                );
+              });
+            print("打印");
+          },
+        ),
+      ],
+    );
+  }
+
   Widget _getMoreWidget() {
     return Center(
       child: Padding(

lib/pages/order_management_page/order_detail_page.dart

@@ -256,7 +256,7 @@ class _ItemInfoWidgetState extends State < ItemInfoWidget > {
             return MyAlertDialog( //调用对话框
               text: '订单修改成功！', childCallback: (val) {
                 if(val){
-                  Navigator.pop(context);
+                  Navigator.pop(context,true);
                 }
               },
             );

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.9:8866/';
   int connectTimeout = 30000;
   int receiveTimeout = 30000;
 }