修复BUG

无故事王国

2023-11-08 5f9cd3ae516f510a9475fd11f440fedf027aa4df

 WanPai/Root/Other/View/StoresChooseView.swift

@@ -27,7 +27,8 @@
    private var storesModel = [CityProfileModel]()


    private var clouse:((CityProfileModel,CityProfileModel?,CityProfileModel)->Void)!
    private var clouse:((CityProfileModel,CityProfileModel?,CityProfileModel)->Void)?
   private var clouse2:((CityProfileModel?,CityProfileModel?,CityProfileModel?)->Void)?
    private let disposeBag = DisposeBag()

   private var defaultStoreModel:HomeStoreModel?
@@ -73,6 +74,41 @@
            storesView.getData()
        }
    }

   static func showMarket(defaultM:HomeStoreModel? = nil, clouse:@escaping (CityProfileModel?,CityProfileModel?,CityProfileModel?)->Void){
      let storesView = StoresChooseView.jq_loadNibView()
      storesView.clouse2 = clouse
      storesView.defaultStoreModel = defaultM
      storesView.frame = sceneDelegate?.window?.frame ?? .zero
      sceneDelegate?.window?.addSubview(storesView)

      if let m = defaultM{
         storesView.label_city.text = m.city.isEmpty ? "选择城市":m.city
         storesView.label_province.text = m.province.isEmpty ? "选择省份":m.province
         storesView.label_currently.text = m.name.isEmpty ? "选择门店":m.name

         if m.provinceCode != 0{
            storesView.provinceModel = CityProfileModel(id: 0, code: m.provinceCode, name: m.province)
            storesView.getData(m.provinceCode)
            storesView.getStore(nil,provinceCode: m.provinceCode)
         }

         if m.cityCode != 0{
            storesView.cityModel = CityProfileModel(id: 0, code: m.cityCode, name: m.city)
         }

         if m.storeId != 0{
            storesView.storeModel = CityProfileModel(id: m.storeId, code: 0, name: m.name)
         }
      }

      UIView.animate(withDuration: 0.4) {
         storesView.view_container.transform = CGAffineTransform(scaleX: 1.0, y: 1.0)
         storesView.alpha = 1
      }completion: { _ in
         storesView.getData()
      }
   }

    private func getData(_ provinceId:Int? = nil){
        Services.queryProvinceAndCity(pcode: provinceId).subscribe(onNext: { [weak self] data in
@@ -170,6 +206,14 @@
    }
    
    @IBAction func completeAction(_ sender: UIButton) {


      if let c = clouse2{
         c(provinceModel,cityModel,storeModel)
         close()
         return
      }

      guard provinceModel != nil else {
         alertError(msg: "请先选择省份");return
      }