huxiaoqiang преди 4 години
родител
ревизия
5026e9c29f

BIN
images/收款码logo.png


+ 0 - 26
lib/main.dart

@@ -289,18 +289,6 @@ class MyApp extends StatelessWidget with WidgetsBindingObserver {
               } catch (e) {}
             }
           });
-
-
-          // order.forEach((element) {
-          //   if (maxAmount < element.seller.amount) {
-          //     maxAmount = element.seller.amount;
-          //     maxAmountNum = 1;
-          //   } else if (maxAmount == element.seller.amount) {
-          //     maxAmountNum++;
-          //   }
-          // });
-          // print('maxAmount===========  $maxAmount');
-          // print('maxAmountNum===========  $maxAmountNum');
           if(maxAmountOwner.isNotEmpty){
             maxAmountOwner.forEach((element) {
               if(MyCookie().getName().contains(element)||element.contains(MyCookie().getName())){
@@ -308,20 +296,6 @@ class MyApp extends StatelessWidget with WidgetsBindingObserver {
               }
             });
           }
-          // int meIsMaximum = order.indexWhere((element) =>
-          //     element.seller.amount == maxAmount &&
-          //     (element.seller.name
-          //             .contains(MyCookie().loginInformation.data.extra.name) ||
-          //         MyCookie()
-          //             .loginInformation
-          //             .data
-          //             .extra
-          //             .name
-          //             .contains(element.seller.name)));
-          // print('meIsMaximum ===========  $meIsMaximum');
-          // if (meIsMaximum >= 0) {
-          //   commissionPayerNum = maxAmountNum;
-          // }
           print('maxAmount============\n$maxAmount\n==============');
           print('maxAmountNum==============\n$maxAmountNum\n==============');
           print('maxAmountOwner==============\n${maxAmountOwner.toString()}\n==============');

+ 4 - 0
lib/my_tools/order_processing/order_processing.dart

@@ -122,6 +122,9 @@ class OrderProcessing {
           if (orderHash != '') {
             showView();
             break x;
+          }else{
+              PopUpQueue().onShow = false;
+              PopUpQueue().showNext();
           }
         }
       } else {
@@ -158,6 +161,7 @@ class OrderProcessing {
         }
       }
     }
+
   }
 
   bool parseOrder(TemplateBeanData element) {

+ 1 - 7
lib/paegs/gang_page/qr_code_for_store_payment_page/qr_code_for_store_payment_page.dart

@@ -144,13 +144,7 @@ class _QRCodeForStorePaymentPageState extends State<QRCodeForStorePaymentPage> {
               child: Container(
                 width: MediaQuery.of(context).size.width,
                 color: Colors.white,
-                child: Text(
-                  '梆梆鱼',
-                  style: TextStyle(
-                      color: MyColors.cFF4233,
-                      fontSize: MediaQuery.of(context).size.width / 97 * 10,
-                      fontWeight: FontWeight.bold),
-                ),
+                child: Image.asset('images/收款码logo.png',height: MediaQuery.of(context).size.width / 97 * 10,),
                 alignment: Alignment.center,
               ),
             ),

+ 1 - 1
pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.1.05+1
+version: 1.1.06+1
 
 environment:
   sdk: ">=2.7.0 <3.0.0"