Merge commit 'bf49c0a8' into xiezhaolin

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

@@ -14,7 +14,7 @@ import UIKit
 class YHInformationPerfectListVC: YHBaseViewController {
     var orderId : Int?
     private let serviceCenterMainReqVM : YHServiceCenterMainViewModel = YHServiceCenterMainViewModel()
-   
+    
     private var hasSubmitFlag : Bool = false  {
         didSet {
             submitBtn.isHidden = hasSubmitFlag
@@ -123,6 +123,14 @@ extension YHInformationPerfectListVC {
                     self.hasSubmitFlag = true
                 } else {
                     self.hasSubmitFlag = false
+                    
+                    if self.serviceCenterMainReqVM.informationFillStepModel?.step == 6 {
+                        self.submitBtn.layer.opacity = 1
+                        self.submitBtn.isEnabled = true
+                    } else {
+                        self.submitBtn.layer.opacity = 0.4
+                        self.submitBtn.isEnabled = false
+                    }
                 }
             }
             self.homeTableView.reloadData()
@@ -133,6 +141,7 @@ extension YHInformationPerfectListVC {
         //我的评分
         let vc = YHScoreDetailViewController()
         vc.orderId = orderId
+        vc.model = serviceCenterMainReqVM.allInfoScoreModel
         navigationController?.pushViewController(vc)
         
     }
@@ -145,26 +154,39 @@ extension YHInformationPerfectListVC {
     }
     
     @objc func clickSubmitBtn() {
-
+        
         
         YHSubmitAllInfoCheckView.showCheckView(tipMsg: "确定是否提交信息？提交后将不能修改") { agree in
             if agree == true {
                 printLog("点击了 确认 按钮")
                 
-                YHSubmintAllInfoSuccessTipView.showCheckView { agree in
-                    self.hasSubmitFlag = true
+                self.submitAllInfo()
+                
+            } else {
+                printLog("点击了 取消 按钮")
+            }
+        }
+    }
+    
+    func submitAllInfo() {
+        guard let orderId = orderId else {
+            printLog("error: orderId 为空")
+            return
+        }
+        
+        serviceCenterMainReqVM.submitAllInfoOp(params: ["orderId" : orderId]) { [weak self] success, error in
+            if success == true {
+                let model =  self?.serviceCenterMainReqVM.allInfoScoreModel
+                YHSubmintAllInfoSuccessTipView.showCheckView(model: model) { agree in
                     if agree == true {
-                        self.goScoreVC()
-                    } else {
-                        
+                        self?.goScoreVC()
                     }
                 }
             } else {
-                printLog("点击了 取消 按钮")
+                let msg = error?.errorMsg ?? "操作失败"
+                YHHUD.flash(message: msg)
             }
         }
-        
-        
     }
     
     func setupUI() {
@@ -191,7 +213,8 @@ extension YHInformationPerfectListVC {
         submitBtn.layer.opacity = 0.4
         submitBtn.setTitle("提交信息", for: .normal)
         submitBtn.setTitleColor(UIColor.white, for: .normal)
-
+        submitBtn.isEnabled = false
+        
         submitBtn.layer.cornerRadius = kCornerRadius6
         submitBtn.clipsToBounds = true
         myBottomView.addSubview(submitBtn)
@@ -351,7 +374,7 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource
             let vc = YHEducationInfoListVC()
             vc.orderId = orderId ?? 0
             navigationController?.pushViewController(vc)
-          
+            
         } else if indexPath.row == 4 {
             //工作经历
             let vc = YHWorkExperienceListViewController()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHContactMainItemStatusModel.swift

@@ -34,3 +34,10 @@ class YHContactMainItemStatusModel {
 struct YHContactMainItemStatusModel2 :  SmartCodable {
     var fill_info_step : Int = 0
 }
+
+
+
+struct YHContactInfoScoreModel :  SmartCodable {
+    var sum_score : String = ""
+}
+

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/V/YHBasicInfoFillView.swift

@@ -241,6 +241,7 @@ private extension YHBasicInfoFillView {
             bottomLine.snp.removeConstraints()
             
             if model?.type == 0 {
+                additionHoldView.snp.removeConstraints()
                 additionHoldView.snp.remakeConstraints { make in
                     make.top.equalTo(answer1Btn.snp.bottom).offset(12)
                     make.left.right.equalToSuperview()
@@ -258,10 +259,10 @@ private extension YHBasicInfoFillView {
             } else {
                 
                 
+                mutilChoiceHoldView.snp.removeConstraints()
                 mutilChoiceHoldView.snp.remakeConstraints { make in
                     make.top.equalTo(answer1Btn.snp.bottom).offset(12)
                     make.left.right.equalToSuperview()
-//                    make.height.equalTo(78)
                     make.bottom.equalToSuperview().offset(-18)
                 }
                 
@@ -300,26 +301,6 @@ private extension YHBasicInfoFillView {
             additionHoldView.isHidden = true
             mutilChoiceHoldView.isHidden  = false
             
-            
-//            title = model.question
-//            if model.answer == "Y" {
-//                didClickResponseBtn(btn: answer2Btn)
-//                myTextView.text = model.info.count > 0 ? model.info : kTipsString
-//            } else {
-//                if model.answer == "N" {
-//                    didClickResponseBtn(btn: answer1Btn)
-//                }
-//            }
-//            
-//            mutilChoiceHoldView.snp.removeConstraints()
-//            mutilChoiceHoldView.snp.remakeConstraints { make in
-//                make.top.equalTo(answer1Btn.snp.bottom).offset(12)
-//                make.left.right.equalToSuperview()
-////                    make.height.equalTo(78)
-//                make.bottom.equalToSuperview().offset(-18)
-//            }
-            
-            
             let lable = UILabel()
             let str = "* 选择成员："
             let attributes: [NSAttributedString.Key: Any] = [
@@ -339,7 +320,37 @@ private extension YHBasicInfoFillView {
             }
             
             
-            guard let subModel = model.model else { return }
+            guard let subModel = model.model else {
+                printLog("errorr: 数据有问题")
+                
+                title = model.question
+                if model.answer == "Y" {
+                    didClickResponseBtn(btn: answer2Btn)
+                    mutilChoiceHoldView.isHidden  = false
+                } else {
+                    
+                    if model.answer == "N" {
+                        didClickResponseBtn(btn: answer1Btn)
+                    } else {
+                        answer2Btn.isSelected = false
+                        updateAnswerButton(answer2Btn, false)
+                        
+                        additionHoldView.snp.removeConstraints()
+                        mutilChoiceHoldView.snp.removeConstraints()
+                        
+                        bottomLine.snp.remakeConstraints { make in
+                            make.top.equalTo(answer1Btn.snp.bottom).offset(12)
+                            make.left.right.equalToSuperview()
+                            make.height.equalTo(0.5)
+                            make.bottom.equalToSuperview()
+                        }
+                        additionHoldView.isHidden = true
+                        bottomLine.isHidden = false
+                        mutilChoiceHoldView.isHidden = true
+                    }
+                }
+                return
+            }
             
             
             var targetView : UIView = lable
@@ -367,7 +378,7 @@ private extension YHBasicInfoFillView {
                     btn.isSelected = false
                 }
                 
-            
+                
                 
                 
                 if index == subModel.subset.count - 1 {
@@ -386,21 +397,36 @@ private extension YHBasicInfoFillView {
                     }
                 }
                 
+                targetView = btn
+                arrCheckBtns.append(btn)
+            }
+            
+            
+            title = model.question
+            if model.answer == "Y" {
+                didClickResponseBtn(btn: answer2Btn)
+                mutilChoiceHoldView.isHidden  = false
+            } else {
                 
-                
-                title = model.question
-                if model.answer == "Y" {
-                    didClickResponseBtn(btn: answer2Btn)
-                    myTextView.text = model.info.count > 0 ? model.info : kTipsString
+                if model.answer == "N" {
+                    didClickResponseBtn(btn: answer1Btn)
                 } else {
-                    if model.answer == "N" {
-                        didClickResponseBtn(btn: answer1Btn)
+                    answer2Btn.isSelected = false
+                    updateAnswerButton(answer2Btn, false)
+                    
+                    additionHoldView.snp.removeConstraints()
+                    mutilChoiceHoldView.snp.removeConstraints()
+                    
+                    bottomLine.snp.remakeConstraints { make in
+                        make.top.equalTo(answer1Btn.snp.bottom).offset(12)
+                        make.left.right.equalToSuperview()
+                        make.height.equalTo(0.5)
+                        make.bottom.equalToSuperview()
                     }
+                    additionHoldView.isHidden = true
+                    bottomLine.isHidden = false
+                    mutilChoiceHoldView.isHidden = true
                 }
-                
-                
-                targetView = btn
-                arrCheckBtns.append(btn)
             }
         } else {
             additionHoldView.isHidden = false
@@ -428,7 +454,7 @@ private extension YHBasicInfoFillView {
 
 
 extension YHBasicInfoFillView : UITextFieldDelegate {
-
+    
     
     func textViewShouldBeginEditing(_ textView: UITextView) -> Bool {
         if textView.text == kTipsString {
@@ -472,7 +498,6 @@ extension YHBasicInfoFillView : UITextFieldDelegate {
             sender.isSelected = true
             model?.info = String(sender.tag)
         }
-        
     }
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildBasicInfoVC.swift

@@ -144,7 +144,7 @@ class YHChildBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
             let item31 = YHFormDetailItem(type: .stayHKDate)
             item31.placeHolder = "请选择".local
             item31.tips = "请选择获准逗留期限".local
-            item31.value = child.childInHk?.info
+            item31.value = child.childInHk.info
             
             let item32 = YHFormDetailItem(type: .roleInHK)
             item32.placeHolder = "请选择".local
@@ -435,7 +435,7 @@ extension YHChildBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                     if detailItem.type == .birthday {
                         self.child?.birthday = date
                     } else if detailItem.type == .stayHKDate {
-                        self.child?.childInHk?.info =  date
+                        self.child?.childInHk.info =  date
                     }
                     self.loadBasicInfo()
                     if let delegate = delegate {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseBasicInfoVC.swift

@@ -175,7 +175,7 @@ class YHSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
         if spouse.isNowInHK() { // 目前在港才显示 逗留期限和在港身份
             let item31 = YHFormDetailItem(type: .stayHKDate)
             item31.placeHolder = "请选择".local
-            item31.value = spouse.childInHk?.info
+            item31.value = spouse.childInHk.info
             item31.tips = "请选择".local
 
             let item32 = YHFormDetailItem(type: .roleInHK)
@@ -596,7 +596,7 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                     if detailItem.type == .birthday {
                         self.spouse?.birthday = date
                     } else if detailItem.type == .stayHKDate {
-                        self.spouse?.childInHk?.info =  date
+                        self.spouse?.childInHk.info =  date
                     }
                     self.loadBasicInfo()
                 }

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

@@ -129,21 +129,21 @@ class YHFamilyMemberInfoVC: YHBaseViewController {
     // 检查填写信息完整性
     func checkIntegrity() -> Bool {
         
-        if let sponse = familyMemberInfo?.spouse, sponse.notFillNum > 0 {
+        if let sponse = familyMemberInfo?.spouse, sponse.notFillNumber > 0 {
           return false
         }
         
-        if let father = familyMemberInfo?.father, father.notFillNum > 0 {
+        if let father = familyMemberInfo?.father, father.notFillNumber > 0 {
             return false
         }
             
-        if let mother = familyMemberInfo?.mother, mother.notFillNum > 0 {
+        if let mother = familyMemberInfo?.mother, mother.notFillNumber > 0 {
             return false
         }
         
         if let childs = familyMemberInfo?.child, !childs.isEmpty {
             for child in childs {
-                if child.notFillNum > 0 {
+                if child.notFillNumber > 0 {
                     return false
                 }
             }
@@ -151,7 +151,7 @@ class YHFamilyMemberInfoVC: YHBaseViewController {
         
         if let brothers = familyMemberInfo?.brother, !brothers.isEmpty {
             for brother in brothers {
-                if brother.notFillNum > 0 {
+                if brother.notFillNumber > 0 {
                     return false
                 }
             }
@@ -233,7 +233,7 @@ extension YHFamilyMemberInfoVC {
     // 请求家庭成员信息
     func requestFamilyInfo() {
         
-        self.familyRequest.getFamilyInfo(params: ["orderId": self.orderId]) { [weak self] success, error in
+        self.familyRequest.getFamilyInfo(params: ["order_id": self.orderId]) { [weak self] success, error in
             guard let self = self else { return }
             if success {
                 familyMemberInfo = self.familyRequest.familyInfo
@@ -337,10 +337,10 @@ extension YHFamilyMemberInfoVC : UITableViewDelegate, UITableViewDataSource {
             let detailItem = item as! YHFamilyMember
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier, for: indexPath) as! YHFormItemEnterDetailCell
             cell.title = detailItem.getTitle()
-            cell.detailLabel.textColor = (isNeedShowError && detailItem.notFillNum > 0 ? .failColor : .labelTextColor2)
+            cell.detailLabel.textColor = (isNeedShowError && detailItem.notFillNumber > 0 ? .failColor : .labelTextColor2)
 
-            if detailItem.notFillNum > 0 {
-                cell.detailLabel.text = String(format: "有%d项未填写".local, detailItem.notFillNum)
+            if detailItem.notFillNumber > 0 {
+                cell.detailLabel.text = String(format: "有%d项未填写".local, detailItem.notFillNumber)
             } else {
                 cell.detailLabel.text = "已填完".local
             }
@@ -464,12 +464,7 @@ extension YHFamilyMemberInfoVC : UITableViewDelegate, UITableViewDataSource {
         let arr = items[indexPath.section]
         let item:YHFormItemProtocol = arr[indexPath.row]
         
-        if item is YHFormTitleItem { // 是标题
-            return 52.0
-        } else if item is YHFormAddItem { // 新增子女兄妹
-            return 70.0
-        }
-        return 50.0
+        return UITableView.automaticDimension
     }
     
     func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {

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

@@ -530,23 +530,6 @@ class YHFormDetailItem : YHFormItemProtocol {
 }
 
 /*  ***** ***** ***** ***** ***** ***** ***** ***** */
-// MARK: - YHWelcome
-class YHWelcome: SmartCodable {
-    
-    var code: Int = 0
-    var msg: String = ""
-    var data: YHFamilyMemberGroupInfo?
-
-    enum CodingKeys: String, CodingKey {
-        case code = "code"
-        case msg = "msg"
-        case data = "data"
-    }
-    
-    required init() {
-        
-    }
-}
 
 // MARK: - 家庭成员 YHData
 class YHFamilyMemberGroupInfo: SmartCodable {
@@ -581,88 +564,362 @@ enum YHFamilyMemberType: Int {
     case brother = 5
 }
 
+//class YHFamilyMember: SmartCodable, YHFormItemProtocol {
+//    
+//    var id: Int = 0
+//    // 是否已故
+//    var deceased: Int = 0
+//    // 主申请人和现配偶是否拥有孩子抚养权
+//    var custody: Int = 0
+//    // 国籍
+//    var nationality: String?
+//    var orderId: Int = 0
+//    // 关系 1父亲  2母亲 3配偶 4子女 5兄弟姐妹
+//    var relation: String?
+//    // 是否拥有学位
+//    var hasDegree: String?
+//    // 学历数组
+//    var hasDegreeJson: [YHHasDegreeJson]?
+//    
+//    // 是否随行至香港
+//    var follow: Int = 0
+//    var statement: Int = 0
+//    // 姓名
+//    var subsetName: String?
+//    
+//    // mark any
+////    var subsetNamePinyin: YHSubsetNamePinyin?
+//    var subsetNamePinyin: SmartAny?
+//    // 曾用名
+//    var usedName: String?
+//    // 出生日期
+//    var birthday: String?
+//    // 出生国家地区 (国内/国外)
+//    var birthPlaceAboard: Int = 0
+//    
+//    // 出生地址信息
+//    var birthPlace: YHAddress?
+//    
+//    // 职业
+//    var occupation: String?
+//    // 职业名称
+//    var occupationName: String?
+//    
+//    // mark any
+//    var operatorAme: SmartAny?
+//    // 香港身份证号
+//    var hkIdentityCard: String?
+//    // 性别 男：1 女：2
+//    var sex: Int = 0
+//    // 婚姻状况
+//    var married: String?
+//    // 是否与主申请人同住
+//    var nows: Int = 0
+//    // 居住地址
+//    var address: YHAddress?
+//    
+//    // 香港身份证信息
+//    var childHasHkId: YHChildStepchildClass?
+//    // 是否前次婚姻子女
+//    var childStepchild: YHChildStepchildClass?
+//    // 在港信息
+//    var childInHk: YHChildStepchildClass?
+//    // 证件数组 (中国身份证、香港身份证、护照等)
+//    var certificates: YHCertificates?
+//
+//    // mark any
+//    var countryIdentity: SmartAny?
+//    
+//    // 在港身份
+//    var hkIdentity: String?
+//    var hkIdentityOther: String?
+//    // 现居住国家
+//    var liveCountry: String?
+//    // 是否要办理港澳通行证
+//    var isHandled: Int = 0
+//    var finishFollow: Int = 0
+//    var step: Int = 0
+//    // 未填写项数
+//    var notFillNum: Int = 0
+//    // 是否在海外居住满1年及以上
+//    var isLiveOverseaYear: Int = 0
+//    // 婚前姓氏
+//    var surname: String?
+//    
+//    enum CodingKeys: String, CodingKey {
+//        case id = "id"
+//        case deceased = "deceased"
+//        case custody = "custody"
+//        case nationality = "nationality"
+//        case orderId = "order_id"
+//        case relation = "relation"
+//        case hasDegree = "has_degree"
+//        case hasDegreeJson = "has_degree_json"
+//        case follow = "follow"
+//        case statement = "statement"
+//        case subsetName = "subset_name"
+//        case subsetNamePinyin = "subset_name_pinyin"
+//        case usedName = "used_name"
+//        case birthday = "birthday"
+//        case birthPlaceAboard = "birth_place_aboard"
+//        case birthPlace = "birth_place"
+//        case occupation = "occupation"
+//        case occupationName = "occupation_name"
+//        case operatorAme = "operator_ame"
+//        case childHasHkId = "child_has_hk_id"
+//        case hkIdentityCard = "hk_identity_card"
+//        case sex = "sex"
+//        case married = "married"
+//        case nows = "nows"
+//        case address = "address"
+//        case childStepchild = "child_stepchild"
+//        case childInHk = "child_in_hk"
+//        case countryIdentity = "country_identity"
+//        case hkIdentity = "hk_identity"
+//        case hkIdentityOther = "hk_identity_other"
+//        case liveCountry = "live_country"
+//        case isHandled = "is_handled"
+//        case finishFollow = "finish_follow"
+//        case step = "step"
+//        case notFillNum = "not_fill_num"
+//        case isLiveOverseaYear = "is_live_oversea_year"
+//        case surname = "surname"
+//        case certificates = "certificates"
+//    }
+//    
+//    required init() {
+//        
+//    }
+//    
+//    // 是否随行
+//    func isFollow() -> Bool {
+//        return follow == 1
+//    }
+//    
+//    func setFollow(_ value:Bool) {
+//        self.follow = (value ? 1 : 0)
+//    }
+//    
+//    // 是否要办理港澳通行证
+//    func isNeedHandleHKPassPort() -> Bool {
+//        return  self.isHandled == 1
+//    }
+//    
+//    func setNeedHandleHKPassPort(_ value:Bool) {
+//        self.isHandled = (value ? 1 : 0)
+//    }
+//    
+//    // 是否与主申请人同住
+//    func isLiveTother() -> Bool {
+//        return self.nows == 1
+//    }
+//    
+//    func setLiveTother(_ value:Bool) {
+//        self.nows = (value ? 1 : 0)
+//    }
+//    
+//    // 是否在海外居住满1年及以上
+//    func isOverSeasOver1Year() -> Bool {
+//        return self.isLiveOverseaYear == 1
+//    }
+//    
+//    func setOverSearsOver1Year(_ value:Bool) {
+//        self.isLiveOverseaYear = value ? 1 : 0
+//    }
+//    
+//    // 是否出生国外
+//    func isBirthOverSeas() -> Bool {
+//        return self.birthPlaceAboard == 1
+//    }
+//    
+//    func setBirthOverSeas(_ value:Bool) {
+//        return self.birthPlaceAboard = value ? 1 : 0
+//    }
+//    
+//    // 目前是否在港
+//    func isNowInHK() -> Bool {
+//        if let inHK = self.childInHk {
+//            if inHK.has == "Y" {
+//                return true
+//            } else if inHK.has == "N" {
+//                return false
+//            }
+//        }
+//        return false
+//    }
+//    
+//    func setNowIsInHK(_ value:Bool) {
+//        self.childInHk?.has = value ?  "Y" : "N"
+//    }
+//    
+//    // 是否办理过香港身份证
+//    func isHaveHKIdentityCard() -> Bool {
+//        if let hasHkId = self.childHasHkId {
+//            if hasHkId.has == "Y" {
+//                return true
+//            } else if hasHkId.has == "N" {
+//                return false
+//            }
+//        }
+//        return false
+//    }
+//    
+//    func setHaveHKIdentityCard(_ value:Bool) {
+//        self.childHasHkId?.has = value ?  "Y" : "N"
+//    }
+//    
+//    // 是否拥有学位
+//    func haveDegreeName() -> String? {
+//        if hasDegree == "1" {
+//            return "有学位"
+//        } else {
+//            return "无学位"
+//        }
+//    }
+//    
+//    func isHaveDegree() ->Bool {
+//        return self.hasDegree == "1"
+//    }
+//    
+//    func setHaveDegree(_ val:Bool) {
+//        self.hasDegree = val ? "1" : "0"
+//    }
+//    
+//    // 是否已故
+//    func isDead() -> Bool {
+//        return self.deceased == 1
+//    }
+//    
+//    func setIsDead(_ val:Bool) {
+//        self.deceased = (val ? 1 : 0)
+//    }
+//    
+//    // 是否在职
+//    func isNowHaveJob() -> Bool {
+//        return self.occupation == "在职"
+//    }
+//    
+//    // 主申请人和现配偶是否拥有孩子抚养权
+//    func isOwnCustody() -> Bool {
+//        return self.custody == 1
+//    }
+//    
+//    func setOwnCustody(_ val:Bool) {
+//        self.custody = val ? 1 : 0
+//    }
+//    
+//    // 是否是男性
+//    func isMale() -> Bool {
+//      return  self.sex == 1
+//    }
+//    
+//    func setMale(_ val: Bool) {
+//        self.sex = (val ? 1 : 2)
+//    }
+//    
+//    func sexName() -> String? {
+//        if self.sex == 1 {
+//            return "男".local
+//        } else if self.sex == 2 {
+//            return "女".local
+//        }
+//        return ""
+//    }
+//    
+//    // 是否前一次婚姻子女
+//    func isPreviousMarriageChild() -> Bool {
+//       return self.childStepchild?.has == "Y"
+//    }
+//    
+//    func setPreviousMarriageChild(_ val: Bool) {
+//        self.childStepchild?.has = (val ? "Y" : "N")
+//    }
+//    
+//    
+//    var relationType:YHFamilyMemberType {
+//        
+//        if relation == "1" {
+//            return .father
+//        } else if relation == "2" {
+//            return .mother
+//        } else if relation == "3" {
+//            return .spouse
+//        } else if relation == "4" {
+//            return .child
+//        } else if relation == "5" {
+//            return .brother
+//        }
+//        
+//        return .none
+//    }
+//    
+//    // YHFamilyMemberProtocol
+//    func getTitle() -> String {
+//        // 1父亲  2 母亲 3 配偶 4子女 5兄弟姐妹
+//        if let relation = relation {
+//            if relation == "1" {
+//                return "父亲".local
+//            } else if relation == "2" {
+//                return "母亲".local
+//            } else if relation == "3" {
+//                return "配偶".local
+//            } else if relation == "4" {
+//                return "子女".local
+//            } else if relation == "5" {
+//                return "兄弟姐妹".local
+//            }
+//        }
+//        return ""
+//    }
+//    
+//    func getSubTitle() -> String {
+//        return ""
+//    }
+//}
+
 class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     
     var id: Int = 0
-    // 是否已故
     var deceased: Int = 0
-    // 主申请人和现配偶是否拥有孩子抚养权
     var custody: Int = 0
-    // 国籍
     var nationality: String?
     var orderId: Int = 0
-    // 关系 1父亲  2母亲 3配偶 4子女 5兄弟姐妹
     var relation: String?
-    // 是否拥有学位
     var hasDegree: String?
-    // 学历数组
     var hasDegreeJson: [YHHasDegreeJson]?
-    
-    // 是否随行至香港
     var follow: Int = 0
     var statement: Int = 0
-    // 姓名
     var subsetName: String?
-    
-    // mark any
-//    var subsetNamePinyin: YHSubsetNamePinyin?
-    var subsetNamePinyin: SmartAny?
-    // 曾用名
-    var usedName: String?
-    // 出生日期
+    var subsetNamePinyin: YHSubsetNamePinyin?
     var birthday: String?
-    // 出生国家地区 (国内/国外)
     var birthPlaceAboard: Int = 0
-    
-    // 出生地址信息
     var birthPlace: YHAddress?
-    
-    // 职业
     var occupation: String?
-    // 职业名称
     var occupationName: String?
-    
-    // mark any
-    var operatorAme: SmartAny?
-    // 香港身份证号
+    var operatorName: String?
+    var childHasHkId: YHChildStepchildClass = YHChildStepchildClass()
     var hkIdentityCard: String?
-    // 性别 男：1 女：2
     var sex: Int = 0
-    // 婚姻状况
     var married: String?
-    // 是否与主申请人同住
     var nows: Int = 0
-    // 居住地址
     var address: YHAddress?
-    
-    // 香港身份证信息
-    var childHasHkId: YHChildStepchildClass?
-    // 是否前次婚姻子女
-    var childStepchild: YHChildStepchildClass?
-    // 在港信息
-    var childInHk: YHChildStepchildClass?
-    // 证件数组 (中国身份证、香港身份证、护照等)
-    var certificates: YHCertificates?
-
-    // mark any
-    var countryIdentity: SmartAny?
-    
-    // 在港身份
+    var childStepchild: YHChildStepchildClass = YHChildStepchildClass()
+    var childInHk: YHChildStepchildClass = YHChildStepchildClass()
+    var countryIdentity: YHChildStepchildClass?
     var hkIdentity: String?
-    var hkIdentityOther: String?
-    // 现居住国家
     var liveCountry: String?
-    // 是否要办理港澳通行证
-    var isHandled: Int = 0
     var finishFollow: Int = 0
     var step: Int = 0
-    // 未填写项数
-    var notFillNum: Int = 0
-    // 是否在海外居住满1年及以上
+    var isHandled: Int = 0
+    var notFillNumber: Int = 0
+    var certificates: YHCertificates?
+    var usedName: String?
+    var hkIdentityOther: String?
+    var isHkHandled: Int = 0
+    var isInHk: Int = 0
     var isLiveOverseaYear: Int = 0
-    // 婚前姓氏
     var surname: String?
-    
+
     enum CodingKeys: String, CodingKey {
         case id = "id"
         case deceased = "deceased"
@@ -676,14 +933,13 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
         case statement = "statement"
         case subsetName = "subset_name"
         case subsetNamePinyin = "subset_name_pinyin"
-        case usedName = "used_name"
         case birthday = "birthday"
         case birthPlaceAboard = "birth_place_aboard"
         case birthPlace = "birth_place"
         case occupation = "occupation"
         case occupationName = "occupation_name"
-        case operatorAme = "operator_ame"
-        case childHasHkId = "child_has_hk_id"
+        case operatorName = "operator_name"
+        case childHasHkId = "child_has_Hk_id"
         case hkIdentityCard = "hk_identity_card"
         case sex = "sex"
         case married = "married"
@@ -693,17 +949,20 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
         case childInHk = "child_in_hk"
         case countryIdentity = "country_identity"
         case hkIdentity = "hk_identity"
-        case hkIdentityOther = "hk_identity_other"
         case liveCountry = "live_country"
-        case isHandled = "is_handled"
         case finishFollow = "finish_follow"
         case step = "step"
-        case notFillNum = "not_fill_num"
+        case isHandled = "is_handled"
+        case notFillNumber = "not_fill_number"
+        case certificates = "certificates"
+        case usedName = "used_name"
+        case hkIdentityOther = "hk_identity_other"
+        case isHkHandled = "is_hk_handled"
+        case isInHk = "is_in_hk"
         case isLiveOverseaYear = "is_live_oversea_year"
         case surname = "surname"
-        case certificates = "certificates"
     }
-    
+            
     required init() {
         
     }
@@ -755,34 +1014,30 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     
     // 目前是否在港
     func isNowInHK() -> Bool {
-        if let inHK = self.childInHk {
-            if inHK.has == "Y" {
-                return true
-            } else if inHK.has == "N" {
-                return false
-            }
+        if self.childInHk.has == "Y" {
+            return true
+        } else if self.childInHk.has == "N" {
+            return false
         }
         return false
     }
     
     func setNowIsInHK(_ value:Bool) {
-        self.childInHk?.has = value ?  "Y" : "N"
+        self.childInHk.has = value ?  "Y" : "N"
     }
     
     // 是否办理过香港身份证
     func isHaveHKIdentityCard() -> Bool {
-        if let hasHkId = self.childHasHkId {
-            if hasHkId.has == "Y" {
-                return true
-            } else if hasHkId.has == "N" {
-                return false
-            }
+        if self.childHasHkId.has == "Y" {
+            return true
+        } else if self.childHasHkId.has == "N" {
+            return false
         }
         return false
     }
     
     func setHaveHKIdentityCard(_ value:Bool) {
-        self.childHasHkId?.has = value ?  "Y" : "N"
+        self.childHasHkId.has = value ?  "Y" : "N"
     }
     
     // 是否拥有学位
@@ -845,14 +1100,13 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     
     // 是否前一次婚姻子女
     func isPreviousMarriageChild() -> Bool {
-       return self.childStepchild?.has == "Y"
+       return self.childStepchild.has == "Y"
     }
     
     func setPreviousMarriageChild(_ val: Bool) {
-        self.childStepchild?.has = (val ? "Y" : "N")
+        self.childStepchild.has = (val ? "Y" : "N")
     }
     
-    
     var relationType:YHFamilyMemberType {
         
         if relation == "1" {
@@ -873,19 +1127,18 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     // YHFamilyMemberProtocol
     func getTitle() -> String {
         // 1父亲  2 母亲 3 配偶 4子女 5兄弟姐妹
-        if let relation = relation {
-            if relation == "1" {
-                return "父亲".local
-            } else if relation == "2" {
-                return "母亲".local
-            } else if relation == "3" {
-                return "配偶".local
-            } else if relation == "4" {
-                return "子女".local
-            } else if relation == "5" {
-                return "兄弟姐妹".local
-            }
+        if relation == "1" {
+            return "父亲".local
+        } else if relation == "2" {
+            return "母亲".local
+        } else if relation == "3" {
+            return "配偶".local
+        } else if relation == "4" {
+            return "子女".local
+        } else if relation == "5" {
+            return "兄弟姐妹".local
         }
+        
         return ""
     }
     
@@ -916,8 +1169,8 @@ class YHAddress: SmartCodable {
 
 // MARK: - YHChildStepchildClass
 class YHChildStepchildClass: SmartCodable {
-    var has: String?
-    var info: String?
+    var has: String = ""
+    var info: String = ""
 
     enum CodingKeys: String, CodingKey {
         case has = "has"
@@ -931,8 +1184,8 @@ class YHChildStepchildClass: SmartCodable {
 
 // MARK: - YHSubsetNamePinyin
 class YHSubsetNamePinyin: SmartCodable {
-    var familyName: String?
-    var givenName: String?
+    var familyName: String = ""
+    var givenName: String = ""
 
     enum CodingKeys: String, CodingKey {
         case familyName = "family_name"

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

@@ -26,41 +26,7 @@ class YHFamilyRequestViewModel {
             
             printLog("model 是 ==> \(json)")
             let dic = json.data as? [AnyHashable : Any]
-            
-            guard var dic = dic else { return }
-            
-#if DEBUG
-
-if let child = dic["child"], child is [[String: Any]] {
-    var child = child as! [[String: Any]]
-    
-    for (index, dic) in child.enumerated() {
-        var d = dic
-        d["certificates"] = [String: Any]()
-        child[index] = d
-    }
-    dic["child"] = child
-    
-}
-            
-if let brother = dic["brother"], brother is [[String: Any]] {
-    var brother = brother as! [[String: Any]]
-    
-    for (index, dic) in brother.enumerated() {
-        var d = dic
-        d["certificates"] = [String: Any]()
-        
-//        ["cnIdentityCard":"",
-//         "passport":"",
-//         "hkMacaoPass":""]
-        
-        brother[index] = d
-    }
-    dic["brother"] = brother
-}
-#endif
-
-            guard let resultModel = YHFamilyMemberGroupInfo.deserialize(dict: dic as? [AnyHashable : Any]) else {
+            guard let resultModel = YHFamilyMemberGroupInfo.deserialize(dict: dic) else {
 
                 callBackBlock(false,nil)
                 return

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MyScore(我的评分)/C/YHScoreDetailViewController.swift

@@ -14,6 +14,11 @@ import GKNavigationBarSwift
 
 class YHScoreDetailViewController: YHBaseViewController {
     var orderId : Int?
+    var model : YHContactInfoScoreModel? {
+        didSet {
+            
+        }
+    }
     private let serviceCenterMainReqVM : YHServiceCenterMainViewModel = YHServiceCenterMainViewModel()
     
     //头部背景图片

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/C/YHOtherInfoFillViewController.swift

@@ -108,9 +108,9 @@ extension YHOtherInfoFillViewController {
             
             otherInfoVM.saveOtherInfo(params: param) { success, error in
                 if success == true {
-                    YHHUD.flash(message: "保存成功")
+                    YHHUD.flash(message: "操作成功")
                 } else {
-                    let msg = error?.errorMsg ?? "保存失败"
+                    let msg = error?.errorMsg ?? "操作失败"
                     YHHUD.flash(message: msg)
                 }
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherPickerView.swift

@@ -128,6 +128,10 @@ class YHOtherPickerView: UIView {
         self.createUI()
         self.type = type
         initDataSource()
+        
+        if arrData.count > 0 {
+            userSelectedItem = arrData[0]
+        }
     }
     
     required init?(coder: NSCoder) {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHSubmintAllInfoSuccessTipView.swift

@@ -18,6 +18,17 @@ class YHSubmintAllInfoSuccessTipView: UIView {
     var agreeButton: UIButton!
     var disAgressButton: UIButton!
     
+    var model : YHContactInfoScoreModel? {
+        didSet {
+            guard let model = model else {
+                return
+            }
+            let a: ASAttributedString = .init(NSAttributedString(string: model.sum_score), .font(UIFont.PFSC_M(ofSize: 43)),.foreground(UIColor.warnColor))
+            let b: ASAttributedString = .init("分", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.labelTextColor2))
+            messageLabel.attributed.text = a + b
+        }
+    }
+    
     //头部背景图片
     lazy var headBkgImagV: UIImageView = {
         let imagV = UIImageView()
@@ -35,9 +46,10 @@ class YHSubmintAllInfoSuccessTipView: UIView {
     }()
     
     
-    static func showCheckView(callBack: @escaping Block) {
+    static func showCheckView(model: YHContactInfoScoreModel?,callBack: @escaping Block) {
         let view = YHSubmintAllInfoSuccessTipView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
         view.block = callBack
+        view.model = model
         let window = UIApplication.shared.yhKeyWindow()
         window?.addSubview(view)
     }
@@ -114,7 +126,7 @@ class YHSubmintAllInfoSuccessTipView: UIView {
     
         messageLabel = {
             let label = UILabel()
-            label.text = "90分"
+            label.text = "--分"
             label.textAlignment = .center
             label.numberOfLines = 1
             return label

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/VM/YHServiceCenterMainViewModel.swift

@@ -24,6 +24,7 @@ class YHServiceCenterMainViewModel: YHBaseViewModel {
     var myScoreResultData : YHScoreResultModel?//网络请求的结果数据
     var localScoreData : YHScoreDataModel? //本地缓存的数据
     
+    var allInfoScoreModel: YHContactInfoScoreModel? //提交信息获取 得分
 }
 
 //请求接口
@@ -109,7 +110,7 @@ extension YHServiceCenterMainViewModel {
                     return
                 }
 
-                if resultModel.fill_info_step > 6 {
+                if resultModel.fill_info_step >= 6 {
                     let model = YHContactMainItemStatusModel()
                     model.type = 1
                     model.isFinished = true
@@ -199,10 +200,10 @@ extension YHServiceCenterMainViewModel {
                 callBackBlock(true,nil)
                 
             } else {
-                
-                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code),errorMsg: json.msg)
+                let err : YHErrorModel = YHErrorModel(errorCode:Int32(json.code),errorMsg: json.msg)
                 self.arrInfoFillStep = []
                 informationFillStepModel = nil
+                callBackBlock(false,err)
             }
            
         } failBlock: { err in
@@ -212,6 +213,30 @@ extension YHServiceCenterMainViewModel {
         }
     }
     
+    //提交订单信息
+    func submitAllInfoOp( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Order.submitAllInfoApi
+        let _ = YHNetRequest.postRequest(url: strUrl,params: params) {[weak self] json, code in
+            //1. json字符串 转 对象
+            printLog("model 是 ==> \(json)")
+            guard let self = self else { return }
+            if json.code == 200 {
+                let dic = json.data
+                guard let resultModel = YHContactInfoScoreModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
+                    callBackBlock(false,nil)
+                    return
+                }
+                self.allInfoScoreModel = resultModel
+                callBackBlock(true,nil)
+            } else {
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code),errorMsg: json.msg.count > 0 ? json.msg : "数据错误")
+                callBackBlock(false,error)
+            }
+        } failBlock: { err in
+            callBackBlock(false,err)
+        }
+    }
+    
     
     //提交 温馨提示弹窗
     func submitSweetNotifyOp( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {

galaxy/galaxy/Classes/Modules/Login(登录)/VM/YHLoginViewModel.swift

@@ -10,7 +10,7 @@ import UIKit
 
 class YHLoginViewModel: YHBaseViewModel {
     var userModel: YHUserModel?
-
+    
     override init() {
         super.init()
     }
@@ -46,8 +46,8 @@ extension YHLoginViewModel {
                                       "client": "super_app"]
         let strUrl = "http://test.api.diymanager.galaxy-immi.com/" + "infoflow/auth/login"
         
-//    http:test.api.diymanager.galaxy-immi.com/infoflow/auth/login
-//        let strUrl = "http://192.168.34.106:18088/" + "infoflow/auth/login"
+        //    http:test.api.diymanager.galaxy-immi.com/infoflow/auth/login
+        //        let strUrl = "http://192.168.34.106:18088/" + "infoflow/auth/login"
         let _ = YHNetRequest.postRequest(url: strUrl, params: params) {[weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -56,6 +56,9 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
     }()
     
     lazy var items: [PersonalModuleItem] = {
+        
+        let version = "app版本号：" + UIDevice.appVersion() + "_" + UIDevice.appBuild()
+        
         return [PersonalModuleItem(icon: "mine_item_msg", title: "我的消息".local, type:.myMessage),
                 PersonalModuleItem(icon: "mine_item_progress", title: "我的进度".local, type:.myProgress),
                 PersonalModuleItem(icon: "mine_item_scoreCenter", title: "积分中心".local, type:.scoreCenter),
@@ -63,6 +66,8 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
                 PersonalModuleItem(icon: "mine_item_poster", title: "我的海报".local, type:.myPoster),
                 PersonalModuleItem(icon: "mine_item_code", title: "我的测评码".local, type:.myTestCode),
                 PersonalModuleItem(icon: "mine_item_appoint", title: "预约银河湾".local, type:.appointGalaxyBay),
+                
+                PersonalModuleItem(icon: "mine_item_appoint", title: version, type:.appointGalaxyBay),
                ]
     }()
     

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -31,6 +31,8 @@ class YHAllApiName {
 //        static let informationStepApi = "frontend/order/information/step"
         static let informationStepApi = "infoflow/order/information/step"
         
+        //提交订单信息
+        static let submitAllInfoApi = "infoflow/order/information/submit"
         
         
         //我的评分结果
@@ -47,7 +49,8 @@ class YHAllApiName {
     
     struct Family {
         // 获取家庭成员信息 添加家庭成员也用这个
-        static let familyInfoApi = "frontend/order/information/family"
+//        static let familyInfoApi = "frontend/order/information/family"
+        static let familyInfoApi = "infoflow/information/family"
         // 删除家庭成员信息
         static let familyMemberDeleteApi = "frontend/order/information/family/delete"
        

galaxy/galaxy/Res/Launch Screen.storyboard

@@ -16,13 +16,18 @@
                         <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="launch_screen_image" highlightedImage="launch_screen_image" translatesAutoresizingMaskIntoConstraints="NO" id="sFt-Ce-yYm">
-                                <rect key="frame" x="-18" y="-37" width="428" height="926"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" insetsLayoutMarginsFromSafeArea="NO" image="launch_screen_image" highlightedImage="launch_screen_image" translatesAutoresizingMaskIntoConstraints="NO" id="sFt-Ce-yYm">
+                                <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                             </imageView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="586-1X-Ryv"/>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="sFt-Ce-yYm" secondAttribute="trailing" id="0yN-WE-6Kj"/>
+                            <constraint firstItem="sFt-Ce-yYm" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="8xj-jA-15j"/>
+                            <constraint firstItem="sFt-Ce-yYm" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="aPd-Z9-bKu"/>
+                            <constraint firstAttribute="bottom" secondItem="sFt-Ce-yYm" secondAttribute="bottom" id="bFA-o7-CPz"/>
+                        </constraints>
                     </view>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>