Commit d0dfa853 authored by pete谢兆麟's avatar pete谢兆麟

Merge branch 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into youhua-dev

parents f235a86c 78dd713e
...@@ -10,12 +10,16 @@ import UIKit ...@@ -10,12 +10,16 @@ import UIKit
import AttributedString import AttributedString
class YHServiceOrderProgressTableViewCell: UITableViewCell { class YHServiceOrderProgressTableViewCell: UITableViewCell {
let redPointWidth = 6.0
var titleLabel: UILabel! var titleLabel: UILabel!
var messageLabel: UILabel! var messageLabel: UILabel!
var buttonLabel: UILabel! var buttonLabel: UILabel!
var progressImageView: UIImageView! var progressImageView: UIImageView!
var progressLabel: UILabel! var progressLabel: UILabel!
var progress: YHProgressView! var progress: YHProgressView!
var redPointView: UIView!
var dataModel : YHServiceCenterProgressModel? { var dataModel : YHServiceCenterProgressModel? {
didSet { didSet {
updateUI() updateUI()
...@@ -238,6 +242,15 @@ extension YHServiceOrderProgressTableViewCell { ...@@ -238,6 +242,15 @@ extension YHServiceOrderProgressTableViewCell {
progress.setProgress(Float(CGFloat(model.percentage))/100.0, animated: false) progress.setProgress(Float(CGFloat(model.percentage))/100.0, animated: false)
progress.isHidden = false progress.isHidden = false
} }
// 处理我的评分和我的方案红点相关显示逻辑
// 1 证件 2 信息完善 3 我的评分 4 我的方案 5 我的签字 6我的文书
if model.type == 3 || model.type == 4 {
self.redPointView.isHidden = true
} else {
self.redPointView.isHidden = true
}
} }
func setupUI() { func setupUI() {
...@@ -267,6 +280,7 @@ extension YHServiceOrderProgressTableViewCell { ...@@ -267,6 +280,7 @@ extension YHServiceOrderProgressTableViewCell {
make.top.equalTo(21) make.top.equalTo(21)
make.left.equalTo(21) make.left.equalTo(21)
make.height.equalTo(24) make.height.equalTo(24)
// make.width.equalTo(68)
} }
messageLabel = { messageLabel = {
...@@ -337,5 +351,22 @@ extension YHServiceOrderProgressTableViewCell { ...@@ -337,5 +351,22 @@ extension YHServiceOrderProgressTableViewCell {
make.height.equalTo(80) make.height.equalTo(80)
make.width.equalTo(80) make.width.equalTo(80)
} }
redPointView = {
let view = UIView()
view.isHidden = true
view.backgroundColor = .failColor
view.layer.cornerRadius = self.redPointWidth/2.0
view.clipsToBounds = true
return view
}()
holdView.addSubview(redPointView)
redPointView.snp.makeConstraints { make in
make.width.equalTo(redPointWidth)
make.height.equalTo(redPointWidth)
make.left.equalTo(titleLabel.snp.right).offset(2)
make.top.equalTo(titleLabel.snp.top).offset(2)
}
} }
} }
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