Commit 77aa4c03 by pierce

fixed bugs

parent 0d0f2cfa
...@@ -104,7 +104,9 @@ public final class GDPersonalAuthModel: BaseModel, NetworkArrType { ...@@ -104,7 +104,9 @@ public final class GDPersonalAuthModel: BaseModel, NetworkArrType {
public static func createArrFrom(_ json: JSON) -> [GDPersonalAuthModel] { public static func createArrFrom(_ json: JSON) -> [GDPersonalAuthModel] {
return json["result"].arrayValue return json["result"].arrayValue
.map { GDPersonalAuthModel.createFrom($0) } .map { GDPersonalAuthModel.createFrom($0) }
.filter { $0.key != .unknown } .filter { $0.key != .unknown
//TODO:wechat auth: added By Pidan
&& $0.key != .wechat }
} }
public static func createFrom(_ json: JSON) -> GDPersonalAuthModel { public static func createFrom(_ json: JSON) -> GDPersonalAuthModel {
......
...@@ -206,6 +206,8 @@ class GDSettingAccountController: BaseViewController { ...@@ -206,6 +206,8 @@ class GDSettingAccountController: BaseViewController {
socialAccount.identifier = self.socialAccountIdentifier socialAccount.identifier = self.socialAccountIdentifier
self.tableView.items.accept([securityItem, accountSetting, socialAccount, accountCancle]) self.tableView.items.accept([securityItem, accountSetting, socialAccount, accountCancle])
self.getSocialPlatInfo()
}).disposed(by: disposeBag) }).disposed(by: disposeBag)
} }
...@@ -279,7 +281,7 @@ class GDSettingAccountController: BaseViewController { ...@@ -279,7 +281,7 @@ class GDSettingAccountController: BaseViewController {
GDRouter.UserRouter?.bindSocialPlat(on: plat, currentVC: self).subscribe(onSuccess: {[weak self] (_) in GDRouter.UserRouter?.bindSocialPlat(on: plat, currentVC: self).subscribe(onSuccess: {[weak self] (_) in
FTIndicator.showToastMessage("绑定成功") FTIndicator.showToastMessage("绑定成功")
guard let self = self else { return } guard let self = self else { return }
// self.getSocialPlatInfo() self.getSocialPlatInfo()
}, onFailure: { (error) in }, onFailure: { (error) in
guard let error = error as? GDMoyaError else { return } guard let error = error as? GDMoyaError else { return }
FTIndicator.showToastMessage(error.msg) FTIndicator.showToastMessage(error.msg)
......
...@@ -62,7 +62,9 @@ class GDZoneInfoAuthCell: UITableViewCell { ...@@ -62,7 +62,9 @@ class GDZoneInfoAuthCell: UITableViewCell {
/// 隔线 /// 隔线
private let lineView = UIView(frame: .zero) private let lineView = UIView(frame: .zero)
/// 认证状态 /// 认证状态
private var authState = BehaviorRelay<[GDPersonalAuthType: Bool]>(value: [.idCard: false, .phone: false, .wechat: false]) /*private var authState = BehaviorRelay<[GDPersonalAuthType: Bool]>(value: [.idCard: false, .phone: false, .wechat: false])*/
/// 认证状态
private var authState = BehaviorRelay<[GDPersonalAuthType: Bool]>(value: [.idCard: false, .phone: false])
private func makeTitleLabel() { private func makeTitleLabel() {
titleLabel.font = .gd_default(14) titleLabel.font = .gd_default(14)
......
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 sign in to comment