修复BUG

无故事王国

2023-11-16 637afbbebd8543f45f5eea6b727316eb95683625

修复BUG

 WanPai/Model/CommonModels.swift

@@ -395,19 +395,19 @@
    var weight: Int = 0
    var bodyStatus = ""

    func save(){
        UserDefaults.standard.set(self.toJSONString(), forKey: "StartClouseHomeModel")
        UserDefaults.standard.synchronize()
    }

    static func get()->StartClouseHomeModel?{
        if let string = UserDefaults.standard.string(forKey: "StartClouseHomeModel"){
            return StartClouseHomeModel.deserialize(from: string)
        }else{
            return nil
        }

    }
//    func save(){
//        UserDefaults.standard.set(self.toJSONString(), forKey: "StartClouseHomeModel")
//        UserDefaults.standard.synchronize()
//    }
//
//    static func get()->StartClouseHomeModel?{
//        if let string = UserDefaults.standard.string(forKey: "StartClouseHomeModel"){
//            return StartClouseHomeModel.deserialize(from: string)
//        }else{
//            return nil
//        }
//
//    }
}

struct StartClouseListModel:HandyJSON{
@@ -417,6 +417,8 @@
    var remainingNums = 0
    var totalNums = 0
    var periodOfValidity = ""
    var isAble = 0
    var id = 0
}

struct StartClouseVideoListModel:HandyJSON {

 WanPai/Network/Services.swift

@@ -556,7 +556,7 @@
            .interface(url: "/account/api/startCource/queryStudentData")
            .append(key: "lat", value: locationTool.currentLocation?.coordinate.latitude.string)
            .append(key: "lon", value: locationTool.currentLocation?.coordinate.longitude.string)
            .append(key: "stuId", value: StartClouseHomeModel.get()?.stuId)
            .append(key: "stuId", value: UserDefaults.standard.value(forKey: "currentStuId") as? Int)
        return NetworkRequest.request(params: params, method: .post, progress: false)
    }

@@ -596,7 +596,7 @@
            .interface(url: "/course/api/startCource/afterSourceList")
            .append(key: "courseTypeId", value: courseTypeId)
            .append(key: "search", value: search)
            .append(key: "stuId", value: StartClouseHomeModel.get()?.stuId)
            .append(key: "stuId", value: UserDefaults.standard.value(forKey: "currentStuId") as? Int)
        return NetworkRequest.request(params: params, method: .post, progress: false)
    }

@@ -702,7 +702,7 @@
            .append(key: "num", value: num)
            .append(key: "oldCourseId", value: oldCourseId)
            .append(key: "time", value: time.joined(separator: ",").replacingOccurrences(of: ".", with: "-"))
            .append(key: "stuId", value: StartClouseHomeModel.get()?.stuId)
            .append(key: "stuId", value: UserDefaults.standard.value(forKey: "currentStuId") as? Int)
        return NetworkRequest.request(params: params, method: .post, progress: true)
    }


 WanPai/Root/Course/VC/CourseDetailApplyVC.swift

