主申请人

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -2158,7 +2158,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
@@ -2184,7 +2184,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = dev.intelligenceGalaxy.profile;
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = com.adhoc.profile;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h";
 				SWIFT_VERSION = 5.0;
@@ -2200,7 +2200,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CODE_SIGN_IDENTITY = "Apple Development";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
@@ -2226,7 +2226,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = dev.intelligenceGalaxy.profile;
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = com.adhoc.profile;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_OBJC_BRIDGING_HEADER = "$(SRCROOT)/$(TARGET_NAME)/Res/galaxy-Bridge-Header.h";
 				SWIFT_VERSION = 5.0;

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/C/YHMainApplicantInformationViewController.swift

@@ -15,6 +15,7 @@ class YHMainApplicantInformationViewController: YHBaseViewController {
     var tableView: UITableView!
     var viewModel: YHMainApplicantInformationViewModel!
     var dataSource: [YHSectionItemModel]?
+    var isShowPrompt: Bool = false
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -35,13 +36,13 @@ class YHMainApplicantInformationViewController: YHBaseViewController {
     
     func updateDataSource() {
         if self.stepView.currentIndex == 0 {
-            self.dataSource = self.viewModel.getBaseDataSource()
+            self.dataSource = self.viewModel.getBaseDataSource(isShowPrompt)
         } else if self.stepView.currentIndex == 1 {
-            self.dataSource = self.viewModel.getIDCardDataSource()
+            self.dataSource = self.viewModel.getIDCardDataSource(isShowPrompt)
         } else if self.stepView.currentIndex == 2 {
-            self.dataSource = self.viewModel.getDocumentInformation()
+            self.dataSource = self.viewModel.getDocumentInformation(isShowPrompt)
         } else if self.stepView.currentIndex == 3 {
-            self.dataSource = self.viewModel.getDetailDataSource()
+            self.dataSource = self.viewModel.getDetailDataSource(isShowPrompt)
         }
         self.tableView.reloadData()
     }
@@ -141,6 +142,18 @@ extension YHMainApplicantInformationViewController: UITableViewDelegate, UITable
         if stepView.currentIndex == 1 {
             return 217.0
         } else {
+            let array = dataSource?[indexPath.row].models ?? []
+            var h = 0
+            for i in 0..<array.count {
+                let data = array[i]
+                if data.id == .id3 || data.id == .id4 || data.id == .id18 {
+                    h = h + 132
+                } else if data.id == .id13 {
+                    h = h + 72
+                } else {
+                    h = h + 52
+                }
+            }
             return CGFloat(count * 52 + 52 + 14)
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/M/YHItemModel.swift

@@ -69,8 +69,9 @@ struct YHItemModel {
     var rightButtonString: String?
     var type: YHItemSelectType?
     var value: [String]?
+    var isShowPrompts: Bool?
     
-    init(id: YHItemID? = nil, isNeed: Bool? = nil, title: String? = nil, isUserKeyBoard: Bool? = nil, prompts: String? = nil, message: String? = nil, leftButtonString: String? = nil, rightButtonString: String? = nil, type: YHItemSelectType? = nil, value: [String]? = nil) {
+    init(id: YHItemID? = nil, isNeed: Bool? = nil, title: String? = nil, isUserKeyBoard: Bool? = nil, prompts: String? = nil, message: String? = nil, leftButtonString: String? = nil, rightButtonString: String? = nil, type: YHItemSelectType? = nil, value: [String]? = nil, isShowPrompts: Bool? = nil) {
         self.id = id
         self.isNeed = isNeed
         self.title = title
@@ -81,6 +82,7 @@ struct YHItemModel {
         self.rightButtonString = rightButtonString
         self.type = type
         self.value = value
+        self.isShowPrompts = isShowPrompts
     }
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/V/YHItemView.swift

@@ -17,7 +17,7 @@ class YHItemView: UIView {
     var centerButton: UIButton!
     var leftButton: UIButton!
     var rightButton: UIButton!
-    
+    var showPromptLabel: UILabel!
     var dataSource: YHItemModel? {
         didSet {
             updateAllViews()
@@ -58,6 +58,19 @@ class YHItemView: UIView {
             make.left.equalTo(112)
         }
         
+        showPromptLabel = {
+            let label = UILabel()
+            label.textColor = UIColor.red
+            label.font = UIFont.PFSC_M(ofSize: 12)
+            return label
+        }()
+        addSubview(showPromptLabel)
+        showPromptLabel.snp.makeConstraints { make in
+            make.left.equalTo(messageTextField.snp.left)
+            make.height.equalTo(20)
+            make.right.bottom.equalToSuperview()
+        }
+        
         nextStepImageView = {
             let imageView = UIImageView()
             imageView.image = UIImage(named: "form_right_arrow")
@@ -117,7 +130,6 @@ class YHItemView: UIView {
             make.height.equalTo(32)
             make.width.equalTo(74)
         }
-        
     }
     
     func updateAllViews() {
@@ -143,6 +155,7 @@ class YHItemView: UIView {
         }
         messageTextField.placeholder = dataSource.prompts
         messageTextField.text = dataSource.message
+        showPromptLabel.text = "\(dataSource.prompts ?? "")" + "\(dataSource.title ?? "")"
         if dataSource.isUserKeyBoard ?? false {
             nextStepImageView.isHidden = true
             centerButton.isHidden = true
@@ -188,6 +201,17 @@ class YHItemView: UIView {
         } else {
             rightButton.isHidden = true
         }
+        
+        if dataSource.isShowPrompts ?? false {
+            if dataSource.message?.count != 0 {
+                showPromptLabel.isHidden = false
+            } else {
+                showPromptLabel.isHidden = true
+            }
+        } else {
+            showPromptLabel.isHidden = true
+        }
+        
     }
     
     func buttonState(isLeft: Bool) {
@@ -340,4 +364,10 @@ extension YHItemView: UITextFieldDelegate {
             block(dataSource ?? YHItemModel())
         }
     }
+    
+    func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
+        let newText = (textField.text! as NSString).replacingCharacters(in: range, with: string)
+        dataSource?.message = newText
+        return true
+    }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/V/YHMainInformationTableViewCell.swift

@@ -19,6 +19,7 @@ class YHMainInformationTableViewCell: UITableViewCell {
             updateAllViews()
         }
     }
+    
     override func awakeFromNib() {
         super.awakeFromNib()
         // Initialization code