Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -2579,7 +2579,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2621,7 +2621,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHInformationPerfectListVC.swift

@@ -118,9 +118,6 @@ extension YHInformationPerfectListVC {
         guard let orderId = orderId else { return}
         self.serviceCenterMainReqVM.getPersonInfoFillStep(params: ["orderId":orderId]) { success, error in
             if success == true {
-                if self.serviceCenterMainReqVM.informationFillStepModel?.sweet_notify_status == 0 {
-                    self.showTipsAlert()
-                }
     
                 if self.serviceCenterMainReqVM.myInfoFillStep > 6 {
                     self.hasSubmitFlag = true
@@ -403,12 +400,11 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource
     }
     
     private func  handleJumpLogicDebug(tapIndex : Int) {
-//        if self.serviceCenterMainReqVM.myInfoFillStep > 6 {
-//            goInfoListVCOp(index:tapIndex)
-//            return
-//        }
-        
         if tapIndex == 0 {
+            if self.serviceCenterMainReqVM.informationFillStepModel?.sweet_notify_status == 0 {
+                self.showTipsAlert()
+                return
+            }
             //主申请人信息
             let vc = YHMainApplicantInformationViewController()
             vc.orderId = orderId ?? 0