Commit 5a542dac authored by pete谢兆麟's avatar pete谢兆麟

邀请有礼

parent 32791faa
......@@ -80,7 +80,7 @@ extension YHInvitationWithGiftsViewController: UITableViewDelegate, UITableViewD
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if indexPath.row == 0 {
return KScreenWidth / 1.82
return KScreenWidth * 0.55 + 16.0
} else if indexPath.row == 1 {
if self.viewModel.recordModel.list.count == 0 {
return 345
......
......@@ -20,7 +20,7 @@ class YHInvitationWithGiftsDetailView: UIView {
var closeButton: UIButton!
var messageLabel: UILabel!
var messageImage: UIImageView!
var bgView: UIView!
var bgView: UIImageView!
override init(frame: CGRect) {
super.init(frame: frame)
......@@ -73,15 +73,16 @@ class YHInvitationWithGiftsDetailView: UIView {
}
bgView = {
let view = UIView()
view.backgroundColor = UIColor(hex: 0xf3f8ff)
return view
let imageView = UIImageView()
imageView.image = UIImage(named: "invitation_with_gifts_detail_bg")
imageView.isUserInteractionEnabled = true
return imageView
}()
topView.addSubview(bgView)
topContentView.addSubview(bgView)
bgView.snp.makeConstraints { make in
make.right.equalTo(-12)
make.top.left.equalTo(12)
make.height.equalTo(29)
make.right.bottom.equalTo(-12)
make.left.equalTo(12)
make.top.equalTo(12)
}
topImageView = {
......@@ -99,7 +100,7 @@ class YHInvitationWithGiftsDetailView: UIView {
scrollView = {
let view = UIScrollView()
view.bounds = CGRect(x: 0, y: 0, width: 287, height: 1252)
view.bounds = CGRect(x: 0, y: 0, width: 287, height: 1223)
// 去除弹簧效果
view.bounces = false
......@@ -112,12 +113,14 @@ class YHInvitationWithGiftsDetailView: UIView {
topContentView.addSubview(scrollView)
scrollView.snp.makeConstraints { make in
make.right.bottom.equalTo(-12)
make.top.left.equalTo(12)
make.left.equalTo(12)
make.top.equalTo(41)
}
bgImageView = {
let imageView = UIImageView()
imageView.image = UIImage(named: "invitation_with_gifts_detail_bg")
imageView.isHidden = true
return imageView
}()
scrollView.addSubview(bgImageView)
......@@ -137,7 +140,7 @@ class YHInvitationWithGiftsDetailView: UIView {
make.left.equalTo(14)
make.right.equalTo(-14)
make.height.equalTo(21)
make.top.equalTo(38)
make.top.equalTo(9)
}
titleImage = {
......@@ -150,7 +153,7 @@ class YHInvitationWithGiftsDetailView: UIView {
make.width.equalTo(259)
make.centerX.equalToSuperview()
make.height.equalTo(681)
make.top.equalTo(71)
make.top.equalTo(42)
}
messageLabel = {
......@@ -165,7 +168,7 @@ class YHInvitationWithGiftsDetailView: UIView {
make.left.equalTo(14)
make.right.equalTo(-14)
make.height.equalTo(21)
make.top.equalTo(782)
make.top.equalTo(753)
}
messageImage = {
......@@ -178,7 +181,7 @@ class YHInvitationWithGiftsDetailView: UIView {
make.width.equalTo(259)
make.centerX.equalToSuperview()
make.height.equalTo(426)
make.top.equalTo(814)
make.top.equalTo(785)
}
......
......@@ -33,7 +33,7 @@ class YHInvitationWithGiftsFirstTableViewCell: UITableViewCell {
}
func setupUI() {
self.backgroundColor = UIColor(hex: 0xededed)
self.backgroundColor = UIColor(hex: 0xebf4fe)
centerImageView = {
let imageView = UIImageView()
imageView.image = UIImage(named: "invitation_with_gifts_first")
......@@ -41,10 +41,10 @@ class YHInvitationWithGiftsFirstTableViewCell: UITableViewCell {
}()
contentView.addSubview(centerImageView)
centerImageView.snp.makeConstraints { make in
make.centerY.equalToSuperview()
make.bottom.equalTo(-8)
make.left.equalTo(12)
make.right.equalTo(-12)
make.height.equalTo(193)
make.top.equalTo(8)
}
}
......
......@@ -66,7 +66,7 @@ class YHInvitationWithGiftsHeadView: UIView {
}
func setUpView() {
self.backgroundColor = UIColor(hex: 0xededed)
self.backgroundColor = UIColor(hex: 0xebf4fe)
let height = KScreenWidth / 0.735
centerImageView = {
let view = UIImageView()
......
......@@ -91,7 +91,7 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
}
func setupUI() {
self.backgroundColor = UIColor(hex: 0xededed)
self.backgroundColor = UIColor(hex: 0xebf4fe)
centerView = {
let view = UIView()
view.layer.cornerRadius = kCornerRadius3
......
......@@ -622,7 +622,6 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
}
}
}
}
if editType == .delete {
self.showDeleteAlert(model)
......
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "invitation_with_gifts_share_bg@2x.png",
"filename" : "Group 2033195291@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "invitation_with_gifts_share_bg@3x.png",
"filename" : "Group 2033195291@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
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