ios 更新

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)",

lib/community/community_view/community_dynamic.dart

@@ -184,7 +184,7 @@ class _CommunityDynamic extends State<CommunityDynamic> {
                 crossAxisAlignment: CrossAxisAlignment.center,
                 children: [
                   Container(
-                    height: 44.h,
+                    // height: 44.h,
                     child: Row(
                       children: [
                         GestureDetector(

lib/community/release_dynamic.dart

@@ -103,7 +103,7 @@ class _ReleaseDynamic extends State<ReleaseDynamic> {
                     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<ReleaseDynamic> {
                       overflow: TextOverflow.ellipsis,
                       style: TextStyle(
                         fontWeight: MyFontWeight.medium,
-                        fontSize: 14.sp,
+                        fontSize: 12.sp,
-                        color: Colors.black,
+                        color: Color(0xFFB3B2B2),
                       ),
                     ),
                   )
@@ -164,7 +164,7 @@ class _ReleaseDynamic extends State<ReleaseDynamic> {
       SmartDialog.showToast("请输入您此刻的想法！");
       return;
     }
-    EasyLoading.show(status: S.of(context).zhengzaijiazai);
+    EasyLoading.show(status: "上传中");
 
     fileUpload().then((value) async {
       String subjectType = "text";

lib/home/home_view/home_banner.dart

@@ -90,11 +90,11 @@ class _HomeBanner extends State<HomeBanner> {
         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("?"));
+          String params = router.substring(router.indexOf("?")+1);
-          params = params.replaceAll("?", "");
           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);
         }

lib/retrofit/min_api.dart

@@ -58,8 +58,8 @@ abstract class MinApiService {
     }
     headers["Environment"] = "app";
     dio.options = BaseOptions(
-      connectTimeout: 10000,
+      connectTimeout: 20000,
-      receiveTimeout: 10000,
+      receiveTimeout: 20000,
       headers: headers,
       responseType: ResponseType.json,
     );

lib/retrofit/retrofit_api.dart

@@ -87,8 +87,8 @@ abstract class ApiService {
       headers["Environment"] = "app";
     }
     dio.options = BaseOptions(
-      connectTimeout: 10000,
+      connectTimeout: 60000,
-      receiveTimeout: 10000,
+      receiveTimeout: 60000,
       headers: headers,
       responseType: ResponseType.json,
     );

lib/union/union_view/union_coupon.dart

@@ -193,7 +193,7 @@ class _UnionCoupon extends State<UnionCoupon> {
                                           : S.of(context).quanchangzhe(widget
                                               .storeInfo
                                               .couponVOList[position]
-                                              .discountPercent))
+                                              .discountPercent /10.0))
                                       : "",
                                   overflow: TextOverflow.ellipsis,
                                   style: TextStyle(