Merge branch 'develop' into duyu

# Conflicts:
#	galaxy/galaxy.xcodeproj/project.pbxproj

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -95,6 +95,7 @@
 		A5234E332B6F9CB700A33433 /* YHBasicInfoFillModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5234E322B6F9CB700A33433 /* YHBasicInfoFillModel.swift */; };
 		A5234E352B707F6B00A33433 /* YHBasicInfoSessionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5234E342B707F6B00A33433 /* YHBasicInfoSessionModel.swift */; };
 		A5234E372B70802400A33433 /* YHBasicInfoCellModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5234E362B70802300A33433 /* YHBasicInfoCellModel.swift */; };
+		A5234E3E2B7235F000A33433 /* YHOtherInfoFillViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5234E3D2B7235F000A33433 /* YHOtherInfoFillViewController.swift */; };
 		A53026902B4E6F2700F35102 /* YHHomeCustomCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A530268F2B4E6F2700F35102 /* YHHomeCustomCell.swift */; };
 		A5551FFE2B4C26CE00510980 /* YHBaseViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */; };
 		A5573ED22B317BFF00D98EC0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5573ED12B317BFF00D98EC0 /* AppDelegate.swift */; };
@@ -329,6 +330,7 @@
 		A5234E322B6F9CB700A33433 /* YHBasicInfoFillModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBasicInfoFillModel.swift; sourceTree = "<group>"; };
 		A5234E342B707F6B00A33433 /* YHBasicInfoSessionModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBasicInfoSessionModel.swift; sourceTree = "<group>"; };
 		A5234E362B70802300A33433 /* YHBasicInfoCellModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBasicInfoCellModel.swift; sourceTree = "<group>"; };
+		A5234E3D2B7235F000A33433 /* YHOtherInfoFillViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOtherInfoFillViewController.swift; sourceTree = "<group>"; };
 		A530268F2B4E6F2700F35102 /* YHHomeCustomCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeCustomCell.swift; sourceTree = "<group>"; };
 		A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBaseViewModel.swift; sourceTree = "<group>"; };
 		A5573ECE2B317BFF00D98EC0 /* galaxy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = galaxy.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -830,6 +832,46 @@
 			path = VM;
 			sourceTree = "<group>";
 		};
+		A5234E382B72346A00A33433 /* OtherInformation(其他信息) */ = {
+			isa = PBXGroup;
+			children = (
+				A5234E3C2B72349F00A33433 /* VM */,
+				A5234E3B2B72349A00A33433 /* C */,
+				A5234E3A2B72349300A33433 /* V */,
+				A5234E392B72348C00A33433 /* M */,
+			);
+			path = "OtherInformation(其他信息)";
+			sourceTree = "<group>";
+		};
+		A5234E392B72348C00A33433 /* M */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = M;
+			sourceTree = "<group>";
+		};
+		A5234E3A2B72349300A33433 /* V */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = V;
+			sourceTree = "<group>";
+		};
+		A5234E3B2B72349A00A33433 /* C */ = {
+			isa = PBXGroup;
+			children = (
+				A5234E3D2B7235F000A33433 /* YHOtherInfoFillViewController.swift */,
+			);
+			path = C;
+			sourceTree = "<group>";
+		};
+		A5234E3C2B72349F00A33433 /* VM */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = VM;
+			sourceTree = "<group>";
+		};
 		A5573EC52B317BFF00D98EC0 = {
 			isa = PBXGroup;
 			children = (
@@ -1247,6 +1289,7 @@
 			isa = PBXGroup;
 			children = (
 				04C693652B73183E004C1758 /* 学历专业资格填写 */,
+				A5234E382B72346A00A33433 /* OtherInformation(其他信息) */,
 				A58556BB2B6BD81C003746B2 /* BaseInformation(基本资料) */,
 				A5167B2D2B6A23D10084C08F /* PersonInfoList(个人信息表) */,
 				A5167B292B6A174B0084C08F /* MyScore(我的评分) */,
@@ -1490,6 +1533,7 @@
 				A5C5B2E82B4EC95600A7C5D1 /* YHDavidTestCollectionViewCell.swift in Sources */,
 				A5FD63F62B68D13200D1D9DA /* YHPersonInfoCellModel.swift in Sources */,
 				042FBBC52B64AE3D00F9DE23 /* YHFormItemOnlyDoubleChoiceCell.swift in Sources */,
+				A5234E3E2B7235F000A33433 /* YHOtherInfoFillViewController.swift in Sources */,
 				041B52DB2B5FDF8E007EBCEB /* YHFamilyInitialInfo.swift in Sources */,
 				A5FD63D22B650BA700D1D9DA /* YHScorePersonInfoCell.swift in Sources */,
 				0468D4222B493A5E00CFB916 /* YHPhoneMessageView.swift in Sources */,

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

@@ -340,7 +340,9 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource
             //工作经历
         } else if indexPath.row == 5 {
             //其他信息
-            
+            let vc = YHOtherInfoFillViewController()
+            vc.orderId = orderId
+            navigationController?.pushViewController(vc)
         } else {
             
         }

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

@@ -16,7 +16,7 @@ class YHBasicInfoFillModel: SmartCodable {
     var child: [SpouseModel]?
     var brother: [SpouseModel]?
     var background: backgroundModel?
-    var orderID: String = ""
+    var order_id: String = ""
     
     required init() {
         

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

@@ -77,8 +77,6 @@ class YHFormItemAddCell: UITableViewCell {
     
     override func layoutSubviews() {
         super.layoutSubviews()
-        
-        print(addBtn.bounds)
         dotLineLayer.path = UIBezierPath(roundedRect: addBtn.bounds, cornerRadius: cornerRadius).cgPath
     
     }

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -93,7 +93,7 @@ class YHNetRequest: NSObject {
         print("sign = \(sign)")
         
         requestHeader.add(name:"sign",value:sign)
-        requestHeader.add(name: "token", value: "eyJpdiI6IlwvQVwvWnQ5N2lnbkx6WDVvVU8yUkFBUT09IiwidmFsdWUiOiJZVmVhV0hsTnFjYUlrUzBPOHRDcHh5eTE0RUEzVXVnSE00c1RkSmpjcENhK05nRkZHdWxLbzNSNXhJM1gwVzdySlJybTF2Q3VVelwvQ0N5YWxjcVgwNVR6eHFHd1hGRUE2eE9sUnlPbExZaTRWUDk0R3gxUGhDRFdTWmtPWUc4YWVcL0o2akdqODJRTFdLTkRvUmprbm5pdlo1Vm1keE5vdVwvc3lyRG5waHhTTGdWckZsUWNFaURtUFJyOHZ4SlwvVFd0VUloVEVvZDN6VHJQQklkbVwvZzBBb1wvM2VZXC9PampiYWx1YzRGQSs4OVBlTjgwYk4yaEFFSFNxUktiVkVieElVU283aHZwdkFuNHNJN0hoQWJLWm1tVEdHV0NOWGtxeWRjWHR4SGdHMytUbEh1S0FYbmNZUmtxWVYzUFdtc214amJHUGFNRW9iRHI4MEdwdlpiYlZRUmhIMWE0V2ZOcnJNNno0bGd4bGp1azZDSXVtcld6bFdLb0VmWVpOU25JUm8rUU0xMVlYWlZxUGQyS2xjUzJrR21VaExhdG5zbGM3cjZzRmlHbW4zZFNrTllOXC9OWWsxKzcyM3Vrdko3eFlYem5HWDkySnFVRGZKajBEVzRwZXcwRFpaWDJpMDVZQk1vSG8wTDJxazBWdWFJZXFEWUtIRU81aFFtZGtXRzZGdVZsQ1BZbDBKb2IzRkRwT2tPcVA5cXp4TTk1ZzJaTGUreStteUVDWldvc0RDXC9GWjJObytGblR3dVhVdzF6dE51b3NMTlMxYVNhVVp0MTk4aGFSVE9vYUp5OEl5SWo2TFlydElvRUhlbGFLU1U1RjFESVwvTFwvaE1ubWhid0RJd3NzVmRBeEd5ZytPam5kUFlqdnpQVCswNVk4SVdDZ21CODFETG1PemduR3g5cW5mNU5WOU56Mzhxalk2bUFCVld2eDZhSE5EUlI2NnIxRkhmOU94dmQrYXZzRU9UNFJBZWVCcmVwMGQ1dlRsSmdvbGpPa1dPVVwvTWIrd2ZlVURiZ3NOMnhQR1RZYk5Hc25OQWlIcEVQXC80YllpSnlsSEZDVWdERVdQS1RoRzBpSTB4Rjh4Y1hscmZBUUhCdm5pc0ZOa0NxVjd1S3VBRUVMeDU0aWNMc1FzZ0JWeWlDTWZVK2dHOG81czBCanFBekdCYTFWRzBic3AyVmMycDZRNGhjVGcxZEEzMllYZ2oyQ0MrXC9IRFU3UHFUeUhzNFQwTmkrbW9EK0dST2M0RFF0Nk5CbkN0RjdNemc4TEt0cDgwbVRsUlwvQkp5N3RDR01OQURSUXc3OWNCWjY4bU93ZmtyaDI2SmtRV3YwdVBJTFBCRkJHZVl6ODJnbE41VnpYZVBoZXd6b0lcL2NIQVpqZEhLNktSZDRXS2VtbEZWTUk2TFpDK0grV1lsNGJ0ekVuU1hcLzh3bUdOTWo0REx5SXBcL3JueGxENUM1eFRXQ0J5VTkyQUJrZ1hZUFJZeE0xRTRDNER6V2tjN0FmckExanZJWHg3cHFWRWowdTJGS2hPdUtrWk9DZTdsYzhha3ZRSGY1MDNIeGE2WWRrK1RZQU1uUXUxR09kZ1ExbjNZc3dXb00zVDRTa2R5Y1hYRXRDRmhlZnV0RVQxRzRzNWxhOVBsVmZrSlZzakhaMkVkcmttMkU2RXVaTmpBS2c4RkVQR3JlVDcxNWJoR3prTzlsZXRrRWR2c1pIaWx4MFIrMm5scXZ4T2JcL0lzK29PYzc4MDBaRVg3c2ZJdUJPWjRHOTA3cjg4eDNzXC8xUkVIY3VQWmpxVmUyY1BDRGFNYlVXY3BvT1Q1cXZCXC9wXC9rMGllXC81MkxUaG1QXC85ZjhER1M0aDREVlpuaVdqOTd0clpwSUY3cWdvV3FiN3pUbTVmMHlhXC85WnNPS1JJdm5vc05CMEtXdVE9PSIsIm1hYyI6ImViMTE5NmQyMjVmOTgxMmYzMjQ5NGI0M2I2NDAwNWQ2OWE5YTNlMzVhODcyMzAxZTU1NzVkNWU3Y2M5YTU3ZjgifQ==")
+        requestHeader.add(name: "token", value: "eyJpdiI6InF0T2FPeUNvbEkycFU4cXBqT1JPT2c9PSIsInZhbHVlIjoiNWNDdmRiSVpxUmtCQ3ZDY3QxbUZOXC9qQzBaRzBWWFlRMitKVHhaWkc4WWQzRWQwa1NEQ3RZQmp3eXc1WDNZelQrWVN1Vlc0N1Q1SThqcUtHUVdMS0tqdDNjMldxZnd0Z0crOERkZktEd1luUm40ZXVwejZ1cGxWaFR5aXBhRTFmR2RcL2JcLzJkc1hNdkJwbjRkaFhWNVVxaXMyOWY1bFhOTzI1VzdxbDZYTmMyTVZzQWJGVHpEdkhUOFBOblowWlFDSGZISDVwSVlyTGM5XC9KcERheURnRUFTemJReXo2Kys5bEw1bkRyMmdFNndWb2VPTHRoa0FKUGdrVGw2bmVBbWRUdWpsYXprZ3RHejFldTZiUzNuZGVjaTNQaFNFMmd0eVlnS203ZW0yVnRHN0JuUVFCVEowa0VOa08wWlNYNDRwV0hrSnZZaTJmUUVKcXQ1Nkt0XC9YRE93NWpVSkpyaCs1MVg0ajBzRWxoNTV5dEZKd1R0SzNYMnZmSitEUGh1bjkzaVwvUHlEZ0UxbzVSWWtiZjl1am91ZHZ1QnlGTUlFeWFhQmFRWnpyQXp4SmE0SXNOd28zT1h3QVZUNDJYaTZXendRdDFYb3ZnZXRHbWFEOGE1cmVuRTVIeXFMWEJKXC84eFpsbUdUNkRjditiRU1ybEI0Qno2K3QyNU9XRjJ0akVFa0VWVGx3XC8wWmVONWpcL1pvcnBqVjhwRW1adnlReE5QeE9ZM2NTRnlwZmpBV1FnNVYyajNQMjBEb1VRU0Fob2RwS1Z2d0p6MkxYVDhTdlBMUittZWZ3SGNZckg1OWJUaGVXcGtzeHl5ZEx3YjlmVThrelJuRjduaFNONmhTTWRqaWdcL2NPQ09oNUFYWTFKRUFjaDk4VjBJa1RRSnNYeGgwWHB3OVlSZ1B6VjRxVXhNQVZOSlZHSGJJN25YZUt0MkVGZXRweVh1b0FiNG1YZXlBQUxIbmRMVW1qampvb1puZ0pvSmZ3VzdiQ05Xd2QxOEtVS284aVwvbnFOZmVtbURTUFZPcFVjcDk5MmdwOVwvbnpIdUlkOFA2RTh1QmtvSnV2QmxGZStPRGcwMjd1TmtUSEF3eXRtNzhFRjZUOFR6K3pYXC9sYXVJcTdHelU5SzVpTElXdGlRS2lsNFl6cHdGVlNPM3I1UG1naUxyZ3NHejZrZFpxYnBPT21RN09BcjBhTnYxUEgyMUh1Snl5MmFiWVoxQjhoSit5NFpBOTFqeUpkTDJMZkN2dXFyS3V2UExxT0ZCVmtocTZQU2o4Z1ZBdkx2ZndnTERVaGd1RFpVQVl1Z2tMSCtDVU5ib1RHT3o0SWd1K1hDa3Z2dmZzTHd0bmhldVV0Yk9KWlhCdXJSdkdWV0RUQUFCdXQ5Y0RscjA5cnBJTld4UXdBdmg2SkVEXC96Qk1tUkIrZzJjeUhMZG04bkIwV1NVM0FXdEo1R3RtUlJROWh4aFp3SEE3cGdGTGNRUXh4VXg0Nm9HdGthRmRxMXZkU2g3cU5pb1J5SW9nUkdYY0RkbTJaZkx4VnV3U25LZDBzWHdJdzhXVDREY3QyM0ZrZURjaWZBbE9zNW15TFd3V2pNVkpHQko2VlQzUnV6Qkc4bURTY2M2Z2tVcWZkSFFMSEFIbEtZdXJsQVdXWHpnZnA4OFV6OXlsYXI0R1Q0UGdVd2x4SG9POEs1XC9hcE1Ebnl1NlNEdjhQV3c1clNGWUVORERYRVBhaE5XTDFzWVNRM05pdmwrUGZKdVhkUml2S0FVTU5SZ0FFZXJqVTJDZWkxMEFvTDBTbm1hZzVVRzNjTW54TlFEcDhVaVMxQzlrZ09iM2dGSFZXSFI0SFdxd2tKdnREK1lYOG91cjdkMTI2ZnZYSnV3T214QXAxaFwvb2FhOUowcklKdUw3eXRLYWc4QitiUmVBPT0iLCJtYWMiOiJlMTA4ZmMxOGI5NDNhNjA1NzhjODRiNzcyZWNmMmEwNGFhZWJmM2E5MzQyYjZiZTE0YzE1MzIzYmZiYzE4YWEyIn0=")
 
         headers = requestHeader
     }