diff --git a/lib/pages/home/classify/order_prepay_page.dart b/lib/pages/home/classify/order_prepay_page.dart index 6709528..596a245 100644 --- a/lib/pages/home/classify/order_prepay_page.dart +++ b/lib/pages/home/classify/order_prepay_page.dart @@ -32,6 +32,7 @@ import 'package:recook/widgets/alert.dart'; import 'package:recook/widgets/custom_app_bar.dart'; import 'package:recook/widgets/custom_image_button.dart'; import 'package:recook/widgets/keyboard/bottom_keyboard_widget.dart'; +import 'package:recook/widgets/progress/re_toast.dart'; import 'package:recook/widgets/toast.dart'; class OrderPrepayPage extends StatefulWidget { @@ -329,7 +330,9 @@ class _OrderPrepayPageState extends BaseStoreState ), ), onPressed: !enable - ? null + ? () { + ReToast.err(text: '订单含跨境商品,无法使用余额支付'); + } : () { setState(() { _defaultPayIndex = index; diff --git a/lib/pages/home/classify/order_preview_page.dart b/lib/pages/home/classify/order_preview_page.dart index da61660..437b2a7 100644 --- a/lib/pages/home/classify/order_preview_page.dart +++ b/lib/pages/home/classify/order_preview_page.dart @@ -61,6 +61,9 @@ class _GoodsOrderPageState extends BaseStoreState { bool _accept = false; + ///瑞币抵扣按钮是否可以点击 + bool switchEnabled = true; + @override void initState() { super.initState(); @@ -576,17 +579,12 @@ class _GoodsOrderPageState extends BaseStoreState { ), Builder( builder: (context) { - bool switchEnabled = true; - switchEnabled = _orderModel.data.coinStatus.isEnable; - if (_checkSwitchEnabled) { - switchEnabled = false; - } return _titleRow( "瑞币抵扣", "", "本单抵扣: ¥${_orderModel.data.coinTotalAmount.toStringAsFixed(2)}", rightTitleColor: Colors.black, - switchValue: _orderModel.data.coinStatus.isUseCoin, + switchValue: _orderModel.data.coinStatus.isUseCoin,//后台回显 TODO: switchEnable: switchEnabled, switchChange: (change) { // 切换瑞币抵扣状态 @@ -755,7 +753,9 @@ class _GoodsOrderPageState extends BaseStoreState { activeColor: AppColor.priceColor, value: switchValue, onChanged: !switchEnable - ? null + ? (change) { + Toast.showError('订单含保税仓或海外仓商品,无法使用瑞币抵扣'); + } : (change) => switchChange(change)), ), Container( @@ -1036,7 +1036,7 @@ class _GoodsOrderPageState extends BaseStoreState { } _orderModel = model.data; if (_checkSwitchEnabled) { - Toast.showError('订单含保税仓或海外仓商品,无法使用瑞币抵扣'); + switchEnabled = false; } setState(() {}); }