diff --git a/lib/order/bargain_group_order.dart b/lib/order/bargain_group_order.dart index cb991dc4..e77ab6e8 100644 --- a/lib/order/bargain_group_order.dart +++ b/lib/order/bargain_group_order.dart @@ -243,21 +243,6 @@ class _ExchangeHistoryList extends State { ); } - String orderStatus(state) { - String orderStatus = ""; - switch (state) { - case 1: - orderStatus = S.of(context).weiwancheng; - break; - case 2: - orderStatus = S.of(context).yiwancheng; - break; - case 9: - orderStatus = S.of(context).yiquxiao; - break; - } - return orderStatus; - } Widget bargainOrder(ActivityOrderList activityOrderList) { return Container( @@ -321,7 +306,7 @@ class _ExchangeHistoryList extends State { padding: EdgeInsets.only(top: 12.h, right: 12.w), child:Text( (widget.type == 1)?(widget.orderStatus == 4 ? "拼团失败" :(activityOrderList.howManyMore != 0 ? "还差${activityOrderList?.howManyMore ?? 0}人拼团成功" : "拼团成功")) - :(widget.orderStatus == 4 ? "砍价失败" : (activityOrderList.howManyMoney != "0.00" ? "还差¥${activityOrderList?.howManyMoney ?? 0}砍价成功" : "砍价成功")), + :(activityOrderList.actRecordState == 1 ? "待支付" :(widget.orderStatus == 4 ? "砍价失败" : (activityOrderList.howManyMoney != "0.00" ? "还差¥${activityOrderList?.howManyMoney ?? 0}砍价成功" : "砍价成功"))), style: TextStyle( fontSize: 14.sp, fontWeight: FontWeight.bold, @@ -464,6 +449,9 @@ class _ExchangeHistoryList extends State { "actRecordId": activityOrderList.actRecordId, "limitNumber":activityOrderList.successNumber, "storeInfo":storeInfo, + }).then((value) { + _refresh(); + setState(() {}); }); } }, diff --git a/lib/store/shopping/shopping_home/bargain_details.dart b/lib/store/shopping/shopping_home/bargain_details.dart index 83de3eab..a5aabe8b 100644 --- a/lib/store/shopping/shopping_home/bargain_details.dart +++ b/lib/store/shopping/shopping_home/bargain_details.dart @@ -535,8 +535,7 @@ class _BargainDetails extends State { ), ], ), - if (limitNumber == - (activityActRecordDetails?.actRecord?.joinNum ?? 0)) + if ((activityActRecordDetails?.actRecord?.state ?? 0) == 1) GestureDetector( onTap: (){ toOrder();