@@ -50,6 +50,7 @@
    private var couponModels = [CouponInfoModel]()
    private var selectCouponModel:CouponInfoModel?
    private var classHours:Int?
    private var signUpCourseModel:SignUpCourseItemModel?

    override func viewDidLoad() {
        super.viewDidLoad()
@@ -115,7 +116,10 @@
            btn_handleBtn.setTitle("立即报名", for: .normal)
        }


        if signUpCourseModel?.payStatus == .unPayment{
            btn_handleBtn.setTitle("待支付", for: .normal)
            btn_addStudent.isHidden = true
        }
    }

    override func setUI() {
@@ -138,11 +142,12 @@
        btn_addStudent.spacingBetweenImageAndTitle = 3
    }

    init(detailModel:CourseDetailModel,isExtend:Bool = false,classHours:Int? = nil) {
    init(detailModel:CourseDetailModel,isExtend:Bool = false,classHours:Int? = nil,signUpCourseModel:SignUpCourseItemModel? = nil) {
        super.init(nibName: nil, bundle: nil)
        self.detailModel = detailModel
        self.isExtend = isExtend
        self.classHours = classHours
        self.signUpCourseModel = signUpCourseModel
    }

    required init?(coder: NSCoder) {

 WanPai/Root/Course/VC/CourseInfoVC.swift

@@ -171,7 +171,8 @@
            Services.startCourseHome().subscribe(onNext: {[weak self] data in
                if let model = data.data{
                    self?.startClouseHomeModel = model
                    model.save()
                    UserDefaults.standard.setValue(model.stuId, forKey: "currentStuId")
                    UserDefaults.standard.synchronize()
                    self?.updateData()
                }
            }).disposed(by: weakSelf.disposeBag)
@@ -182,7 +183,8 @@
            guard let weakSelf = self else { return }
            Services.startCourseHome().subscribe(onNext: {[weak self] data in
                if let model = data.data{
                    model.save()
                    UserDefaults.standard.setValue(model.stuId, forKey: "currentStuId")
                    UserDefaults.standard.synchronize()
                    if model.isThere == 1{
                        let courseInfoVC = CourseInfoVC()
                        courseInfoVC.startClouseHomeModel = model

 WanPai/Root/Course/VC/CourseVC.swift

@@ -47,7 +47,8 @@
            Services.startCourseHome().subscribe(onNext: {[weak self] data in
                if let model = data.data{
                    if model.isThere == 1{
                        model.save()
                        UserDefaults.standard.setValue(model.stuId, forKey: "currentStuId")
                        UserDefaults.standard.synchronize()
                        let courseInfoVC = CourseInfoVC()
                        courseInfoVC.startClouseHomeModel = model
                        let clouseNav = BaseNav(rootViewController: courseInfoVC)

 WanPai/Root/Course/VC/SignUpCourseVC.swift

@@ -108,28 +108,20 @@

extension SignUpCourseVC:UITableViewDelegate{
    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let item = viewModel.dataSource.value[indexPath.row]
        let item = viewModel.dataSource.value[indexPath.row]
        Services.registeredData(coursePayId: item.coursePayId).subscribe(onNext: {data in
            if let m = data.data{
                let vc = CourseDetailVC(id: item.coursePackageId,signUpCourseModel: m)
                self.push(vc: vc)
            }


        }) { error in

        }.disposed(by: disposeBag)


        /**
         let item = viewModel.dataSource.value[indexPath.row]
         Services.queryCourseInfo(id:  item.coursePackageId).subscribe(onNext: { data in
         if let m = data.data{
         let vc = CourseDetailApplyVC(detailModel: m,isExtend: item.payStatus.rawValue == 2)
         let vc = CourseDetailApplyVC(detailModel: m,signUpCourseModel: item)
         self.push(vc: vc)
         }
         }).disposed(by: self.disposeBag)

         */
    }
}


 WanPai/Root/Course/VC/StudentExchangeVC.swift

@@ -54,6 +54,8 @@
    @IBAction func changeAction(_ sender: UIButton) {
        if let s = selectIndex{
            let id = viewModel.dataSource.value[s].stuId
            UserDefaults.standard.setValue(id, forKey: "currentStuId")
            UserDefaults.standard.synchronize()
            Services.startCourseSwitch(id: id).subscribe(onNext: { data in
                NotificationCenter.default.post(name: StudentUpdate_Nofi, object: nil)
                self.navigationController?.popViewController()

 WanPai/Root/Course/View/CourseUnAssignView.swift

@@ -36,7 +36,7 @@
        let unassignView = CourseUnAssignView.jq_loadNibView()
        unassignView.frame = sceneDelegate?.window?.frame ?? .zero
        unassignView.label_num.text = "未分配课时数：\(num)"
        unassignView.list = list
        unassignView.list = list.filter({$0.isAble == 1})
        sceneDelegate?.window?.addSubview(unassignView)
        UIView.animate(withDuration: 0.5) {
            unassignView.view_container.transform = CGAffineTransform(scaleX: 1.0, y: 1.0)
@@ -61,7 +61,7 @@
        }

        let m = list[selectIndex!]
        Services.weeksOfAddHours(packetId: m.courseId).subscribe(onNext: { data in
        Services.weeksOfAddHours(packetId: m.id).subscribe(onNext: { data in
            UIView.animate(withDuration: 0.5) {
                self.view_container.transform = CGAffineTransform(scaleX: 0.1, y: 0.1)
                self.alpha = 0

 WanPai/Root/Home/VC/HomeVC.swift

@@ -39,7 +39,8 @@

        Services.startCourseHome().subscribe(onNext: {[weak self] data in
            if let model = data.data{
                model.save()
                UserDefaults.standard.setValue(model.stuId, forKey: "currentStuId")
                UserDefaults.standard.synchronize()
                if model.isThere == 1{
                    let courseInfoVC = CourseInfoVC()
                    courseInfoVC.startClouseHomeModel = model