Merge remote-tracking branch 'origin/new_revision_app' into new_revision_app

# Conflicts:
#	lib/home/home_page.dart
#	lib/settlement/settlement.dart

ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>11.0</string>
 </dict>
 </plist>

ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
- platform :ios, '10.0'
+ platform :ios, '11.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

ios/Podfile.lock

@@ -325,7 +325,7 @@ SPEC CHECKSUMS:
   AFNetworking: 7864c38297c79aaca1500c33288e429c3451fdce
   BaiduMapKit: f227cfb43581e91466fb4f1344f655eab5788777
   BMKLocationKit: 688d8e1194980b96fc9a6585c0eb42e62fbaf780
-  Flutter: 50d75fe2f02b26cc09d224853bb45737f8b3214a
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   flutter_baidu_mapapi_base: cb406be78c3a949fb58a45dc6627f139d580bd37
   flutter_baidu_mapapi_map: 81c4e6e93dc668e311d9b521421deaf292390434
   flutter_baidu_mapapi_search: 13a360334e91abea0bcf820546b2ef4548e42e08
@@ -355,6 +355,6 @@ SPEC CHECKSUMS:
   webview_flutter: 5fb4def2bbd4339889ee14d045b605cefc5bc232
   ZLPhotoBrowser-objc: c7657d3bc85ae231884e058d0e3638f619164736
 
-PODFILE CHECKSUM: 77c662d4cd560e96445691f5bf7f29e2b140072c
+PODFILE CHECKSUM: 27a0f08c504497d82c425d2ccb28d9958a6e156a
 
 COCOAPODS: 1.11.3

ios/Runner.xcodeproj/project.pbxproj

@@ -617,7 +617,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 9;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -667,7 +667,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 3.1.7;
+				MARKETING_VERSION = 3.1.9;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -819,7 +819,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 9;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -869,7 +869,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 3.1.7;
+				MARKETING_VERSION = 3.1.9;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
@@ -912,7 +912,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
-				CURRENT_PROJECT_VERSION = 7;
+				CURRENT_PROJECT_VERSION = 9;
 				DEVELOPMENT_TEAM = YF3Q8DVP52;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -962,7 +962,7 @@
 					"$(PROJECT_DIR)/baidu",
 					"$(PROJECT_DIR)/Runner/baidu",
 				);
-				MARKETING_VERSION = 3.1.7;
+				MARKETING_VERSION = 3.1.9;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
 					"$(inherited)",

ios/Runner/Info.plist

@@ -144,6 +144,7 @@
 	</dict>
 	<key>UIBackgroundModes</key>
 	<array>
+		<string>location</string>
 		<string>remote-notification</string>
 	</array>
 	<key>UILaunchStoryboardName</key>

lib/community/community_view/class_list_view.dart

@@ -217,7 +217,7 @@ class _ClassListView extends State<ClassListView> {
                   maxLines: 2,
                   style: TextStyle(
                     fontSize: 13.sp,
-                    height: 1.2.h,
+                    height: 1.5.h,
                     fontWeight: MyFontWeight.medium,
                     color: Colors.black,
                   ),

lib/home/home_page.dart

@@ -163,6 +163,8 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
 
     final BaseData brand =
         await apiService.queryHomeBrand().catchError((onError) {
+          SmartDialog.showToast(AppUtils.dioErrorTypeToString(onError.type),
+              alignment: Alignment.center);
       refreshController.refreshFailed();
     });
     if (brand != null && brand.isSuccess) {
@@ -287,9 +289,7 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
 
   queryUserBalance() async {
     BaseData<UserInfo> baseData =
-    await apiService.queryInfo().catchError((onError) {
-      SmartDialog.showToast(AppUtils.dioErrorTypeToString(onError.type),
-          alignment: Alignment.center);});
+    await apiService.queryInfo().catchError((onError) {});
     if (baseData != null && baseData.isSuccess) {
       userInfo = baseData.data;
       mRaiseMoney = double.tryParse(userInfo.raiseMoney);
@@ -538,7 +538,7 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
                     HomeRecommendGoods(homeRank),
 
                     ///助农专区
-                            if(mRaiseMoney != 0.0)
+                    if(mRaiseMoney != 0)
                     HappyHelpFarmers(),
 
                     ///福利中心
@@ -582,8 +582,7 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
                       },
                     ),
                   ],
-                        );
-                    }),
+                );})
               ),
             ),
           ),
