ios

更改视频列表简介间距；
更改ios地图列表bug；
优化下单助农积分板块；
更改iOS订单结算，vip优惠按钮；
更改首页bug；

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 = 8;
+				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.8;
+				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 = 8;
+				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.8;
+				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 = 8;
+				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.8;
+				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

@@ -503,7 +503,10 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
               },
               child: SingleChildScrollView(
                 physics: NeverScrollableScrollPhysics(),
-                child: Column(
+                child: FutureBuilder(
+                    future: queryHome(),
+                    builder: (context, snapshot) {
+                      return Column(
                   children: [
                     ///banner
                     HomeBanner(bannerData, controller),
@@ -579,7 +582,7 @@ class HomePageState extends State<HomePage> with AutomaticKeepAliveClientMixin {
                       },
                     ),
                   ],
-                ),
+                );})
               ),
             ),
           ),

lib/main_page.dart

@@ -204,7 +204,7 @@ class _MainPage extends State<MainPage> with WidgetsBindingObserver {
       myLocPlugin.authAK("ylW2QPlsbERkho7jOgU4GQSeawmdUIoR");
       BMFMapSDK.setApiKeyAndCoordType(
         'ylW2QPlsbERkho7jOgU4GQSeawmdUIoR',
-        BMF_COORD_TYPE.COMMON,
+        BMF_COORD_TYPE.BD09LL,
       );
     } else if (Platform.isAndroid) {
       BMFMapSDK.setCoordType(BMF_COORD_TYPE.BD09LL);

lib/retrofit/min_api.dart

@@ -26,7 +26,7 @@ import 'data/shopping_home_config.dart';
 
 part 'min_api.g.dart';
 
-const localBaseUrl = "http://192.168.10.129:8765/app/";///本地
+const localBaseUrl = "http://192.168.10.78:8765/app/";///本地
 // const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地
 const serviceBaseUrl = "https://pos.api.lotus-wallet.com/app/";///线上
 

lib/retrofit/retrofit_api.dart

@@ -64,7 +64,7 @@ import 'data/wx_pay.dart';
 
 part 'retrofit_api.g.dart';
 
-const localBaseUrl = "http://192.168.10.129:8766/app/";///本地
+const localBaseUrl = "http://192.168.10.78:8766/app/";///本地
 // const localBaseUrl = "https://2946-27-19-77-115.jp.ngrok.io/app/";///本地
 const serviceBaseUrl = "https://pos.platform.lotus-wallet.com/app/";///线上
 

lib/settlement/settlement.dart

@@ -122,6 +122,7 @@ class _Settlement extends State<Settlement> {
           storeId: storeId,
         showLoading: false
       );
+      queryMemberInfo();
       if (promotions != null && promotions != "" && tableId <= 0) {
         queryOrderInfo(
             address != null ? address.id : null,
@@ -256,6 +257,20 @@ class _Settlement extends State<Settlement> {
     }
   }
 
+  ///会员信息
+  queryMemberInfo() async {
+    BaseData baseData = await minService.memberInfo().catchError((error) {
+      debugPrint(error);
+    });
+    if (baseData != null && baseData.isSuccess) {
+      SharedPreferences.getInstance().then(
+            (value) => {
+          value.setString('minMember', jsonEncode(baseData.data)),
+        },
+      );
+    }
+  }
+
   ///查看订单详情
   queryOrderDetails(id) async {
     BaseData<MinOrderInfo> baseData = await minService.getOrderDetails({

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,