Commit 84c43b87 authored by David黄金龙's avatar David黄金龙

1、修改版本号

2、处理身份优势的逻辑
parent 1ac0b05d
......@@ -4074,7 +4074,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -4215,7 +4215,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -4419,7 +4419,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......@@ -4465,7 +4465,7 @@
CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
FRAMEWORK_SEARCH_PATHS = (
......
......@@ -40,10 +40,14 @@ class YHStatusAdvantageVC: YHBaseViewController, WKUIDelegate, WKNavigationDeleg
var isQrInfoOk : Bool = false
//是否曾今有过网络
private var isNetWorkOkBefore : Bool = false
//当前用户是否有订单
let serviceCenterMainReqVM : YHServiceCenterMainViewModel = YHServiceCenterMainViewModel()
var hasOrderFlag : Bool = false
override func viewDidLoad() {
super.viewDidLoad()
setupUI()
......@@ -65,6 +69,22 @@ class YHStatusAdvantageVC: YHBaseViewController, WKUIDelegate, WKNavigationDeleg
// MARK: - 内部方法
private extension YHStatusAdvantageVC {
// 请求订单数据
func requestOrder() {
if YHLoginManager.shared.isLogin() == false {
self.bottomHoldView.hasOrder = self.hasOrderFlag
return
}
self.serviceCenterMainReqVM.getContactList {
[weak self] success, error in
guard let self = self else { return }
self.hasOrderFlag = self.serviceCenterMainReqVM.arrContactList.count > 0
self.bottomHoldView.hasOrder = self.hasOrderFlag
}
}
func loadQrInfo() {
let params : [String : Int] = ["pid[0]" : 14,"pid[1]" : 16]
viewModel.getHKEvent(param: params) { success, error in
......@@ -98,6 +118,9 @@ private extension YHStatusAdvantageVC {
NotificationCenter.default.addObserver(self, selector: #selector(updateNetWorkUI), name: .reachabilityChanged, object: nil)
view.backgroundColor = .white
requestOrder()
//获取导航栏高度
let navHeight = self.navigationController?.navigationBar.frame.height
//获取状态栏高度
......@@ -110,7 +133,6 @@ private extension YHStatusAdvantageVC {
webview.scrollView.bounces = false
webview.scrollView.delegate = self
// reloadWebUrl()
view.addSubview(webview)
view.addSubview(bottomHoldView)
......
......@@ -25,6 +25,12 @@ class YHStatusAdvantageBottomView: UIView {
typealias Block = (Int) -> () //0-快速测评 1-资讯顾问 2-分享有礼
var block: Block?
var hasOrder : Bool = false {
didSet {
setNeedsLayout()
}
}
lazy var topLine: UIView = {
let line = UIView()
......@@ -80,9 +86,16 @@ class YHStatusAdvantageBottomView: UIView {
super.layoutSubviews()
if YHLoginManager.shared.isLogin() {
quickEvaluationBtn.isHidden = true
consultantBtn.isHidden = true
rewardBtn.isHidden = false
if hasOrder {
quickEvaluationBtn.isHidden = true
consultantBtn.isHidden = true
rewardBtn.isHidden = false
} else {
quickEvaluationBtn.isHidden = false
consultantBtn.isHidden = false
rewardBtn.isHidden = true
}
} else {
quickEvaluationBtn.isHidden = false
consultantBtn.isHidden = false
......@@ -130,6 +143,9 @@ private extension YHStatusAdvantageBottomView {
make.height.equalTo(44)
// make.width.equalTo(116)
}
setNeedsLayout()
}
@objc func clickEvaluationBtn() {
......
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