修复 瑞币抵扣显示

lib/pages/home/classify/order_preview_page.dart

@@ -18,6 +18,7 @@ import 'package:recook/constants/header.dart';
 import 'package:recook/manager/user_manager.dart';
 import 'package:recook/models/address_list_model.dart';
 import 'package:recook/models/base_model.dart';
+import 'package:recook/models/order_list_model.dart';
 import 'package:recook/models/order_prepay_model.dart';
 import 'package:recook/models/order_preview_model.dart';
 import 'package:recook/models/self_pickup_store_list_model.dart';
@@ -65,7 +66,16 @@ class _GoodsOrderPageState extends BaseStoreState<GoodsOrderPage> {
   bool _accept = false;
 
   ///瑞币抵扣按钮是否可以点击
-  bool switchEnabled = true;
+  bool get switchEnabled {
+    if (_checkSwitchEnabled) {
+      return false;
+    }
+
+    return _orderModel.data?.coinStatus?.isEnable ?? true;
+  }
+
+  //瑞币按钮状态
+  bool get isUseCoin => _orderModel.data?.coinStatus?.isUseCoin ?? false;
 
   @override
   void initState() {
@@ -591,9 +601,9 @@ class _GoodsOrderPageState extends BaseStoreState<GoodsOrderPage> {
               return _titleRow(
                 "瑞币",
                 text,
-                "本单抵扣: ￥${coin.toStringAsFixed(2)}",
+                "本单抵扣: ￥${isUseCoin ? coin.toStringAsFixed(2) : '0.00'}",
                 rightTitleColor: Colors.black,
-                switchValue: _orderModel.data.coinStatus.isUseCoin, //后台回显 TODO:
+                switchValue: isUseCoin, //后台回显 TODO:
                 switchEnable: switchEnabled,
                 switchChange: (change) {
                   // 切换瑞币抵扣状态
@@ -727,8 +737,7 @@ class _GoodsOrderPageState extends BaseStoreState<GoodsOrderPage> {
                 style: titleColor != null
                     ? AppTextStyle.generate(27.sp,
                         color: titleColor, fontWeight: FontWeight.w400)
-                    : AppTextStyle.generate(27.sp,
+                    : AppTextStyle.generate(27.sp, fontWeight: FontWeight.w400),
-                        fontWeight: FontWeight.w400),
               )),
           Expanded(
             child: Text(
@@ -765,7 +774,8 @@ class _GoodsOrderPageState extends BaseStoreState<GoodsOrderPage> {
                       value: switchValue,
                       onChanged: !switchEnable
                           ? (change) {
-                              Toast.showError('订单含保税仓或海外仓商品，无法使用瑞币抵扣');
+                              // ReToast.err(text: '订单含保税仓或海外仓商品，无法使用瑞币抵扣');
+                              switchChange(change);
                             }
                           : (change) => switchChange(change)),
                 ),
@@ -1056,9 +1066,6 @@ class _GoodsOrderPageState extends BaseStoreState<GoodsOrderPage> {
       return;
     }
     _orderModel = model.data;
-    if (_checkSwitchEnabled) {
-      switchEnabled = false;
-    }
     setState(() {});
   }
 

lib/pages/lottery/lottery_cart_page.dart

@@ -17,6 +17,7 @@ import 'package:recook/pages/lottery/widget/lottery_grid_view.dart';
 import 'package:recook/pages/lottery/widget/lottery_scaffold.dart';
 import 'package:recook/widgets/alert.dart';
 import 'package:recook/widgets/custom_image_button.dart';
+import 'package:recook/widgets/progress/re_toast.dart';
 
 class LotteryCartPage extends StatefulWidget {
   final bool isDouble;
@@ -339,8 +340,7 @@ class _LotteryCartPageState extends State<LotteryCartPage> {
       params,
     );
     if (resultData.data['code'] == "SUCCESS") {
-      GSDialog.of(context).dismiss(context);
+      ReToast.success(text: '下单成功');
-      showToast('下单成功');
       LotteryCartStore.clear(widget.isDouble
           ? LotteryType.DOUBLE_LOTTERY
           : LotteryType.BIG_LOTTERY);
@@ -349,8 +349,7 @@ class _LotteryCartPageState extends State<LotteryCartPage> {
       Navigator.pop(context);
     } else {
       Navigator.pop(context);
-      GSDialog.of(context).dismiss(context);
+      ReToast.err(text: '兑换失败');
-      showToast('兑换失败');
     }
   }
 

lib/pages/shopping_cart/shopping_cart_page.dart

@@ -26,6 +26,7 @@ import 'package:recook/widgets/alert.dart';
 import 'package:recook/widgets/custom_image_button.dart';
 import 'package:recook/widgets/mvp_list_view/mvp_list_view.dart';
 import 'package:recook/widgets/mvp_list_view/mvp_list_view_contact.dart';
+import 'package:recook/widgets/progress/re_toast.dart';
 import 'package:recook/widgets/toast.dart';
 
 class ShoppingCartPage extends StatefulWidget {
@@ -251,7 +252,7 @@ class _ShoppingCartPageState extends BaseStoreState<ShoppingCartPage>
             Toast.showInfo("您还没有选择商品");
             return;
           }
-          GSDialog.of(context).showLoadingDialog(_context, "");
+          ReToast.loading();
           _presenter.submitOrder(
               UserManager.instance.user.info.id,
               _selectedGoods.map<int>((goods) {
@@ -464,7 +465,6 @@ class _ShoppingCartPageState extends BaseStoreState<ShoppingCartPage>
 
   @override
   void submitOrderSuccess(OrderPreviewModel model) {
-    GSDialog.of(context).dismiss(_context);
     AppRouter.push(context, RouteName.GOODS_ORDER_PAGE,
             arguments: GoodsOrderPage.setArguments(model))
         .then((value) {
@@ -480,7 +480,6 @@ class _ShoppingCartPageState extends BaseStoreState<ShoppingCartPage>
 
   @override
   void failure(String msg) {
-    GSDialog.of(context).dismiss(_context);
+    ReToast.err(text: msg);
-    GSDialog.of(context).showError(globalContext, msg);
   }
 }

lib/widgets/progress/sc_dialog.dart

@@ -10,7 +10,7 @@
 import 'package:flutter/material.dart';
 
 import 'package:recook/widgets/progress/loading_dialog.dart';
-
+@Deprecated('use Retoast or Toast instead')
 class GSDialog {
   static Map<BuildContext, GSDialog> dialogs = Map();