Browse Source

Merge branch 'dev' into wr_2023_business

# Conflicts:
#	ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-1024.png
#	ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png
#	ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x-ipad.png
#	ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png
#	ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png
#	ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29-ipad.png
#	ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29.png
#	ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x-ipad.png
#	ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png
#	ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
#	ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40.png
#	ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
#	ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
#	ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
#	ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
#	ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76.png
#	ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
#	ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png
#	ios/Runner/Info.plist
#	pubspec.lock
wr_2023_business
wurong 1 year ago
parent
commit
4734bb02b7
  1. 6
      ios/Podfile.lock
  2. 19
      ios/Runner.xcodeproj/project.pbxproj
  3. 126
      ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json
  4. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-1024.png
  5. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png
  6. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x-ipad.png
  7. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png
  8. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png
  9. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29-ipad.png
  10. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29.png
  11. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x-ipad.png
  12. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png
  13. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png
  14. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-38@2x.png
  15. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-38@3x.png
  16. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40.png
  17. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png
  18. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png
  19. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png
  20. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png
  21. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-64@2x.png
  22. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-64@3x.png
  23. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-68@2x.png
  24. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76.png
  25. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png
  26. BIN
      ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png
  27. 2
      ios/Runner/Info.plist
  28. 2
      lib/store/store_order.dart
  29. 42
      lib/view_widget/rename_dialog_content.dart
  30. 248
      pubspec.lock

6
ios/Podfile.lock

@ -339,13 +339,13 @@ SPEC CHECKSUMS:
BaiduMapKit: f227cfb43581e91466fb4f1344f655eab5788777
BMKLocationKit: 688d8e1194980b96fc9a6585c0eb42e62fbaf780
emoji_picker_flutter: df19dac03a2b39ac667dc8d1da939ef3a9e21347
Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
flutter_baidu_mapapi_base: cb406be78c3a949fb58a45dc6627f139d580bd37
flutter_baidu_mapapi_map: 81c4e6e93dc668e311d9b521421deaf292390434
flutter_baidu_mapapi_search: 13a360334e91abea0bcf820546b2ef4548e42e08
flutter_baidu_mapapi_utils: f6a5d23da26b0e58f1ae9908da7ba87fd48384b1
flutter_bmflocation: 1bd73181196567fe1529f765aa4f8e2615a8a3cf
fluwx: 838466d89c1ba099f6eec36c514801658371cda5
fluwx: a24006296e7ca601e8544e12bd6269497fae23e6
image_pickers: 25c8916d358bc9d2707cb470ba3d57497f105773
mob_sharesdk: 0698d60b3c1549a5b0bcfdec6f407439dd2960c0
MOBFoundation: 6df2684b4db4f0f5bd71b0623f82e11271bf7ac8
@ -373,4 +373,4 @@ SPEC CHECKSUMS:
PODFILE CHECKSUM: f8bac8842dd5d4f36a3709c129ae7a2ccd5be619
COCOAPODS: 1.11.3
COCOAPODS: 1.13.0

19
ios/Runner.xcodeproj/project.pbxproj

@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 52;
objectVersion = 54;
objects = {
/* Begin PBXBuildFile section */
@ -439,6 +439,7 @@
};
3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@ -470,6 +471,7 @@
};
9740EEB61CF901F6004384FC /* Run Script */ = {
isa = PBXShellScriptBuildPhase;
alwaysOutOfDate = 1;
buildActionMask = 2147483647;
files = (
);
@ -617,7 +619,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 14;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -667,7 +669,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 3.2.20;
MARKETING_VERSION = 3.2.22;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
@ -687,6 +689,7 @@
"-l\"z\"",
"-fcxx-modules",
"-fmodules",
"-ld64",
);
PRODUCT_BUNDLE_IDENTIFIER = com.zsw.hx;
PRODUCT_NAME = "$(TARGET_NAME)";
@ -819,7 +822,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 14;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -869,7 +872,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 3.2.20;
MARKETING_VERSION = 3.2.22;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
@ -889,6 +892,7 @@
"-l\"z\"",
"-fcxx-modules",
"-fmodules",
"-ld64",
);
PRODUCT_BUNDLE_IDENTIFIER = com.zsw.hx;
PRODUCT_NAME = "$(TARGET_NAME)";
@ -912,7 +916,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 14;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
@ -962,7 +966,7 @@
"$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu",
);
MARKETING_VERSION = 3.2.20;
MARKETING_VERSION = 3.2.22;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
@ -982,6 +986,7 @@
"-l\"z\"",
"-fcxx-modules",
"-fmodules",
"-ld64",
);
PRODUCT_BUNDLE_IDENTIFIER = com.zsw.hx;
PRODUCT_NAME = "$(TARGET_NAME)";

