修复BUG

younger_times

2023-07-05 0d8f5fc8a516bfd07e425909e4a4432600572ee7

 OKProject/Class/Home/Controller/HomeVC.swift

@@ -59,15 +59,15 @@
        return btn
    }()

//    private let button_more:UIButton = {
//        let btn = UIButton.init(type: .custom)
//        btn.isHidden = true
//        btn.setImage(UIImage.init(named: "btn_more")!, for: .normal)
//        btn.setTitle("", for: .normal)
//        btn.backgroundColor = .white
//        btn.addShadow(ofColor: UIColor(hexString: "#E6E6E6")!.withAlphaComponent(0.5), radius: 4, offset: CGSize(width: -1, height: 0), opacity: 1)
//        return btn
//    }()
    private let button_more:UIButton = {
        let btn = UIButton.init(type: .custom)
        btn.isHidden = true
        btn.setImage(UIImage.init(named: "btn_more")!, for: .normal)
        btn.setTitle("", for: .normal)
        btn.backgroundColor = .white
        btn.addShadow(ofColor: UIColor(hexString: "#E6E6E6")!.withAlphaComponent(0.5), radius: 4, offset: CGSize(width: -1, height: 0), opacity: 1)
        return btn
    }()
    
    /// VTMagicController
    private lazy var vtmagic: VTMagicController = {
@@ -190,105 +190,105 @@
        collectionView.backgroundColor = UIColor.color(light: UIColor.color(hexString: "#FFFFFF"), dark: UIColor.color(hexString: "#191919"))
        view.addSubview(collectionView)
        app.window?.addSubview(leftMenu)
        leftMenu.didSelectRow.delegate(on: self) { (self, row) in
        leftMenu.didSelectRow.delegate(on: self) { (self, name) in
            DispatchQueue.main.async { [self] in
                switch row{
                    case 0://我的订单

                if name.contains("企业认证"){
                    let vc = EnterpriseAuthVC()
                    self.yy_push(vc: vc)
                    return
                }

                if name.contains("订单审核"){
                    let vc = OrderReviewListVC()
                    self.yy_push(vc: vc)
                    return
                }

                switch name{
                    case "我的订单"://我的订单
                        let vc = MyOrderListVC()
                        self.yy_push(vc: vc)
                        break
                    case 1: // 优惠券
                    case "优惠券": // 优惠券
                        let vc = MineCouponsVC()
                        self.yy_push(vc: vc)
                        break
                    case 2: //企业认证
                        let vc = EnterpriseAuthVC()
                    case "我的卡包": //卡包
                        let vc = TravelCardVC()
                        self.yy_push(vc: vc)
                        break
                    case 3: //钱包
                    case "钱包": //开发票
                        let vc = MineWalletVC()
                        self.yy_push(vc: vc)
                        break
                    case 4: //订单审核
                        let vc = OrderReviewListVC()
                    case "亲密账户": //亲密账户
                        self.show()
                        APIManager.shared.provider.rx.request(.getUserUserList).map(YYModel<[UserRelationModel]>.self).validate().subscribe(onSuccess: {data in
                            self.hide()
                            if data.data!.count > 0{
                                let vc = BindRelationVC()
                                vc.relationM = data.data ?? []
                        self.yy_push(vc: vc)

//                        self.show()
//                        APIManager.shared.provider.rx.request(.getUserUserList).map(YYModel<[UserRelationModel]>.self).validate().subscribe(onSuccess: {data in
//                            self.hide()
//                            if data.data!.count > 0{
//                                let vc = BindRelationVC()
//                                vc.relationM = data.data ?? []
//                                self.yy_push(vc: vc)
//                            }else{
//                                let vc = BindRelationAgreementVC()
//                                self.yy_push(vc: vc)
//                            }
//                        }) { error in
//                            self.hide()
//                            alert(text: error.localizedDescription)
//                        }.disposed(by: self.disposeBag)
                            }else{
                                let vc = BindRelationAgreementVC()
                                self.yy_push(vc: vc)
                            }
                        }) { error in
                            self.hide()
                            alert(text: error.localizedDescription)
                        }.disposed(by: self.disposeBag)
                        break
                    case 5: //开发票
                    case "开发票": //开发票
                        let vc = InvoiceViewController()
                        self.yy_push(vc: vc)
                        break
                    case 6: //意见反馈
                    case "入驻成为商家":
                        APIManager.shared.provider.rx.request(.getMerchant).map(YYModel<MerchantInfoModel>.self).subscribe { model in
                            self.hide()
                            if model.data?.state == .delete || model.data?.state == .freeze{
                                alert(text: String(format: "您的商家账号已%@，请联系平台：%@", model.data!.state.rawStr,self.customerViewModel.platform.value))
                                return
                            }

                            if model.data?.auditStatus == .waiting{
                                let vc = BusinessSubmitSuccessVC()
                                self.yy_push(vc: vc)
                            }else if model.data?.auditStatus == .agreent{
                                let vc = MerchantVC()
                                vc.merchantInfoModel = model.data
                                self.yy_push(vc: vc)
                            }else{
                                let vc = BusinessVC()
                                vc.merchantInfoModel = model.data
                                self.yy_push(vc: vc)
                            }
                        } onError: { error in

                        }.disposed(by: self.rx.disposeBag)

                    case "我的评论": //分享
                        let vc = MineCommoentVC()
                        self.yy_push(vc: vc)
                        break
                    case "我发布的": // 意见反馈
                        let vc = MinePublishVC()
                        self.yy_push(vc: vc)
                    case "安全": //客服
                        let vc = MineSafeVC()
                        self.yy_push(vc: vc)
                        break
                    case "意见反馈": //设置
                        let vc = MineFeedbackVC()
                        self.yy_push(vc: vc)
//                        self.show()
//                        APIManager.shared.provider.rx.request(.getMerchant).map(YYModel<MerchantInfoModel>.self).subscribe { model in
//                            self.hide()
//                            if model.data?.state == .delete || model.data?.state == .freeze{
//                                alert(text: String(format: "您的商家账号已%@，请联系平台：%@", model.data!.state.rawStr,self.customerViewModel.platform.value))
//                                return
//                            }
//
//                            if model.data?.auditStatus == .waiting{
//                                let vc = BusinessSubmitSuccessVC()
//                                self.yy_push(vc: vc)
//                            }else if model.data?.auditStatus == .agreent{
//                                let vc = MerchantVC()
//                                vc.merchantInfoModel = model.data
//                                self.yy_push(vc: vc)
//                            }else{
//                                let vc = BusinessVC()
//                                vc.merchantInfoModel = model.data
//                                self.yy_push(vc: vc)
//                            }
//                        } onError: { error in
//
//                        }.disposed(by: self.rx.disposeBag)
                        break
                    case 7: //客服
                        let vc = MineCustomerServiceVC()
                        self.yy_push(vc: vc)
//                        let vc = MineCommoentVC()
//                        self.yy_push(vc: vc)
                        break
                    case 8://设置
                        let vc = MineSetUpVC()
                        self.yy_push(vc: vc)
//                        let vc = MinePublishVC()
//                        self.yy_push(vc: vc)
                    case 9: //分享
                        let vc = MineShareVC()
                        self.yy_push(vc: vc)
//                        let vc = MineSafeVC()
//                        self.yy_push(vc: vc)
                        break
                    case 10: // 意见反馈
                        let vc = MineFeedbackVC()
                        self.yy_push(vc: vc)
                    case 11: //客服
                    case "客服": //分享
                        let vc = MineCustomerServiceVC()
                        self.yy_push(vc: vc)
                        break
                    case 12: //设置
                    case "设置":
                        let vc = MineSetUpVC()
                        self.yy_push(vc: vc)
                        break
                    case 13: //分享
                    case "分享":
                        let vc = MineShareVC()
                        self.yy_push(vc: vc)
                        break
@@ -335,14 +335,14 @@
        }
        vtmagic.magicView.reloadData()

//        view.addSubview(button_more)
//        button_more.addTarget(self, action: #selector(itemMoreAction), for: .touchUpInside)
//        button_more.snp.makeConstraints { make in
//            make.top.equalToSuperview()
//            make.right.equalToSuperview()
//            make.width.equalTo(54)
//            make.height.equalTo(36)
//        }
        view.addSubview(button_more)
        button_more.addTarget(self, action: #selector(itemMoreAction), for: .touchUpInside)
        button_more.snp.makeConstraints { make in
            make.top.equalToSuperview()
            make.right.equalToSuperview()
            make.width.equalTo(54)
            make.height.equalTo(36)
        }
    }
    
    deinit {
@@ -546,7 +546,7 @@
                        return false
                    }).count == 0

//                    self.button_more.isHidden = hidden
                    self.button_more.isHidden = hidden

                    if let modularArray = model as? [ShowModularModel],modularArray.count > 0{