|
|
@@ -208,7 +208,7 @@ class _QueryWidgetState extends State < QueryWidget > {
|
|
|
child: Row(
|
|
|
mainAxisAlignment: MainAxisAlignment.spaceAround,
|
|
|
children: < Widget > [
|
|
|
- GestureDetector(
|
|
|
+ InkWell(
|
|
|
child: Container(
|
|
|
height: ScreenUtil.getInstance().setHeight(80),
|
|
|
decoration: BoxDecoration(
|
|
|
@@ -230,7 +230,7 @@ class _QueryWidgetState extends State < QueryWidget > {
|
|
|
}
|
|
|
},
|
|
|
),
|
|
|
- GestureDetector(
|
|
|
+ InkWell(
|
|
|
child: Container(
|
|
|
height: ScreenUtil.getInstance().setHeight(80),
|
|
|
decoration: BoxDecoration(
|
|
|
@@ -252,7 +252,7 @@ class _QueryWidgetState extends State < QueryWidget > {
|
|
|
}
|
|
|
},
|
|
|
),
|
|
|
- GestureDetector(
|
|
|
+ InkWell(
|
|
|
child: Container(
|
|
|
height: ScreenUtil.getInstance().setHeight(80),
|
|
|
decoration: BoxDecoration(
|
|
|
@@ -376,78 +376,82 @@ class _QueryWidgetState extends State < QueryWidget > {
|
|
|
5: '已作废',
|
|
|
6: '已取消'
|
|
|
};
|
|
|
- return InkWell(
|
|
|
- child: Card(
|
|
|
+ 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 > [
|
|
|
- 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:obj.orderStatus==5?Colors.red:Color.fromRGBO(126, 211, 33, 1)), ),
|
|
|
- ],
|
|
|
- )
|
|
|
- ),
|
|
|
- Padding(
|
|
|
- padding: EdgeInsets.only(bottom: ScreenUtil.getInstance().setHeight(20)),
|
|
|
- child: Row(
|
|
|
- children: < Widget > [
|
|
|
- Text('${obj.sendCompanyName} --> ${obj.receiptCompanyName}',
|
|
|
- overflow: TextOverflow.ellipsis,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)), ),
|
|
|
+ InkWell(
|
|
|
+ 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:obj.orderStatus==5?Colors.red:Color.fromRGBO(126, 211, 33, 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)), ),
|
|
|
+ Padding(
|
|
|
+ padding: EdgeInsets.only(bottom: ScreenUtil.getInstance().setHeight(20)),
|
|
|
+ child: Row(
|
|
|
+ children: < Widget > [
|
|
|
+ Text('${obj.sendCompanyName} --> ${obj.receiptCompanyName}',
|
|
|
+ overflow: TextOverflow.ellipsis,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),
|
|
|
+ ),
|
|
|
),
|
|
|
- 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),
|
|
|
- ),
|
|
|
+ onTap: () {
|
|
|
+ Navigator.push(
|
|
|
+ context,
|
|
|
+ MaterialPageRoute(
|
|
|
+ builder: (BuildContext context) {
|
|
|
+ return OrderDetailsPage(orderNo: obj.orderNo);
|
|
|
+ })
|
|
|
+ );
|
|
|
+ },
|
|
|
),
|
|
|
orderStatus == 1 ? _status1Fun(obj, index) : orderStatus == 2 ? _status2Fun(obj, index) : _status3Fun(obj, index)
|
|
|
],
|
|
|
),
|
|
|
)
|
|
|
- ),
|
|
|
- onTap: () {
|
|
|
- Navigator.push(
|
|
|
- context,
|
|
|
- MaterialPageRoute(
|
|
|
- builder: (BuildContext context) {
|
|
|
- return OrderDetailsPage(orderNo: obj.orderNo);
|
|
|
- })
|
|
|
- );
|
|
|
- },
|
|
|
- );
|
|
|
+ );
|
|
|
}
|
|
|
|
|
|
Widget _status1Fun(FromStatusGetOrderList obj, int index) {
|