Merge commit '9c44f9d4' into xiezhaolin

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

@@ -12,7 +12,7 @@ class YHCollegeSearchViewController: YHBaseViewController {
     
     var searchCollegeName:String?
     var selectBlock:((String?)->Void)?
-    var colleges:[Any] = [1,2,3]
+    var colleges:[Any] = []
     
     lazy var searchBar: YHSearchBar = {
         let bar = YHSearchBar.createBar()
@@ -33,8 +33,36 @@ class YHCollegeSearchViewController: YHBaseViewController {
         tableView.dataSource = self
         tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
         tableView.register(YHCollegeNameCell.self, forCellReuseIdentifier: YHCollegeNameCell.cellReuseIdentifier)
+        tableView.backgroundView = emptyDataTipsView
         return tableView
     }()
+    
+    lazy var emptyDataTipsView:UIView = {
+        let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 124))
+        
+        let imgView = UIImageView(image: UIImage(named: "service_center_no_data"))
+        imgView.contentMode = .scaleAspectFill
+        view.addSubview(imgView)
+        
+        let label = UILabel()
+        label.textColor = UIColor.labelTextColor2
+        label.font = UIFont.PFSC_R(ofSize: 14)
+        label.textAlignment = .center
+        label.text = "无搜索结果"
+        view.addSubview(label)
+        
+        imgView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(130)
+            make.width.height.equalTo(92)
+            make.centerX.equalTo(view)
+        }
+        
+        label.snp.makeConstraints { make in
+            make.top.equalTo(imgView.snp.bottom).offset(12)
+            make.centerX.equalTo(view)
+        }
+        return view
+    }()
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -58,7 +86,7 @@ class YHCollegeSearchViewController: YHBaseViewController {
         }
         searchBar.confirmBlock = {
             [weak self] in
-            guard let self = self else { return }
+            guard let self = self else { return }            
             if let selectBlock = selectBlock {
                 selectBlock(searchBar.textField.text)
                 self.navigationController?.popViewController(animated: true)

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

@@ -189,7 +189,7 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
             
             let formItem = item as! YHFormTitleItem
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.titleLabel.text = formItem.getTitle()
+            cell.setTitleAndSubTitle(title:formItem.getTitle())
             return cell
         }
         
@@ -239,6 +239,15 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
             } else if cellType == .selectSheet {
                 let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as! YHFormItemSelectSheetCell
                 cell.isShowBottomLine = (indexPath.row != arr.count-1)
+                cell.isShowTipsButton = (detailItem.type == .degreeType)
+                cell.tipsBtnClickBlock = nil
+                if detailItem.type == .degreeType {
+                    cell.tipsBtnClickBlock = {
+                        [weak self] in
+                        guard let self = self else { return }
+                        YHHUD.flash(message: "该内容在学位证上，通常是授予后面，如授予“理学”学士学位，则填理学")
+                    }
+                }
                 cell.placeHolder = detailItem.placeHolder
                 cell.isMust = detailItem.isNeed
                 cell.title = detailItem.getTitle()

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

@@ -194,8 +194,9 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
             let formItem = item as! YHFormTitleItem
             
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.titleLabel.text = formItem.getTitle()
-            
+            let isNeedWrap = (formItem.type == .mainApplicantProfessionalQualification)
+            cell.setTitleAndSubTitle(title:formItem.getTitle(), subTitle:formItem.getSubTitle(), isNeedWrap:isNeedWrap)
+
             // 决定右边按钮显示样式
             cell.showEditType(type: .none)
             if formItem.type == .mainApplicantEducation { // 学历
@@ -406,9 +407,7 @@ extension YHEducationInfoListVC : 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 { // 新增子女兄妹
+        if item is YHFormAddItem { // 新增子女兄妹
             return 70.0
         }
         return UITableView.automaticDimension

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

@@ -165,8 +165,7 @@ extension YHQualificationDetailVC : UITableViewDelegate, UITableViewDataSource {
             
             // 配偶父母子女兄妹title
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.titleLabel.text = formItem.getTitle()
-            cell.subTitleLabel.text = formItem.getSubTitle()
+            cell.setTitleAndSubTitle(title:formItem.getTitle(), subTitle:formItem.getSubTitle())
             return cell
         }
         

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

@@ -251,7 +251,7 @@ extension YHChildBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
         
         if cellType == .title { // 标题
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.titleLabel.text = item.getTitle()
+            cell.setTitleAndSubTitle(title:item.getTitle())
             return cell
         }
         

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

@@ -210,7 +210,8 @@ extension YHChildPrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
         
         if item is YHFormTitleItem { // 标题
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.titleLabel.text = item.getTitle()
+            cell.setTitleAndSubTitle(title:item.getTitle())
+
             return cell
             
         } else if item is YHFormDetailItem { // 具体信息

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

@@ -266,7 +266,7 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
         
         if cellType == .title { // 标题
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.titleLabel.text = item.getTitle()
+            cell.setTitleAndSubTitle(title:item.getTitle())
             return cell
         }
         

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

@@ -168,7 +168,7 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
         
         if item is YHFormTitleItem { // 标题
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.titleLabel.text = item.getTitle()
+            cell.setTitleAndSubTitle(title:item.getTitle())
             return cell
             
         } else if item is YHFormDetailItem { // 具体信息

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

@@ -212,7 +212,7 @@ extension YHBrotherInfoVC : UITableViewDelegate, UITableViewDataSource {
         
         if cellType == .title { // 标题
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.titleLabel.text = item.getTitle()
+            cell.setTitleAndSubTitle(title:item.getTitle())
             return cell
         }
         

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

@@ -166,7 +166,7 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour
         
         if item is YHFormTitleItem { // 标题
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.titleLabel.text = item.getTitle()
+            cell.setTitleAndSubTitle(title:item.getTitle())
             return cell
         }
         

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

@@ -255,9 +255,8 @@ extension YHFamilyMemberInfoVC : UITableViewDelegate, UITableViewDataSource {
             
             // 配偶父母子女兄妹title
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.titleLabel.text = formItem.getTitle()
-            cell.subTitleLabel.text = formItem.getSubTitle()
-            
+            cell.setTitleAndSubTitle(title:formItem.getTitle())
+           
             // 决定右边按钮显示样式
             cell.showEditType(type: .none)
             if formItem.type == .child {

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

@@ -244,7 +244,8 @@ extension YHParentInfoVC : UITableViewDelegate, UITableViewDataSource {
         
         if cellType == .title { // 标题
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.titleLabel.text = item.getTitle()
+            cell.setTitleAndSubTitle(title:item.getTitle())
+
             return cell
         }
         

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

@@ -183,9 +183,7 @@ class YHSheetPickerView: UIView {
                  YHSheetPickerViewItem(title:"无业".local, index:2),
                  YHSheetPickerViewItem(title:"学生".local, index:3),
                  ],
-            
-            // YHSheetPickerViewItem(title:"".local, index:)
-                
+                            
             // 职业2
             .profession:
                 [YHSheetPickerViewItem(title:"企业管理者 (高级管理者)".local, index:0),

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

@@ -20,6 +20,7 @@ class YHFormItemSelectSheetCell: UITableViewCell {
     // 是否必填 如必填title会展示红色*
     var isMust = false
     var placeHolder:String?
+    var tipsBtnClickBlock:(()->Void)?
 
     var title:String? {
         didSet {
@@ -37,7 +38,7 @@ class YHFormItemSelectSheetCell: UITableViewCell {
                 }
                 titleLabel.attributedText = questionAttrStr
             } else {
-                titleLabel.text = ""
+                titleLabel.attributedText = nil
             }
         }
     }
@@ -62,6 +63,13 @@ class YHFormItemSelectSheetCell: UITableViewCell {
             bottomLine.isHidden = !isShowBottomLine
         }
     }
+    
+    // 是否展示标题旁的提示!按钮
+    var isShowTipsButton:Bool = false {
+        didSet {
+            tipsButton.isHidden = !isShowTipsButton
+        }
+    }
 
     private lazy var titleLabel: UILabel = {
         let label = UILabel()
@@ -80,6 +88,14 @@ class YHFormItemSelectSheetCell: UITableViewCell {
         return label
     }()
     
+    private lazy var tipsButton: UIButton = {
+        let btn = UIButton()
+        btn.setImage(UIImage(named: "form_btn_tips"), for: .normal)
+        btn.addTarget(self, action: #selector(didTipsButtonClicked), for: .touchUpInside)
+        btn.isHidden = true
+        return btn
+    }()
+    
     private lazy var arrowImgView: UIImageView = {
         let imgView = UIImageView(image: UIImage(named: "form_right_arrow"))
         return imgView
@@ -119,16 +135,23 @@ class YHFormItemSelectSheetCell: UITableViewCell {
         contentView.addSubview(arrowImgView)
         contentView.addSubview(tipsLabel)
         contentView.addSubview(bottomLine)
+        contentView.addSubview(tipsButton)
 
         titleLabel.snp.makeConstraints { make in
             make.top.equalToSuperview().offset(16)
             make.left.equalToSuperview().offset(horizonalGap)
-            make.right.equalTo(detailLabel.snp.left).offset(-8)
-            make.width.equalTo(120)
+            make.width.lessThanOrEqualTo(120)
+        }
+        
+        tipsButton.snp.makeConstraints { make in
+            make.centerY.equalTo(titleLabel)
+            make.left.equalTo(titleLabel.snp.right).offset(0)
+            make.width.height.equalTo(16.0)
         }
         
         detailLabel.snp.makeConstraints { make in
             make.top.equalTo(titleLabel)
+            make.left.equalToSuperview().offset(horizonalGap+120+8)
             make.right.equalTo(arrowImgView.snp.left)
         }
         
@@ -148,6 +171,12 @@ class YHFormItemSelectSheetCell: UITableViewCell {
         setTips("", isShow: false)
     }
     
+    @objc func didTipsButtonClicked() {
+        if let tipsBtnClickBlock = tipsBtnClickBlock {
+            tipsBtnClickBlock()
+        }
+    }
+    
     func setTips(_ tips:String?, isShow:Bool) {
         tipsLabel.text = tips
         tipsLabel.isHidden = !isShow

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

@@ -17,9 +17,39 @@ class YHFormItemTitleCell: UITableViewCell {
     let cancelTag = 9528
     
     var rightClickBlock:((YHFormTitleItemEditType)->Void)?
+    
+    // isNeedWrap 副标题是否需要换行
+    func setTitleAndSubTitle(title: String? = "", subTitle: String? = "", isNeedWrap:Bool = false) {
+        
+        let titleAttributes: [NSAttributedString.Key: Any] = [
+            .font: UIFont.PFSC_M(ofSize: 17),
+            .foregroundColor: UIColor.mainTextColor
+        ]
+        let subTitleAttributes: [NSAttributedString.Key: Any] = [
+            .font: UIFont.PFSC_R(ofSize: 12),
+            .foregroundColor: UIColor.labelTextColor2
+        ]
+        
+        let attrStr = NSMutableAttributedString(string:"", attributes: titleAttributes)
+    
+        if let title = title, !title.isEmpty {
+            let titleAttrStr = NSMutableAttributedString(string:title, attributes:titleAttributes)
+            attrStr.append(titleAttrStr)
+        }
+        // 副标题是否需要换行
+        if isNeedWrap {
+            let warpAttrStr = NSMutableAttributedString(string:"\n", attributes:titleAttributes)
+            attrStr.append(warpAttrStr)
+        }
+        
+        if let subTitle = subTitle, !subTitle.isEmpty {
+            let titleAttrStr = NSMutableAttributedString(string:subTitle, attributes:subTitleAttributes)
+            attrStr.append(titleAttrStr)
+        }
+        titleLabel.attributedText = attrStr
+    }
 
-
-    lazy var titleLabel: UILabel = {
+    private lazy var titleLabel: UILabel = {
         let label = UILabel()
         label.textColor = .mainTextColor
         label.textAlignment = .left
@@ -28,15 +58,6 @@ class YHFormItemTitleCell: UITableViewCell {
         return label
     }()
     
-    lazy var subTitleLabel: UILabel = {
-        let label = UILabel()
-        label.textColor = .labelTextColor2
-        label.textAlignment = .left
-        label.numberOfLines = 0
-        label.font = UIFont.PFSC_R(ofSize: 12)
-        return label
-    }()
-    
     lazy var cancelButton: UIButton = {
         
         let btn = UIButton()
@@ -77,37 +98,26 @@ class YHFormItemTitleCell: UITableViewCell {
         
         self.selectionStyle = .none
         contentView.addSubview(titleLabel)
-        contentView.addSubview(subTitleLabel)
         contentView.addSubview(bottomLine)
         contentView.addSubview(editButton)
         contentView.addSubview(cancelButton)
 
         titleLabel.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(16)
-            make.right.equalTo(subTitleLabel.snp.left).offset(-3)
-            make.centerY.equalToSuperview()
-        }
-        
-        subTitleLabel.snp.makeConstraints { make in
-            make.right.equalToSuperview().offset(-16)
-            make.centerY.equalToSuperview()
-        }
-        
-        editButton.snp.makeConstraints { make in
-            make.size.equalTo(CGSizeMake(24, 24))
-            make.centerY.equalToSuperview()
-            make.right.equalToSuperview().offset(-18)
+            make.right.equalTo(cancelButton.snp.left).offset(-3)
+            make.top.equalToSuperview().offset(16)
+            make.bottom.equalToSuperview().offset(-16)
         }
         
         editButton.snp.makeConstraints { make in
             make.size.equalTo(CGSizeMake(24, 24))
-            make.centerY.equalToSuperview()
+            make.top.equalTo(titleLabel).offset(0)
             make.right.equalToSuperview().offset(-18)
         }
         
         cancelButton.snp.makeConstraints { make in
             make.size.equalTo(CGSizeMake(92, 40))
-            make.centerY.equalToSuperview()
+            make.centerY.equalTo(editButton)
             make.right.equalToSuperview()
         }
         

galaxy/galaxy/Classes/Modules/Login(登录)/M/YHUserModel.swift

@@ -17,8 +17,9 @@ struct YHUserModel: SmartCodable {
     var ip: String?
     var imei: String?
     var channel: String?
-    
-    
-    
     var token: String? // 暂无token
+        
+//    var token: String? {
+//      return "eyJpdiI6Ik5aeEVDclZTK0FISEFBZUgxN2VkdGc9PSIsInZhbHVlIjoiRFRJOHlObzVrZlp4T2tVYW1MSE1ZK0Z3dXlyK3p4QlczNmxsTXdkdW5GQVY4Q2VqZlNNUDdrdVpsb0JcLytpYmJheUp2MWZTUE5pOWgrVWRLdEtIUkx4R1wvS3F6SmRSQ0dWeFVXanFINGkyRWNMTXB4TVlcLzhjXC9NSzVoMFwvZ1ZOaVIwb0VqWlo1VERPSHY2RWJhME1RdWtkXC8yanBQdm9lMWM4WXJVK1BnMDd6SncwVVlWMDNnbSswSnM3eVwveFRRck03M3pOaDFSc3g0UmlYMTJQdmZpSkhUWHVMa21RV2xRbXBkalVTTUFicmFaN2NVNXl1ZTJOeEJoKzhrMnZtdzdvM1U5Qmh4WXNiSEFERUpiZHNWNkxoM2ZkVVRUdFlMMU1MQnIyaWNxNSt4S1NocDVEbnNqeHphUCtVVk1qTlVnMk1ydVNPamJ0c2tDQ1wvWFk1SkxtSWtDMU9oT3ZqaFpuNU5aVUVicHpYVU56VnlqK01Cb20welJMbkQrcTFWOHFUbzlPK0RGdDRcLzJ1T094MjNjYTVZZmJcL2txRE93cEFUYzlKWWdVWE9cLzFnYnVwTFZ4VUtqMFQ5QlgzZitDQjhyNURpU3p0bktqblBicUxPekNBcWRWM0g0WklSOEc0T0RPVkNBMGZQdEtWV3ZqN3IrcHZDYm9UNjREdnA3U1RZY1Z1dFE3K1RRM2F2eGY0QXc2dGlha0RBUDVpVHdFWE53dzl2eVczVk9VNTJSa1Fzb1J4ZGd0c0RCdktPQ1FWOUQ5Y0krckQ3bFc4NkNJMHliSXlnNGtYU1ZCUHRZWTdCKzA5d1wvdldzWTlpeUdYaEg4eGhITHpRSUthMWpSVlZvZVhwZ3BvamxCTHFSUXJmQ1hQNThYbUNNanZnVGs0b3RDTUFmYkdsYTEzeEtnTXJpZVU0QnJHWDJoUk9sUklzaFFhUkJiNWk0Z2E0cUUwejU4RmF2RnE4Z2U0eEo3VmZ2SmFMTlVacFBvSFlZUmM2N3liVTdhTk5NWU9YS0xtalk3QUN3NWV2UTlPeE5hMmk0aHU4MSt0YjNJQytFczRMa2l6XC9jV0Jxc01QYU0yYXdTXC92RXBxTFNVOVd6SlwvRm9KM21jUHlcL2diRlMyU3REeEl0K1RxSjRuck8xaXlOaWY4NXVzMVBibXpVSEZJWkVZQnFUd2k5TUVJcDUwUEFjTmljTzYyaWFYaFkzZUtkR294d29LUzBUTFF1Y0xxbWtMNFF4ZlZkN2k4YktEUnRGekU3OEdaN2J3TUR4T2FpVHRKaGlqRWNcL2c5dlwvOUVEVmdLNUhBSk1wSGV5UXVoOFJydlczc09HU1EyeXI4SFZZQmJJQWx1cGFIaXhmK1VJNmdoNmwrOElMZXFxSHZtazQreW84RFBlOXFnVDI2bm1tZWl0K01OcU1DSGJEQXdnWW9Hc0ptWFVJbXVXdEpyT2FKUHprTzJ1MkxFSEViZGV4cFpuOWRXK3dUdVR4bmJHZ1VRRGJycFRBME5lWUtaT0JCYjViSWVvcVJ3RXllb2tQZ1VkUWFqVWo0UHQzMUQwWVMwZ05rTTU0Nk1QQUdxTm9rZFNISVYrTG5DWlArNkt5RkZxajdZN1luakRKQVdUaVpnOUhCUExYMEVKRXRRT3QyZTI4cU9TdlBrbWxVZkFLSWZFbXNha3lCZUhFRVpyTmxQOERjbVwvMytCc0JpNnZcL1Nvek9yR2pUWGF2XC9VMzN4OEY5T3VsdUNGRFNWbHZZMnBzNHhMeEdIR21majBOOUJNbEhlK1J4S3dFTnlJamdTeFQyTWlTTlhCUWxnSDF6VmNhWHIzVGpoREY5clB2XC9uZHZjSm1iTHZ1bjFIUUFRait6dUJlUk1WQ1FhdXFoN002YlQ5MVwvQVMzYzJJQ0RFR1czdEtqMFBTQT09IiwibWFjIjoiOGVlZjBmNTVmMzEwNjhkZjVmYTlkYzAwYzllMjJmNjUyZmRmN2U1ODFiZTIzNzRjMDVjMTNiOTNhOWRhMmVkYSJ9"
+//    }
 }

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

@@ -37,11 +37,11 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
     }()
     
     lazy var items: [PersonalModuleItem] = {
-        return [PersonalModuleItem(title: "调整颜色".local.local),
-                PersonalModuleItem(title: "深色模式".local),
-                PersonalModuleItem(title: "个人信息收集清单".local),
-                PersonalModuleItem(title: "第三方信息共享清单".local),
-                PersonalModuleItem(title: "关于我们".local)]
+        return [PersonalModuleItem(title: "调整设置".local, type:.changeSettings),
+                PersonalModuleItem(title: "深色模式".local, type:.darkMode),
+                PersonalModuleItem(title: "个人信息收集清单".local, type:.infoCollectList),
+                PersonalModuleItem(title: "第三方信息共享清单".local, type:.infoShareList),
+                PersonalModuleItem(title: "关于我们".local, type:.aboutUs)]
     }()
     
     override func viewDidLoad() {
@@ -72,6 +72,7 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
     @objc func logout() {
         YHLoginManager.shared.clearUserInfo()
         NotificationCenter.default.post(name: YhConstant.YhNotification.didLoginoutSuccessNotifiction, object: nil)
+        YHHUD.flash(message: "退出成功")
         self.navigationController?.popViewController(animated: true)
     }
 }
@@ -96,7 +97,11 @@ extension YHMySettingViewController : UITableViewDelegate, UITableViewDataSource
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
         if (indexPath.row >= items.count) { return }
-        
+        let item = items[indexPath.row]
+        if item.type == .aboutUs {
+           let vc = YHAboutUsViewController()
+           self.navigationController?.pushViewController(vc)
+        }
     }
 }
 

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

@@ -9,12 +9,32 @@ import UIKit
 import SnapKit
 import NEConversationUIKit
 
+enum YHPersonalModuleItemType: Int {
+    case none = 0
+    
+    case myMessage
+    case myProgress
+    case scoreCenter
+    case recommend
+    case myPoster
+    case myTestCode
+    case appointGalaxyBay
+    
+    case changeSettings
+    case darkMode
+    case infoCollectList
+    case infoShareList
+    case aboutUs
+}
+
 struct PersonalModuleItem {
     var icon: String?
     var title: String
-    init(icon: String? = nil, title: String) {
+    var type:YHPersonalModuleItemType = .none
+    init(icon: String? = nil, title: String, type:YHPersonalModuleItemType) {
         self.icon = icon
         self.title = title
+        self.type = type
     }
 }
 
@@ -25,6 +45,7 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
         if #available(iOS 11.0, *) {
             tableView.contentInsetAdjustmentBehavior = .never
         }
+        tableView.showsVerticalScrollIndicator = false
         tableView.tableHeaderView = headerView
         tableView.backgroundColor = .clear
         tableView.separatorStyle = .none
@@ -35,13 +56,14 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
     }()
     
     lazy var items: [PersonalModuleItem] = {
-        return [PersonalModuleItem(icon: "mine_item_msg", title: "我的消息".local),
-                PersonalModuleItem(icon: "mine_item_progress", title: "我的进度".local),
-                PersonalModuleItem(icon: "mine_item_scoreCenter", title: "积分中心".local),
-                PersonalModuleItem(icon: "mine_item_recommend", title: "推荐有礼".local),
-                PersonalModuleItem(icon: "mine_item_poster", title: "我的海报".local),
-                PersonalModuleItem(icon: "mine_item_code", title: "我的测评码".local),
-                PersonalModuleItem(icon: "mine_item_appoint", title: "预约银河湾".local),]
+        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),
+                PersonalModuleItem(icon: "mine_item_recommend", title: "推荐有礼".local, type:.recommend),
+                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),
+               ]
     }()
     
     lazy var headerView: YHUserInfoHeaderView = {

galaxy/galaxy/Res/Assets.xcassets/Form/form_btn_tips.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Frame@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Frame@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}