11

lib/common/widgets/order/mixin/order_mixin.dart

@@ -454,6 +454,19 @@ mixin OrderMixin {
   /// **************** start 副屏幕相关 start ****************
 
   void putOffSendSubScreen({int seconds = 5}) {
+    // 如果有商品就不反回
+    if (_sysType == SysType.SUPERMARKET) {
+      if (supermarketSpuList.isNotEmpty) {
+        putOffSendSubScreenDelayed = null;
+        return;
+      }
+    }
+    if (_sysType == SysType.CANTEEN) {
+      if (canteenSpuList.isNotEmpty) {
+        putOffSendSubScreenDelayed = null;
+        return;
+      }
+    }
     if (putOffSendSubScreenDelayed != null) {
       sendSubScreenBack();
       putOffSendSubScreenDelayed = null;
@@ -472,9 +485,6 @@ mixin OrderMixin {
   }
 
   Future<void> sendSubScreen() async {
-    await SubScreenPlugin.sendMsgToViceScreen(
-      SubScreenAction.jumpSubPage.name,
-    );
     final json = SubScreenProductEvent(
       shopList: shopCardList.map((e) => e.toJson()).toList(),
       sysType: _sysType,