Browse Source

商家端新版更改,代码合并,已发布一个测试版;(3.2.28)

注册账号页面商家名称输入类型更改;
wr_2023_new_business
zsw 1 year ago
parent
commit
ab425fef79
  1. 8
      ios/Podfile.lock
  2. 12
      ios/Runner.xcodeproj/project.pbxproj
  3. 1
      lib/business_system/login/register_retrieve_password.dart
  4. 205
      pubspec.lock

8
ios/Podfile.lock

@ -46,6 +46,8 @@ PODS:
- fluwx (0.0.1): - fluwx (0.0.1):
- Flutter - Flutter
- mob_sharesdk/ShareSDKPlatforms/WeChatFull - mob_sharesdk/ShareSDKPlatforms/WeChatFull
- image_gallery_saver (1.5.0):
- Flutter
- image_pickers (0.0.1): - image_pickers (0.0.1):
- AFNetworking - AFNetworking
- Flutter - Flutter
@ -251,6 +253,7 @@ DEPENDENCIES:
- flutter_baidu_mapapi_utils (from `.symlinks/plugins/flutter_baidu_mapapi_utils/ios`) - flutter_baidu_mapapi_utils (from `.symlinks/plugins/flutter_baidu_mapapi_utils/ios`)
- flutter_bmflocation (from `.symlinks/plugins/flutter_bmflocation/ios`) - flutter_bmflocation (from `.symlinks/plugins/flutter_bmflocation/ios`)
- fluwx (from `.symlinks/plugins/fluwx/ios`) - fluwx (from `.symlinks/plugins/fluwx/ios`)
- image_gallery_saver (from `.symlinks/plugins/image_gallery_saver/ios`)
- image_pickers (from `.symlinks/plugins/image_pickers/ios`) - image_pickers (from `.symlinks/plugins/image_pickers/ios`)
- number_precision (from `.symlinks/plugins/number_precision/ios`) - number_precision (from `.symlinks/plugins/number_precision/ios`)
- package_info (from `.symlinks/plugins/package_info/ios`) - package_info (from `.symlinks/plugins/package_info/ios`)
@ -300,6 +303,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/flutter_bmflocation/ios" :path: ".symlinks/plugins/flutter_bmflocation/ios"
fluwx: fluwx:
:path: ".symlinks/plugins/fluwx/ios" :path: ".symlinks/plugins/fluwx/ios"
image_gallery_saver:
:path: ".symlinks/plugins/image_gallery_saver/ios"
image_pickers: image_pickers:
:path: ".symlinks/plugins/image_pickers/ios" :path: ".symlinks/plugins/image_pickers/ios"
number_precision: number_precision:
@ -345,12 +350,13 @@ SPEC CHECKSUMS:
flutter_baidu_mapapi_utils: f6a5d23da26b0e58f1ae9908da7ba87fd48384b1 flutter_baidu_mapapi_utils: f6a5d23da26b0e58f1ae9908da7ba87fd48384b1
flutter_bmflocation: 1bd73181196567fe1529f765aa4f8e2615a8a3cf flutter_bmflocation: 1bd73181196567fe1529f765aa4f8e2615a8a3cf
fluwx: a24006296e7ca601e8544e12bd6269497fae23e6 fluwx: a24006296e7ca601e8544e12bd6269497fae23e6
image_gallery_saver: 259eab68fb271cfd57d599904f7acdc7832e7ef2
image_pickers: 25c8916d358bc9d2707cb470ba3d57497f105773 image_pickers: 25c8916d358bc9d2707cb470ba3d57497f105773
mob_sharesdk: 0698d60b3c1549a5b0bcfdec6f407439dd2960c0 mob_sharesdk: 0698d60b3c1549a5b0bcfdec6f407439dd2960c0
MOBFoundation: 6df2684b4db4f0f5bd71b0623f82e11271bf7ac8 MOBFoundation: 6df2684b4db4f0f5bd71b0623f82e11271bf7ac8
number_precision: 26fa2be2212f9d1429f92d667d6b0aa4df0058d8 number_precision: 26fa2be2212f9d1429f92d667d6b0aa4df0058d8
package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62 package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
path_provider: f96fff6166a8867510d2c25fdcc346327cc4b259 path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0 permission_handler: ccb20a9fad0ee9b1314a52b70b76b473c5f8dab0
scan: aea35bb4aa59ccc8839c576a18cd57c7d492cc86 scan: aea35bb4aa59ccc8839c576a18cd57c7d492cc86
SDWebImage: e5cc87bf736e60f49592f307bdf9e157189298a3 SDWebImage: e5cc87bf736e60f49592f307bdf9e157189298a3

12
ios/Runner.xcodeproj/project.pbxproj

@ -619,7 +619,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 6; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -669,7 +669,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 3.2.27; MARKETING_VERSION = 3.2.28;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
@ -822,7 +822,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 6; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -872,7 +872,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 3.2.27; MARKETING_VERSION = 3.2.28;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",
@ -916,7 +916,7 @@
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
CURRENT_PROJECT_VERSION = 6; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = YF3Q8DVP52; DEVELOPMENT_TEAM = YF3Q8DVP52;
ENABLE_BITCODE = NO; ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = ( FRAMEWORK_SEARCH_PATHS = (
@ -966,7 +966,7 @@
"$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/baidu",
"$(PROJECT_DIR)/Runner/baidu", "$(PROJECT_DIR)/Runner/baidu",
); );
MARKETING_VERSION = 3.2.27; MARKETING_VERSION = 3.2.28;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
"$(inherited)", "$(inherited)",

1
lib/business_system/login/register_retrieve_password.dart

@ -540,7 +540,6 @@ class _RegisterRetrievePassword extends State<RegisterRetrievePassword> {
border: InputBorder.none, border: InputBorder.none,
contentPadding: EdgeInsets.only(left: 23.w), contentPadding: EdgeInsets.only(left: 23.w),
), ),
keyboardType: TextInputType.phone,
style: TextStyle( style: TextStyle(
color: Color(0xFF808080), color: Color(0xFF808080),
fontSize: 14.sp, fontSize: 14.sp,

205
pubspec.lock

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