iOS提交审核

@@ -33,9 +33,9 @@ if (flutterRoot == null) {
 
 
 
-def flutterVersionCode = "503"
+def flutterVersionCode = "505"
 if (flutterVersionCode == null) {
-    flutterVersionCode = '503'
+    flutterVersionCode = '505'
 
 
 }
@@ -44,9 +44,9 @@ if (flutterVersionCode == null) {
 
 
 
-def flutterVersionName = "5.0.3"
+def flutterVersionName = "5.0.5"
 if (flutterVersionName == null) {
-    flutterVersionName = '5.0.3' 
+    flutterVersionName = '5.0.5' 
 
 }
 

@@ -3,3 +3,4 @@ distributionPath=wrapper/dists
 distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+

@@ -510,7 +510,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 500;
+				CURRENT_PROJECT_VERSION = 504;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FLUTTER_BUILD_MODE = release;
@@ -525,7 +525,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 5.0.0;
+				MARKETING_VERSION = 5.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = Runner;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -656,7 +656,7 @@
 				CODE_SIGN_ENTITLEMENTS = "Runner/一键订Debug.entitlements";
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 500;
+				CURRENT_PROJECT_VERSION = 504;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FLUTTER_BUILD_MODE = release;
@@ -671,7 +671,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 5.0.0;
+				MARKETING_VERSION = 5.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = Runner;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -692,7 +692,7 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 500;
+				CURRENT_PROJECT_VERSION = 504;
 				DEVELOPMENT_TEAM = 8J59HM8B82;
 				ENABLE_BITCODE = NO;
 				FLUTTER_BUILD_MODE = release;
@@ -707,7 +707,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				MARKETING_VERSION = 5.0.0;
+				MARKETING_VERSION = 5.0.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.naji.reserveLine;
 				PRODUCT_NAME = Runner;
 				PROVISIONING_PROFILE_SPECIFIER = "";

@@ -191,32 +191,34 @@ class _IfNeedCreateStoreState extends State<IfNeedCreateStore>
     _baseIndoProvider = Provider.of<BaseIndoProvider>(context, listen: true);
     return Scaffold(
         backgroundColor: Colors.white,
-        appBar: SystemAppBar('选择店铺',
-            // leftTitle: '上一步',
+        appBar: SystemAppBar(
+          '选择店铺',
+          // leftTitle: '上一步',
 
-            rightImgName: 'add_check_store.png', onTapRight: () {
-          if (otherLoginProvider.pageState != PageState.Success) {
-            // if (!App.sp.containsKey('openid') ||
-            //     App.sp.get("openid") == null ||
-            //     App.sp.get("openid") == '') {
-            //跳转小程序
-            Utils.goMiniProgramCreatePage(context);
-            // } else {
-            //   //跳转至新建店铺流程
-            //   NavigatorUtil.goEnterStoreNamePage(context);
-            // }
-          } else {
-            // if (!App.sp.containsKey('openid') ||
-            //     App.sp.get("openid") == null ||
-            //     App.sp.get("openid") == '') {
-            //   //跳转小程序
-            //   Utils.goMiniProgramCreatePage(context);
-            // } else {
-            //跳转至新建店铺流程
-            NavigatorUtil.goEnterStoreNamePage(context);
-            // }
-          }
-        }),
+          //     rightImgName: 'add_check_store.png', onTapRight: () {
+          //   if (otherLoginProvider.pageState != PageState.Success) {
+          //     // if (!App.sp.containsKey('openid') ||
+          //     //     App.sp.get("openid") == null ||
+          //     //     App.sp.get("openid") == '') {
+          //     //跳转小程序
+          //     Utils.goMiniProgramCreatePage(context);
+          //     // } else {
+          //     //   //跳转至新建店铺流程
+          //     //   NavigatorUtil.goEnterStoreNamePage(context);
+          //     // }
+          //   } else {
+          //     // if (!App.sp.containsKey('openid') ||
+          //     //     App.sp.get("openid") == null ||
+          //     //     App.sp.get("openid") == '') {
+          //     //   //跳转小程序
+          //     //   Utils.goMiniProgramCreatePage(context);
+          //     // } else {
+          //     //跳转至新建店铺流程
+          //     NavigatorUtil.goEnterStoreNamePage(context);
+          //     // }
+          //   }
+          // }
+        ),
         body: Container(
             // margin: EdgeInsets.only(bottom: ScreenUtil().setWidth(40)),
             padding:
@@ -279,15 +281,19 @@ class _IfNeedCreateStoreState extends State<IfNeedCreateStore>
                 //                 )),
                 //           ]));
                 // }
-                return ExceptionPage(
-                  pageState: model.pageState,
-                  callback: () {
-                    _checkSellerAcc(showLoading: true);
-                  },
-                  emptyMsg: "您还没有绑定任何店铺",
-                  emptyImg: "empty_search",
-                  showMsg: "加载中，请稍后...",
-                );
+                return InkWell(
+                    onTap: () {
+                      Utils.goPhone("400-000-9690");
+                    },
+                    child: ExceptionPage(
+                      pageState: model.pageState,
+                      callback: () {
+                        _checkSellerAcc(showLoading: true);
+                      },
+                      emptyMsg: "您还没有绑定任何店铺，请与400 000 9690 联系。",
+                      emptyImg: "empty_search",
+                      showMsg: "加载中，请稍后...",
+                    ));
               } else {
                 return
                     // VEmptyView(40),

@@ -373,15 +373,252 @@ class LoginState extends State<LoginPage> with WidgetsBindingObserver {
       App.sp.remove("unionid");
     }
     Map<String, String> params = {
-      "seller_code": "001297",
+      "seller_code": "004352",
       "alias": "ssahdahgdafgahjkhakjgh",
-      "account": "0001",
+      "account": "0000",
       "password": "123456"
     };
     value.login(context, params).then((value) {
       // setState(() {
       //   // errorText = value ?? "";
       // });
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+      
     });
   }
 

@@ -48,7 +48,8 @@ class OtherLoginProvider extends ChangeNotifier {
       {isShowLoading = true, showLoading = false}) async {
     BaseResp<dynamic> baseResp = await DioUtil()
         .request<dynamic>(context, Method.get, HttpUrl.check_seller_acc,
-            data: params, showLoading:pageState == PageState.Loading ? false:showLoading)
+            data: params,
+            showLoading: pageState == PageState.Loading ? false : showLoading)
         .catchError((error) {
       print(error);
     });

@@ -668,19 +668,45 @@ class TableManagerModel with ChangeNotifier {
 //获取预订（原来普通预订和宴会预订）
   _getReserveListAndFeastData(context, params, showloading,
       {bool selfDismiss = false}) async {
+    String hmsS = ''; //起始
+    String hmsE = ''; //结束
+    String keys = '';
+    // if (currTimeIndex == 1) {
+    //   //早市
+    //   keys = 'morning';
+    // } else if (currTimeIndex == 2) {
+    //   //午市
+    //   keys = 'noon';
+    // } else if (currTimeIndex == 3) {
+    //   //晚市
+    //   keys = 'night';
+    // }
+
+    // if (keys != '') {
+    //   List temp = dailyMap[keys];
+    //   hmsS = " ${temp.first}:00";
+    //   hmsE = " ${temp.last}:59";
+    // } else {
+    //   hmsS = " 00:00:00";
+    //   hmsE = " 23:59:59";
+    // }
+    hmsS = " 00:00:00";
+    hmsE = " 23:59:59";
+
     UserModel userModel = Provider.of<UserModel>(context, listen: false);
     String timeStrStart = dateTime.year.toString() +
         "-" +
         Utils.addZeroNumber(dateTime.month) +
         "-" +
         Utils.addZeroNumber(dateTime.day) +
-        " 00:00:00";
+        hmsS;
+
     String timeStrEnd = dateTime.year.toString() +
         "-" +
         Utils.addZeroNumber(dateTime.month) +
         "-" +
         Utils.addZeroNumber(dateTime.day) +
-        " 23:59:59";
+        hmsE;
     String start =
         (DateUtil.getDateMsByTimeStr(timeStrStart) / 1000).floor().toString();
     String end =