修复BUG

无故事王国

2023-10-10 a1ac0f1634ff0bd8f04259fc4cf7ebabd8c8c82d

 WanPai/Root/Yard/VC/YardListVC.swift

@@ -15,12 +15,12 @@
    var startDate = BehaviorRelay<String?>(value:nil)
    var endDate = BehaviorRelay<String?>(value:nil)
    var siteType = BehaviorRelay<NormalSimpleModel?>(value:nil)
    var inStore = BehaviorRelay<NormalSimpleModel?>(value:nil)
    var selectStore = BehaviorRelay<NormalSimpleModel?>(value:nil)
    var city = BehaviorRelay<CityProfileModel?>(value:nil)


    override func api() -> (Observable<BaseResponse<[SiteItemModel]>>)? {
        return Services.querySiteList(pageNum: page, pageSize: pageSize, siteTypeId: siteType.value?.id, cityCode: city.value?.code, storeId: inStore.value?.id, startTime: startDate.value, endTime: endDate.value)
        return Services.querySiteList(pageNum: page, pageSize: pageSize, siteTypeId: siteType.value?.id, cityCode: city.value?.code, storeId: selectStore.value?.id, startTime: startDate.value, endTime: endDate.value)
    }
}

@@ -43,8 +43,14 @@
    private var selectStoreModel:NormalSimpleModel?

    private let viewModel = YardListViewModel()
    

   init(selectStore:NormalSimpleModel? = nil) {
      super.init(nibName: nil, bundle: nil)
      if selectStore != nil{
         viewModel.selectStore.accept(selectStore)
      }
   }
	
    override func viewDidLoad() {
        super.viewDidLoad()
        title = "预约场地"
@@ -85,6 +91,7 @@
        tableView.separatorStyle = .none
        tableView.register(UINib(nibName: "YardTCell", bundle: nil), forCellReuseIdentifier: "_YardTCell")
        tableView.jq_setEmptyView()
      btn_stores.setTitle(viewModel.selectStore.value?.name ?? "所在门店", for: .normal)
    }

    override func setRx() {
@@ -152,14 +159,14 @@
        guard !sender.isSelected else {return}
        closeAction()
        sender.isSelected = true
        inStoreView = CourseSubTypeView.show(inView: self.view, afterView: view_top, items: storeItems,selectModel: viewModel.inStore.value) { [weak self] m in
        inStoreView = CourseSubTypeView.show(inView: self.view, afterView: view_top, items: storeItems,selectModel: viewModel.selectStore.value) { [weak self] m in
            sender.isSelected = false
            if m.id == 0{
                sender.setTitle("所在门店", for: .normal)
                self?.viewModel.inStore.accept(nil)
                self?.viewModel.selectStore.accept(nil)
            }else{
                sender.setTitle(m.name, for: .normal)
                self?.viewModel.inStore.accept(m)
                self?.viewModel.selectStore.accept(m)
            }
            self?.viewModel.beginRefresh()
        } closeClouse: {
@@ -177,6 +184,10 @@
        cityChooseSubTypeView?.removeFromSuperview()
        inStoreView?.removeFromSuperview()
    }

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

extension YardListVC:UITableViewDelegate{