fix BUG

无故事王国

2023-10-26 8eee8cb7f7451983d1b40c4cd33ef511735e16a4

fix BUG

 WanPai/Model/CommonModels.swift

@@ -648,9 +648,12 @@
    var status:StudentAppointType = .complete
    var storeNameAddr: String = ""
    var timeFrame: String = ""
    var ids = [Int]()
//    var ids = [Int]()
    var siteId = 0

    var userId = 0
    var sid = [Int]()
    var rid = [Int]()

    required init() {}
}
@@ -777,11 +780,10 @@

struct YardBookingDetailModel:HandyJSON{
    var data:YardBookingDetailDataModel?
    var ids = [Int]() //区域ID
//    var ids = [Int]() //区域ID
}

struct YardBookingDetailDataModel:HandyJSON{
    var appUserId: Int = 0
    var booker: String = ""
    var cancelTime: String = ""
    var cancelUserId: String = ""
@@ -814,6 +816,10 @@
    var userCouponId: String = ""
    var voucher: String = ""
    var typeName = ""

    var appUserId: Int = 0
    var sid = [Int]()
    var rid = [Int]()
}

struct GameListModel:HandyJSON {

 WanPai/Root/Course/TCell/CourseBooking_1_TCell.swift

@@ -82,7 +82,7 @@

            var times = [OpenDoorTimeModel]()
            times.append(OpenDoorTimeModel(start_time: startDateTime, end_time: endDateTime))
            let openDoorModel = OpenDoorModel(sid: [studentAppointModel.siteId], rid: studentAppointModel.ids , uid: studentAppointModel.userId, time: times, type: 2)
            let openDoorModel = OpenDoorModel(sid: [studentAppointModel.siteId], rid: studentAppointModel.rid , uid: studentAppointModel.userId, time: times, type: 2)
            if let modelStr = openDoorModel.toJSONString(){
                QRPreview.show(modelStr)
            }

 WanPai/Root/Welfare/VC/WelfareCouponsSubListVC.swift

@@ -27,6 +27,7 @@
        table.separatorStyle = .none
        table.delegate = self
        table.dataSource = self
        table.estimatedRowHeight = 200
        table.register(UINib(nibName: "WelfareCouponsTCell", bundle: nil), forCellReuseIdentifier: "_WelfareCouponsTCell")
        return table
    }()
@@ -74,7 +75,12 @@
    }
}

extension WelfareCouponsSubListVC:UITableViewDelegate{}
extension WelfareCouponsSubListVC:UITableViewDelegate{
    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
        return UITableView.automaticDimension
    }

}

extension WelfareCouponsSubListVC:UITableViewDataSource{
    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {

 WanPai/Root/Yard/VC/YardBookingDetailVC.swift

@@ -97,11 +97,11 @@
                    case .inStore:
                        self?.btn_payment.isHidden = true
                        self?.btn_cancel.isHidden = true
                        self?.showQRCode(model, ids: data.data?.ids ?? [])
                        self?.showQRCode(model)
                    case .pending:
                        self?.btn_payment.isHidden = true
                        self?.btn_cancel.isHidden = false
                        self?.showQRCode(model, ids: data.data?.ids ?? [])
                        self?.showQRCode(model)
                        fallthrough
                    default:
                        break
@@ -124,7 +124,7 @@
        label_descInfo.attributedText = attribute
    }

    private func showQRCode(_ model:YardBookingDetailDataModel,ids:[Int]){
    private func showQRCode(_ model:YardBookingDetailDataModel){

        guard model.goType == 0 else {
                //入园方式是手环，隐藏Code
@@ -133,7 +133,7 @@

        if let m = yardBookingDetailDataModel{
            let t = OpenDoorTimeModel(start_time: TimeInterval(model.startTime / 1000), end_time: TimeInterval(model.endTime / 1000))
            let openDoorModel = OpenDoorModel(sid: [m.siteId], rid: [m.storeId], uid: m.appUserId, time: [t], type: 2)
            let openDoorModel = OpenDoorModel(sid: m.sid, rid: m.rid, uid: m.appUserId, time: [t], type: 2)
            if let modelStr = openDoorModel.toJSONString(){
                img_QRCode.image = QRCodeImage(string: modelStr, size: 132 * sceneDelegate!.window!.screen.scale)
            }