From b5e7eff6cd68eda9c30f1dde88090e3bb19b1cfe Mon Sep 17 00:00:00 2001 From: fmk Date: Thu, 28 Apr 2022 18:47:14 +0800 Subject: [PATCH] =?UTF-8?q?ios=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ios/Runner.xcodeproj/project.pbxproj | 12 ++++++------ lib/community/community_view/community_dynamic.dart | 2 +- lib/community/release_dynamic.dart | 8 ++++---- lib/home/home_view/home_banner.dart | 6 +++--- lib/retrofit/min_api.dart | 4 ++-- lib/retrofit/retrofit_api.dart | 4 ++-- lib/union/union_view/union_coupon.dart | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj index 1c667829..cab64196 100644 --- a/ios/Runner.xcodeproj/project.pbxproj +++ b/ios/Runner.xcodeproj/project.pbxproj @@ -616,7 +616,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 88; + CURRENT_PROJECT_VERSION = 90; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -666,7 +666,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 1.0.88; + MARKETING_VERSION = 1.0.90; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -816,7 +816,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 88; + CURRENT_PROJECT_VERSION = 90; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -866,7 +866,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 1.0.88; + MARKETING_VERSION = 1.0.90; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", @@ -907,7 +907,7 @@ CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO; CLANG_ENABLE_MODULES = YES; CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; - CURRENT_PROJECT_VERSION = 88; + CURRENT_PROJECT_VERSION = 90; DEVELOPMENT_TEAM = YF3Q8DVP52; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -957,7 +957,7 @@ "$(PROJECT_DIR)/baidu", "$(PROJECT_DIR)/Runner/baidu", ); - MARKETING_VERSION = 1.0.88; + MARKETING_VERSION = 1.0.90; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "$(inherited)", diff --git a/lib/community/community_view/community_dynamic.dart b/lib/community/community_view/community_dynamic.dart index 27bdb7aa..83a235dc 100644 --- a/lib/community/community_view/community_dynamic.dart +++ b/lib/community/community_view/community_dynamic.dart @@ -184,7 +184,7 @@ class _CommunityDynamic extends State { crossAxisAlignment: CrossAxisAlignment.center, children: [ Container( - height: 44.h, + // height: 44.h, child: Row( children: [ GestureDetector( diff --git a/lib/community/release_dynamic.dart b/lib/community/release_dynamic.dart index d3aef942..540f5d4d 100644 --- a/lib/community/release_dynamic.dart +++ b/lib/community/release_dynamic.dart @@ -103,7 +103,7 @@ class _ReleaseDynamic extends State { overflow: TextOverflow.ellipsis, style: TextStyle( fontWeight: MyFontWeight.semi_bold, - fontSize: 18.sp, + fontSize: 14.sp, color: Colors.red, ), ), @@ -117,8 +117,8 @@ class _ReleaseDynamic extends State { overflow: TextOverflow.ellipsis, style: TextStyle( fontWeight: MyFontWeight.medium, - fontSize: 14.sp, - color: Colors.black, + fontSize: 12.sp, + color: Color(0xFFB3B2B2), ), ), ) @@ -164,7 +164,7 @@ class _ReleaseDynamic extends State { SmartDialog.showToast("请输入您此刻的想法！"); return; } - EasyLoading.show(status: S.of(context).zhengzaijiazai); + EasyLoading.show(status: "上传中"); fileUpload().then((value) async { String subjectType = "text"; diff --git a/lib/home/home_view/home_banner.dart b/lib/home/home_view/home_banner.dart index 4d3df053..f5d245a0 100644 --- a/lib/home/home_view/home_banner.dart +++ b/lib/home/home_view/home_banner.dart @@ -90,11 +90,11 @@ class _HomeBanner extends State { break; case 4: String router = bannerData.content; + // String router = "/router/store_order?{\"storeId\":\"1512378184161558528\",\"tenantCode\":\"1188\",\"storeName\":\"农场煮意\"}"; if (router.contains("?")) { - String params = router.substring(router.indexOf("?")); - params = params.replaceAll("?", ""); + String params = router.substring(router.indexOf("?")+1); Map map = jsonDecode(params); - Navigator.of(context).pushNamed(router, arguments: map); + Navigator.of(context).pushNamed(router.substring(0,router.indexOf("?")), arguments: map); } else { Navigator.of(context).pushNamed(router); } diff --git a/lib/retrofit/min_api.dart b/lib/retrofit/min_api.dart index 33adbca6..f8e85a64 100644 --- a/lib/retrofit/min_api.dart +++ b/lib/retrofit/min_api.dart @@ -58,8 +58,8 @@ abstract class MinApiService { } headers["Environment"] = "app"; dio.options = BaseOptions( - connectTimeout: 10000, - receiveTimeout: 10000, + connectTimeout: 20000, + receiveTimeout: 20000, headers: headers, responseType: ResponseType.json, ); diff --git a/lib/retrofit/retrofit_api.dart b/lib/retrofit/retrofit_api.dart index 751209d3..1f7b8706 100644 --- a/lib/retrofit/retrofit_api.dart +++ b/lib/retrofit/retrofit_api.dart @@ -87,8 +87,8 @@ abstract class ApiService { headers["Environment"] = "app"; } dio.options = BaseOptions( - connectTimeout: 10000, - receiveTimeout: 10000, + connectTimeout: 60000, + receiveTimeout: 60000, headers: headers, responseType: ResponseType.json, ); diff --git a/lib/union/union_view/union_coupon.dart b/lib/union/union_view/union_coupon.dart index 0daa0d1c..ad38744f 100644 --- a/lib/union/union_view/union_coupon.dart +++ b/lib/union/union_view/union_coupon.dart @@ -193,7 +193,7 @@ class _UnionCoupon extends State { : S.of(context).quanchangzhe(widget .storeInfo .couponVOList[position] - .discountPercent)) + .discountPercent /10.0)) : "", overflow: TextOverflow.ellipsis, style: TextStyle(