|
|
|
@ -249,11 +249,11 @@ class _OrderPageState extends State<OrderPage>
|
|
|
|
left: 13.0, right: 13.0),
|
|
|
|
left: 13.0, right: 13.0),
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
border: Border.all(
|
|
|
|
border: Border.all(
|
|
|
|
color: Colors.blue[700],
|
|
|
|
color: Color(0xFF4CAF50),
|
|
|
|
style: BorderStyle.solid,
|
|
|
|
style: BorderStyle.solid,
|
|
|
|
width: 5.0,
|
|
|
|
width: 5.0,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
color: Colors.blue[700],
|
|
|
|
color: Color(0xFF4CAF50),
|
|
|
|
borderRadius: BorderRadius.circular(
|
|
|
|
borderRadius: BorderRadius.circular(
|
|
|
|
30.0)),
|
|
|
|
30.0)),
|
|
|
|
child: deliveredOrderList[
|
|
|
|
child: deliveredOrderList[
|
|
|
|
@ -535,11 +535,11 @@ class _OrderPageState extends State<OrderPage>
|
|
|
|
left: 13.0, right: 13.0),
|
|
|
|
left: 13.0, right: 13.0),
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
decoration: BoxDecoration(
|
|
|
|
border: Border.all(
|
|
|
|
border: Border.all(
|
|
|
|
color: Colors.green,
|
|
|
|
color: Colors.grey[700],
|
|
|
|
style: BorderStyle.solid,
|
|
|
|
style: BorderStyle.solid,
|
|
|
|
width: 5.0,
|
|
|
|
width: 5.0,
|
|
|
|
),
|
|
|
|
),
|
|
|
|
color: Colors.green,
|
|
|
|
color: Colors.grey[700],
|
|
|
|
borderRadius: BorderRadius.circular(
|
|
|
|
borderRadius: BorderRadius.circular(
|
|
|
|
30.0)),
|
|
|
|
30.0)),
|
|
|
|
child: processingOrderList[
|
|
|
|
child: processingOrderList[
|
|
|
|
@ -1142,7 +1142,7 @@ class _OrderPageState extends State<OrderPage>
|
|
|
|
cancelledOrderList.clear();
|
|
|
|
cancelledOrderList.clear();
|
|
|
|
for (int i = 0; i < model.orders.length; i++) {
|
|
|
|
for (int i = 0; i < model.orders.length; i++) {
|
|
|
|
if (model.orders[i].orderStatusId == 40 ||
|
|
|
|
if (model.orders[i].orderStatusId == 40 ||
|
|
|
|
model.orders[i].orderStatus == 996 ||
|
|
|
|
model.orders[i].orderStatusId == 996 ||
|
|
|
|
model.orders[i].orderStatusId == 200) {
|
|
|
|
model.orders[i].orderStatusId == 200) {
|
|
|
|
cancelledOrderList.add(model.orders[i]);
|
|
|
|
cancelledOrderList.add(model.orders[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|