@@ -603,6 +602,7 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
       child: GestureDetector(
         onTap: (){
           Navigator.of(context).pushNamed('/router/invite_friends');
+          // Navigator.of(context).pushNamed('/router/mine_greenery');
         },
         child: ClipRRect(
           child:Image.asset(

lib/settlement/settlement.dart

@@ -120,7 +120,8 @@ class _Settlement extends State<Settlement> {
           token: minToken,
           tenant: tenant,
           storeId: storeId,
-          showLoading: false);
+        showLoading: false
+      );
       queryMemberInfo();
       if (promotions != null && promotions != "" && tableId <= 0) {
         queryOrderInfo(
@@ -498,9 +499,7 @@ class _Settlement extends State<Settlement> {
     placeOrderFirst.orderTypeId = 0;
     placeOrderFirst.parentCode = parentCode; // 火锅加菜
     placeOrderFirst.parentId = parentId; // 火锅加菜
-    placeOrderFirst.payChannel = ((placeOrderFirst.cartSum == "0.00")
-        ? payChannel = 0
-        : (settleOrderInfo.isRaise ? 7 : payChannel));
+    placeOrderFirst.payChannel = ((placeOrderFirst.cartSum == "0.00") ? payChannel = 0 : (settleOrderInfo.isRaise ? 7:payChannel));
     placeOrderFirst.promotionInfoDTO = PromotionInfoDTOBean();
     placeOrderFirst.promotionInfoDTO.promotionId =
         (promotion != null && tableId <= 0) ? promotion.id : "";
@@ -753,8 +752,8 @@ class _Settlement extends State<Settlement> {
                         child: Container(
                           child: Column(
                             children: [
-                              DistributionMode((addressId, isTake,
-                                      memberCouponId, orderId, promotionId) {
+                              DistributionMode((addressId, isTake, memberCouponId,
+                                  orderId, promotionId) {
                                 setState(() {
                                   this.selectedBtn = 0;
                                 });
@@ -785,22 +784,19 @@ class _Settlement extends State<Settlement> {
                               // ),
 
                               ///订单商品
-                              if (settleOrderInfo != null ||
-                                  minOrderInfo != null)
+                              if(settleOrderInfo != null || minOrderInfo != null)
                               SettlementOrderCommodity(
                                 selectedBtn,
                                 settleOrderInfo,
                                 minOrderInfo,
                                 tableId,
                                 pageType,
-                                    (coupons != "" || promotions != "")
-                                        ? false
-                                        : useVipPriceSelect,
-                                    this.showVipTips),
+                                (coupons != "" || promotions!="") ? false :useVipPriceSelect,
+                                this.showVipTips
+                              ),
 
                               ///优惠券/备注/会员优惠金额
-                              if (settleOrderInfo != null ||
-                                  minOrderInfo != null)
+                              if(settleOrderInfo != null || minOrderInfo != null)
                               ActivityCouponRemarks(
                                 couponCart,
                                 activityCart,
@@ -817,26 +813,21 @@ class _Settlement extends State<Settlement> {
                                     arguments: {},
                                   ).then((value) => {
                                     setState(() {
-                                              if (value != null)
-                                                remakers = value;
+                                      if (value != null) remakers = value;
                                     })
-                                          });
-                                    },
+                                  });},
                                 tableId,
                                 vipPriceSelect,
                                   (){
                                     setState(() {
                                       this.showVipTips = true;
                                     });
-                                    }),
-
-                              if (settleOrderInfo != null &&
-                                  placeOrder &&
-                                  joinA != JoinActivity.BargainBug)
+                                  }
+                              ),
 
+                              if (settleOrderInfo != null && placeOrder && joinA != JoinActivity.BargainBug)
                               ///支付方式
-                                PayMethod(payChannelCheck, coupons, promotions,
-                                    useVipPriceSelect, settleOrderInfo),
+                                PayMethod(payChannelCheck,coupons,promotions,useVipPriceSelect,settleOrderInfo),
                             ],
                           ),
                         ),
@@ -945,8 +936,8 @@ class _Settlement extends State<Settlement> {
             useVipPriceSelect,
             count1,
             payChannel,
-          tableId);
-    }
+            tableId);}
+
   }
 
   vipPriceSelect(bool useVipPriceSelect) {
@@ -966,8 +957,7 @@ class _Settlement extends State<Settlement> {
           useVipPriceSelect,
           count1,
           payChannel,
-          tableId);
-    }
+          tableId);}
   }
 
   mobileChange(String mobile) {
@@ -1007,8 +997,10 @@ class _Settlement extends State<Settlement> {
     //   promotions = "";
     //   this.promotion = null;
     if (tableId > 0) {
-      if (couponBean == null) queryCancelMemberCoupon(parentId);
-      if (couponBean.id != null) queryUseMemberCoupon(couponBean.id);
+      if(couponBean == null)
+      queryCancelMemberCoupon(parentId);
+      if (couponBean.id != null)
+        queryUseMemberCoupon(couponBean.id);
     } else {
       queryOrderInfo(
           address?.id,

lib/settlement/settlement_view/activity_coupon_remarks.dart

@@ -76,7 +76,7 @@ class _ActivityCouponRemarks extends State<ActivityCouponRemarks> {
         mainAxisAlignment: MainAxisAlignment.spaceEvenly,
         crossAxisAlignment: CrossAxisAlignment.center,
         children: [
-          if(!widget?.settleOrderInfo?.isRaise ?? false)
+          if(!(widget?.settleOrderInfo?.isRaise ?? false))
           Row(
             mainAxisAlignment: MainAxisAlignment.center,
             crossAxisAlignment: CrossAxisAlignment.center,