完善

无故事王国

2023-10-09 f942b6e016805d35c36301bf534fbbb367be4a34

完善

 WanPai/Config/Enums.swift

@@ -50,7 +50,6 @@
    case register = 2
    case updatePwd = 3
    case forgotPwd = 4
    case bindPhone = 5

    var titleStr:String{
        switch self {
@@ -62,8 +61,6 @@
                return "修改密码"
            case .forgotPwd:
                return "忘记密码"
            case .bindPhone:
                return "绑定手机号"
        }
    }
}

 WanPai/Model/CommonModels.swift

@@ -797,3 +797,8 @@
    var end_time:TimeInterval = 0 //结束时间
}

struct LoginModel:HandyJSON{
    var token = ""
    var isBind = 0
}


 WanPai/Network/Services.swift

@@ -120,12 +120,22 @@
        return NetworkRequest.request(params: params, method: .post, progress: true)
    }

    class func wxLogin(openId:String,nickname:String,headimgurl:String)->Observable<BaseResponse<SimpleModel>>{
    class func wxLogin(openId:String,nickname:String,headimgurl:String,sex:Int)->Observable<BaseResponse<LoginModel>>{
        let params = ParamsAppender.build(url: All_Url)
            .interface(url: "/account/base/appUser/loginWeChat")
            .append(key: "openId", value: openId)
            .append(key: "nickname", value: nickname)
            .append(key: "headimgurl", value: headimgurl)
            .append(key: "sex", value: sex)
        return NetworkRequest.request(params: params, method: .post, progress: true)
    }

    class func wxPhoneBind(phone:String,code:String,openId:String)->Observable<BaseResponse<SimpleModel>>{
        let params = ParamsAppender.build(url: All_Url)
            .interface(url: "/account/base/appUser/bind")
            .append(key: "phone", value: phone)
            .append(key: "openId", value: openId)
            .append(key: "code", value: code)
        return NetworkRequest.request(params: params, method: .post, progress: true)
    }


 WanPai/Root/Login/VC/BindPhoneVC.swift

@@ -1,9 +1,9 @@
//
//  BindPhoneVC.swift
//  WanPai
//
//  Created by 无故事王国 on 2023/10/9.
//
    //
    //  BindPhoneVC.swift
    //  WanPai
    //
    //  Created by 无故事王国 on 2023/10/9.
    //

import UIKit
import QMUIKit
@@ -14,18 +14,30 @@
    @IBOutlet weak var tf_phone: QMUITextField!
    @IBOutlet weak var tf_code: QMUITextField!
    @IBOutlet weak var btn_code: UIButton!
    private var wxUserInfoModel:WechatUserInfoModel!
    private var token:String!

    override func viewDidLoad() {
        super.viewDidLoad()
    override func viewDidLoad() {
        super.viewDidLoad()
        title = "绑定手机号"
    }
    }

    init(wxUserInfoModel:WechatUserInfoModel,token:String) {
        super.init(nibName: nil, bundle: nil)
        self.wxUserInfoModel = wxUserInfoModel
        self.token = token
    }

    required init?(coder: NSCoder) {
        fatalError("init(coder:) has not been implemented")
    }

    @IBAction func getCodeAction(_ sender: UIButton) {
        guard tf_phone.text!.jq_isPhone else {
            alert(msg: "请输入正确的手机号码");return
        }

        Services.getSMSCode(phone: tf_phone.text!, type: .bindPhone).subscribe(onNext: {result in
        Services.getSMSCode(phone: tf_phone.text!, type: .login).subscribe(onNext: {result in
            sender.jq_openCountDown()
        }) { error in
            alertError(msg: error.localizedDescription)
@@ -41,6 +53,17 @@
            alert(msg: "请输入验证码");return
        }

        Services.wxPhoneBind(phone: tf_phone.text!, code: tf_code.text!, openId: wxUserInfoModel.openid).subscribe(onNext: {[weak self] data in
            guard let weakSelf = self else { return }
            if data.code == 200{
                alertSuccess(msg: "绑定成功")
                UserViewModel.saveToken(weakSelf.token)
                app.registerAndLoginSuccess()
            }else{
                alert(msg: data.msg)
            }
        }) { error in
            alertError(msg: error.localizedDescription)
        }.disposed(by: disposeBag)
    }
	
}

 WanPai/Root/Login/VC/BindPhoneVC.xib

@@ -72,7 +72,7 @@
                        <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入验证码" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="uLi-4i-BeV" customClass="QMUITextField">
                            <rect key="frame" x="74" y="0.0" width="98" height="40"/>
                            <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/>
                            <textInputTraits key="textInputTraits" spellCheckingType="no" keyboardType="numberPad" enablesReturnKeyAutomatically="YES" secureTextEntry="YES" smartQuotesType="no"/>
                            <textInputTraits key="textInputTraits" spellCheckingType="no" keyboardType="numberPad" enablesReturnKeyAutomatically="YES" smartQuotesType="no"/>
                            <userDefinedRuntimeAttributes>
                                <userDefinedRuntimeAttribute type="number" keyPath="maximumTextLength">
                                    <integer key="value" value="6"/>

 WanPai/Root/Login/VC/LoginVC.swift

@@ -115,8 +115,12 @@
    @IBAction func getCodeAction(_ sender: UIButton) {
        guard !tf_phone.text!.isEmpty else {alertError(msg: tf_phone.placeholder!);return}
        guard tf_phone.text!.jq_isPhone else {alertError(msg: "请输入正确的手机号");return}
        Services.getSMSCode(phone: tf_phone.text!, type: .login).subscribe(onNext: {result in
            sender.jq_openCountDown()
        Services.getSMSCode(phone: tf_phone.text!, type: .login).subscribe(onNext: {data in
            if data.code == 200{
                sender.jq_openCountDown()
            }else{
                alertError(msg: data.msg)
            }
        }) { error in
            alertError(msg: error.localizedDescription)
        }.disposed(by: disposeBag)
@@ -161,10 +165,8 @@
    
    @IBAction func wechatLoginAcion(_ sender: QMUIButton) {
        guard btn_reader.isSelected else {alert(msg: "请先仔细阅读并同意协议");return}
        let vc = BindPhoneVC()
        vc.modalPresentationStyle = .fullScreen
        push(vc: vc)
//        WeChatTools.sendAuthRequest()
        showHUD()
        WeChatTools.sendAuthRequest()
    }
    
    

 WanPai/SceneDelegate.swift

@@ -46,12 +46,31 @@

    func scene(_ scene: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>) {
        if let code = URLContexts.first?.url.jq_params?["code"]{
            let resp = SendAuthResp()
            resp.code = code
            WeChatTools.getAccessToken(resp) { model in
                if let m = model{
                    WeChatTools.getUserInfo(access_token: m.access_token, openId: m.openid) { userInfoModel in

            DispatchQueue.main.async {
                hiddenHUD()
                let resp = SendAuthResp()
                resp.code = code
                WeChatTools.getAccessToken(resp) { model in
                    if let m = model{
                        WeChatTools.getUserInfo(access_token: m.access_token, openId: m.openid) { userInfoModel in
                            if let u = userInfoModel{
                                Services.wxLogin(openId: u.openid, nickname: u.nickname, headimgurl: u.headimgurl, sex: u.sex).subscribe(onNext: { data in
                                    if let m = data.data{
                                        if m.isBind == 0{
                                            let vc = BindPhoneVC(wxUserInfoModel: u,token: m.token)
                                            JQ_currentViewController().jq_push(vc: vc)
                                        }else{
                                            UserViewModel.saveToken(m.token)
                                            app.registerAndLoginSuccess()
                                        }
                                    }
                                }) { error in
                                    alertError(msg: error.localizedDescription)
                                }.disposed(by: JQ_disposeBag)
                            }else{
                                alertError(msg: "获取信息失败")
                            }
                        }
                    }
                }
            }