r
1 天以前 8c309ff419690cc77c9b178096878e18d4849fc2
fix bug
3个文件已修改
21 ■■■■ 已修改文件
WanPai.xcodeproj/project.pbxproj 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WanPai/Root/CardCenter/View/CardCenterSheetView.swift 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WanPai/Root/Search/VC/WorldCupContentDetailVC.swift 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WanPai.xcodeproj/project.pbxproj
@@ -2471,7 +2471,7 @@
                    "$(inherited)",
                    "$(PROJECT_DIR)/WanPai/YYPaymentManager/WeChatPay",
                );
                MARKETING_VERSION = 2.1.1;
                MARKETING_VERSION = 2.1.2;
                OTHER_LDFLAGS = (
                    "$(inherited)",
                    "-ObjC",
@@ -2673,7 +2673,7 @@
                    "$(inherited)",
                    "$(PROJECT_DIR)/WanPai/YYPaymentManager/WeChatPay",
                );
                MARKETING_VERSION = 2.1.1;
                MARKETING_VERSION = 2.1.2;
                OTHER_LDFLAGS = (
                    "$(inherited)",
                    "-ObjC",
WanPai/Root/CardCenter/View/CardCenterSheetView.swift
@@ -187,6 +187,10 @@
    @IBAction func closeAction(_ sender: UIButton) {
        dimissAlert()
    }
    func dimissAlert(){
        NotificationCenter.default.removeObserver(self)
        self.cons_bottom.constant = -(JQ_ScreenW * 1.1)
@@ -225,7 +229,16 @@
        updatePrice()
        let studentIds = selectStudents.map({"\($0.stuId)"}).joined(separator: ",")
        if totalMoney == 0 {
            Services.payHuiminCard(id: m.id, payType: PayType.coin, studentIds: studentIds).subscribe(onNext: { data in
                if  data.code == 200 {
                    self.dimissAlert()
                    let vc = PaymentResultVC(result: .success, objType: .huimin)
                    JQ_currentViewController().jq_push(vc: vc)
                }
            }).disposed(by: self.disposeBag)
        }else {
        PaymentView.show(enumType: .huiminCard, money: (ali: totalMoney, wx: totalMoney, coin: nil, course: nil, integral: nil)) {[unowned self] type in
            Services.payHuiminCard(id: m.id, payType: type, studentIds: studentIds).subscribe(onNext: { data in
                if let m = data.data{
@@ -285,6 +298,8 @@
        }
    }
    }
    override func layoutSubviews() {
        super.layoutSubviews()
        DispatchQueue.main.asyncAfter(wallDeadline: .now()+0.1) {
WanPai/Root/Search/VC/WorldCupContentDetailVC.swift
@@ -54,7 +54,7 @@
                override func viewDidLoad() {
                                super.viewDidLoad()
                                title = "社区世界杯"
                                title = "赛事详情"
                                Services.getMyWorldCupInfo(id: id).subscribe(onNext: {[weak self]data in
                                                if let model = data.data{