Merge commit '09b94ff7' into xiezhaolin

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -2667,7 +2667,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2709,7 +2709,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

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

@@ -48,7 +48,6 @@ class YHServiceCenterSecondViewController: YHBaseViewController {
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
-        loadData2()
         loadData()
     }
 }
@@ -235,6 +234,11 @@ private extension YHServiceCenterSecondViewController {
         serviceCenterMainReqVM.submitSweetNotifyOp(params: params as [String : Any]) { success, error in
             if success == true {
                 YHInformationFillTipsAlertView.hideCheckView()
+                self.loadData2()
+                
+                let vc = YHInformationPerfectListVC()
+                vc.orderId = self.orderId
+                self.navigationController?.pushViewController(vc)
             } else {
                 YHHUD.flash(message: error?.errorMsg ?? "发生错误,请重试")
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateEntryHeadView.swift

@@ -119,7 +119,5 @@ private extension YHCertificateEntryHeadView {
         
         let e: ASAttributedString = .init("件", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
         statiticLable.attributed.text = a + aa + b + bb + c + cc + d + dd + e
-        
-        
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyScore(我的评分)/V/scoreOptionData.plist

@@ -32,7 +32,7 @@
 			</dict>
 			<dict>
 				<key>scoreValue</key>
-				<string>15分</string>
+				<string>0分</string>
 				<key>scoreName</key>
 				<string>4）50+</string>
 				<key>isSelected</key>

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/BaseInformation(基本资料)/V/YHBasicInfoFillCell.swift

@@ -104,6 +104,5 @@ extension YHBasicInfoFillCell {
             }
             tmpView = view
         }
-        
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHEducationDetailVC.swift

@@ -245,7 +245,9 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
             } else if cellType == .selectSheet {
                 let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as! YHFormItemSelectSheetCell
                 cell.isShowTipsButton = (detailItem.type == .degreeType)
-                cell.tipsBtnClickBlock = nil
+                cell.tipsBtnClickBlock = {
+                    YHWholeScreenTipsView.show(type: .degreeType, targetView: cell.tipsButton)
+                }
                 cell.placeHolder = detailItem.placeHolder
                 cell.isMust = detailItem.isNeed
                 cell.title = detailItem.getTitle()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/V/YHFormItemSelectSheetCell.swift

@@ -89,7 +89,7 @@ class YHFormItemSelectSheetCell: UITableViewCell {
         return label
     }()
     
-    private lazy var tipsButton: UIButton = {
+    lazy var tipsButton: UIButton = {
         let btn = UIButton()
         btn.setImage(UIImage(named: "form_btn_tips"), for: .normal)
         btn.addTarget(self, action: #selector(didTipsButtonClicked), for: .touchUpInside)
@@ -175,7 +175,9 @@ class YHFormItemSelectSheetCell: UITableViewCell {
     }
     
     @objc func didTipsButtonClicked() {
-        YHWholeScreenTipsView.show(type: .residenceInfo, targetView: tipsButton)
+        if let tipsBtnClickBlock = tipsBtnClickBlock {
+            tipsBtnClickBlock()
+        }
     }
     
     func setTips(_ tips:String?, isShow:Bool) {