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

连接替换 UIbug

parent fbd18ea6
...@@ -152,7 +152,7 @@ private extension YHStatusAdvantageVC { ...@@ -152,7 +152,7 @@ private extension YHStatusAdvantageVC {
if tag == 0 { if tag == 0 {
//跳转测评页 //跳转测评页
let vc = YHH5WebViewVC() let vc = YHH5WebViewVC()
vc.url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge/evaluation?channel=APP-zrll" vc.url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/evaluation?channel=APP-zrll"
vc.isShowRightShareItemFlag = true vc.isShowRightShareItemFlag = true
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
} else if tag == 1 { } else if tag == 1 {
......
...@@ -131,7 +131,7 @@ extension YHInvatationShareViewController { ...@@ -131,7 +131,7 @@ extension YHInvatationShareViewController {
} }
func loadData() { func loadData() {
if let qrCode = generateQRCode(from: YHBaseUrlManager.shared.curH5URL() + "superAppBridge/evaluation?channel=lkhtj-app&customer_id=\(YHLoginManager.shared.userModel?.id ?? "")&scene_id=30") { if let qrCode = generateQRCode(from: YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/evaluation?channel=lkhtj-app&customer_id=\(YHLoginManager.shared.userModel?.id ?? "")&scene_id=30") {
// 可以将qrCode设置为UIImageView的image属性来显示二维码 // 可以将qrCode设置为UIImageView的image属性来显示二维码
imageView.image = qrCode imageView.image = qrCode
} }
...@@ -157,14 +157,14 @@ extension YHInvatationShareViewController { ...@@ -157,14 +157,14 @@ extension YHInvatationShareViewController {
@objc func wxClick() { @objc func wxClick() {
// guard let combinedImage = combinedImageFrom(imageView: centerImageView) else { return } // guard let combinedImage = combinedImageFrom(imageView: centerImageView) else { return }
YHShareManager.shared.sendLinkContent("香港身份规划专属礼包,限时领取!", "1000元折扣福利券,资深银河规划专家1V1评估方案", UIImage(named: "invitation_with_gifts_share_other") ?? UIImage(), link: YHBaseUrlManager.shared.curH5URL() + "superAppBridge/evaluation?channel=lkhtj-app&customer_id=\(YHLoginManager.shared.userModel?.id ?? "")&scene_id=30") YHShareManager.shared.sendLinkContent("香港身份规划专属礼包,限时领取!", "1000元折扣福利券,资深银河规划专家1V1评估方案", UIImage(named: "invitation_with_gifts_share_other") ?? UIImage(), link: YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/evaluation?channel=lkhtj-app&customer_id=\(YHLoginManager.shared.userModel?.id ?? "")&scene_id=30")
// YHShareManager.shared.sendImageContent(combinedImage) // YHShareManager.shared.sendImageContent(combinedImage)
} }
@objc func peopleClick() { @objc func peopleClick() {
// guard let combinedImage = combinedImageFrom(imageView: centerImageView) else { return } // guard let combinedImage = combinedImageFrom(imageView: centerImageView) else { return }
// YHShareManager.shared.sendImageContent(combinedImage, WXSceneTimeline) // YHShareManager.shared.sendImageContent(combinedImage, WXSceneTimeline)
YHShareManager.shared.sendLinkContent("香港身份规划专属礼包,限时领取!", "1000元折扣福利券,资深银河规划专家1V1评估方案", UIImage(named: "invitation_with_gifts_share_other") ?? UIImage(), link: YHBaseUrlManager.shared.curH5URL() + "superAppBridge/evaluation?channel=lkhtj-app&customer_id=\(YHLoginManager.shared.userModel?.id ?? "")&scene_id=30", WXSceneTimeline) YHShareManager.shared.sendLinkContent("香港身份规划专属礼包,限时领取!", "1000元折扣福利券,资深银河规划专家1V1评估方案", UIImage(named: "invitation_with_gifts_share_other") ?? UIImage(), link: YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/evaluation?channel=lkhtj-app&customer_id=\(YHLoginManager.shared.userModel?.id ?? "")&scene_id=30", WXSceneTimeline)
} }
......
...@@ -13,38 +13,7 @@ class YHInvitationWithGiftsViewController: YHBaseViewController { ...@@ -13,38 +13,7 @@ class YHInvitationWithGiftsViewController: YHBaseViewController {
var tableView: UITableView! var tableView: UITableView!
var bottomViewForShare: YHInvitationWithGiftsShareBottomView! var bottomViewForShare: YHInvitationWithGiftsShareBottomView!
var viewModel: YHInvitationWithGiftsViewModel = YHInvitationWithGiftsViewModel() var viewModel: YHInvitationWithGiftsViewModel = YHInvitationWithGiftsViewModel()
lazy var navBar: YHCustomNavigationBar = {
let bar = YHCustomNavigationBar.navBar()
bar.backgroundColor = .clear
bar.backButton.setImage(UIImage(named: "back_icon"), for: .normal)
bar.backBlock = {
[weak self] in
guard let self = self else { return }
let view = YHInvitationWithGiftsShareView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
view.block = {[weak self] tag in
if tag == 0 {
self?.navigationController?.popViewController()
} else {
let vc = YHInvatationShareViewController()
self?.navigationController?.pushViewController(vc)
}
}
let window = UIApplication.shared.yhKeyWindow()
window?.addSubview(view)
}
return bar
}()
lazy var navView:UIView = {
let view = UIView()
view.backgroundColor = .clear
view.addSubview(self.navBar)
self.navBar.snp.makeConstraints { make in
make.left.right.bottom.equalToSuperview()
make.height.equalTo(k_Height_NavContentBar)
}
return view
}()
lazy var headView : YHInvitationWithGiftsHeadView = { lazy var headView : YHInvitationWithGiftsHeadView = {
let headView = YHInvitationWithGiftsHeadView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 666)) let headView = YHInvitationWithGiftsHeadView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 666))
return headView return headView
...@@ -151,7 +120,6 @@ extension YHInvitationWithGiftsViewController { ...@@ -151,7 +120,6 @@ extension YHInvitationWithGiftsViewController {
} }
func setView() { func setView() {
gk_navigationBar.isHidden = true
view.backgroundColor = .contentBkgColor view.backgroundColor = .contentBkgColor
let rightButtonItem = UIBarButtonItem(title: "规则", style: .plain, target: self, action: #selector(lookDeatil)) let rightButtonItem = UIBarButtonItem(title: "规则", style: .plain, target: self, action: #selector(lookDeatil))
rightButtonItem.setTitleTextAttributes([.foregroundColor: UIColor.mainTextColor], for: .normal) rightButtonItem.setTitleTextAttributes([.foregroundColor: UIColor.mainTextColor], for: .normal)
...@@ -192,11 +160,6 @@ extension YHInvitationWithGiftsViewController { ...@@ -192,11 +160,6 @@ extension YHInvitationWithGiftsViewController {
make.bottom.left.right.equalToSuperview() make.bottom.left.right.equalToSuperview()
make.height.equalTo(98) make.height.equalTo(98)
} }
view.addSubview(self.navView)
self.navView.snp.makeConstraints { make in
make.left.right.top.equalToSuperview()
make.height.equalTo(k_Height_NavigationtBarAndStatuBar)
}
} }
@objc func lookDeatil() { @objc func lookDeatil() {
...@@ -232,14 +195,13 @@ extension YHInvitationWithGiftsViewController: UIScrollViewDelegate { ...@@ -232,14 +195,13 @@ extension YHInvitationWithGiftsViewController: UIScrollViewDelegate {
} else if percent > 1.0 { } else if percent > 1.0 {
percent = 1.0 percent = 1.0
} }
navView.backgroundColor = UIColor(hex: 0xFFFFFF, alpha: percent) gk_navBackgroundColor = UIColor(hex: 0xFFFFFF, alpha: percent)
gk_navBarAlpha = 1
if percent >= 0.5 { if percent >= 0.5 {
navBar.backButton.setImage(UIImage(named: "back_icon"), for: .normal) gk_navTitle = "关于银河湾"
navBar.title = "关于银河湾"
} else { } else {
navBar.backButton.setImage(UIImage(named: "back_icon"), for: .normal) gk_navTitle = ""
navBar.title = ""
} }
} }
} }
...@@ -52,6 +52,8 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell { ...@@ -52,6 +52,8 @@ class YHInvitationWithGiftsSecondTableViewCell: UITableViewCell {
label.textColor = UIColor.yhGreyColor label.textColor = UIColor.yhGreyColor
label.font = UIFont.PFSC_M(ofSize: 12) label.font = UIFont.PFSC_M(ofSize: 12)
label.textAlignment = .center label.textAlignment = .center
label.layer.borderWidth = 1
label.layer.borderColor = UIColor(hex: 0xebf4fe).cgColor
self.tableView.tableFooterView = label self.tableView.tableFooterView = label
} else { } else {
self.tableView.tableFooterView = UIView() self.tableView.tableFooterView = UIView()
......
...@@ -67,7 +67,7 @@ extension YHEvaluationView { ...@@ -67,7 +67,7 @@ extension YHEvaluationView {
@objc func tapButton(gestureRecognizer:UITapGestureRecognizer) { @objc func tapButton(gestureRecognizer:UITapGestureRecognizer) {
//跳转测评页 //跳转测评页
let vc = YHH5WebViewVC() let vc = YHH5WebViewVC()
vc.url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge/evaluation?channel=APP-zrll" vc.url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/evaluation?channel=APP-zrll"
vc.isShowRightShareItemFlag = true vc.isShowRightShareItemFlag = true
parentViewController?.navigationController?.pushViewController(vc) parentViewController?.navigationController?.pushViewController(vc)
} }
......
...@@ -92,7 +92,7 @@ class YHServiceCenterMainViewController: YHBaseViewController { ...@@ -92,7 +92,7 @@ class YHServiceCenterMainViewController: YHBaseViewController {
//跳转测评页 //跳转测评页
let vc = YHH5WebViewVC() let vc = YHH5WebViewVC()
vc.url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge/evaluation?channel=APP-zrll" vc.url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/evaluation?channel=APP-zrll"
vc.isShowRightShareItemFlag = true vc.isShowRightShareItemFlag = true
self?.navigationController?.pushViewController(vc) self?.navigationController?.pushViewController(vc)
} }
......
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