diff --git a/.dart_tool/package_config.json b/.dart_tool/package_config.json index ea57ae0..19b9fc0 100644 --- a/.dart_tool/package_config.json +++ b/.dart_tool/package_config.json @@ -61,6 +61,12 @@ "packageUri": "lib/", "languageVersion": "2.12" }, + { + "name": "flutter_custom_dialog", + "rootUri": "file:///Users/zhangmanman/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_custom_dialog-1.2.0", + "packageUri": "lib/", + "languageVersion": "2.12" + }, { "name": "flutter_lints", "rootUri": "file:///Users/zhangmanman/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_lints-1.0.4", @@ -200,7 +206,7 @@ "languageVersion": "2.16" } ], - "generated": "2022-06-02T07:53:46.018758Z", + "generated": "2022-06-06T06:44:16.766050Z", "generator": "pub", "generatorVersion": "2.16.2" } diff --git a/.dart_tool/package_config_subset b/.dart_tool/package_config_subset index 3958dec..71ff514 100644 --- a/.dart_tool/package_config_subset +++ b/.dart_tool/package_config_subset @@ -38,6 +38,10 @@ fake_async 2.12 file:///Users/zhangmanman/flutter/.pub-cache/hosted/pub.flutter-io.cn/fake_async-1.2.0/ file:///Users/zhangmanman/flutter/.pub-cache/hosted/pub.flutter-io.cn/fake_async-1.2.0/lib/ +flutter_custom_dialog +2.12 +file:///Users/zhangmanman/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_custom_dialog-1.2.0/ +file:///Users/zhangmanman/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_custom_dialog-1.2.0/lib/ flutter_lints 2.12 file:///Users/zhangmanman/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_lints-1.0.4/ diff --git a/.packages b/.packages index 9426763..5ee9f18 100644 --- a/.packages +++ b/.packages @@ -3,7 +3,7 @@ # # For more info see: https://dart.dev/go/dot-packages-deprecation # -# Generated by pub on 2022-06-02 15:53:46.001080. +# Generated by pub on 2022-06-06 14:44:16.749790. async:file:///Users/zhangmanman/flutter/.pub-cache/hosted/pub.flutter-io.cn/async-2.8.2/lib/ boolean_selector:file:///Users/zhangmanman/flutter/.pub-cache/hosted/pub.flutter-io.cn/boolean_selector-2.1.0/lib/ characters:file:///Users/zhangmanman/flutter/.pub-cache/hosted/pub.flutter-io.cn/characters-1.2.0/lib/ @@ -14,6 +14,7 @@ cupertino_icons:file:///Users/zhangmanman/flutter/.pub-cache/hosted/pub.flutter- dio:file:///Users/zhangmanman/flutter/.pub-cache/hosted/pub.flutter-io.cn/dio-4.0.6/lib/ fake_async:file:///Users/zhangmanman/flutter/.pub-cache/hosted/pub.flutter-io.cn/fake_async-1.2.0/lib/ flutter:file:///Users/zhangmanman/flutter/packages/flutter/lib/ +flutter_custom_dialog:file:///Users/zhangmanman/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_custom_dialog-1.2.0/lib/ flutter_lints:file:///Users/zhangmanman/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_lints-1.0.4/lib/ flutter_pickers:file:///Users/zhangmanman/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_pickers-2.1.9/lib/ flutter_slidable:file:///Users/zhangmanman/flutter/.pub-cache/hosted/pub.flutter-io.cn/flutter_slidable-1.3.0/lib/ diff --git a/assets/images/order/icon_order_null.png b/assets/images/order/icon_order_null.png new file mode 100644 index 0000000..19d5598 Binary files /dev/null and b/assets/images/order/icon_order_null.png differ diff --git a/assets/images/order/icon_order_success.png b/assets/images/order/icon_order_success.png new file mode 100644 index 0000000..2491a56 Binary files /dev/null and b/assets/images/order/icon_order_success.png differ diff --git a/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill b/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill index c22ad1e..7426125 100644 Binary files a/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill and b/build/c075001b96339384a97db4862b8ab8db.cache.dill.track.dill differ diff --git a/build/ios/Debug-iphonesimulator/App.framework/App b/build/ios/Debug-iphonesimulator/App.framework/App index fde6032..4485936 100755 Binary files a/build/ios/Debug-iphonesimulator/App.framework/App and b/build/ios/Debug-iphonesimulator/App.framework/App differ diff --git a/build/ios/Debug-iphonesimulator/App.framework/_CodeSignature/CodeResources b/build/ios/Debug-iphonesimulator/App.framework/_CodeSignature/CodeResources index b778af2..4ab9a1d 100644 --- a/build/ios/Debug-iphonesimulator/App.framework/_CodeSignature/CodeResources +++ b/build/ios/Debug-iphonesimulator/App.framework/_CodeSignature/CodeResources @@ -10,7 +10,7 @@ flutter_assets/AssetManifest.json - WizTOW6x2/RinR0bKkhfXoeoJx4= + 1sOsTvhxKw99Hx2cRjBljHUJB5c= flutter_assets/FontManifest.json @@ -18,7 +18,7 @@ flutter_assets/NOTICES.Z - 7myYrVyGqTThsMJAn8T6O0Mdghg= + 0mLRTK4qWTtgSCa0XfL/0CuMYCQ= flutter_assets/assets/icons/order_icon_00.png @@ -44,6 +44,18 @@ WeT8G1QDNyrGRQikaR2IGrRvsD8= + flutter_assets/assets/images/order/icon_order_null.png + + Uu7xcfWU71VztYDTRuNzqPRvqGs= + + flutter_assets/assets/images/order/icon_order_success.png + + sxjr9ZcIGCoXZ3yC/aLqSpGzJ2Q= + + flutter_assets/assets/images/order/icon_order_sucess.png + + sxjr9ZcIGCoXZ3yC/aLqSpGzJ2Q= + flutter_assets/assets/images/search.png bbW0EKFzhnRZv1DDPt08Hk6bU+U= @@ -118,11 +130,7 @@ flutter_assets/kernel_blob.bin - 82pSRvynToE3XuZn/j7IN1LxFBc= - - flutter_assets/packages/address_picker/assets/address.json - - kgyuZt7qczl2PaHzg5n/68liJ/o= + l8d5keZY1KLx7iKI8dlPM/8F6R0= flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf @@ -139,11 +147,11 @@ hash - WizTOW6x2/RinR0bKkhfXoeoJx4= + 1sOsTvhxKw99Hx2cRjBljHUJB5c= hash2 - VLxYKoE+uRVZeDTet7QRMm8DQ9kUFgHsD/txlHMZTEw= + JNmjsnkNXL8KvWm/J15qfXGlNQ9X8l275TLwldQyyCA= flutter_assets/FontManifest.json @@ -161,11 +169,11 @@ hash - 7myYrVyGqTThsMJAn8T6O0Mdghg= + 0mLRTK4qWTtgSCa0XfL/0CuMYCQ= hash2 - D0VvBnitr/dBYuk47JePe7wvSJwCOLniFji07Niu5KA= + Vj5e3D60c5MxGaGOqo4NfKbfAXfbXYYma57et7dIWKs= flutter_assets/assets/icons/order_icon_00.png @@ -223,6 +231,39 @@ F/uUnCCGE7yndHTmhkCKDSKaRROI62vsfaEM035x9sc= + flutter_assets/assets/images/order/icon_order_null.png + + hash + + Uu7xcfWU71VztYDTRuNzqPRvqGs= + + hash2 + + qtyJFHGAmZHyL6c77vFLzs06x1M0uGUfEtEAaaUsBS4= + + + flutter_assets/assets/images/order/icon_order_success.png + + hash + + sxjr9ZcIGCoXZ3yC/aLqSpGzJ2Q= + + hash2 + + c4wySsehvqIo8Zk5X7c4aUL48MJdmgEXr2tcciPMLlE= + + + flutter_assets/assets/images/order/icon_order_sucess.png + + hash + + sxjr9ZcIGCoXZ3yC/aLqSpGzJ2Q= + + hash2 + + c4wySsehvqIo8Zk5X7c4aUL48MJdmgEXr2tcciPMLlE= + + flutter_assets/assets/images/search.png hash @@ -425,22 +466,11 @@ hash - 82pSRvynToE3XuZn/j7IN1LxFBc= + l8d5keZY1KLx7iKI8dlPM/8F6R0= hash2 - YoBNf5RvniHs1Q2W36/9OpdC/HRZUw74lK9e/g0ISdg= - - - flutter_assets/packages/address_picker/assets/address.json - - hash - - kgyuZt7qczl2PaHzg5n/68liJ/o= - - hash2 - - uJgJoe9h1lFDKa1Kz1PuV4JTZjriibquVGCe3UspM3Q= + PbCxbgSr03xuoHF6okSWNtHnrEmO4/hIUmZX5MRLpY4= flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf diff --git a/build/ios/Debug-iphonesimulator/App.framework/flutter_assets/AssetManifest.json b/build/ios/Debug-iphonesimulator/App.framework/flutter_assets/AssetManifest.json index a133299..307b8d2 100644 --- a/build/ios/Debug-iphonesimulator/App.framework/flutter_assets/AssetManifest.json +++ b/build/ios/Debug-iphonesimulator/App.framework/flutter_assets/AssetManifest.json @@ -1 +1 @@ -{"assets/icons/order_icon_00.png":["assets/icons/order_icon_00.png"],"assets/images/.DS_Store":["assets/images/.DS_Store"],"assets/images/5fbf2512c344f.jpg":["assets/images/5fbf2512c344f.jpg"],"assets/images/banner.png":["assets/images/banner.png"],"assets/images/detail.png":["assets/images/detail.png"],"assets/images/location.png":["assets/images/location.png"],"assets/images/search.png":["assets/images/search.png"],"assets/images/select_1.png":["assets/images/select_1.png"],"assets/images/top.png":["assets/images/top.png"],"assets/images/vip_bg.png":["assets/images/vip_bg.png"],"assets/images/vip_item_1.png":["assets/images/vip_item_1.png"],"assets/images/vip_item_2.png":["assets/images/vip_item_2.png"],"assets/images/vip_item_3.png":["assets/images/vip_item_3.png"],"assets/images/vip_item_4.png":["assets/images/vip_item_4.png"],"assets/images/vip_role.png":["assets/images/vip_role.png"],"assets/login/auth_bg.png":["assets/login/auth_bg.png"],"assets/tabBar/tabBar_00.png":["assets/tabBar/tabBar_00.png"],"assets/tabBar/tabBar_01.png":["assets/tabBar/tabBar_01.png"],"assets/tabBar/tabBar_02.png":["assets/tabBar/tabBar_02.png"],"assets/tabBar/tabBar_show_00.png":["assets/tabBar/tabBar_show_00.png"],"assets/tabBar/tabBar_show_01.png":["assets/tabBar/tabBar_show_01.png"],"assets/tabBar/tabBar_show_02.png":["assets/tabBar/tabBar_show_02.png"],"packages/address_picker/assets/address.json":["packages/address_picker/assets/address.json"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]} \ No newline at end of file +{"assets/icons/order_icon_00.png":["assets/icons/order_icon_00.png"],"assets/images/.DS_Store":["assets/images/.DS_Store"],"assets/images/5fbf2512c344f.jpg":["assets/images/5fbf2512c344f.jpg"],"assets/images/banner.png":["assets/images/banner.png"],"assets/images/detail.png":["assets/images/detail.png"],"assets/images/location.png":["assets/images/location.png"],"assets/images/order/icon_order_null.png":["assets/images/order/icon_order_null.png"],"assets/images/order/icon_order_success.png":["assets/images/order/icon_order_success.png"],"assets/images/search.png":["assets/images/search.png"],"assets/images/select_1.png":["assets/images/select_1.png"],"assets/images/top.png":["assets/images/top.png"],"assets/images/vip_bg.png":["assets/images/vip_bg.png"],"assets/images/vip_item_1.png":["assets/images/vip_item_1.png"],"assets/images/vip_item_2.png":["assets/images/vip_item_2.png"],"assets/images/vip_item_3.png":["assets/images/vip_item_3.png"],"assets/images/vip_item_4.png":["assets/images/vip_item_4.png"],"assets/images/vip_role.png":["assets/images/vip_role.png"],"assets/login/auth_bg.png":["assets/login/auth_bg.png"],"assets/tabBar/tabBar_00.png":["assets/tabBar/tabBar_00.png"],"assets/tabBar/tabBar_01.png":["assets/tabBar/tabBar_01.png"],"assets/tabBar/tabBar_02.png":["assets/tabBar/tabBar_02.png"],"assets/tabBar/tabBar_show_00.png":["assets/tabBar/tabBar_show_00.png"],"assets/tabBar/tabBar_show_01.png":["assets/tabBar/tabBar_show_01.png"],"assets/tabBar/tabBar_show_02.png":["assets/tabBar/tabBar_show_02.png"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]} \ No newline at end of file diff --git a/build/ios/Debug-iphonesimulator/App.framework/flutter_assets/NOTICES.Z b/build/ios/Debug-iphonesimulator/App.framework/flutter_assets/NOTICES.Z index af86d03..8537645 100644 Binary files a/build/ios/Debug-iphonesimulator/App.framework/flutter_assets/NOTICES.Z and b/build/ios/Debug-iphonesimulator/App.framework/flutter_assets/NOTICES.Z differ diff --git a/build/ios/Debug-iphonesimulator/App.framework/flutter_assets/kernel_blob.bin b/build/ios/Debug-iphonesimulator/App.framework/flutter_assets/kernel_blob.bin index e7443ba..f912004 100644 Binary files a/build/ios/Debug-iphonesimulator/App.framework/flutter_assets/kernel_blob.bin and b/build/ios/Debug-iphonesimulator/App.framework/flutter_assets/kernel_blob.bin differ diff --git a/build/ios/Debug-iphonesimulator/Runner.app/Assets.car b/build/ios/Debug-iphonesimulator/Runner.app/Assets.car index b1894a2..3cb0d97 100644 Binary files a/build/ios/Debug-iphonesimulator/Runner.app/Assets.car and b/build/ios/Debug-iphonesimulator/Runner.app/Assets.car differ diff --git a/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/App b/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/App index fde6032..4485936 100755 Binary files a/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/App and b/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/App differ diff --git a/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources b/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources index b778af2..4ab9a1d 100644 --- a/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources +++ b/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources @@ -10,7 +10,7 @@ flutter_assets/AssetManifest.json - WizTOW6x2/RinR0bKkhfXoeoJx4= + 1sOsTvhxKw99Hx2cRjBljHUJB5c= flutter_assets/FontManifest.json @@ -18,7 +18,7 @@ flutter_assets/NOTICES.Z - 7myYrVyGqTThsMJAn8T6O0Mdghg= + 0mLRTK4qWTtgSCa0XfL/0CuMYCQ= flutter_assets/assets/icons/order_icon_00.png @@ -44,6 +44,18 @@ WeT8G1QDNyrGRQikaR2IGrRvsD8= + flutter_assets/assets/images/order/icon_order_null.png + + Uu7xcfWU71VztYDTRuNzqPRvqGs= + + flutter_assets/assets/images/order/icon_order_success.png + + sxjr9ZcIGCoXZ3yC/aLqSpGzJ2Q= + + flutter_assets/assets/images/order/icon_order_sucess.png + + sxjr9ZcIGCoXZ3yC/aLqSpGzJ2Q= + flutter_assets/assets/images/search.png bbW0EKFzhnRZv1DDPt08Hk6bU+U= @@ -118,11 +130,7 @@ flutter_assets/kernel_blob.bin - 82pSRvynToE3XuZn/j7IN1LxFBc= - - flutter_assets/packages/address_picker/assets/address.json - - kgyuZt7qczl2PaHzg5n/68liJ/o= + l8d5keZY1KLx7iKI8dlPM/8F6R0= flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf @@ -139,11 +147,11 @@ hash - WizTOW6x2/RinR0bKkhfXoeoJx4= + 1sOsTvhxKw99Hx2cRjBljHUJB5c= hash2 - VLxYKoE+uRVZeDTet7QRMm8DQ9kUFgHsD/txlHMZTEw= + JNmjsnkNXL8KvWm/J15qfXGlNQ9X8l275TLwldQyyCA= flutter_assets/FontManifest.json @@ -161,11 +169,11 @@ hash - 7myYrVyGqTThsMJAn8T6O0Mdghg= + 0mLRTK4qWTtgSCa0XfL/0CuMYCQ= hash2 - D0VvBnitr/dBYuk47JePe7wvSJwCOLniFji07Niu5KA= + Vj5e3D60c5MxGaGOqo4NfKbfAXfbXYYma57et7dIWKs= flutter_assets/assets/icons/order_icon_00.png @@ -223,6 +231,39 @@ F/uUnCCGE7yndHTmhkCKDSKaRROI62vsfaEM035x9sc= + flutter_assets/assets/images/order/icon_order_null.png + + hash + + Uu7xcfWU71VztYDTRuNzqPRvqGs= + + hash2 + + qtyJFHGAmZHyL6c77vFLzs06x1M0uGUfEtEAaaUsBS4= + + + flutter_assets/assets/images/order/icon_order_success.png + + hash + + sxjr9ZcIGCoXZ3yC/aLqSpGzJ2Q= + + hash2 + + c4wySsehvqIo8Zk5X7c4aUL48MJdmgEXr2tcciPMLlE= + + + flutter_assets/assets/images/order/icon_order_sucess.png + + hash + + sxjr9ZcIGCoXZ3yC/aLqSpGzJ2Q= + + hash2 + + c4wySsehvqIo8Zk5X7c4aUL48MJdmgEXr2tcciPMLlE= + + flutter_assets/assets/images/search.png hash @@ -425,22 +466,11 @@ hash - 82pSRvynToE3XuZn/j7IN1LxFBc= + l8d5keZY1KLx7iKI8dlPM/8F6R0= hash2 - YoBNf5RvniHs1Q2W36/9OpdC/HRZUw74lK9e/g0ISdg= - - - flutter_assets/packages/address_picker/assets/address.json - - hash - - kgyuZt7qczl2PaHzg5n/68liJ/o= - - hash2 - - uJgJoe9h1lFDKa1Kz1PuV4JTZjriibquVGCe3UspM3Q= + PbCxbgSr03xuoHF6okSWNtHnrEmO4/hIUmZX5MRLpY4= flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf diff --git a/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/AssetManifest.json b/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/AssetManifest.json index a133299..307b8d2 100644 --- a/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/AssetManifest.json +++ b/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/AssetManifest.json @@ -1 +1 @@ -{"assets/icons/order_icon_00.png":["assets/icons/order_icon_00.png"],"assets/images/.DS_Store":["assets/images/.DS_Store"],"assets/images/5fbf2512c344f.jpg":["assets/images/5fbf2512c344f.jpg"],"assets/images/banner.png":["assets/images/banner.png"],"assets/images/detail.png":["assets/images/detail.png"],"assets/images/location.png":["assets/images/location.png"],"assets/images/search.png":["assets/images/search.png"],"assets/images/select_1.png":["assets/images/select_1.png"],"assets/images/top.png":["assets/images/top.png"],"assets/images/vip_bg.png":["assets/images/vip_bg.png"],"assets/images/vip_item_1.png":["assets/images/vip_item_1.png"],"assets/images/vip_item_2.png":["assets/images/vip_item_2.png"],"assets/images/vip_item_3.png":["assets/images/vip_item_3.png"],"assets/images/vip_item_4.png":["assets/images/vip_item_4.png"],"assets/images/vip_role.png":["assets/images/vip_role.png"],"assets/login/auth_bg.png":["assets/login/auth_bg.png"],"assets/tabBar/tabBar_00.png":["assets/tabBar/tabBar_00.png"],"assets/tabBar/tabBar_01.png":["assets/tabBar/tabBar_01.png"],"assets/tabBar/tabBar_02.png":["assets/tabBar/tabBar_02.png"],"assets/tabBar/tabBar_show_00.png":["assets/tabBar/tabBar_show_00.png"],"assets/tabBar/tabBar_show_01.png":["assets/tabBar/tabBar_show_01.png"],"assets/tabBar/tabBar_show_02.png":["assets/tabBar/tabBar_show_02.png"],"packages/address_picker/assets/address.json":["packages/address_picker/assets/address.json"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]} \ No newline at end of file +{"assets/icons/order_icon_00.png":["assets/icons/order_icon_00.png"],"assets/images/.DS_Store":["assets/images/.DS_Store"],"assets/images/5fbf2512c344f.jpg":["assets/images/5fbf2512c344f.jpg"],"assets/images/banner.png":["assets/images/banner.png"],"assets/images/detail.png":["assets/images/detail.png"],"assets/images/location.png":["assets/images/location.png"],"assets/images/order/icon_order_null.png":["assets/images/order/icon_order_null.png"],"assets/images/order/icon_order_success.png":["assets/images/order/icon_order_success.png"],"assets/images/search.png":["assets/images/search.png"],"assets/images/select_1.png":["assets/images/select_1.png"],"assets/images/top.png":["assets/images/top.png"],"assets/images/vip_bg.png":["assets/images/vip_bg.png"],"assets/images/vip_item_1.png":["assets/images/vip_item_1.png"],"assets/images/vip_item_2.png":["assets/images/vip_item_2.png"],"assets/images/vip_item_3.png":["assets/images/vip_item_3.png"],"assets/images/vip_item_4.png":["assets/images/vip_item_4.png"],"assets/images/vip_role.png":["assets/images/vip_role.png"],"assets/login/auth_bg.png":["assets/login/auth_bg.png"],"assets/tabBar/tabBar_00.png":["assets/tabBar/tabBar_00.png"],"assets/tabBar/tabBar_01.png":["assets/tabBar/tabBar_01.png"],"assets/tabBar/tabBar_02.png":["assets/tabBar/tabBar_02.png"],"assets/tabBar/tabBar_show_00.png":["assets/tabBar/tabBar_show_00.png"],"assets/tabBar/tabBar_show_01.png":["assets/tabBar/tabBar_show_01.png"],"assets/tabBar/tabBar_show_02.png":["assets/tabBar/tabBar_show_02.png"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]} \ No newline at end of file diff --git a/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/NOTICES.Z b/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/NOTICES.Z index af86d03..8537645 100644 Binary files a/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/NOTICES.Z and b/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/NOTICES.Z differ diff --git a/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/kernel_blob.bin b/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/kernel_blob.bin index e7443ba..f912004 100644 Binary files a/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/kernel_blob.bin and b/build/ios/Debug-iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/kernel_blob.bin differ diff --git a/build/ios/Debug-iphonesimulator/Runner.app/Info.plist b/build/ios/Debug-iphonesimulator/Runner.app/Info.plist index 8977342..ed5eeba 100644 Binary files a/build/ios/Debug-iphonesimulator/Runner.app/Info.plist and b/build/ios/Debug-iphonesimulator/Runner.app/Info.plist differ diff --git a/build/ios/Debug-iphonesimulator/Runner.app/Runner b/build/ios/Debug-iphonesimulator/Runner.app/Runner index 48ed2b2..1496240 100755 Binary files a/build/ios/Debug-iphonesimulator/Runner.app/Runner and b/build/ios/Debug-iphonesimulator/Runner.app/Runner differ diff --git a/build/ios/Debug-iphonesimulator/Runner.app/_CodeSignature/CodeResources b/build/ios/Debug-iphonesimulator/Runner.app/_CodeSignature/CodeResources index dfc86cd..a6437dd 100644 --- a/build/ios/Debug-iphonesimulator/Runner.app/_CodeSignature/CodeResources +++ b/build/ios/Debug-iphonesimulator/Runner.app/_CodeSignature/CodeResources @@ -82,7 +82,7 @@ Assets.car - 7S2CCDeC+WVSYdNiuC7jN5JPfzs= + a8kp9RAG/YJIuyATNTtFLHMhlUQ= Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib @@ -110,7 +110,7 @@ Frameworks/App.framework/App - GOlq6BYsNqukZahkC+9IuWzKmNQ= + L1a0o1wVkn+B8eseIyb3hZzaAWQ= Frameworks/App.framework/Info.plist @@ -118,11 +118,11 @@ Frameworks/App.framework/_CodeSignature/CodeResources - rMyPEhUGklK+o8K/jrHFgBzpqh4= + n+4Ljp9rUsHHUhNVO2tJ1jIrKTk= Frameworks/App.framework/flutter_assets/AssetManifest.json - WizTOW6x2/RinR0bKkhfXoeoJx4= + 1sOsTvhxKw99Hx2cRjBljHUJB5c= Frameworks/App.framework/flutter_assets/FontManifest.json @@ -130,7 +130,7 @@ Frameworks/App.framework/flutter_assets/NOTICES.Z - 7myYrVyGqTThsMJAn8T6O0Mdghg= + 0mLRTK4qWTtgSCa0XfL/0CuMYCQ= Frameworks/App.framework/flutter_assets/assets/icons/order_icon_00.png @@ -152,6 +152,14 @@ WeT8G1QDNyrGRQikaR2IGrRvsD8= + Frameworks/App.framework/flutter_assets/assets/images/order/icon_order_null.png + + Uu7xcfWU71VztYDTRuNzqPRvqGs= + + Frameworks/App.framework/flutter_assets/assets/images/order/icon_order_success.png + + sxjr9ZcIGCoXZ3yC/aLqSpGzJ2Q= + Frameworks/App.framework/flutter_assets/assets/images/search.png bbW0EKFzhnRZv1DDPt08Hk6bU+U= @@ -226,11 +234,7 @@ Frameworks/App.framework/flutter_assets/kernel_blob.bin - 82pSRvynToE3XuZn/j7IN1LxFBc= - - Frameworks/App.framework/flutter_assets/packages/address_picker/assets/address.json - - kgyuZt7qczl2PaHzg5n/68liJ/o= + l8d5keZY1KLx7iKI8dlPM/8F6R0= Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf @@ -324,9 +328,21 @@ 1QumeTTkdhWvmY7i40QoJewEapE= + Frameworks/flutter_custom_dialog.framework/Info.plist + + 3mNC47cQIuHJ/Ov0gcer6GIfhg8= + + Frameworks/flutter_custom_dialog.framework/_CodeSignature/CodeResources + + 51IuPzs7kR5CICUfUgaN7uyZ93c= + + Frameworks/flutter_custom_dialog.framework/flutter_custom_dialog + + oFoqqcFsMDPltVkU0RkOFYvEhVw= + Info.plist - /RQCq13KJBMov0SzKJuLkfbxdGw= + 7XVZBWJ7mNBWLNqNnlgk54qSYpM= PkgInfo @@ -548,11 +564,11 @@ hash - 7S2CCDeC+WVSYdNiuC7jN5JPfzs= + a8kp9RAG/YJIuyATNTtFLHMhlUQ= hash2 - eR+QJZ4fhhJMcBu+uY4+oKFLdSeePE3pnuxW91BmLQ8= + iEAI+rG4BoNcaTdDWb7qCDDh9Odoelu7IAjEYskeSiM= Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib @@ -625,11 +641,11 @@ hash - GOlq6BYsNqukZahkC+9IuWzKmNQ= + L1a0o1wVkn+B8eseIyb3hZzaAWQ= hash2 - QUdRYXcwmL+11hKfCtWPek4Qq7TdP2NLdy4dczToNWo= + L9NcViiqF/e0QWa+Uj0UHBDXboScJPPvd/yMhvdQZaE= Frameworks/App.framework/Info.plist @@ -647,22 +663,22 @@ hash - rMyPEhUGklK+o8K/jrHFgBzpqh4= + n+4Ljp9rUsHHUhNVO2tJ1jIrKTk= hash2 - 637bBJT62/mKphiHijkwwiI2EGaPgaJtStqrwcDzpfI= + /CF/OmNCLyOqJ+m6HhomsMQvHqf8qaVgrkk8jzLR+g4= Frameworks/App.framework/flutter_assets/AssetManifest.json hash - WizTOW6x2/RinR0bKkhfXoeoJx4= + 1sOsTvhxKw99Hx2cRjBljHUJB5c= hash2 - VLxYKoE+uRVZeDTet7QRMm8DQ9kUFgHsD/txlHMZTEw= + JNmjsnkNXL8KvWm/J15qfXGlNQ9X8l275TLwldQyyCA= Frameworks/App.framework/flutter_assets/FontManifest.json @@ -680,11 +696,11 @@ hash - 7myYrVyGqTThsMJAn8T6O0Mdghg= + 0mLRTK4qWTtgSCa0XfL/0CuMYCQ= hash2 - D0VvBnitr/dBYuk47JePe7wvSJwCOLniFji07Niu5KA= + Vj5e3D60c5MxGaGOqo4NfKbfAXfbXYYma57et7dIWKs= Frameworks/App.framework/flutter_assets/assets/icons/order_icon_00.png @@ -742,6 +758,28 @@ F/uUnCCGE7yndHTmhkCKDSKaRROI62vsfaEM035x9sc= + Frameworks/App.framework/flutter_assets/assets/images/order/icon_order_null.png + + hash + + Uu7xcfWU71VztYDTRuNzqPRvqGs= + + hash2 + + qtyJFHGAmZHyL6c77vFLzs06x1M0uGUfEtEAaaUsBS4= + + + Frameworks/App.framework/flutter_assets/assets/images/order/icon_order_success.png + + hash + + sxjr9ZcIGCoXZ3yC/aLqSpGzJ2Q= + + hash2 + + c4wySsehvqIo8Zk5X7c4aUL48MJdmgEXr2tcciPMLlE= + + Frameworks/App.framework/flutter_assets/assets/images/search.png hash @@ -944,22 +982,11 @@ hash - 82pSRvynToE3XuZn/j7IN1LxFBc= + l8d5keZY1KLx7iKI8dlPM/8F6R0= hash2 - YoBNf5RvniHs1Q2W36/9OpdC/HRZUw74lK9e/g0ISdg= - - - Frameworks/App.framework/flutter_assets/packages/address_picker/assets/address.json - - hash - - kgyuZt7qczl2PaHzg5n/68liJ/o= - - hash2 - - uJgJoe9h1lFDKa1Kz1PuV4JTZjriibquVGCe3UspM3Q= + PbCxbgSr03xuoHF6okSWNtHnrEmO4/hIUmZX5MRLpY4= Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf @@ -1215,6 +1242,39 @@ Y7sS66zRuTsBvhoY8E7AmSrn+3DMMIOCUocmE2apBcw= + Frameworks/flutter_custom_dialog.framework/Info.plist + + hash + + 3mNC47cQIuHJ/Ov0gcer6GIfhg8= + + hash2 + + QCbaiKNTxqsx1aA5mcs+JqFFNAWNSgnj8XB5ZLioqHE= + + + Frameworks/flutter_custom_dialog.framework/_CodeSignature/CodeResources + + hash + + 51IuPzs7kR5CICUfUgaN7uyZ93c= + + hash2 + + fxxuNCw38sqz1VmpSDEBlMGzJWq1J+8bGr78MiAO6Mo= + + + Frameworks/flutter_custom_dialog.framework/flutter_custom_dialog + + hash + + oFoqqcFsMDPltVkU0RkOFYvEhVw= + + hash2 + + AEJYugX6XvcOhtnp9Auq0pjFuY9c9l9omArtnmbO9ok= + + rules diff --git a/build/ios/Debug-iphonesimulator/Runner.swiftmodule/x86_64-apple-ios-simulator.swiftmodule b/build/ios/Debug-iphonesimulator/Runner.swiftmodule/x86_64-apple-ios-simulator.swiftmodule index 3bf8475..9a74032 100644 Binary files a/build/ios/Debug-iphonesimulator/Runner.swiftmodule/x86_64-apple-ios-simulator.swiftmodule and b/build/ios/Debug-iphonesimulator/Runner.swiftmodule/x86_64-apple-ios-simulator.swiftmodule differ diff --git a/build/ios/Debug-iphonesimulator/Runner.swiftmodule/x86_64.swiftmodule b/build/ios/Debug-iphonesimulator/Runner.swiftmodule/x86_64.swiftmodule index 3bf8475..9a74032 100644 Binary files a/build/ios/Debug-iphonesimulator/Runner.swiftmodule/x86_64.swiftmodule and b/build/ios/Debug-iphonesimulator/Runner.swiftmodule/x86_64.swiftmodule differ diff --git a/build/ios/iphonesimulator/Runner.app/Assets.car b/build/ios/iphonesimulator/Runner.app/Assets.car index b1894a2..3cb0d97 100644 Binary files a/build/ios/iphonesimulator/Runner.app/Assets.car and b/build/ios/iphonesimulator/Runner.app/Assets.car differ diff --git a/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/App b/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/App index fde6032..4485936 100755 Binary files a/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/App and b/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/App differ diff --git a/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources b/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources index b778af2..4ab9a1d 100644 --- a/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources +++ b/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/_CodeSignature/CodeResources @@ -10,7 +10,7 @@ flutter_assets/AssetManifest.json - WizTOW6x2/RinR0bKkhfXoeoJx4= + 1sOsTvhxKw99Hx2cRjBljHUJB5c= flutter_assets/FontManifest.json @@ -18,7 +18,7 @@ flutter_assets/NOTICES.Z - 7myYrVyGqTThsMJAn8T6O0Mdghg= + 0mLRTK4qWTtgSCa0XfL/0CuMYCQ= flutter_assets/assets/icons/order_icon_00.png @@ -44,6 +44,18 @@ WeT8G1QDNyrGRQikaR2IGrRvsD8= + flutter_assets/assets/images/order/icon_order_null.png + + Uu7xcfWU71VztYDTRuNzqPRvqGs= + + flutter_assets/assets/images/order/icon_order_success.png + + sxjr9ZcIGCoXZ3yC/aLqSpGzJ2Q= + + flutter_assets/assets/images/order/icon_order_sucess.png + + sxjr9ZcIGCoXZ3yC/aLqSpGzJ2Q= + flutter_assets/assets/images/search.png bbW0EKFzhnRZv1DDPt08Hk6bU+U= @@ -118,11 +130,7 @@ flutter_assets/kernel_blob.bin - 82pSRvynToE3XuZn/j7IN1LxFBc= - - flutter_assets/packages/address_picker/assets/address.json - - kgyuZt7qczl2PaHzg5n/68liJ/o= + l8d5keZY1KLx7iKI8dlPM/8F6R0= flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf @@ -139,11 +147,11 @@ hash - WizTOW6x2/RinR0bKkhfXoeoJx4= + 1sOsTvhxKw99Hx2cRjBljHUJB5c= hash2 - VLxYKoE+uRVZeDTet7QRMm8DQ9kUFgHsD/txlHMZTEw= + JNmjsnkNXL8KvWm/J15qfXGlNQ9X8l275TLwldQyyCA= flutter_assets/FontManifest.json @@ -161,11 +169,11 @@ hash - 7myYrVyGqTThsMJAn8T6O0Mdghg= + 0mLRTK4qWTtgSCa0XfL/0CuMYCQ= hash2 - D0VvBnitr/dBYuk47JePe7wvSJwCOLniFji07Niu5KA= + Vj5e3D60c5MxGaGOqo4NfKbfAXfbXYYma57et7dIWKs= flutter_assets/assets/icons/order_icon_00.png @@ -223,6 +231,39 @@ F/uUnCCGE7yndHTmhkCKDSKaRROI62vsfaEM035x9sc= + flutter_assets/assets/images/order/icon_order_null.png + + hash + + Uu7xcfWU71VztYDTRuNzqPRvqGs= + + hash2 + + qtyJFHGAmZHyL6c77vFLzs06x1M0uGUfEtEAaaUsBS4= + + + flutter_assets/assets/images/order/icon_order_success.png + + hash + + sxjr9ZcIGCoXZ3yC/aLqSpGzJ2Q= + + hash2 + + c4wySsehvqIo8Zk5X7c4aUL48MJdmgEXr2tcciPMLlE= + + + flutter_assets/assets/images/order/icon_order_sucess.png + + hash + + sxjr9ZcIGCoXZ3yC/aLqSpGzJ2Q= + + hash2 + + c4wySsehvqIo8Zk5X7c4aUL48MJdmgEXr2tcciPMLlE= + + flutter_assets/assets/images/search.png hash @@ -425,22 +466,11 @@ hash - 82pSRvynToE3XuZn/j7IN1LxFBc= + l8d5keZY1KLx7iKI8dlPM/8F6R0= hash2 - YoBNf5RvniHs1Q2W36/9OpdC/HRZUw74lK9e/g0ISdg= - - - flutter_assets/packages/address_picker/assets/address.json - - hash - - kgyuZt7qczl2PaHzg5n/68liJ/o= - - hash2 - - uJgJoe9h1lFDKa1Kz1PuV4JTZjriibquVGCe3UspM3Q= + PbCxbgSr03xuoHF6okSWNtHnrEmO4/hIUmZX5MRLpY4= flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf diff --git a/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/AssetManifest.json b/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/AssetManifest.json index a133299..307b8d2 100644 --- a/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/AssetManifest.json +++ b/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/AssetManifest.json @@ -1 +1 @@ -{"assets/icons/order_icon_00.png":["assets/icons/order_icon_00.png"],"assets/images/.DS_Store":["assets/images/.DS_Store"],"assets/images/5fbf2512c344f.jpg":["assets/images/5fbf2512c344f.jpg"],"assets/images/banner.png":["assets/images/banner.png"],"assets/images/detail.png":["assets/images/detail.png"],"assets/images/location.png":["assets/images/location.png"],"assets/images/search.png":["assets/images/search.png"],"assets/images/select_1.png":["assets/images/select_1.png"],"assets/images/top.png":["assets/images/top.png"],"assets/images/vip_bg.png":["assets/images/vip_bg.png"],"assets/images/vip_item_1.png":["assets/images/vip_item_1.png"],"assets/images/vip_item_2.png":["assets/images/vip_item_2.png"],"assets/images/vip_item_3.png":["assets/images/vip_item_3.png"],"assets/images/vip_item_4.png":["assets/images/vip_item_4.png"],"assets/images/vip_role.png":["assets/images/vip_role.png"],"assets/login/auth_bg.png":["assets/login/auth_bg.png"],"assets/tabBar/tabBar_00.png":["assets/tabBar/tabBar_00.png"],"assets/tabBar/tabBar_01.png":["assets/tabBar/tabBar_01.png"],"assets/tabBar/tabBar_02.png":["assets/tabBar/tabBar_02.png"],"assets/tabBar/tabBar_show_00.png":["assets/tabBar/tabBar_show_00.png"],"assets/tabBar/tabBar_show_01.png":["assets/tabBar/tabBar_show_01.png"],"assets/tabBar/tabBar_show_02.png":["assets/tabBar/tabBar_show_02.png"],"packages/address_picker/assets/address.json":["packages/address_picker/assets/address.json"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]} \ No newline at end of file +{"assets/icons/order_icon_00.png":["assets/icons/order_icon_00.png"],"assets/images/.DS_Store":["assets/images/.DS_Store"],"assets/images/5fbf2512c344f.jpg":["assets/images/5fbf2512c344f.jpg"],"assets/images/banner.png":["assets/images/banner.png"],"assets/images/detail.png":["assets/images/detail.png"],"assets/images/location.png":["assets/images/location.png"],"assets/images/order/icon_order_null.png":["assets/images/order/icon_order_null.png"],"assets/images/order/icon_order_success.png":["assets/images/order/icon_order_success.png"],"assets/images/search.png":["assets/images/search.png"],"assets/images/select_1.png":["assets/images/select_1.png"],"assets/images/top.png":["assets/images/top.png"],"assets/images/vip_bg.png":["assets/images/vip_bg.png"],"assets/images/vip_item_1.png":["assets/images/vip_item_1.png"],"assets/images/vip_item_2.png":["assets/images/vip_item_2.png"],"assets/images/vip_item_3.png":["assets/images/vip_item_3.png"],"assets/images/vip_item_4.png":["assets/images/vip_item_4.png"],"assets/images/vip_role.png":["assets/images/vip_role.png"],"assets/login/auth_bg.png":["assets/login/auth_bg.png"],"assets/tabBar/tabBar_00.png":["assets/tabBar/tabBar_00.png"],"assets/tabBar/tabBar_01.png":["assets/tabBar/tabBar_01.png"],"assets/tabBar/tabBar_02.png":["assets/tabBar/tabBar_02.png"],"assets/tabBar/tabBar_show_00.png":["assets/tabBar/tabBar_show_00.png"],"assets/tabBar/tabBar_show_01.png":["assets/tabBar/tabBar_show_01.png"],"assets/tabBar/tabBar_show_02.png":["assets/tabBar/tabBar_show_02.png"],"packages/cupertino_icons/assets/CupertinoIcons.ttf":["packages/cupertino_icons/assets/CupertinoIcons.ttf"]} \ No newline at end of file diff --git a/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/NOTICES.Z b/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/NOTICES.Z index af86d03..8537645 100644 Binary files a/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/NOTICES.Z and b/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/NOTICES.Z differ diff --git a/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/kernel_blob.bin b/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/kernel_blob.bin index e7443ba..f912004 100644 Binary files a/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/kernel_blob.bin and b/build/ios/iphonesimulator/Runner.app/Frameworks/App.framework/flutter_assets/kernel_blob.bin differ diff --git a/build/ios/iphonesimulator/Runner.app/Info.plist b/build/ios/iphonesimulator/Runner.app/Info.plist index 8977342..ed5eeba 100644 Binary files a/build/ios/iphonesimulator/Runner.app/Info.plist and b/build/ios/iphonesimulator/Runner.app/Info.plist differ diff --git a/build/ios/iphonesimulator/Runner.app/Runner b/build/ios/iphonesimulator/Runner.app/Runner index 48ed2b2..1496240 100755 Binary files a/build/ios/iphonesimulator/Runner.app/Runner and b/build/ios/iphonesimulator/Runner.app/Runner differ diff --git a/build/ios/iphonesimulator/Runner.app/_CodeSignature/CodeResources b/build/ios/iphonesimulator/Runner.app/_CodeSignature/CodeResources index dfc86cd..a6437dd 100644 --- a/build/ios/iphonesimulator/Runner.app/_CodeSignature/CodeResources +++ b/build/ios/iphonesimulator/Runner.app/_CodeSignature/CodeResources @@ -82,7 +82,7 @@ Assets.car - 7S2CCDeC+WVSYdNiuC7jN5JPfzs= + a8kp9RAG/YJIuyATNTtFLHMhlUQ= Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib @@ -110,7 +110,7 @@ Frameworks/App.framework/App - GOlq6BYsNqukZahkC+9IuWzKmNQ= + L1a0o1wVkn+B8eseIyb3hZzaAWQ= Frameworks/App.framework/Info.plist @@ -118,11 +118,11 @@ Frameworks/App.framework/_CodeSignature/CodeResources - rMyPEhUGklK+o8K/jrHFgBzpqh4= + n+4Ljp9rUsHHUhNVO2tJ1jIrKTk= Frameworks/App.framework/flutter_assets/AssetManifest.json - WizTOW6x2/RinR0bKkhfXoeoJx4= + 1sOsTvhxKw99Hx2cRjBljHUJB5c= Frameworks/App.framework/flutter_assets/FontManifest.json @@ -130,7 +130,7 @@ Frameworks/App.framework/flutter_assets/NOTICES.Z - 7myYrVyGqTThsMJAn8T6O0Mdghg= + 0mLRTK4qWTtgSCa0XfL/0CuMYCQ= Frameworks/App.framework/flutter_assets/assets/icons/order_icon_00.png @@ -152,6 +152,14 @@ WeT8G1QDNyrGRQikaR2IGrRvsD8= + Frameworks/App.framework/flutter_assets/assets/images/order/icon_order_null.png + + Uu7xcfWU71VztYDTRuNzqPRvqGs= + + Frameworks/App.framework/flutter_assets/assets/images/order/icon_order_success.png + + sxjr9ZcIGCoXZ3yC/aLqSpGzJ2Q= + Frameworks/App.framework/flutter_assets/assets/images/search.png bbW0EKFzhnRZv1DDPt08Hk6bU+U= @@ -226,11 +234,7 @@ Frameworks/App.framework/flutter_assets/kernel_blob.bin - 82pSRvynToE3XuZn/j7IN1LxFBc= - - Frameworks/App.framework/flutter_assets/packages/address_picker/assets/address.json - - kgyuZt7qczl2PaHzg5n/68liJ/o= + l8d5keZY1KLx7iKI8dlPM/8F6R0= Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf @@ -324,9 +328,21 @@ 1QumeTTkdhWvmY7i40QoJewEapE= + Frameworks/flutter_custom_dialog.framework/Info.plist + + 3mNC47cQIuHJ/Ov0gcer6GIfhg8= + + Frameworks/flutter_custom_dialog.framework/_CodeSignature/CodeResources + + 51IuPzs7kR5CICUfUgaN7uyZ93c= + + Frameworks/flutter_custom_dialog.framework/flutter_custom_dialog + + oFoqqcFsMDPltVkU0RkOFYvEhVw= + Info.plist - /RQCq13KJBMov0SzKJuLkfbxdGw= + 7XVZBWJ7mNBWLNqNnlgk54qSYpM= PkgInfo @@ -548,11 +564,11 @@ hash - 7S2CCDeC+WVSYdNiuC7jN5JPfzs= + a8kp9RAG/YJIuyATNTtFLHMhlUQ= hash2 - eR+QJZ4fhhJMcBu+uY4+oKFLdSeePE3pnuxW91BmLQ8= + iEAI+rG4BoNcaTdDWb7qCDDh9Odoelu7IAjEYskeSiM= Base.lproj/LaunchScreen.storyboardc/01J-lp-oVM-view-Ze5-6b-2t3.nib @@ -625,11 +641,11 @@ hash - GOlq6BYsNqukZahkC+9IuWzKmNQ= + L1a0o1wVkn+B8eseIyb3hZzaAWQ= hash2 - QUdRYXcwmL+11hKfCtWPek4Qq7TdP2NLdy4dczToNWo= + L9NcViiqF/e0QWa+Uj0UHBDXboScJPPvd/yMhvdQZaE= Frameworks/App.framework/Info.plist @@ -647,22 +663,22 @@ hash - rMyPEhUGklK+o8K/jrHFgBzpqh4= + n+4Ljp9rUsHHUhNVO2tJ1jIrKTk= hash2 - 637bBJT62/mKphiHijkwwiI2EGaPgaJtStqrwcDzpfI= + /CF/OmNCLyOqJ+m6HhomsMQvHqf8qaVgrkk8jzLR+g4= Frameworks/App.framework/flutter_assets/AssetManifest.json hash - WizTOW6x2/RinR0bKkhfXoeoJx4= + 1sOsTvhxKw99Hx2cRjBljHUJB5c= hash2 - VLxYKoE+uRVZeDTet7QRMm8DQ9kUFgHsD/txlHMZTEw= + JNmjsnkNXL8KvWm/J15qfXGlNQ9X8l275TLwldQyyCA= Frameworks/App.framework/flutter_assets/FontManifest.json @@ -680,11 +696,11 @@ hash - 7myYrVyGqTThsMJAn8T6O0Mdghg= + 0mLRTK4qWTtgSCa0XfL/0CuMYCQ= hash2 - D0VvBnitr/dBYuk47JePe7wvSJwCOLniFji07Niu5KA= + Vj5e3D60c5MxGaGOqo4NfKbfAXfbXYYma57et7dIWKs= Frameworks/App.framework/flutter_assets/assets/icons/order_icon_00.png @@ -742,6 +758,28 @@ F/uUnCCGE7yndHTmhkCKDSKaRROI62vsfaEM035x9sc= + Frameworks/App.framework/flutter_assets/assets/images/order/icon_order_null.png + + hash + + Uu7xcfWU71VztYDTRuNzqPRvqGs= + + hash2 + + qtyJFHGAmZHyL6c77vFLzs06x1M0uGUfEtEAaaUsBS4= + + + Frameworks/App.framework/flutter_assets/assets/images/order/icon_order_success.png + + hash + + sxjr9ZcIGCoXZ3yC/aLqSpGzJ2Q= + + hash2 + + c4wySsehvqIo8Zk5X7c4aUL48MJdmgEXr2tcciPMLlE= + + Frameworks/App.framework/flutter_assets/assets/images/search.png hash @@ -944,22 +982,11 @@ hash - 82pSRvynToE3XuZn/j7IN1LxFBc= + l8d5keZY1KLx7iKI8dlPM/8F6R0= hash2 - YoBNf5RvniHs1Q2W36/9OpdC/HRZUw74lK9e/g0ISdg= - - - Frameworks/App.framework/flutter_assets/packages/address_picker/assets/address.json - - hash - - kgyuZt7qczl2PaHzg5n/68liJ/o= - - hash2 - - uJgJoe9h1lFDKa1Kz1PuV4JTZjriibquVGCe3UspM3Q= + PbCxbgSr03xuoHF6okSWNtHnrEmO4/hIUmZX5MRLpY4= Frameworks/App.framework/flutter_assets/packages/cupertino_icons/assets/CupertinoIcons.ttf @@ -1215,6 +1242,39 @@ Y7sS66zRuTsBvhoY8E7AmSrn+3DMMIOCUocmE2apBcw= + Frameworks/flutter_custom_dialog.framework/Info.plist + + hash + + 3mNC47cQIuHJ/Ov0gcer6GIfhg8= + + hash2 + + QCbaiKNTxqsx1aA5mcs+JqFFNAWNSgnj8XB5ZLioqHE= + + + Frameworks/flutter_custom_dialog.framework/_CodeSignature/CodeResources + + hash + + 51IuPzs7kR5CICUfUgaN7uyZ93c= + + hash2 + + fxxuNCw38sqz1VmpSDEBlMGzJWq1J+8bGr78MiAO6Mo= + + + Frameworks/flutter_custom_dialog.framework/flutter_custom_dialog + + hash + + oFoqqcFsMDPltVkU0RkOFYvEhVw= + + hash2 + + AEJYugX6XvcOhtnp9Auq0pjFuY9c9l9omArtnmbO9ok= + + rules diff --git a/ios/Flutter/Debug.xcconfig b/ios/Flutter/Debug.xcconfig index 592ceee..ec97fc6 100644 --- a/ios/Flutter/Debug.xcconfig +++ b/ios/Flutter/Debug.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" #include "Generated.xcconfig" diff --git a/ios/Flutter/Release.xcconfig b/ios/Flutter/Release.xcconfig index 592ceee..c4855bf 100644 --- a/ios/Flutter/Release.xcconfig +++ b/ios/Flutter/Release.xcconfig @@ -1 +1,2 @@ +#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" #include "Generated.xcconfig" diff --git a/ios/Podfile b/ios/Podfile new file mode 100644 index 0000000..1e8c3c9 --- /dev/null +++ b/ios/Podfile @@ -0,0 +1,41 @@ +# Uncomment this line to define a global platform for your project +# platform :ios, '9.0' + +# CocoaPods analytics sends network stats synchronously affecting flutter build latency. +ENV['COCOAPODS_DISABLE_STATS'] = 'true' + +project 'Runner', { + 'Debug' => :debug, + 'Profile' => :release, + 'Release' => :release, +} + +def flutter_root + generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__) + unless File.exist?(generated_xcode_build_settings_path) + raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first" + end + + File.foreach(generated_xcode_build_settings_path) do |line| + matches = line.match(/FLUTTER_ROOT\=(.*)/) + return matches[1].strip if matches + end + raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get" +end + +require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root) + +flutter_ios_podfile_setup + +target 'Runner' do + use_frameworks! + use_modular_headers! + + flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__)) +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + flutter_additional_ios_build_settings(target) + end +end diff --git a/ios/Podfile.lock b/ios/Podfile.lock new file mode 100644 index 0000000..97f652a --- /dev/null +++ b/ios/Podfile.lock @@ -0,0 +1,22 @@ +PODS: + - Flutter (1.0.0) + - flutter_custom_dialog (0.0.1): + - Flutter + +DEPENDENCIES: + - Flutter (from `Flutter`) + - flutter_custom_dialog (from `.symlinks/plugins/flutter_custom_dialog/ios`) + +EXTERNAL SOURCES: + Flutter: + :path: Flutter + flutter_custom_dialog: + :path: ".symlinks/plugins/flutter_custom_dialog/ios" + +SPEC CHECKSUMS: + Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a + flutter_custom_dialog: c0d222a3c35af5b57581e54ef8784c94037cd2ec + +PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c + +COCOAPODS: 1.11.3 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index ed2c826..c72edf4 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -13,6 +13,7 @@ 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; + D161D184430A73C7AFE3F414 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 09B768F845A82872334E7A16 /* Pods_Runner.framework */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -29,9 +30,13 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 09B768F845A82872334E7A16 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; + 371378016AFF346EF7E0D34D /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = ""; }; + 38C2E7B3EBFA7AA2122D649F /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; + 4643CD03BD8D460C4DC65AFD /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = ""; }; 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; @@ -49,12 +54,21 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D161D184430A73C7AFE3F414 /* Pods_Runner.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 3B5B0C178FB5AAB9F32F54A8 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 09B768F845A82872334E7A16 /* Pods_Runner.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( @@ -72,6 +86,8 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, + F1BEE1BC907253FD819F9F17 /* Pods */, + 3B5B0C178FB5AAB9F32F54A8 /* Frameworks */, ); sourceTree = ""; }; @@ -98,6 +114,17 @@ path = Runner; sourceTree = ""; }; + F1BEE1BC907253FD819F9F17 /* Pods */ = { + isa = PBXGroup; + children = ( + 38C2E7B3EBFA7AA2122D649F /* Pods-Runner.debug.xcconfig */, + 371378016AFF346EF7E0D34D /* Pods-Runner.release.xcconfig */, + 4643CD03BD8D460C4DC65AFD /* Pods-Runner.profile.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -105,12 +132,14 @@ isa = PBXNativeTarget; buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */; buildPhases = ( + B169546311D4064A9327FB82 /* [CP] Check Pods Manifest.lock */, 9740EEB61CF901F6004384FC /* Run Script */, 97C146EA1CF9000F007C117D /* Sources */, 97C146EB1CF9000F007C117D /* Frameworks */, 97C146EC1CF9000F007C117D /* Resources */, 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, + B2E28DD269F95197EE113D3C /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -197,6 +226,45 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build"; }; + B169546311D4064A9327FB82 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + B2E28DD269F95197EE113D3C /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/ios/Runner.xcworkspace/contents.xcworkspacedata b/ios/Runner.xcworkspace/contents.xcworkspacedata index 1d526a1..21a3cc1 100644 --- a/ios/Runner.xcworkspace/contents.xcworkspacedata +++ b/ios/Runner.xcworkspace/contents.xcworkspacedata @@ -4,4 +4,7 @@ + + diff --git a/lib/pages/address/adds_add/adds_add_page.dart b/lib/pages/address/adds_add/adds_add_page.dart index 416c4e8..b2c80cf 100644 --- a/lib/pages/address/adds_add/adds_add_page.dart +++ b/lib/pages/address/adds_add/adds_add_page.dart @@ -1,12 +1,11 @@ /* * @Author: Aimee~ * @Date: 2022-06-01 11:11:40 - * @LastEditTime: 2022-06-02 17:51:22 + * @LastEditTime: 2022-06-06 14:13:28 * @LastEditors: Aimee * @FilePath: /gl_dao/lib/pages/address/adds_add/adds_add_page.dart * @Description: 新增地址 */ -// import 'package:address_picker/address_picker.dart'; import 'package:flutter/material.dart'; import 'package:flutter_pickers/address_picker/locations_data.dart'; import 'package:flutter_pickers/pickers.dart'; @@ -35,6 +34,7 @@ class _AddressAddPageState extends State { padding: const EdgeInsets.fromLTRB(16, 30, 16, 30), child: ListView( children: [ + // 收件人姓名 const TextField( decoration: InputDecoration( hintText: "收货人姓名", @@ -53,6 +53,7 @@ class _AddressAddPageState extends State { ), ), const Divider(), + // 收件人电话 const TextField( decoration: InputDecoration( hintText: "收货人联系电话", @@ -71,6 +72,7 @@ class _AddressAddPageState extends State { ), ), const Divider(), + // 省市区 GestureDetector( onTap: _chooseArea, child: TextField( @@ -95,6 +97,7 @@ class _AddressAddPageState extends State { ), ), const Divider(), + // 详细地址、 const TextField( maxLength: 120, maxLines: 3, @@ -135,6 +138,7 @@ class _AddressAddPageState extends State { }); /// 根据城市名 查询城市code(有先后顺序) + // ignore: avoid_print print( Address.getCityCodeByName( provinceName: p, @@ -144,6 +148,7 @@ class _AddressAddPageState extends State { ); /// 根据城市code 查询城市名称 + // ignore: avoid_print print( Address.getCityNameByCode( provinceCode: "510000", diff --git a/lib/pages/components/yy_alert_dialog_with_divider.dart b/lib/pages/components/yy_alert_dialog_with_divider.dart new file mode 100644 index 0000000..c1edfdf --- /dev/null +++ b/lib/pages/components/yy_alert_dialog_with_divider.dart @@ -0,0 +1,74 @@ +/* + * @Author: Aimee~ + * @Date: 2022-06-06 13:31:27 + * @LastEditTime: 2022-06-06 15:44:53 + * @LastEditors: Aimee + * @FilePath: /gl_dao/lib/pages/components/yy_alert_dialog_with_divider.dart + * @Description: 弹窗样式 + */ + +import 'package:flutter/material.dart'; +import 'package:flutter_custom_dialog/flutter_custom_dialog.dart'; + +import '../../main_color.dart'; + +YYDialog yYAlertDialogWithDivider( + BuildContext context, { + String text1 = '', + String text2 = '', + required String title, + String type = '', // 默认是问号，成功显示success + VoidCallback? onCancel, + VoidCallback? onSure, +}) { + return YYDialog().build(context) + ..width = MediaQuery.of(context).size.width * 0.8 + ..borderRadius = 4.0 + ..widget( + Opacity( + opacity: 0.5, + child: Container( + margin: const EdgeInsets.only(top: 21), + width: 50.0, + height: 50.0, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(150.0), + ), + child: Image.asset( + type == "" + ? "assets/images/order/icon_order_null.png" + : "assets/images/order/icon_order_success.png", + alignment: Alignment.center, + fit: BoxFit.cover, + repeat: ImageRepeat.noRepeat, + ), + ), + ), + ) + ..text( + padding: const EdgeInsets.all(25.0), + alignment: Alignment.center, + text: title, + color: tTextColor333, + fontSize: 16.0, + fontWeight: FontWeight.w500, + ) + ..divider() + ..doubleButton( + height: 60.0, + padding: const EdgeInsets.all(16.0), + gravity: Gravity.spaceEvenly, + withDivider: true, + text1: text1, + color1: tTextColor666, + fontSize1: 15.0, + fontWeight1: FontWeight.w400, + onTap1: onCancel, + text2: text2, + color2: tMainRedColor, + fontSize2: 15.0, + fontWeight2: FontWeight.w400, + onTap2: onSure, + ) + ..show(); +} diff --git a/lib/pages/store/buy/buy.dart b/lib/pages/store/buy/buy.dart index 40378ff..d063155 100644 --- a/lib/pages/store/buy/buy.dart +++ b/lib/pages/store/buy/buy.dart @@ -1,7 +1,7 @@ /* * @Author: Aimee~ * @Date: 2022-05-26 13:16:03 - * @LastEditTime: 2022-06-01 13:01:25 + * @LastEditTime: 2022-06-06 15:53:45 * @LastEditors: Aimee * @FilePath: /gl_dao/lib/pages/store/buy/buy.dart * @Description: 订单确认页面 @@ -11,6 +11,8 @@ import 'package:get/get.dart'; import '../../../main_color.dart'; import '../../address/adds_list/adds_list_page.dart'; +import '../../components/yy_alert_dialog_with_divider.dart'; +import '../checkout/checkout_page.dart'; class BuyPages extends StatefulWidget { const BuyPages({Key? key}) : super(key: key); @@ -107,7 +109,18 @@ class _BuyPagesState extends State { ), ), GestureDetector( - onTap: () {}, + onTap: () { + Get.to(const CheckoutPage()); + // yYAlertDialogWithDivider( + // context, + // title: '订单提交成功', + // type: 'success', + // text1: '继续采购', + // text2: '查看订单', + // onCancel: onCancel, + // onSure: onSure, + // ); + }, child: Container( margin: const EdgeInsets.only(top: 1), padding: const EdgeInsets.fromLTRB(26, 10, 26, 10), @@ -135,6 +148,16 @@ class _BuyPagesState extends State { ); } + onCancel() { + // ignore: avoid_print + print('onCancel.....'); + } + + onSure() { + // ignore: avoid_print + print('onSure.....'); + } + // 自定义购买信息 Widget purchaseInfo() { return Container( diff --git a/lib/pages/store/checkout/checkout_page.dart b/lib/pages/store/checkout/checkout_page.dart new file mode 100644 index 0000000..73b72b4 --- /dev/null +++ b/lib/pages/store/checkout/checkout_page.dart @@ -0,0 +1,292 @@ +// ignore_for_file: unnecessary_const + +/* + * @Author: Aimee~ + * @Date: 2022-06-06 09:14:27 + * @LastEditTime: 2022-06-06 15:45:05 + * @LastEditors: Aimee + * @FilePath: /gl_dao/lib/pages/store/checkout/checkout_page.dart + * @Description: 收银台 + */ + +// import 'package:flutter/cupertino.dart'; + +import 'package:flutter/material.dart'; + +import '../../../main_color.dart'; +import '../../components/yy_alert_dialog_with_divider.dart'; + +class CheckoutPage extends StatefulWidget { + const CheckoutPage({Key? key}) : super(key: key); + + @override + State createState() => _CheckoutPageState(); +} + +class _CheckoutPageState extends State { + String defaultValue = "A"; + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: appBar(), + body: Stack( + children: [ + Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + width: MediaQuery.of(context).size.width, + padding: const EdgeInsets.fromLTRB(0, 30, 0, 50), + decoration: const BoxDecoration( + gradient: LinearGradient( + begin: Alignment.topCenter, + end: Alignment.bottomCenter, + colors: [ + tMainRedColor, + Colors.red, + ], + ), + ), + child: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + const Text( + '1999', + style: TextStyle( + fontSize: 34, + color: Colors.white, + fontWeight: FontWeight.bold, + ), + ), + Container( + padding: const EdgeInsets.only(bottom: 5), + child: const Text( + ' DT积分', + style: TextStyle( + fontSize: 14, + color: Colors.white, + ), + ), + ), + ], + ), + const SizedBox(height: 26), + Container( + padding: const EdgeInsets.only( + left: 12, + right: 12, + top: 4, + bottom: 4, + ), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(150.0), + color: Colors.white.withOpacity(0.2), + ), + child: const Text( + '订单编号:202206061232334322122 ', + textAlign: TextAlign.center, + style: TextStyle( + color: Colors.white, + fontSize: 13, + ), + ), + ), + ], + ), + ), + const SizedBox(height: 26), + Column( + children: [ + Row( + children: [ + const SizedBox( + width: 16, + ), + Container( + height: 16, + width: 4, + color: tMainRedColor.withOpacity(0.5), + ), + const SizedBox(width: 6), + const Text( + '支付方式', + style: TextStyle( + fontSize: 16, + color: tTextColor333, + fontWeight: FontWeight.w500, + ), + ), + const SizedBox( + height: 26, + ), + ], + ), + RadioListTile( + value: 'A', + groupValue: defaultValue, + title: const Text( + "DT积分支付", + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w400, + ), + ), + activeColor: tMainRedColor, + subtitle: const Text( + "使用DT积分 方便快捷 升值快", + style: TextStyle( + fontSize: 12, + ), + ), + secondary: SizedBox( + width: 44, + height: 44, + child: ClipOval( + child: Image.network( + 'https://www.itying.com/images/flutter/1.png', + fit: BoxFit.cover, + ), + ), + ), + controlAffinity: ListTileControlAffinity.trailing, + onChanged: (v) { + setState(() { + defaultValue = v.toString(); + }); + }, + ), + const Divider(), + RadioListTile( + value: 'B', + groupValue: defaultValue, + title: const Text( + "微信支付", + style: TextStyle( + fontSize: 16, + fontWeight: FontWeight.w400, + ), + ), + activeColor: tMainRedColor, + subtitle: const Text( + "使用DT积分 方便快捷 升值快", + style: TextStyle( + fontSize: 12, + ), + ), + secondary: SizedBox( + width: 44, + height: 44, + child: ClipOval( + child: Image.network( + 'https://www.itying.com/images/flutter/1.png', + fit: BoxFit.cover, + ), + ), + ), + controlAffinity: ListTileControlAffinity.trailing, + onChanged: (v) { + setState(() { + defaultValue = v.toString(); + }); + }, + ), + const Divider(), + ], + ), + ], + ), + buttomButton(), + ], + ), + ); + } + + // 自定义底部提交按钮 + Widget buttomButton() { + return Positioned( + bottom: 0, + left: 0, + child: Container( + width: MediaQuery.of(context).size.width * 0.8, + margin: EdgeInsets.only(left: MediaQuery.of(context).size.width * 0.1), + decoration: const BoxDecoration( + color: Colors.white, + ), + child: SafeArea( + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + flex: 1, + child: GestureDetector( + onTap: () { + yYAlertDialogWithDivider( + context, + title: '确认放弃支付么?', + text1: '放弃支付', + text2: '继续支付', + onCancel: onCancel, + onSure: onSure, + ); + }, + child: Container( + margin: const EdgeInsets.only(top: 1), + padding: const EdgeInsets.fromLTRB(26, 10, 26, 10), + height: 60, + alignment: Alignment.center, + decoration: const BoxDecoration( + gradient: LinearGradient( + colors: [tMainRedColor, tMainRedColor], + ), + ), + child: const Text( + '立即支付', + style: TextStyle( + fontSize: 17, + color: Colors.white, + fontWeight: FontWeight.w600, + ), + ), + ), + ), + ), + ], + ), + ), + ), + ); + } + + onCancel() { + // ignore: avoid_print + print('onCancel.....'); + } + + onSure() { + // ignore: avoid_print + print('onSure.....'); + } + + // 自定义顶部导航 + PreferredSizeWidget appBar() { + return AppBar( + elevation: 0, + backgroundColor: tMainRedColor, + title: const Text( + '支付收银台', + style: TextStyle( + color: Colors.white, + fontSize: 18, + fontWeight: FontWeight.w500, + ), + ), + ); + } +} diff --git a/pubspec.lock b/pubspec.lock index ba31aa0..31126c7 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -69,6 +69,13 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_custom_dialog: + dependency: "direct main" + description: + name: flutter_custom_dialog + url: "https://pub.flutter-io.cn" + source: hosted + version: "1.2.0" flutter_lints: dependency: "direct dev" description: diff --git a/pubspec.yaml b/pubspec.yaml index 81a4b19..bcc35f1 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,6 +14,7 @@ dependencies: dio: ^4.0.6 get: ^4.6.5 flutter_pickers: ^2.1.9 + flutter_custom_dialog: ^1.2.0 dev_dependencies: flutter_test: @@ -27,4 +28,5 @@ flutter: - assets/tabBar/ - assets/icons/ - assets/images/ + - assets/images/order/