diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index a1debba7..1cf9e0da 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -35,7 +35,7 @@ = 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/DingTalk (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/Douyin (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/Dropbox (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/Evernote (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) - mob_sharesdk/ShareSDKPlatforms/Facebook (4.4.0): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/Flickr (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/GooglePlus (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/Instagram (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/Instapaper (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/Kakao (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/KuaiShou (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) - mob_sharesdk/ShareSDKPlatforms/Line (4.4.0): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/LinkedIn (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/Messenger (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/MingDao (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/Oasis (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/Pinterest (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/Pocket (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/QQ (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/Reddit (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/SinaWeibo (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/SMS (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/SnapChat (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/Telegram (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/TikTok (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/Twitter (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/VKontakte (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/WatermelonVideo (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) - mob_sharesdk/ShareSDKPlatforms/WeChat_Lite (4.4.0): - mob_sharesdk/ShareSDK - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/WhatsApp (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/Yixin (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) + - mob_sharesdk/ShareSDKPlatforms/YouDaoNote (4.4.0): + - mob_sharesdk/ShareSDK + - MOBFoundation (>= 3.2.9) - mob_sharesdk/ShareSDKRestoreScene (4.4.0): - mob_sharesdk/ShareSDKExtension - MOBFoundation (>= 3.2.9) @@ -92,9 +179,38 @@ PODS: - Flutter - mob_sharesdk - mob_sharesdk/ShareSDKExtension + - mob_sharesdk/ShareSDKPlatforms/DingTalk + - mob_sharesdk/ShareSDKPlatforms/Douyin + - mob_sharesdk/ShareSDKPlatforms/Dropbox + - mob_sharesdk/ShareSDKPlatforms/Evernote - mob_sharesdk/ShareSDKPlatforms/Facebook + - mob_sharesdk/ShareSDKPlatforms/Flickr + - mob_sharesdk/ShareSDKPlatforms/GooglePlus + - mob_sharesdk/ShareSDKPlatforms/Instagram + - mob_sharesdk/ShareSDKPlatforms/Instapaper + - mob_sharesdk/ShareSDKPlatforms/Kakao + - mob_sharesdk/ShareSDKPlatforms/KuaiShou - mob_sharesdk/ShareSDKPlatforms/Line + - mob_sharesdk/ShareSDKPlatforms/LinkedIn + - mob_sharesdk/ShareSDKPlatforms/Messenger + - mob_sharesdk/ShareSDKPlatforms/MingDao + - mob_sharesdk/ShareSDKPlatforms/Oasis + - mob_sharesdk/ShareSDKPlatforms/Pinterest + - mob_sharesdk/ShareSDKPlatforms/Pocket + - mob_sharesdk/ShareSDKPlatforms/QQ + - mob_sharesdk/ShareSDKPlatforms/Reddit + - mob_sharesdk/ShareSDKPlatforms/SinaWeibo + - mob_sharesdk/ShareSDKPlatforms/SMS + - mob_sharesdk/ShareSDKPlatforms/SnapChat + - mob_sharesdk/ShareSDKPlatforms/Telegram + - mob_sharesdk/ShareSDKPlatforms/TikTok + - mob_sharesdk/ShareSDKPlatforms/Twitter + - mob_sharesdk/ShareSDKPlatforms/VKontakte + - mob_sharesdk/ShareSDKPlatforms/WatermelonVideo - mob_sharesdk/ShareSDKPlatforms/WeChat_Lite + - mob_sharesdk/ShareSDKPlatforms/WhatsApp + - mob_sharesdk/ShareSDKPlatforms/Yixin + - mob_sharesdk/ShareSDKPlatforms/YouDaoNote - mob_sharesdk/ShareSDKRestoreScene - mob_sharesdk/ShareSDKUI - sqflite (0.0.2): @@ -222,7 +338,7 @@ SPEC CHECKSUMS: scan: aea35bb4aa59ccc8839c576a18cd57c7d492cc86 SDWebImage: 4dc3e42d9ec0c1028b960a33ac6b637bb432207b shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d - sharesdk_plugin: 6d6634bb480174b607030f19fc9d84d68cfbf326 + sharesdk_plugin: 5a59e49d2d5e55c8e8f67cc9ddf05172c2494a6b sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904 SSZipArchive: e7b4f3d9e780c2acc1764cd88fbf2de28f26e5b2 thumbnails: bb4f4e9bb4b51c8ae4e6ad9a2fa81373f9b634ad @@ -235,6 +351,6 @@ SPEC CHECKSUMS: WechatOpenSDK_Fuck: aa8f4b0af902837e887a1d40c62f06c060c1dc98 ZLPhotoBrowser-objc: c7657d3bc85ae231884e058d0e3638f619164736 -PODFILE CHECKSUM: 7092aa3092b9508e0ccea9e76cd5fa33505dbb46 +PODFILE CHECKSUM: 77c662d4cd560e96445691f5bf7f29e2b140072c COCOAPODS: 1.11.2 diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 620d6f35..b94d898c 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -657,6 +657,7 @@ 9705A1C41CF9048500538489 /* Embed Frameworks */, 3B06AD1E1E4923F5004D2608 /* Thin Binary */, 120EAF7195D9AB3BB1E8FA2B /* [CP] Copy Pods Resources */, + 8C1FAACB8CAD66760F3893D3 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -763,6 +764,23 @@ shellPath = /bin/sh; shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin\n"; }; + 8C1FAACB8CAD66760F3893D3 /* [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; + }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -912,7 +930,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 41; + CURRENT_PROJECT_VERSION = 54; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -962,7 +980,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 1.0.41; + MARKETING_VERSION = 1.0.54; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -1033,6 +1051,7 @@ }; 97C147031CF9000F007C117D /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; @@ -1141,7 +1160,7 @@ }; 97C147061CF9000F007C117D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = ""; @@ -1149,7 +1168,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 41; + CURRENT_PROJECT_VERSION = 54; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -1199,7 +1218,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 1.0.41; + MARKETING_VERSION = 1.0.54; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -1278,7 +1297,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 41; + CURRENT_PROJECT_VERSION = 54; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -1328,7 +1347,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 1.0.41; + MARKETING_VERSION = 1.0.54; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index eb266313..aa6e11cb 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName - 迴鄉 + 一心回鄉 CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier diff --git a/ios/zh-Hans.lproj/InfoPlist.strings b/ios/zh-Hans.lproj/InfoPlist.strings index 00d36ed5..fa71ee76 100644 --- a/ios/zh-Hans.lproj/InfoPlist.strings +++ b/ios/zh-Hans.lproj/InfoPlist.strings @@ -7,8 +7,8 @@ */ -CFBundleName="回乡"; -CFBundleDisplayName="回乡"; +CFBundleName="一心回乡"; +CFBundleDisplayName="一心回乡"; NSCameraUsageDescription="您的相机权限将用于更新头像使用"; NSPhotoLibraryUsageDescription="您的照片信息将用于更新头像使用"; NSLocationWhenInUseUsageDescription="您的定位位置信息将用于查看周围的门店"; diff --git a/lib/community/headlines/article_page.dart b/lib/community/headlines/article_page.dart index 7a1fd383..6c6f928d 100644 --- a/lib/community/headlines/article_page.dart +++ b/lib/community/headlines/article_page.dart @@ -106,7 +106,7 @@ class _ArticlePage extends State } BaseData> baseData = await apiService.queryArticle({ "pageNum": pageNum, - "pageSize": 100, + "pageSize": 10, "searchKey": "", "state": 1, "type": 2 diff --git a/lib/store/store_view/product_sku.dart b/lib/store/store_view/product_sku.dart index c75e8a58..6ca52c67 100644 --- a/lib/store/store_view/product_sku.dart +++ b/lib/store/store_view/product_sku.dart @@ -114,8 +114,8 @@ class _ProductSku extends State { children: [ MImage( widget.miNiDetail.imgs[0], - width: 70, - height: 70, + width: 75, + height: 75, fit: BoxFit.cover, errorSrc: "assets/image/default_1.png", fadeSrc: "assets/image/default_1.png", @@ -123,7 +123,7 @@ class _ProductSku extends State { SizedBox( width: 10, ), - Column( + Expanded(child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( @@ -139,6 +139,8 @@ class _ProductSku extends State { child: Text( ": " + (selectSkus.map((e) => "$e").toList().toString()), + maxLines: 1, + overflow: TextOverflow.ellipsis, style: TextStyle( color: Color(0xFF727272), fontSize: 11.sp, @@ -167,7 +169,8 @@ class _ProductSku extends State { ], ), ], - ), + )) + , Spacer(), InkWell( onTap: () { diff --git a/lib/view_widget/invite_success_dialog.dart b/lib/view_widget/invite_success_dialog.dart index ee9fc595..d3ed9309 100644 --- a/lib/view_widget/invite_success_dialog.dart +++ b/lib/view_widget/invite_success_dialog.dart @@ -47,7 +47,7 @@ class _InviteSuccessDialog extends State { children: [ Image.asset( "assets/image/yq.png", - width: 65, + width: 61, height: 65, ), SizedBox(height: 9.h,), diff --git a/lib/view_widget/new_people_reward.dart b/lib/view_widget/new_people_reward.dart index 8a0a702a..8f1d68bc 100644 --- a/lib/view_widget/new_people_reward.dart +++ b/lib/view_widget/new_people_reward.dart @@ -152,46 +152,46 @@ class _NewPeopleReward extends State { ], ), ), - Expanded( - child: Padding( - padding: EdgeInsets.only(top: 4, bottom: 4), - child: Column( - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text( - newUserCouponList.storeName, - overflow: TextOverflow.ellipsis, - maxLines: 2, - style: TextStyle( - fontSize: 14.sp, - fontWeight: MyFontWeight.semi_bold, - color: Color(0xFF181818), - ), - ), - Text( - newUserCouponList.couponName, - overflow: TextOverflow.ellipsis, - maxLines: 2, - style: TextStyle( - fontSize: 12.sp, - fontWeight: MyFontWeight.medium, - color: Color(0xFFD3623D), - ), - ), - Text( - "有效期至:${(newUserCouponList.useEndTime != null && newUserCouponList.useEndTime != "") ? newUserCouponList.useEndTime.split(" ")[0] : "$newUserCouponList.useEndTime"}", - overflow: TextOverflow.ellipsis, - maxLines: 2, - style: TextStyle( - fontSize: 10.sp, - fontWeight: MyFontWeight.regular, - color: Color(0xFF727272), - ), - ) - ], - )), - ), + Expanded(child:Padding( + padding: EdgeInsets.only(top: 4, bottom: 4,left:10), + child: Column( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text( + newUserCouponList.storeName, + overflow: TextOverflow.ellipsis, + maxLines: 2, + style: TextStyle( + fontSize: 14.sp, + fontWeight: MyFontWeight.semi_bold, + color: Color(0xFF181818), + ), + ), + Text( + newUserCouponList.couponName, + overflow: TextOverflow.ellipsis, + maxLines: 2, + style: TextStyle( + fontSize: 12.sp, + fontWeight: MyFontWeight.medium, + color: Color(0xFFD3623D), + ), + ), + Text( + "有效期至:${(newUserCouponList.useEndTime != null && newUserCouponList.useEndTime != "") + ? newUserCouponList.useEndTime.split(" ")[0] + : "$newUserCouponList.useEndTime"}", + overflow: TextOverflow.ellipsis, + maxLines: 2, + style: TextStyle( + fontSize: 10.sp, + fontWeight: MyFontWeight.regular, + color: Color(0xFF727272), + ), + ) + ], + ))), ], ), ); diff --git a/pubspec.lock b/pubspec.lock index 784ca8a7..0fc25a0b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -229,7 +229,7 @@ packages: name: flutter_html url: "https://pub.flutter-io.cn" source: hosted - version: "2.2.0" + version: "2.2.1" flutter_layout_grid: dependency: transitive description: @@ -475,7 +475,7 @@ packages: name: path_provider_linux url: "https://pub.flutter-io.cn" source: hosted - version: "2.1.2" + version: "2.1.4" path_provider_platform_interface: dependency: transitive description: