Skip to content

G
galaxy-iOS
Commit 534c91ed authored by Steven杜宇's avatar Steven杜宇
Browse files
Options

Merge branch 'develop' into duyu 

# Conflicts:
#	galaxy/galaxy.xcodeproj/project.pbxproj
parents ad30dc2c 3f9b4a52
Show whitespace changes
Inline Side-by-side
Showing with 106 additions and 14 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 534c91ed
......@@ -127,6 +127,7 @@
A5FD63BD2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63BC2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift */; };
A5FD63BF2B6250BC00D1D9DA /* YHInformationPerfectCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63BE2B6250BC00D1D9DA /* YHInformationPerfectCell.swift */; };
A5FD63C12B62616D00D1D9DA /* YHInformationPerfectModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63C02B62616D00D1D9DA /* YHInformationPerfectModel.swift */; };
A5FD63C32B63438A00D1D9DA /* YHContactMainItemStatusModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63C22B63438A00D1D9DA /* YHContactMainItemStatusModel.swift */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
......@@ -286,6 +287,7 @@
A5FD63BC2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInformationPerfectListVC.swift; sourceTree = "<group>"; };
A5FD63BE2B6250BC00D1D9DA /* YHInformationPerfectCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInformationPerfectCell.swift; sourceTree = "<group>"; };
A5FD63C02B62616D00D1D9DA /* YHInformationPerfectModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInformationPerfectModel.swift; sourceTree = "<group>"; };
A5FD63C22B63438A00D1D9DA /* YHContactMainItemStatusModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHContactMainItemStatusModel.swift; sourceTree = "<group>"; };
B6BB01E4C5DB87B66F0ECE84 /* Pods-galaxy.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-galaxy.release.xcconfig"; path = "Target Support Files/Pods-galaxy/Pods-galaxy.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */
......@@ -725,6 +727,7 @@
children = (
A5C382D02B5FAAB300C5E65C /* YHContactItemModel.swift */,
A5FD63C02B62616D00D1D9DA /* YHInformationPerfectModel.swift */,
A5FD63C22B63438A00D1D9DA /* YHContactMainItemStatusModel.swift */,
);
path = M;
sourceTree = "<group>";
......@@ -1137,6 +1140,7 @@
0468D42B2B55019900CFB916 /* YHAnalytics.swift in Sources */,
A5ACE93C2B4564F7002C94D2 /* UIColor+Extension.swift in Sources */,
042FBBBD2B63519C00F9DE23 /* YHFormItemSelectSheetCell.swift in Sources */,
A5FD63C32B63438A00D1D9DA /* YHContactMainItemStatusModel.swift in Sources */,
041B52982B5E8EA0007EBCEB /* YHFamilyMemberFormVC.swift in Sources */,
A5C382CF2B5F9A9100C5E65C /* YHServiceCenterMainViewModel.swift in Sources */,
A5C5B2EA2B4ECA4D00A7C5D1 /* YHDavidModel0.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHInformationPerfectListVC.swift
View file @ 534c91ed
......@@ -16,7 +16,7 @@ class YHInformationPerfectListVC: YHBaseViewController {
var arrData : [YHInformationPerfectModel] = []
private var myTargetIndex : Int32 = 3
private var myTargetIndex : Int32 = 1
private lazy var topBkg : UIView = {
let imagV = UIImageView()
......@@ -51,9 +51,8 @@ class YHInformationPerfectListVC: YHBaseViewController {
make.height.equalTo(26)
}
let desLable = UILabel(text: "此表由主申请人填写，我们将会根据您的个人信息制作资料清单，请按顺序填写，提交后1-2个工作日内联系您哦~")
desLable.font = kFont(size: 12)
desLable.font = kFont(size: 13)
desLable.numberOfLines = 0
desLable.lineBreakMode = .byWordWrapping
......@@ -177,6 +176,5 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource
} else {
navigationController?.pushViewController(YHMainApplicantInformationViewController())
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterSecondViewController.swift
View file @ 534c91ed
......@@ -12,6 +12,8 @@ import UIKit
class YHServiceCenterSecondViewController: YHBaseViewController {
// private let serviceCenterMainReqVM : YHServiceCenterMainViewModel = YHServiceCenterMainViewModel()
private var arrData : [YHContactMainItemStatusModel] = []
private var unfoldFlag : Bool = true //是否展开
private lazy var downArrowImagev : UIImageView = {
let imagV = UIImageView(frame: CGRect(x: KScreenWidth - 16 - 32, y: 17, width: 24, height: 24))
......@@ -61,6 +63,14 @@ extension YHServiceCenterSecondViewController {
gk_navBarAlpha = 1.0
gk_navLineHidden = false
let arr = [1,2,3]
for item in arr {
let model = YHContactMainItemStatusModel()
model.type = item
model.isFinished = false
arrData.append(model)
}
view.addSubview(topBkg)
topBkg.snp.makeConstraints { make in
make.top.left.right.equalToSuperview()
......@@ -101,9 +111,8 @@ extension YHServiceCenterSecondViewController : UITableViewDelegate,UITableViewD
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
if unfoldFlag == true {
return 2
return arrData.count
}
return 0
}
......@@ -143,6 +152,8 @@ extension YHServiceCenterSecondViewController : UITableViewDelegate,UITableViewD
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let newCell = tableView.dequeueReusableCell(withClass: YHContractMainItemStatusCell.self)
newCell.selectionStyle = .none
newCell.dataModel = arrData[indexPath.row]
return newCell
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHContactMainItemStatusModel.swift 0 → 100644
View file @ 534c91ed
//
// YHContactMainItemStatusModel.swift
// galaxy
//
// Created by davidhuangA on 2024/1/26.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHContactMainItemStatusModel {
var type : Int = -1 {
didSet {
if type == 1 {
iconName = "service_center_sfsq_xxws_icon"
itemName = "信息完善"
} else if type == 2 {
iconName = "service_center_sfsq_zlsc_icon"
itemName = "资料上传"
} else if type == 3 {
iconName = "service_center_sfsq_wdpf_icon"
itemName = "我的评分"
}
}
}
var isFinished : Bool = false
var iconName : String = ""
var itemName : String = ""
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHContractCell.swift
View file @ 534c91ed
......@@ -41,14 +41,14 @@ class YHContractCell: UITableViewCell {
let lable = UILabel()
lable.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
lable.font = kFont(name: "PingFangSC-Medium", size: 17)
lable.text = "香港优秀人才计划-张先生"
lable.text = ""
return lable
}()
lazy var contractIdLable = {
let lable = UILabel()
lable.font = kFont(name: "PingFangSC-Medium", size: 17)
lable.text = "订单号：10936"
lable.text = ""
lable.textColor = UIColor(red: 0.533, green: 0.561, blue: 0.596, alpha: 1)
lable.font = kFont(name: "PingFangSC-Regular", size: 12)
return lable
......@@ -64,7 +64,8 @@ class YHContractCell: UITableViewCell {
extension YHContractCell {
func updateUI() {
contractNameLable.text = dataModel?.productName ?? "-"
contractIdLable.text = dataModel?.orderSn ?? "-"
let str = "订单号：" + (dataModel?.id ?? "-")
contractIdLable.text = str
}
func setupUI() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHContractMainItemStatusCell.swift
View file @ 534c91ed
......@@ -14,7 +14,7 @@ class YHContractMainItemStatusCell: UITableViewCell {
static let cellReuseIdentifier = "YHContractMainItemStatusCell"
static let cellHeight :CGFloat = 97.0
var dataModel : YHContactItemModel? {
var dataModel : YHContactMainItemStatusModel? {
didSet {
updateUI()
}
......@@ -39,7 +39,7 @@ class YHContractMainItemStatusCell: UITableViewCell {
private lazy var iconImageV : UIImageView = {
let nextImgV = UIImageView()
nextImgV.image = UIImage(named: "service_center_finish_info_icon")
nextImgV.image = UIImage(named: "service_center_sfsq_xxws_icon")
nextImgV.contentMode = .scaleAspectFill
return nextImgV
}()
......@@ -89,8 +89,11 @@ class YHContractMainItemStatusCell: UITableViewCell {
extension YHContractMainItemStatusCell {
func updateUI() {
// contractNameLable.text = dataModel?.productName ?? "-"
// contractIdLable.text = dataModel?.orderSn ?? "-"
iconImageV.image = UIImage(named: dataModel?.iconName ?? "")
itemNameLable.text = dataModel?.itemName ?? ""
gofinishHoldView.isHidden = !(dataModel?.isFinished ?? false)
goUnfinishHoldView.isHidden = dataModel?.isFinished ?? false
}
func setupUI() {
......@@ -134,7 +137,6 @@ extension YHContractMainItemStatusCell {
make.height.equalTo(34)
make.width.equalTo(76)
}
// goUnfinishHoldView.isHidden = true
gofinishHoldView.isHidden = true
......
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_center_sfsq_wdpf_icon.imageset/Contents.json 0 → 100644
View file @ 534c91ed
{
"images" : [
{
"filename" : "Group 3380.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Group 3380@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Group 3380@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_center_sfsq_zlsc_icon.imageset/Contents.json 0 → 100644
View file @ 534c91ed
{
"images" : [
{
"filename" : "Group 3381.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Group 3381@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Group 3381@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment