pay 修改

lib/home/home_page.dart

@@ -628,7 +628,7 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
         break;
       case 4:
         String router = bannerData.content;
-        // String router = "/router/store_order?{\"id\":\"1512378184161558528\",\"tenant\":\"1188\",\"storeName\":\"农场煮意\"}";
+        // String router = "/router/store_order?{"id":"1460885296764682240","tenant":"1179","storeName":"一心回乡商城"}";
         if (router.contains("?")) {
           String params = router.substring(router.indexOf("?") + 1);
           Map map = jsonDecode(params);

lib/main_page.dart

@@ -487,7 +487,7 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
               offset: Offset(0, 2),
               blurRadius: 4,
               spreadRadius: 0,
-            )
+            ),
           ],
           borderRadius: BorderRadius.vertical(
             top: Radius.circular(4),

lib/settlement/settlement_view/pay_method.dart

@@ -9,7 +9,6 @@ import 'package:shared_preferences/shared_preferences.dart';
 import '../../retrofit/data/min_order_info.dart';
 import '../../retrofit/data/settleOrderInfo.dart';
 import '../../view_widget/settlement_tips_dialog.dart';
-import '../../view_widget/tips_dialog.dart';
 
 class PayMethod extends StatefulWidget {
   final Function(int payChannel) payChannelCheck;
@@ -186,6 +185,13 @@ class _PayMethod extends State<PayMethod> {
           GestureDetector(
             behavior: HitTestBehavior.opaque,
             onTap: () {
+              double greenMoney = double.parse(mGreenMoney);
+              if (greenMoney == null) {
+                greenMoney = 0;
+              }
+              if (widget.settleOrderInfo.orderNum > greenMoney) {
+                return;
+              }
               setState(() {
                 checkIndex = 3;
                 // if(widget.promotions != "" || widget.coupons != "" || widget.useVipPriceSelect || widget.useBenefitSelect){
@@ -210,10 +216,7 @@ class _PayMethod extends State<PayMethod> {
               crossAxisAlignment: CrossAxisAlignment.center,
               children: [
                 checkView(3),
-                Expanded(
-                  child: Container(),
-                  flex: 1,
-                ),
+                Spacer(flex: 1,),
                 Text(
                   "¥$mGreenMoney",
                   style: TextStyle(
@@ -230,18 +233,18 @@ class _PayMethod extends State<PayMethod> {
                   S.of(context).lvbizhifu,
                   style: TextStyle(
                     fontSize: 14.sp,
-                    color: Color(0xff353535),
+                    color: widget.settleOrderInfo.orderNum > (double.parse(mGreenMoney) ?? 0) ? Color(0x66353535) : Color(0xff353535),
                     fontWeight: MyFontWeight.semi_bold,
                   ),
                 ),
               ],
             ),
           ),
-          if(mGreenMoney!="0.00" && (widget.tableId > 0 ? !(widget?.minOrderInfo?.isRaise ?? false) : !(widget?.settleOrderInfo?.isRaise ?? false)))
+          if(mGreenMoney != "0.00" && (widget.tableId > 0 ? !(widget?.minOrderInfo?.isRaise ?? false) : !(widget?.settleOrderInfo?.isRaise ?? false)))
           SizedBox(
             height: 10,
           ),
-          if(mRaiseMoney!="0" && (widget.tableId > 0? (widget?.minOrderInfo?.isRaise ?? false) : (widget?.settleOrderInfo?.isRaise ?? false)))
+          if(mRaiseMoney != "0" && (widget.tableId > 0 ? (widget?.minOrderInfo?.isRaise ?? false) : (widget?.settleOrderInfo?.isRaise ?? false)))
           GestureDetector(
             behavior: HitTestBehavior.opaque,
             onTap: () {
@@ -249,11 +252,11 @@ class _PayMethod extends State<PayMethod> {
                 checkIndex = 4;
                 if(widget.promotions != "" || widget.coupons != "" || widget.useVipPriceSelect || widget.useBenefitSelect){
                   SmartDialog.show(
-                      widget: SettlementTips(
-                            () {
-                        },
-                        text: "助农积分不参与任何活动优惠，请重新选择支付方式",
-                      ));
+                    widget: SettlementTips(
+                          () {},
+                      text: "助农积分不参与任何活动优惠，请重新选择支付方式",
+                    ),
+                  );
                   return;
                 }
               });