126
ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@ -2,117 +2,115 @@
"images": [
{
"size": "20x20",
"idiom": "iphone",
"idiom": "universal",
"filename": "icon-20@2x.png",
"scale": "2x"
"scale": "2x",
"platform": "ios"
},
{
"size": "20x20",
"idiom": "iphone",
"idiom": "universal",
"filename": "icon-20@3x.png",
"scale": "3x"
"scale": "3x",
"platform": "ios"
},
{
"size": "29x29",
"idiom": "iphone",
"filename": "icon-29.png",
"scale": "1x"
},
{
"size": "29x29",
"idiom": "iphone",
"idiom": "universal",
"filename": "icon-29@2x.png",
"scale": "2x"
"scale": "2x",
"platform": "ios"
},
{
"size": "29x29",
"idiom": "iphone",
"idiom": "universal",
"filename": "icon-29@3x.png",
"scale": "3x"
"scale": "3x",
"platform": "ios"
},
{
"size": "38x38",
"idiom": "universal",
"filename": "icon-38@2x.png",
"scale": "2x",
"platform": "ios"
},
{
"size": "38x38",
"idiom": "universal",
"filename": "icon-38@3x.png",
"scale": "3x",
"platform": "ios"
},
{
"size": "40x40",
"idiom": "iphone",
"idiom": "universal",
"filename": "icon-40@2x.png",
"scale": "2x"
"scale": "2x",
"platform": "ios"
},
{
"size": "40x40",
"idiom": "iphone",
"idiom": "universal",
"filename": "icon-40@3x.png",
"scale": "3x"
"scale": "3x",
"platform": "ios"
},
{
"size": "60x60",
"idiom": "iphone",
"idiom": "universal",
"filename": "icon-60@2x.png",
"scale": "2x"
"scale": "2x",
"platform": "ios"
},
{
"size": "60x60",
"idiom": "iphone",
"idiom": "universal",
"filename": "icon-60@3x.png",
"scale": "3x"
},
{
"size": "20x20",
"idiom": "ipad",
"filename": "icon-20-ipad.png",
"scale": "1x"
"scale": "3x",
"platform": "ios"
},
{
"size": "20x20",
"idiom": "ipad",
"filename": "icon-20@2x-ipad.png",
"scale": "2x"
"size": "64x64",
"idiom": "universal",
"filename": "icon-64@2x.png",
"scale": "2x",
"platform": "ios"
},
{
"size": "29x29",
"idiom": "ipad",
"filename": "icon-29-ipad.png",
"scale": "1x"
"size": "64x64",
"idiom": "universal",
"filename": "icon-64@3x.png",
"scale": "3x",
"platform": "ios"
},
{
"size": "29x29",
"idiom": "ipad",
"filename": "icon-29@2x-ipad.png",
"scale": "2x"
},
{
"size": "40x40",
"idiom": "ipad",
"filename": "icon-40.png",
"scale": "1x"
},
{
"size": "40x40",
"idiom": "ipad",
"filename": "icon-40@2x.png",
"scale": "2x"
},
{
"size": "76x76",
"idiom": "ipad",
"filename": "icon-76.png",
"scale": "1x"
"size": "68x68",
"idiom": "universal",
"filename": "icon-68@2x.png",
"scale": "2x",
"platform": "ios"
},
{
"size": "76x76",
"idiom": "ipad",
"idiom": "universal",
"filename": "icon-76@2x.png",
"scale": "2x"
"scale": "2x",
"platform": "ios"
},
{
"size": "83.5x83.5",
"idiom": "ipad",
"idiom": "universal",
"filename": "icon-83.5@2x.png",
"scale": "2x"
"scale": "2x",
"platform": "ios"
},
{
"size": "1024x1024",
"idiom": "ios-marketing",
"idiom": "universal",
"filename": "icon-1024.png",
"scale": "1x"
"scale": "1x",
"platform": "ios"
}
],
"info": {

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-1024.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 271 KiB

After

Width:  |  Height:  |  Size: 167 KiB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20-ipad.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 983 B

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x-ipad.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@2x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-20@3x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29-ipad.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x-ipad.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@2x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-29@3x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-38@2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-38@3x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@2x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-40@3x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@2x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-60@3x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 15 KiB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-64@2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-64@3x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-68@2x.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.7 KiB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-76@2x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
ios/Runner/Assets.xcassets/AppIcon.appiconset/icon-83.5@2x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 13 KiB

2
ios/Runner/Info.plist

@ -180,5 +180,7 @@
<array>
<string>location</string>
</array>
<key>UIApplicationSupportsIndirectInputEvents</key>
<true/>
</dict>
</plist>

2
lib/store/store_order.dart

@ -245,7 +245,7 @@ class _StoreOrderPage extends State<StoreOrderPage>
context),
sliver: SliverAppBar(
expandedHeight: (storeInfo != null &&
storeInfo.couponVOList != null)
storeInfo.couponVOList != null)
? 400.h
: 395.h,
floating: false,

42
lib/view_widget/rename_dialog_content.dart

@ -66,33 +66,33 @@ class _RenameDialogContentState extends State<RenameDialogContent> {
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
children: [
FlatButton(
onPressed: () {
widget.vc.text = "";
widget.cancelBtnTap();
Navigator.of(context).pop();
},
child: Text(
S.of(context).quxiao,
style: TextStyle(fontSize: 18, color: Colors.black),
),
),
// FlatButton(
// onPressed: () {
// widget.vc.text = "";
// widget.cancelBtnTap();
// Navigator.of(context).pop();
// },
// child: Text(
// S.of(context).quxiao,
// style: TextStyle(fontSize: 18, color: Colors.black),
// ),
// ),
Container(
// 线
width: borderWidth,
color: Colors.grey,
height: btnHeight - borderWidth - borderWidth,
),
FlatButton(
onPressed: () {
widget.okBtnTap();
Navigator.of(context).pop();
widget.vc.text = "";
},
child: Text(
S.of(context).queding,
style: TextStyle(fontSize:18, color: Colors.black),
)),
// FlatButton(
// onPressed: () {
// widget.okBtnTap();
// Navigator.of(context).pop();
// widget.vc.text = "";
// },
// child: Text(
// S.of(context).queding,
// style: TextStyle(fontSize:18, color: Colors.black),
// )),
],
),
],

248
pubspec.lock

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save