Commit 37745825 authored by David黄金龙's avatar David黄金龙

Merge branch 'main' into 630-dev

* main:
  1、处理一处 数据刷新的问题 2、修改版本号  0.8.0.9
  修改版本号  0.8.0.8
  检查是否安装 微信 未安装 则隐藏微信入口

# Conflicts:
#	galaxy/galaxy.xcodeproj/project.pbxproj
parents b817302d 43f1ee01
...@@ -43,11 +43,11 @@ class YHOtherServiceListViewController: YHBaseViewController { ...@@ -43,11 +43,11 @@ class YHOtherServiceListViewController: YHBaseViewController {
super.viewDidLoad() super.viewDidLoad()
view.backgroundColor = .white view.backgroundColor = .white
setupUI() setupUI()
loadData()
} }
override func viewWillAppear(_ animated: Bool) { override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated) super.viewWillAppear(animated)
loadData()
} }
} }
......
...@@ -156,30 +156,46 @@ class YHOtherLoginViewController: YHBaseViewController { ...@@ -156,30 +156,46 @@ class YHOtherLoginViewController: YHBaseViewController {
make.width.equalTo(260) make.width.equalTo(260)
} }
wechatButton = {
let button = UIButton(type: .custom)
button.setImage(UIImage(named: "login_wechat"), for: .normal)
button.addTarget(self, action: #selector(wechatLogin), for: .touchUpInside)
return button
}()
view.addSubview(wechatButton)
wechatButton.snp.makeConstraints { make in
make.right.equalTo(view.snp.centerX).offset(-22)
make.bottom.equalTo(-58)
make.height.width.equalTo(44)
}
appleButton = { if WXApi.isWXAppInstalled() {
let button = UIButton(type: .custom) wechatButton = {
button.setImage(UIImage(named: "login_apple"), for: .normal) let button = UIButton(type: .custom)
button.addTarget(self, action: #selector(appleLogin), for: .touchUpInside) button.setImage(UIImage(named: "login_wechat"), for: .normal)
return button button.addTarget(self, action: #selector(wechatLogin), for: .touchUpInside)
}() return button
view.addSubview(appleButton) }()
appleButton.snp.makeConstraints { make in view.addSubview(wechatButton)
make.left.equalTo(view.snp.centerX).offset(22) wechatButton.snp.makeConstraints { make in
make.bottom.equalTo(-58) make.right.equalTo(view.snp.centerX).offset(-22)
make.height.width.equalTo(44) make.bottom.equalTo(-58)
make.height.width.equalTo(44)
}
appleButton = {
let button = UIButton(type: .custom)
button.setImage(UIImage(named: "login_apple"), for: .normal)
button.addTarget(self, action: #selector(appleLogin), for: .touchUpInside)
return button
}()
view.addSubview(appleButton)
appleButton.snp.makeConstraints { make in
make.left.equalTo(view.snp.centerX).offset(22)
make.bottom.equalTo(-58)
make.height.width.equalTo(44)
}
} else {
appleButton = {
let button = UIButton(type: .custom)
button.setImage(UIImage(named: "login_apple"), for: .normal)
button.addTarget(self, action: #selector(appleLogin), for: .touchUpInside)
return button
}()
view.addSubview(appleButton)
appleButton.snp.makeConstraints { make in
make.centerX.equalToSuperview()
make.bottom.equalTo(-58)
make.height.width.equalTo(44)
}
} }
} }
......
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