WanPai/AppDelegate.swift
@@ -29,7 +29,7 @@ if let img = data.data{ SDWebImageDownloader.shared.downloadImage(with: URL(string: img)) { image, _, _, _ in if let img = image{ LaunchImageHelper.changePortraitLaunchImage(img) LaunchImageHelper.changeAllLaunchImageToLandscape(img) } } } WanPai/Base.lproj/LaunchScreen.storyboard
@@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM"> <device id="retina6_12" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="System colors in document resources" minToolsVersion="11.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> @@ -20,12 +20,20 @@ <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_LOGO" translatesAutoresizingMaskIntoConstraints="NO" id="wQN-pJ-fP4"> <rect key="frame" x="122.66666666666669" y="124" width="148" height="72"/> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="蜀ICP备08107699号-5A" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xz2-QF-W7C"> <rect key="frame" x="107.00000000000001" y="798.66666666666663" width="179.33333333333337" height="19.333333333333371"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/> <nil key="textColor"/> <nil key="highlightedColor"/> </label> </subviews> <viewLayoutGuide key="safeArea" id="6Tk-OE-BBY"/> <color key="backgroundColor" systemColor="systemBackgroundColor"/> <constraints> <constraint firstItem="6Tk-OE-BBY" firstAttribute="bottom" secondItem="xz2-QF-W7C" secondAttribute="bottom" id="F5m-5Z-ptp"/> <constraint firstItem="wQN-pJ-fP4" firstAttribute="top" secondItem="6Tk-OE-BBY" secondAttribute="top" constant="65" id="Vvc-P2-aee"/> <constraint firstItem="wQN-pJ-fP4" firstAttribute="centerX" secondItem="6Tk-OE-BBY" secondAttribute="centerX" id="wCQ-9d-evQ"/> <constraint firstItem="xz2-QF-W7C" firstAttribute="centerX" secondItem="6Tk-OE-BBY" secondAttribute="centerX" id="z6u-xg-PCy"/> </constraints> </view> </viewController> WanPai/Base/BaseNav.swift
@@ -63,9 +63,7 @@ open func navigationController(_ navigationController: UINavigationController, willShow viewController: UIViewController, animated: Bool) { let status = lucencyVCs.contains(where: {$0 == viewController.classForCoder}) print("--->\(viewController)") if navigationController.viewControllers.count == 1 || status{ if (navigationController.viewControllers.count == 1 || status) && !(viewController is WelfareVC){ if #available(iOS 15.0, *) { navigationBar.standardAppearance.backgroundImage = nil navigationBar.scrollEdgeAppearance?.backgroundImage = nil WanPai/Base/BaseVC.swift
@@ -32,7 +32,6 @@ setData() if navigationController?.viewControllers.count ?? 0 > 1{ if navigationController is BaseNav{ navigationItem.leftBarButtonItem = UIBarButtonItem.jq_creat(image: nav_back_img.withTintColor(.white), target: self, alignment:.left, action: #selector(backItemEvent)).item }else{ WanPai/Common/View/CommonAlertView.xib
@@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <device id="retina6_12" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/> <capability name="Named colors" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="System colors in document resources" minToolsVersion="11.0"/> @@ -17,7 +17,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MnH-T0-9ye"> <rect key="frame" x="45" y="342.33333333333331" width="303" height="192.33333333333331"/> <rect key="frame" x="45" y="333.66666666666669" width="303" height="210.00000000000006"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8x2-bB-pNn"> <rect key="frame" x="143.33333333333334" y="24" width="16.333333333333343" height="18"/> @@ -29,13 +29,16 @@ <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="raL-bN-qOz"> <rect key="frame" x="30" y="79" width="243" height="19.333333333333329"/> <rect key="frame" x="30" y="85" width="243" height="20"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="20" id="hYQ-ML-EmM"/> </constraints> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/> <nil key="textColor"/> <nil key="highlightedColor"/> </label> <stackView opaque="NO" contentMode="scaleToFill" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="fy8-sq-PJ2"> <rect key="frame" x="21.666666666666686" y="132.33333333333337" width="260" height="40"/> <rect key="frame" x="21.666666666666686" y="150" width="260" height="40"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="x3p-KY-6M2"> <rect key="frame" x="0.0" y="0.0" width="120" height="40"/> @@ -84,12 +87,12 @@ <constraints> <constraint firstItem="fy8-sq-PJ2" firstAttribute="centerX" secondItem="MnH-T0-9ye" secondAttribute="centerX" id="1Hg-jW-kxR"/> <constraint firstAttribute="bottom" secondItem="fy8-sq-PJ2" secondAttribute="bottom" constant="20" id="A10-oV-IHK"/> <constraint firstItem="fy8-sq-PJ2" firstAttribute="top" secondItem="raL-bN-qOz" secondAttribute="bottom" constant="34" id="Ar9-mL-jBv"/> <constraint firstItem="fy8-sq-PJ2" firstAttribute="top" secondItem="raL-bN-qOz" secondAttribute="bottom" constant="45" id="Ar9-mL-jBv"/> <constraint firstAttribute="trailing" secondItem="raL-bN-qOz" secondAttribute="trailing" constant="30" id="T4d-qj-pFi"/> <constraint firstItem="8x2-bB-pNn" firstAttribute="centerX" secondItem="MnH-T0-9ye" secondAttribute="centerX" id="cVP-So-X9I"/> <constraint firstItem="raL-bN-qOz" firstAttribute="leading" secondItem="MnH-T0-9ye" secondAttribute="leading" constant="30" id="lDV-JW-sCh"/> <constraint firstItem="8x2-bB-pNn" firstAttribute="top" secondItem="MnH-T0-9ye" secondAttribute="top" constant="24" id="mGE-YB-U7v"/> <constraint firstItem="raL-bN-qOz" firstAttribute="top" secondItem="8x2-bB-pNn" secondAttribute="bottom" constant="37" id="oSb-O8-R6D"/> <constraint firstItem="raL-bN-qOz" firstAttribute="top" secondItem="8x2-bB-pNn" secondAttribute="bottom" constant="43" id="oSb-O8-R6D"/> <constraint firstItem="raL-bN-qOz" firstAttribute="centerX" secondItem="MnH-T0-9ye" secondAttribute="centerX" id="ycu-Gg-hDl"/> </constraints> <userDefinedRuntimeAttributes> WanPai/Common/View/CommonBannerView.swift
@@ -35,14 +35,16 @@ var interval:Double = 3 private var startOffsetX:CGFloat = 0 private var fillBounds:CGRect? override func layoutSubviews() { super.layoutSubviews() } public func setImages(images:Array<String>,type:ImageType = .Image,imageClickBlock:@escaping (Int) -> Void) { = .Image,fillBounds:CGRect? = nil,imageClickBlock:@escaping (Int) -> Void) { self.type = type self.fillBounds = fillBounds self.images = images self.clickBlock = imageClickBlock self.initLayout() @@ -53,16 +55,23 @@ return } width = self.bounds.width height = self.bounds.height if fillBounds != nil{ width = fillBounds!.width height = fillBounds!.height scrollView.frame = CGRect(origin: .zero, size: fillBounds!.size) }else{ width = self.bounds.width height = self.bounds.height scrollView.frame = self.bounds } scrollView.frame = self.bounds scrollView.contentSize = CGSize(width:width * CGFloat(images.count + 2),height:height) scrollView.contentOffset = CGPoint(x:width,y:0) scrollView.isUserInteractionEnabled = true scrollView.isPagingEnabled = true scrollView.isScrollEnabled = images.count > 1 scrollView.contentInsetAdjustmentBehavior = .never scrollView.showsHorizontalScrollIndicator = false scrollView.delegate = self self.addSubview(scrollView) @@ -122,15 +131,17 @@ } } func setCurrent(currIndex:Int) { func setCurrent(currIndex:Int,animate:Bool = false) { if(currIndex < 0){ self.currIndex = images.count - 1 }else{ self.currIndex = currIndex } pageControl.currentPage = self.currIndex scrollView.setContentOffset(CGPoint(x:width * CGFloat(self.currIndex + 1),y:0), animated: false) if animate{ scrollView.setContentOffset(CGPoint(x:width * CGFloat(self.currIndex + 1),y:0), animated: false) } } //给图⽚添加点击⼿势 @@ -188,7 +199,7 @@ @objc func startAutoScroll(){ if(isDisplayInScreen()){ setCurrent(currIndex: (currIndex + 1) % images.count) setCurrent(currIndex: (currIndex + 1) % images.count,animate: true) } }
@@ -57,19 +57,18 @@ //提示框 func alert(msg: String) { hiddenHUD() SVProgressHUD.showInfo(withStatus: msg) // hiddenHUD() SVProgressHUD.showInfo(withStatus: msg,maskType: .clear) } func alertError(msg:String){ hiddenHUD() SVProgressHUD.setMinimumDismissTimeInterval(1.5) SVProgressHUD.showError(withStatus: msg) // hiddenHUD() SVProgressHUD.showError(withStatus: msg,maskType: .clear) } func alertSuccess(msg:String){ hiddenHUD() SVProgressHUD.showSuccess(withStatus: msg) // hiddenHUD() SVProgressHUD.showSuccess(withStatus: msg,maskType: .clear) } func showHUD(_ text:String? = nil){ @@ -130,7 +129,7 @@ case "加入玩湃": if page == "主页"{} if page == "课程列表"{ if page == "运动营列表"{ if type == "详情"{ JQ_currentViewController().jq_push(vc: CourseDetailVC(id:id ?? 0)) }else{ @@ -183,7 +182,7 @@ JQ_currentViewController().jq_push(vc: JoinMemberIntroduceVC()) } case "开始课程": case "开始运动营": if page == "主页"{ } WanPai/Config/Enums.swift
@@ -72,6 +72,7 @@ case privacy = 2 case other = 4 case matchStore = 5 case useStore = 6 var titleStr:String{ switch self{ @@ -80,6 +81,7 @@ case .user:return "用户协议" case .matchStore:return "参与门店" case .other:return "" case .useStore:return "可用门店" } } } @@ -97,7 +99,7 @@ enum HomeItemType:Int,HandyJSONEnum{ case none = 0 ///报名玩湃课程 ///报名玩湃运动营 case course = 1 ///预约场地 case booking = 2 @@ -105,7 +107,7 @@ case activity = 3 ///免费福利 case welfare = 4 ///线上课程积分 ///线上运动营积分 case coin = 5 ///购买优惠门票 case ticket = 6 @@ -287,7 +289,7 @@ switch self { case .goods:return "实物" case .coupon:return "优惠券" case .course:return "课程" case .course:return "运动营" case .ticket:return "门票" } } @@ -427,6 +429,6 @@ enum ScanType:Int{ case games = 1000 //游戏 case course = 1001 //课程 case course = 1001 //运动营 case yard = 1002 //场地 } WanPai/Model/CommonModels.swift
@@ -528,7 +528,7 @@ var detailsType:DetailType = .positive //1扣减 2增加 } struct CouponModel:HandyJSON{ class CouponModel:HandyJSON{ var available: String = "" var cityOrStore: String = "" var effectiveTime: String = "" @@ -539,6 +539,10 @@ var type:CouponType = .discount var useCondition: CouponConditionType = .nationwide var useStatus: CouponUseType = .overdue var showAll = false required init(){} } struct CouponModelRuleModel:HandyJSON{ @@ -657,7 +661,7 @@ var coverImage: String = "" var integral:Int = 0 var packageName: String = "" var studyStatus: Int = 0 var studyStatus: Int = 1 var synopsis: String = "" var videoId: Int = 0 var videoName: String = "" WanPai/Network/Services.swift
@@ -316,7 +316,7 @@ } } // MARK: -- 课程相关 // MARK: -- 运动营相关 extension Services { /// 获取优惠券 @@ -428,7 +428,7 @@ } /// 购买课程 /// 购买运动营 class func courcePayment(conponId:Int? = nil,courseConfigId:Int,id:Int,price:Double,payType:PayType,stuId:[Int])->Observable<BaseResponse<PaymentModel>>{ let params = ParamsAppender.build(url: All_Url) .interface(url: "/course/api/course/paymentCourse") @@ -474,7 +474,7 @@ extension Services{ /// 已报名课程-课程列表 /// 已报名运动营-运动营列表 static func registeredCourse(courseTypeId:Int? = nil,search:String? = nil)->Observable<BaseResponse<[SignUpCourseItemModel]>>{ let params = ParamsAppender.build(url: All_Url) .interface(url: "/course/api/startCource/registeredCourses") @@ -532,7 +532,7 @@ } /// 学员预约课程列表 /// 学员预约运动营列表 static func studentAppointList(page:Int,stuId:Int,status:StudentAppointType?,search:String,timeType:StudentAppointDateType)->Observable<BaseResponse<[StudentAppointModel]>>{ let params = ParamsAppender.build(url: All_Url) .interface(url: "/account/api/startCource/stuAppointList") @@ -540,12 +540,12 @@ .append(key: "timeType", value: timeType.rawValue) .append(key: "search", value: search) .append(key: "stuId", value: stuId) .append(key: "page", value: page) .append(key: "pageNum", value: page) .append(key: "size", value: 20) return NetworkRequest.request(params: params, method: .post, progress: false) } /// 课后练习-获取布置课程列表 /// 课后练习-获取布置运动营列表 static func queryArrangeCourseList()->Observable<BaseResponse<[CityProfileModel]>>{ let params = ParamsAppender.build(url: All_Url) .interface(url: "/course/api/course/queryArrangeCourseList") @@ -607,7 +607,7 @@ } /// 上课首页-课程列表 /// 上课首页-运动营列表 static func weeksOfCourseDetails(stuId:Int,time:Date,storeId:Int)->Observable<BaseResponse<WeeklyCourseModel>>{ let params = ParamsAppender.build(url: All_Url) .interface(url: "/account/api/startCource/weeksOfCourseDetailsList") WanPai/Root/Course/TCell/CourseBooking_1_TCell.swift
@@ -73,24 +73,45 @@ let date = studentAppointModel.timeFrame.components(separatedBy: " ").first let timesList = studentAppointModel.timeFrame.components(separatedBy: " ").last var a1 = [String]() var b1 = [String]() for v in timesList?.components(separatedBy: "-") ?? []{ let a = v.components(separatedBy: ",").first! let b = v.components(separatedBy: ",").last! a1.append(a);b1.append(b) if let t = timesList{ let startTime = t.components(separatedBy: "-").first! let endTime = t.components(separatedBy: "-").last! let startDateTime = Date.jq_StringToTimeInterval(String(format: "%@ %@", date!,startTime), "yyyy.MM.dd HH:mm:ss") let endDateTime = Date.jq_StringToTimeInterval(String(format: "%@ %@", date!,endTime), "yyyy.MM.dd HH:mm:ss") 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) if let modelStr = openDoorModel.toJSONString(){ QRPreview.show(modelStr) } } var times = [OpenDoorTimeModel]() for (index,v) in a1.enumerated(){ let startTime = Date.jq_StringToTimeInterval(String(format: "%@ %@", date!,v), "yyyy.MM.dd HH:mm:ss") let endTime = Date.jq_StringToTimeInterval(String(format: "%@ %@", date!,b1[index]),"yyyy.MM.dd HH:mm:ss") times.append(OpenDoorTimeModel(start_time: startTime, end_time: endTime)) } let openDoorModel = OpenDoorModel(sid: [studentAppointModel.siteId], rid: studentAppointModel.ids , uid: studentAppointModel.userId, time: times, type: 2) if let modelStr = openDoorModel.toJSONString(){ QRPreview.show(modelStr) } // var a1 = [String]() // var b1 = [String]() // // for v in timesList?.components(separatedBy: "-") ?? []{ // let a = v.components(separatedBy: ",").first! // let b = v.components(separatedBy: ",").last! // a1.append(a);b1.append(b) // } // // var times = [OpenDoorTimeModel]() // for (index,v) in a1.enumerated(){ // let startTime = Date.jq_StringToTimeInterval(String(format: "%@ %@", date!,v), "yyyy.MM.dd HH:mm:ss") // let endTime = Date.jq_StringToTimeInterval(String(format: "%@ %@", date!,b1[index]),"yyyy.MM.dd HH:mm:ss") // times.append(OpenDoorTimeModel(start_time: startTime, end_time: endTime)) // } // let openDoorModel = OpenDoorModel(sid: [studentAppointModel.siteId], rid: studentAppointModel.ids , uid: studentAppointModel.userId, time: times, type: 2) // if let modelStr = openDoorModel.toJSONString(){ // QRPreview.show(modelStr) // } } } WanPai/Root/Course/TCell/CourseExerciseTCell.swift
@@ -13,18 +13,18 @@ var exerciseVideoModel:ExerciseVideoModel!{ didSet{ img_cover.sd_setImage(with: URL(string: exerciseVideoModel.coverImage)) label_title.text = exerciseVideoModel.packageName label_course.text = "布置课程：\(exerciseVideoModel.videoName)" label_title.text = exerciseVideoModel.videoName label_course.text = "布置运动营：\(exerciseVideoModel.packageName)" label_info.text = exerciseVideoModel.synopsis label_obtainCoin.text = "\(exerciseVideoModel.integral)积分" if exerciseVideoModel.studyStatus == 1{ label_status.text = "未学习" label_status.textColor = Def_ThemeColor view_status.backgroundColor = UIColor(hexStr: "#FD9331").withAlphaComponent(0.29) if exerciseVideoModel.studyStatus == 2{ label_status.text = "已学习" label_status.textColor = .white view_status.backgroundColor = UIColor(hexStr: "#ACACAC") }else{ label_status.text = "已学习" label_status.textColor = .white view_status.backgroundColor = UIColor(hexStr: "#ACACAC") label_status.text = "未学习" label_status.textColor = Def_ThemeColor view_status.backgroundColor = UIColor(hexStr: "#FD9331").withAlphaComponent(0.29) } } } @@ -40,11 +40,14 @@ override func awakeFromNib() { super.awakeFromNib() selectionStyle = .none backgroundColor = .clear contentView.backgroundColor = .clear } @IBAction func detailAction(_ sender: UIButton) { let vc = CourseVideoDetailVC(model: exerciseVideoModel) vc.title = "课后练习" JQ_currentViewController().jq_push(vc: vc) } // @IBAction func detailAction(_ sender: UIButton) { // let vc = CourseVideoDetailVC(model: exerciseVideoModel) // vc.title = "课后练习" // JQ_currentViewController().jq_push(vc: vc) // } } WanPai/Root/Course/TCell/CourseExerciseTCell.xib
@@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <device id="retina6_12" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/> <capability name="Named colors" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="System colors in document resources" minToolsVersion="11.0"/> @@ -12,11 +12,11 @@ <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="_CourseExerciseTCell" rowHeight="180" id="KGk-i7-Jjw" customClass="CourseExerciseTCell" customModule="WanPai" customModuleProvider="target"> <rect key="frame" x="0.0" y="0.0" width="497" height="180"/> <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="_CourseExerciseTCell" rowHeight="211" id="KGk-i7-Jjw" customClass="CourseExerciseTCell" customModule="WanPai" customModuleProvider="target"> <rect key="frame" x="0.0" y="0.0" width="497" height="211"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" ambiguous="YES" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> <rect key="frame" x="0.0" y="0.0" width="497" height="180"/> <rect key="frame" x="0.0" y="0.0" width="497" height="211"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="D8i-5m-KbW"> @@ -68,8 +68,8 @@ </userDefinedRuntimeAttribute> </userDefinedRuntimeAttributes> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="布置课程：--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="w8Y-sZ-oiu"> <rect key="frame" x="131" y="45" width="72.666666666666686" height="17"/> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="布置运动营：--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="w8Y-sZ-oiu"> <rect key="frame" x="131" y="45" width="85" height="17"/> <constraints> <constraint firstAttribute="height" constant="17" id="WSV-ej-IgH"/> </constraints> @@ -86,7 +86,7 @@ <color key="textColor" red="0.23921568627450979" green="0.24313725490196078" blue="0.27058823529411763" alpha="0.69999999999999996" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Fek-OC-hmC"> <button opaque="NO" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Fek-OC-hmC"> <rect key="frame" x="398" y="126" width="86" height="31"/> <color key="backgroundColor" name="FE6E0D"/> <constraints> @@ -102,9 +102,6 @@ <real key="value" value="2"/> </userDefinedRuntimeAttribute> </userDefinedRuntimeAttributes> <connections> <action selector="detailAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="Og3-OU-Zd7"/> </connections> </button> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="可获积分：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Shz-3K-sdt"> <rect key="frame" x="131" y="140.66666666666666" width="61.333333333333343" height="14.333333333333343"/> @@ -122,7 +119,7 @@ <nil key="highlightedColor"/> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZS2-RI-zzb"> <rect key="frame" x="14" y="176" width="471" height="1"/> <rect key="frame" x="14" y="183" width="471" height="1"/> <color key="backgroundColor" red="0.59215686274509804" green="0.59215686274509804" blue="0.59215686274509804" alpha="0.22" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="1" id="SZH-wH-wqJ"/> @@ -139,7 +136,7 @@ <constraint firstAttribute="trailing" secondItem="Fek-OC-hmC" secondAttribute="trailing" constant="13" id="FPm-Jr-bX2"/> <constraint firstItem="D8i-5m-KbW" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="18" id="HK4-Ks-pLB"/> <constraint firstItem="Shz-3K-sdt" firstAttribute="leading" secondItem="D8i-5m-KbW" secondAttribute="trailing" constant="11" id="HPk-X3-33q"/> <constraint firstItem="ZS2-RI-zzb" firstAttribute="top" secondItem="D8i-5m-KbW" secondAttribute="bottom" constant="18" id="LL8-sK-yfg"/> <constraint firstItem="ZS2-RI-zzb" firstAttribute="top" secondItem="D8i-5m-KbW" secondAttribute="bottom" constant="25" id="LL8-sK-yfg"/> <constraint firstItem="ucP-Ze-NXw" firstAttribute="leading" secondItem="gzO-xf-hET" secondAttribute="leading" id="LRe-iY-sbO"/> <constraint firstItem="D8i-5m-KbW" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="PxX-Kc-Mec"/> <constraint firstAttribute="bottom" secondItem="ZS2-RI-zzb" secondAttribute="bottom" id="RiL-rj-zyM"/> @@ -165,7 +162,7 @@ <outlet property="label_title" destination="gzO-xf-hET" id="QQg-Mk-Zk4"/> <outlet property="view_status" destination="16o-eh-HEi" id="0o5-Jq-Fn6"/> </connections> <point key="canvasLocation" x="-61.832061068702288" y="34.507042253521128"/> <point key="canvasLocation" x="-61.832061068702288" y="45.422535211267608"/> </tableViewCell> </objects> <resources> @@ -173,7 +170,7 @@ <color red="0.99199998378753662" green="0.53299999237060547" blue="0.0080000003799796104" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </namedColor> <systemColor name="systemGroupedBackgroundColor"> <color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.94901960780000005" green="0.94901960780000005" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </systemColor> </resources> </document> WanPai/Root/Course/VC/CourseBookingListVC.swift
@@ -77,7 +77,7 @@ override func viewDidLoad() { super.viewDidLoad() title = "预约课程" title = "预约运动营" pageMenu.delegate = self pageViewController.delegate = self WanPai/Root/Course/VC/CourseDetailApplyVC.swift
@@ -52,14 +52,9 @@ override func viewDidLoad() { super.viewDidLoad() title = "课程详情" title = "运动营详情" if let m = detailModel{ view_banner.setImages(images: m.detailDrawing.components(separatedBy: ","), type: .URL) { index in } label_title.text = m.name label_listenWeek.text = "每" + m.weeks.joined(separator: "、") label_listenTime.text = m.times.joined(separator: "｜") @@ -91,6 +86,10 @@ cons_tableHei.constant = CGFloat(studentModels.count * 87) tableView.reloadData() changePrice(selectClassIndex) view_banner.setImages(images: m.detailDrawing.components(separatedBy: ","), type: .URL,fillBounds: CGRect(origin: .zero, size: CGSize(width: view.frame.width, height: view.frame.width * 0.564))) { index in } } @@ -101,7 +100,7 @@ btn_handleBtn.setTitle("立即报名", for: .normal) } viewDidLayoutSubviews() } override func setUI() { WanPai/Root/Course/VC/CourseDetailApplyVC.xib
@@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <device id="retina6_12" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/> <capability name="Named colors" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="System colors in document resources" minToolsVersion="11.0"/> @@ -288,8 +288,8 @@ <constraint firstAttribute="height" constant="1" id="hxy-lx-Ib6"/> </constraints> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="选择课程套餐：" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="o5m-d0-NYP"> <rect key="frame" x="14" y="14" width="100" height="20"/> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="选择运动营套餐：" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="o5m-d0-NYP"> <rect key="frame" x="13.999999999999993" y="14" width="114.33333333333331" height="20"/> <constraints> <constraint firstAttribute="height" constant="20" id="7AI-5Q-AEw"/> </constraints> WanPai/Root/Course/VC/CourseDetailVC.swift
@@ -150,7 +150,7 @@ override func viewDidLoad() { super.viewDidLoad() title = "课程详情" title = "运动营详情" if signUpCourseModel?.payStatus == 1{ btn_enroll.setTitle("待支付", for: .normal) WanPai/Root/Course/VC/CourseEXPVC.xib
@@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <device id="retina6_12" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22129"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/> <capability name="Named colors" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="System colors in document resources" minToolsVersion="11.0"/> @@ -33,14 +33,14 @@ <constraint firstAttribute="height" constant="1" id="wIN-wA-7Gs"/> </constraints> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="课程名称：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gz3-Ea-Wyo"> <rect key="frame" x="14" y="17" width="71.666666666666671" height="17"/> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="运动营名称：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gz3-Ea-Wyo"> <rect key="frame" x="14" y="17" width="86" height="17"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DSP-8t-zt5"> <rect key="frame" x="85.666666666666671" y="17" width="13" height="17"/> <rect key="frame" x="100" y="17" width="13" height="17"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <nil key="textColor"/> <nil key="highlightedColor"/> WanPai/Root/Course/VC/CourseExerciseSubListVC.swift
@@ -52,7 +52,7 @@ tableView.delegate = self tableView.dataSource = self tableView.separatorStyle = .none viewModel.configure(tableView) viewModel.configure(tableView,needMore: false) // tableView.jq_setEmptyView() } @@ -69,7 +69,7 @@ sender.isSelected = true var items = Array<NormalSimpleModel>() items.append(NormalSimpleModel(id: 0, name: "全部课程")) items.append(NormalSimpleModel(id: 0, name: "全部")) for type in types { items.append(NormalSimpleModel(id: type.id, name: type.name)) } @@ -78,7 +78,7 @@ sender.isSelected = false self?.selectType = m if m.id == 0{ sender.setTitle("布置课程", for: .normal) sender.setTitle("布置运动营", for: .normal) self?.viewModel.courseTypeId.accept(nil) }else{ sender.setTitle(m.name, for: .normal) @@ -92,6 +92,12 @@ } extension CourseExerciseSubListVC:UITableViewDelegate{ func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { let model = viewModel.dataSource.value[indexPath.row] let vc = CourseVideoDetailVC(model: model) vc.title = "课后练习" push(vc: vc) } }
@@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <device id="retina6_12" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/> <capability name="Named colors" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="System colors in document resources" minToolsVersion="11.0"/> @@ -25,10 +25,10 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2Qr-aS-IbC"> <rect key="frame" x="0.0" y="59" width="393" height="87"/> <rect key="frame" x="0.0" y="59" width="393" height="105"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ide-TN-Iqx"> <rect key="frame" x="14" y="9" width="326" height="38"/> <rect key="frame" x="14" y="15" width="326" height="38"/> <subviews> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_search" translatesAutoresizingMaskIntoConstraints="NO" id="hzt-xY-w3e"> <rect key="frame" x="4" y="10.666666666666671" width="17" height="17"/> @@ -61,7 +61,7 @@ </userDefinedRuntimeAttributes> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="qwo-f0-OeA"> <rect key="frame" x="340" y="9" width="53" height="38"/> <rect key="frame" x="340" y="15" width="53" height="38"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/> <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> <state key="normal" title="搜索"> @@ -72,13 +72,13 @@ </connections> </button> <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="NDx-vs-KqL"> <rect key="frame" x="14" y="47" width="86" height="40"/> <rect key="frame" x="14" y="57" width="95" height="48"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jwk-F4-OqE" customClass="QMUIButton"> <rect key="frame" x="0.0" y="0.0" width="86" height="40"/> <rect key="frame" x="0.0" y="0.0" width="95" height="48"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/> <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> <state key="normal" title="布置课程" image="icon_down_arrow"> <state key="normal" title="布置运动营" image="icon_down_arrow"> <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </state> <state key="selected" image="icon_down_arrow_s"> @@ -89,17 +89,19 @@ </connections> </button> </subviews> <constraints> <constraint firstAttribute="height" constant="48" id="aRz-kC-ZGj"/> </constraints> </stackView> </subviews> <color key="backgroundColor" systemColor="systemBackgroundColor"/> <constraints> <constraint firstAttribute="trailing" secondItem="Ide-TN-Iqx" secondAttribute="trailing" constant="53" id="09Y-fS-sRJ"/> <constraint firstItem="qwo-f0-OeA" firstAttribute="top" secondItem="Ide-TN-Iqx" secondAttribute="top" id="9JH-Vb-RA0"/> <constraint firstItem="Ide-TN-Iqx" firstAttribute="top" secondItem="2Qr-aS-IbC" secondAttribute="top" constant="9" id="9Xf-0e-gqQ"/> <constraint firstItem="NDx-vs-KqL" firstAttribute="top" secondItem="Ide-TN-Iqx" secondAttribute="bottom" id="Bgr-4i-Z14"/> <constraint firstItem="Ide-TN-Iqx" firstAttribute="top" secondItem="2Qr-aS-IbC" secondAttribute="top" constant="15" id="9Xf-0e-gqQ"/> <constraint firstItem="NDx-vs-KqL" firstAttribute="top" secondItem="Ide-TN-Iqx" secondAttribute="bottom" constant="4" id="Bgr-4i-Z14"/> <constraint firstItem="Ide-TN-Iqx" firstAttribute="leading" secondItem="2Qr-aS-IbC" secondAttribute="leading" constant="14" id="KeQ-85-MIS"/> <constraint firstAttribute="trailing" secondItem="qwo-f0-OeA" secondAttribute="trailing" id="RBG-3o-cWm"/> <constraint firstAttribute="height" constant="87" id="coM-NN-S4P"/> <constraint firstItem="NDx-vs-KqL" firstAttribute="leading" secondItem="2Qr-aS-IbC" secondAttribute="leading" constant="14" id="nlY-1J-CUh"/> <constraint firstItem="qwo-f0-OeA" firstAttribute="leading" secondItem="Ide-TN-Iqx" secondAttribute="trailing" id="onb-Ni-Kqv"/> <constraint firstItem="qwo-f0-OeA" firstAttribute="bottom" secondItem="Ide-TN-Iqx" secondAttribute="bottom" id="wrp-Pt-iKV"/> @@ -118,8 +120,9 @@ </userDefinedRuntimeAttributes> </view> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="oVl-x5-GNE" customClass="BaseTableView" customModule="WanPai" customModuleProvider="target"> <rect key="frame" x="0.0" y="156" width="393" height="652"/> <color key="backgroundColor" systemColor="systemBackgroundColor"/> <rect key="frame" x="0.0" y="164" width="393" height="644"/> <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <rect key="contentStretch" x="0.050000000000000003" y="0.0" width="1" height="1"/> </tableView> </subviews> <viewLayoutGuide key="safeArea" id="ufI-mk-2VZ"/> @@ -131,14 +134,14 @@ <constraint firstItem="2Qr-aS-IbC" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="topMargin" id="cFq-zd-6To"/> <constraint firstAttribute="bottomMargin" secondItem="oVl-x5-GNE" secondAttribute="bottom" constant="10" id="hbr-Im-kjk"/> <constraint firstAttribute="trailing" secondItem="2Qr-aS-IbC" secondAttribute="trailing" id="k16-eD-x3K"/> <constraint firstItem="oVl-x5-GNE" firstAttribute="top" secondItem="2Qr-aS-IbC" secondAttribute="bottom" constant="10" id="qbz-V9-qCQ"/> <constraint firstItem="oVl-x5-GNE" firstAttribute="top" secondItem="2Qr-aS-IbC" secondAttribute="bottom" id="qbz-V9-qCQ"/> </constraints> <point key="canvasLocation" x="140" y="21"/> </view> </objects> <resources> <image name="icon_down_arrow" width="20" height="14"/> <image name="icon_down_arrow_s" width="20" height="14"/> <image name="icon_down_arrow" width="13" height="8"/> <image name="icon_down_arrow_s" width="13" height="8"/> <image name="icon_search" width="17" height="17"/> <namedColor name="FE6E0D"> <color red="0.99199998378753662" green="0.53299999237060547" blue="0.0080000003799796104" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> WanPai/Root/Course/VC/CourseInfoVC.swift
@@ -400,18 +400,10 @@ if m.type == 1 && m.isType == 0{ CommonAlertView.show(title: "提示", content: "确认请假？") { status in if status{ Services.startCourceRreverse(courseId: m.id, time: weakSelf.currentDate.jq_format("yyyy-MM-dd"), stuId: stuId).subscribe(onNext: { data in Services.startCourceRreverse(courseId: m.id, time: weakSelf.currentDate.jq_format("yyyy-MM-dd"), stuId: stuId).subscribe(onNext: {[weak self] data in alertSuccess(msg: "请假成功") weakSelf.tableView.reloadData() // tableView.beginUpdates() // weakSelf.weeklyCourseModel?.data.remove(at: indexPath.row) // tableView.deleteRows(at: [indexPath], with: .automatic) // tableView.endUpdates() // weakSelf.cons_tableHei.constant = 58 + 70 * Double(weakSelf.weeklyCourseModel?.data.count ?? 0) // UIView.animate(withDuration: 0.3) { // weakSelf.view.layoutIfNeeded() // weakSelf.viewDidLayoutSubviews() // } self?.getSelectDayData() }).disposed(by: weakSelf.disposeBag) } } WanPai/Root/Course/VC/CourseListVC.swift
@@ -69,7 +69,7 @@ override func viewDidLoad() { super.viewDidLoad() title = "课程列表" title = "运动营列表" viewModel.getDefaultData() viewModel.beginRefresh() } @@ -145,7 +145,7 @@ sender.setTitle(m.name, for: .normal) self?.viewModel.selectPackeType.accept(m) }else{ sender.setTitle("课程类型", for: .normal) sender.setTitle("运动营类型", for: .normal) self?.viewModel.selectPackeType.accept(nil) } sender.isSelected = false WanPai/Root/Course/VC/CourseListVC.xib
@@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <device id="retina6_12" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/> <capability name="Named colors" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="Stack View standard spacing" minToolsVersion="9.0"/> @@ -37,7 +37,7 @@ <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_search" translatesAutoresizingMaskIntoConstraints="NO" id="nUl-EG-ACs"> <rect key="frame" x="4" y="10.666666666666671" width="17" height="17"/> </imageView> <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="输入课程名称，门店名称" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="c4Q-WQ-T1F" customClass="QMUITextField"> <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="输入运动营名称，门店名称" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="c4Q-WQ-T1F" customClass="QMUITextField"> <rect key="frame" x="25" y="0.0" width="291" height="38"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/> <textInputTraits key="textInputTraits" returnKeyType="search"/> @@ -79,13 +79,13 @@ <rect key="frame" x="14" y="53" width="365" height="52"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="t2I-Ui-tOU" customClass="QMUIButton"> <rect key="frame" x="0.0" y="0.0" width="79" height="52"/> <rect key="frame" x="0.0" y="0.0" width="95" height="52"/> <constraints> <constraint firstAttribute="width" relation="lessThanOrEqual" constant="100" id="mVd-f6-PFw"/> </constraints> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/> <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> <state key="normal" title="课程类型" image="icon_down_arrow"> <state key="normal" title="运动营类型" image="icon_down_arrow"> <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </state> <state key="selected" image="icon_down_arrow_s"> @@ -96,7 +96,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nAn-MT-4zR" customClass="QMUIButton"> <rect key="frame" x="120" y="0.0" width="79" height="52"/> <rect key="frame" x="130.66666666666666" y="0.0" width="79" height="52"/> <constraints> <constraint firstAttribute="width" relation="lessThanOrEqual" constant="100" id="hHc-sk-rO6"/> </constraints> @@ -113,7 +113,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NcC-Kc-Iu6" customClass="QMUIButton"> <rect key="frame" x="240" y="0.0" width="42" height="52"/> <rect key="frame" x="245.33333333333331" y="0.0" width="42" height="52"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/> <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> <state key="normal" title="销量" image="icon_sort_normal"> @@ -178,7 +178,7 @@ </constraints> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/> <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> <state key="normal" title="已报名课程"/> <state key="normal" title="已报名运动营"/> <connections> <action selector="enrolledAction:" destination="-1" eventType="touchUpInside" id="c1b-aj-ufD"/> </connections> WanPai/Root/Course/VC/CourseVideoDetailVC.swift
@@ -91,16 +91,10 @@ Services.exerciseCourseDetail(coursePackageId: model.coursePackageId, videoId: model.videoId).subscribe(onNext: {[weak self] data in if let model = data.data{ self?.exerciseVideoDetailModel = model self?.playerVC.player = AVPlayer(url: URL(string: model.videoURL)!) self?.playerVC.player?.play() self?.playerVC.player?.addPeriodicTimeObserver(forInterval: CMTimeMake(value: 1, timescale: 1), queue: DispatchQueue.main) { [weak self](time) in self?.timeDuration += 1 } self?.label_name.text = model.packageName self?.label_coin.text = "\(model.integral)积分" self?.label_introduce.text = model.synopsis self?.label_studyState.isHidden = false if model.studyStatus == 1{ self?.label_studyState.text = "已学习" self?.label_studyState.backgroundColor = UIColor(hexStr: "#318C10").withAlphaComponent(0.29) @@ -109,6 +103,17 @@ self?.label_studyState.text = "未学习" self?.label_studyState.backgroundColor = UIColor(hexStr: "#FD9331").withAlphaComponent(0.29) self?.label_studyState.textColor = Def_ThemeColor } if let videoUrl = URL(string: model.videoURL){ self?.playerVC.player = AVPlayer(url: videoUrl) self?.playerVC.player?.play() self?.playerVC.player?.addPeriodicTimeObserver(forInterval: CMTimeMake(value: 1, timescale: 1), queue: DispatchQueue.main) { [weak self](time) in self?.timeDuration += 1 } }else{ alertError(msg: "视频链接不存在或已删除") } self?.img_introduceCover.sd_setImage(with: URL(string: model.detailedDiagram), completed: {[weak self] image, error, type, url in @@ -131,6 +136,7 @@ playerVC.view.frame = view_videoContainer.frame self.addChild(playerVC) playerVC.didMove(toParent: self) label_studyState.isHidden = true }
@@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <device id="retina6_12" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="System colors in document resources" minToolsVersion="11.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> @@ -106,8 +106,8 @@ <constraint firstAttribute="trailing" secondItem="otm-WL-Xfs" secondAttribute="trailing" constant="5" id="uuO-pq-Yaa"/> </constraints> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="课程介绍" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="svO-AL-k9L"> <rect key="frame" x="15" y="309" width="65.333333333333329" height="19.333333333333314"/> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="运动营介绍" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="svO-AL-k9L"> <rect key="frame" x="15" y="309" width="81.666666666666671" height="19.333333333333314"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> WanPai/Root/Course/VC/ExperienceCourseVC.xib
@@ -41,14 +41,14 @@ <constraint firstAttribute="height" constant="1" id="Rfm-D9-9bP"/> </constraints> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="课程名称：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nPx-yr-g0d"> <rect key="frame" x="14" y="17" width="71.666666666666671" height="17"/> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="运动营名称：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nPx-yr-g0d"> <rect key="frame" x="14" y="17" width="86" height="17"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/> <nil key="textColor"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cFP-un-jIB"> <rect key="frame" x="90.666666666666671" y="17" width="13" height="17"/> <rect key="frame" x="105" y="17" width="13" height="17"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <nil key="textColor"/> <nil key="highlightedColor"/> WanPai/Root/Course/VC/SignUpCourseVC.swift
@@ -47,7 +47,7 @@ override func viewDidLoad() { super.viewDidLoad() title = "已报名课程" title = "已报名运动营" viewModel.getDefaultData() viewModel.beginRefresh() } @@ -90,7 +90,7 @@ sender.setTitle(m.name, for: .normal) self?.viewModel.courseType.accept(m) }else{ sender.setTitle("课程类型", for: .normal) sender.setTitle("运动营类型", for: .normal) self?.viewModel.courseType.accept(nil) } sender.isSelected = false WanPai/Root/Course/VC/SignUpCourseVC.xib
@@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <device id="retina6_12" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22129"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/> <capability name="Named colors" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="System colors in document resources" minToolsVersion="11.0"/> @@ -33,7 +33,7 @@ <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_search" translatesAutoresizingMaskIntoConstraints="NO" id="xDn-Uh-hs3"> <rect key="frame" x="4" y="10.666666666666671" width="17" height="17"/> </imageView> <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="输入课程名称，门店名称" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="6Cj-8V-y0Z" customClass="QMUITextField"> <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="输入运动营名称，门店名称" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="6Cj-8V-y0Z" customClass="QMUITextField"> <rect key="frame" x="25" y="0.0" width="291" height="38"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/> <textInputTraits key="textInputTraits" returnKeyType="search"/> @@ -72,13 +72,13 @@ </connections> </button> <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="ljY-Lp-0lq"> <rect key="frame" x="14" y="53" width="86" height="52"/> <rect key="frame" x="14" y="53" width="95" height="52"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="tTc-fK-ck9" customClass="QMUIButton"> <rect key="frame" x="0.0" y="0.0" width="86" height="52"/> <rect key="frame" x="0.0" y="0.0" width="95" height="52"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/> <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> <state key="normal" title="课程类型" image="icon_down_arrow"> <state key="normal" title="运动营类型" image="icon_down_arrow"> <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </state> <state key="selected" image="icon_down_arrow_s"> @@ -137,8 +137,8 @@ </view> </objects> <resources> <image name="icon_down_arrow" width="20" height="14"/> <image name="icon_down_arrow_s" width="20" height="14"/> <image name="icon_down_arrow" width="13" height="8"/> <image name="icon_down_arrow_s" width="13" height="8"/> <image name="icon_search" width="17" height="17"/> <namedColor name="FE6E0D"> <color red="0.99199998378753662" green="0.53299999237060547" blue="0.0080000003799796104" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> WanPai/Root/Course/View/CourseBookingFuncView.xib
@@ -24,7 +24,7 @@ <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_search" translatesAutoresizingMaskIntoConstraints="NO" id="6og-yb-vZ5"> <rect key="frame" x="4" y="6.6666666666666661" width="17" height="17"/> </imageView> <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="输入课程名称" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Mrw-tc-NDG" customClass="QMUITextField"> <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="输入运动营名称" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Mrw-tc-NDG" customClass="QMUITextField"> <rect key="frame" x="25" y="0.0" width="291" height="30"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="13"/> <textInputTraits key="textInputTraits" returnKeyType="search"/> WanPai/Root/Course/View/CourseUnAssignView.swift
@@ -94,7 +94,7 @@ let btn = QMUIButton(type: .custom) btn.tag = 1100 + indexPath.row btn.isUserInteractionEnabled = false btn.setTitle("课程", for: .normal) btn.setTitle("运动营", for: .normal) btn.setTitleColor(.black, for: .normal) btn.titleLabel?.font = UIFont.systemFont(ofSize: 14, weight: .medium) btn.setImage(UIImage(named: "btn_choose"), for: .normal) WanPai/Root/Course/View/CourseUnAssignView.xib
@@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <device id="retina6_12" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22129"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/> <capability name="Named colors" minToolsVersion="9.0"/> <capability name="System colors in document resources" minToolsVersion="11.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> @@ -30,8 +30,8 @@ <color key="textColor" name="FE6E0D"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="分配课程：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qF6-d6-WeV"> <rect key="frame" x="110.66666666666666" y="84.666666666666629" width="81.666666666666657" height="20.333333333333329"/> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="分配运动营：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qF6-d6-WeV"> <rect key="frame" x="102.66666666666666" y="84.666666666666629" width="98" height="20.333333333333329"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> WanPai/Root/Games/GamesVC.swift
@@ -15,7 +15,7 @@ var scan_type:ScanType? //扫码类型 var space_id:Int? //场地ID var sutu_id:Int? //设备ID var id:Int? //课程/场地/游戏 var id:Int? //运动营/场地/游戏 } class GamesVC: BaseVC { WanPai/Root/Home/VC/JoinMemberIntroduceVC.swift
@@ -42,25 +42,37 @@ #endif PaymentView.show(money: (ali:price,wx:price,coin:nil,course:nil,integral:nil)) { type in Services.enrollMember(paytype: type).subscribe(onNext: {data in switch type { case .aliPay: if let orderString = data.data?.orderString{ YYPaymentManager.shared.sendPaymentRequest(YYAlipayRequest(orderString: orderString)) { result in switch result { case .success: alertSuccess(msg: "支付成功") case .cancel: alert(msg: "已取消支付") case .failure(let error): alertError(msg: error.localizedDescription) } } } case .wechat:break default:break } }).disposed(by: self.disposeBag) } } Services.enrollMember(paytype: type).subscribe(onNext: {data in switch type { case .aliPay: if let orderString = data.data?.orderString{ YYPaymentManager.shared.sendPaymentRequest(YYAlipayRequest(orderString: orderString)) {[weak self] result in guard let weakSelf = self else { return } switch result { case .success: let vc = PaymentResultVC(result: .success, objType: .member, handleVC: nil, courseConfigId: nil, againClouse: nil) weakSelf.push(vc: vc) case .cancel: let vc = PaymentResultVC(result: .fail("已取消支付", 0), objType: .member, handleVC: nil, courseConfigId: nil, againClouse: nil) weakSelf.push(vc: vc) case .failure(let error): if let er = error as? NetworkRequest.NetRequestError{ switch er { case .Other(let code,let string): let vc = PaymentResultVC(result: .fail(string,code), objType: .games) weakSelf.push(vc: vc) default: let vc = PaymentResultVC(result: .fail("支付失败",0), objType: .games) weakSelf.push(vc: vc) } } } } } case .wechat:break default:break } }).disposed(by: self.disposeBag) } } } WanPai/Root/Other/VC/PaymentResultVC.swift
@@ -16,7 +16,7 @@ } enum PaymentObjType{ case member //会员 case courseApply //课程报名 case courseApply //运动营报名 case activityApply //活动报名 case yard //场地预约 case games //邮箱 @@ -100,7 +100,7 @@ case .success: btn_again.setTitle("立即预约", for: .normal) btn_back.setTitle("返回首页", for: .normal) label_content.text = "报名成功，请及时预约课程上课！" label_content.text = "报名成功，请及时预约运动营上课！" if isExtend{ btn_back.isHidden = true btn_again.setTitle("返回", for: .normal) WanPai/Root/Other/VC/ProfileVC.swift
@@ -41,7 +41,7 @@ } @IBAction func logoutAction(_ sender: UIButton) { CommonAlertView.show(title: "退出登录", content: "是否退出当前账号？") { status in CommonAlertView.show(title: "提示", content: "确认退出当前账号？") { status in if status{ UserViewModel.clearToken() app.needLogin() WanPai/Root/Other/VC/ProfileVC.xib
@@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <device id="retina6_12" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/> <capability name="Named colors" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="System colors in document resources" minToolsVersion="11.0"/> @@ -48,26 +48,26 @@ </connections> </button> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="R9B-6k-bGu"> <rect key="frame" x="0.0" y="253" width="393" height="300"/> <rect key="frame" x="0.0" y="253" width="393" height="306"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="b2k-2V-k9C"> <rect key="frame" x="0.0" y="0.0" width="393" height="50"/> <rect key="frame" x="0.0" y="0.0" width="393" height="51"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vAy-G7-z7P"> <rect key="frame" x="14" y="49.666666666666686" width="365" height="0.3333333333333357"/> <rect key="frame" x="14" y="50.666666666666686" width="365" height="0.3333333333333357"/> <color key="backgroundColor" red="0.83137254901960778" green="0.83137254901960778" blue="0.83137254901960778" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="0.40000000000000002" id="rhn-Yh-6ix"/> <constraint firstAttribute="height" constant="0.5" id="rhn-Yh-6ix"/> </constraints> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="用户姓名" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="p1h-rL-UFE"> <rect key="frame" x="14.000000000000004" y="16.666666666666686" width="57.333333333333343" height="17"/> <rect key="frame" x="14.000000000000004" y="17" width="57.333333333333343" height="17"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="eQF-2k-COB"> <rect key="frame" x="362.66666666666669" y="16.666666666666686" width="13.333333333333314" height="17"/> <rect key="frame" x="362.66666666666669" y="17" width="13.333333333333314" height="17"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -78,7 +78,7 @@ <constraint firstAttribute="bottom" secondItem="vAy-G7-z7P" secondAttribute="bottom" id="GI1-cv-eE2"/> <constraint firstItem="eQF-2k-COB" firstAttribute="centerY" secondItem="p1h-rL-UFE" secondAttribute="centerY" id="MR9-Zb-QdJ"/> <constraint firstItem="vAy-G7-z7P" firstAttribute="leading" secondItem="b2k-2V-k9C" secondAttribute="leading" constant="14" id="NsJ-TV-WEK"/> <constraint firstAttribute="height" constant="50" id="mb3-Lu-vBK"/> <constraint firstAttribute="height" constant="51" id="mb3-Lu-vBK"/> <constraint firstItem="p1h-rL-UFE" firstAttribute="leading" secondItem="b2k-2V-k9C" secondAttribute="leading" constant="14" id="nAZ-DK-56m"/> <constraint firstAttribute="trailing" secondItem="vAy-G7-z7P" secondAttribute="trailing" constant="14" id="sOJ-L7-0Zl"/> <constraint firstItem="p1h-rL-UFE" firstAttribute="centerY" secondItem="b2k-2V-k9C" secondAttribute="centerY" id="ze5-YL-hOl"/> @@ -86,23 +86,23 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iPt-bU-TRd"> <rect key="frame" x="0.0" y="50" width="393" height="50"/> <rect key="frame" x="0.0" y="51" width="393" height="51"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="beT-Wj-n8U"> <rect key="frame" x="14" y="49.666666666666686" width="365" height="0.3333333333333357"/> <rect key="frame" x="14" y="50.666666666666686" width="365" height="0.3333333333333357"/> <color key="backgroundColor" red="0.83137254900000002" green="0.83137254900000002" blue="0.83137254900000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="0.40000000000000002" id="xcZ-6d-tbL"/> <constraint firstAttribute="height" constant="0.5" id="xcZ-6d-tbL"/> </constraints> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="联系方式" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6jx-eb-RXN"> <rect key="frame" x="14.000000000000004" y="16.666666666666686" width="57.333333333333343" height="17"/> <rect key="frame" x="14.000000000000004" y="17" width="57.333333333333343" height="17"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ec9-N9-5yO"> <rect key="frame" x="362.66666666666669" y="16.666666666666686" width="13.333333333333314" height="17"/> <rect key="frame" x="362.66666666666669" y="17" width="13.333333333333314" height="17"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -110,7 +110,7 @@ </subviews> <color key="backgroundColor" systemColor="systemBackgroundColor"/> <constraints> <constraint firstAttribute="height" constant="50" id="G9D-P8-wg3"/> <constraint firstAttribute="height" constant="51" id="G9D-P8-wg3"/> <constraint firstAttribute="trailing" secondItem="beT-Wj-n8U" secondAttribute="trailing" constant="14" id="YHI-Zf-Mtd"/> <constraint firstItem="Ec9-N9-5yO" firstAttribute="centerY" secondItem="6jx-eb-RXN" secondAttribute="centerY" id="bQF-5m-1lv"/> <constraint firstItem="beT-Wj-n8U" firstAttribute="leading" secondItem="iPt-bU-TRd" secondAttribute="leading" constant="14" id="g3H-0c-BfQ"/> @@ -121,23 +121,23 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mCJ-rn-t8T"> <rect key="frame" x="0.0" y="100" width="393" height="50"/> <rect key="frame" x="0.0" y="102" width="393" height="51"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="W8Y-Oy-amf"> <rect key="frame" x="14" y="49.666666666666686" width="365" height="0.3333333333333357"/> <rect key="frame" x="14" y="50.666666666666686" width="365" height="0.3333333333333357"/> <color key="backgroundColor" red="0.83137254900000002" green="0.83137254900000002" blue="0.83137254900000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="0.40000000000000002" id="fI7-fO-gjk"/> <constraint firstAttribute="height" constant="0.5" id="fI7-fO-gjk"/> </constraints> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="性别" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Cbg-dh-tEs"> <rect key="frame" x="14.000000000000002" y="16.666666666666686" width="28.666666666666671" height="17"/> <rect key="frame" x="14.000000000000002" y="17" width="28.666666666666671" height="17"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BV9-ZD-gTd"> <rect key="frame" x="362.66666666666669" y="16.666666666666686" width="13.333333333333314" height="17"/> <rect key="frame" x="362.66666666666669" y="17" width="13.333333333333314" height="17"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -146,7 +146,7 @@ <color key="backgroundColor" systemColor="systemBackgroundColor"/> <constraints> <constraint firstItem="BV9-ZD-gTd" firstAttribute="centerY" secondItem="Cbg-dh-tEs" secondAttribute="centerY" id="2bH-1P-DZc"/> <constraint firstAttribute="height" constant="50" id="5Ax-vc-Jq2"/> <constraint firstAttribute="height" constant="51" id="5Ax-vc-Jq2"/> <constraint firstItem="Cbg-dh-tEs" firstAttribute="leading" secondItem="mCJ-rn-t8T" secondAttribute="leading" constant="14" id="9Is-NY-Rfj"/> <constraint firstItem="W8Y-Oy-amf" firstAttribute="leading" secondItem="mCJ-rn-t8T" secondAttribute="leading" constant="14" id="A8V-2Q-OkG"/> <constraint firstAttribute="bottom" secondItem="W8Y-Oy-amf" secondAttribute="bottom" id="IfV-KU-7Uw"/> @@ -156,23 +156,23 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jsd-mD-Qt3"> <rect key="frame" x="0.0" y="150" width="393" height="50"/> <rect key="frame" x="0.0" y="153" width="393" height="51"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Knb-gk-eBK"> <rect key="frame" x="14" y="49.666666666666686" width="365" height="0.3333333333333357"/> <rect key="frame" x="14" y="50.666666666666686" width="365" height="0.3333333333333357"/> <color key="backgroundColor" red="0.83137254900000002" green="0.83137254900000002" blue="0.83137254900000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="0.40000000000000002" id="Fd6-iF-l84"/> <constraint firstAttribute="height" constant="0.5" id="Fd6-iF-l84"/> </constraints> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="生日" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WTO-bR-h4Z"> <rect key="frame" x="14.000000000000002" y="16.666666666666686" width="28.666666666666671" height="17"/> <rect key="frame" x="14.000000000000002" y="17" width="28.666666666666671" height="17"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UxX-uD-G2b"> <rect key="frame" x="362.66666666666669" y="16.666666666666686" width="13.333333333333314" height="17"/> <rect key="frame" x="362.66666666666669" y="17" width="13.333333333333314" height="17"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -181,7 +181,7 @@ <color key="backgroundColor" systemColor="systemBackgroundColor"/> <constraints> <constraint firstItem="UxX-uD-G2b" firstAttribute="centerY" secondItem="WTO-bR-h4Z" secondAttribute="centerY" id="0As-pd-nQj"/> <constraint firstAttribute="height" constant="50" id="EWY-q4-QLf"/> <constraint firstAttribute="height" constant="51" id="EWY-q4-QLf"/> <constraint firstAttribute="trailing" secondItem="UxX-uD-G2b" secondAttribute="trailing" constant="17" id="K8F-Qv-APj"/> <constraint firstAttribute="bottom" secondItem="Knb-gk-eBK" secondAttribute="bottom" id="Ngh-sd-5Pb"/> <constraint firstItem="Knb-gk-eBK" firstAttribute="leading" secondItem="Jsd-mD-Qt3" secondAttribute="leading" constant="14" id="ipI-UQ-pKG"/> @@ -191,23 +191,23 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4Si-tj-2Vy"> <rect key="frame" x="0.0" y="200" width="393" height="50"/> <rect key="frame" x="0.0" y="204" width="393" height="51"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9qT-eV-ESp"> <rect key="frame" x="14" y="49.666666666666686" width="365" height="0.3333333333333357"/> <rect key="frame" x="14" y="50.666666666666686" width="365" height="0.3333333333333357"/> <color key="backgroundColor" red="0.83137254900000002" green="0.83137254900000002" blue="0.83137254900000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="0.40000000000000002" id="6bW-cF-74K"/> <constraint firstAttribute="height" constant="0.5" id="6bW-cF-74K"/> </constraints> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="所在地区" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dbZ-d2-h7V"> <rect key="frame" x="14.000000000000004" y="16.666666666666686" width="57.333333333333343" height="17"/> <rect key="frame" x="14.000000000000004" y="17" width="57.333333333333343" height="17"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KeY-Wp-GF3"> <rect key="frame" x="362.66666666666669" y="16.666666666666686" width="13.333333333333314" height="17"/> <rect key="frame" x="362.66666666666669" y="17" width="13.333333333333314" height="17"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -219,30 +219,30 @@ <constraint firstAttribute="bottom" secondItem="9qT-eV-ESp" secondAttribute="bottom" id="4bi-ot-7lC"/> <constraint firstItem="9qT-eV-ESp" firstAttribute="leading" secondItem="4Si-tj-2Vy" secondAttribute="leading" constant="14" id="BOk-qL-NNF"/> <constraint firstItem="dbZ-d2-h7V" firstAttribute="leading" secondItem="4Si-tj-2Vy" secondAttribute="leading" constant="14" id="Nta-IR-59f"/> <constraint firstAttribute="height" constant="50" id="Rd6-4a-1UP"/> <constraint firstAttribute="height" constant="51" id="Rd6-4a-1UP"/> <constraint firstItem="dbZ-d2-h7V" firstAttribute="centerY" secondItem="4Si-tj-2Vy" secondAttribute="centerY" id="YGt-Wb-w44"/> <constraint firstAttribute="trailing" secondItem="KeY-Wp-GF3" secondAttribute="trailing" constant="17" id="dfN-6i-jk7"/> <constraint firstAttribute="trailing" secondItem="9qT-eV-ESp" secondAttribute="trailing" constant="14" id="nl3-MS-TPO"/> </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2K0-H1-xLC"> <rect key="frame" x="0.0" y="250" width="393" height="50"/> <rect key="frame" x="0.0" y="255" width="393" height="51"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="4ZK-ib-Om9"> <rect key="frame" x="14" y="49.666666666666629" width="365" height="0.3333333333333357"/> <rect key="frame" x="14" y="50.666666666666629" width="365" height="0.3333333333333357"/> <color key="backgroundColor" red="0.83137254900000002" green="0.83137254900000002" blue="0.83137254900000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="0.40000000000000002" id="uM9-Am-vue"/> <constraint firstAttribute="height" constant="0.5" id="uM9-Am-vue"/> </constraints> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="会员有效期" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fzJ-cy-nAh"> <rect key="frame" x="14" y="16.666666666666629" width="71.666666666666671" height="17"/> <rect key="frame" x="14" y="17" width="71.666666666666671" height="17"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xkh-Hd-htf"> <rect key="frame" x="362.66666666666669" y="16.666666666666629" width="13.333333333333314" height="17"/> <rect key="frame" x="362.66666666666669" y="17" width="13.333333333333314" height="17"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -255,7 +255,7 @@ <constraint firstItem="fzJ-cy-nAh" firstAttribute="centerY" secondItem="2K0-H1-xLC" secondAttribute="centerY" id="GeP-tm-5G8"/> <constraint firstAttribute="bottom" secondItem="4ZK-ib-Om9" secondAttribute="bottom" id="Vzb-iH-qzt"/> <constraint firstAttribute="trailing" secondItem="4ZK-ib-Om9" secondAttribute="trailing" constant="14" id="YMq-4b-uEw"/> <constraint firstAttribute="height" constant="50" id="c4K-Tf-r3G"/> <constraint firstAttribute="height" constant="51" id="c4K-Tf-r3G"/> <constraint firstItem="fzJ-cy-nAh" firstAttribute="leading" secondItem="2K0-H1-xLC" secondAttribute="leading" constant="14" id="cBf-Qo-UE7"/> <constraint firstAttribute="trailing" secondItem="Xkh-Hd-htf" secondAttribute="trailing" constant="17" id="feQ-Qt-XfD"/> </constraints> WanPai/Root/Search/VC/SearchStoreDetailVC.swift
@@ -144,7 +144,7 @@ if section == 0{ label.text = "场地列表" }else{ label.text = "课程列表" label.text = "运动营列表" } } return headerView WanPai/Root/Search/VC/SearchVC.xib
@@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22154" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <device id="retina6_12" orientation="portrait" appearance="light"/> <accessibilityOverrides/> <dependencies> <deployment identifier="iOS"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/> <capability name="Named colors" minToolsVersion="9.0"/> <capability name="System colors in document resources" minToolsVersion="11.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> @@ -38,7 +38,7 @@ <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bg_search" translatesAutoresizingMaskIntoConstraints="NO" id="DGE-Vl-Na6"> <rect key="frame" x="0.0" y="0.0" width="393" height="195.33333333333334"/> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="立刻开通快乐运动会员" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uWB-gY-2cI"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="立刻开通玩湃生活会员" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uWB-gY-2cI"> <rect key="frame" x="110.00000000000001" y="65" width="173.33333333333337" height="20.333333333333329"/> <fontDescription key="fontDescription" type="system" pointSize="17"/> <color key="textColor" red="0.20392156862745098" green="0.3411764705882353" blue="0.42352941176470588" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> WanPai/Root/Welfare/TCell/WelfareCouponsTCell.swift
@@ -1,9 +1,9 @@ // // WelfareCouponsTCell.swift // WanPai // // Created by 无故事王国 on 2023/6/28. // // // WelfareCouponsTCell.swift // WanPai // // Created by 无故事王国 on 2023/6/28. // import UIKit import QMUIKit @@ -12,58 +12,58 @@ class WelfareCouponsTCell: UITableViewCell { @IBOutlet weak var img_header: UIImageView! @IBOutlet weak var img_footer: UIImageView! @IBOutlet weak var label_price: UILabel! @IBOutlet weak var label_useCon: UILabel! @IBOutlet weak var label_title: UILabel! @IBOutlet weak var label_dueDatetime: UILabel! @IBOutlet weak var label_storeUse: UILabel! @IBOutlet weak var btn_info: QMUIButton! @IBOutlet weak var view_line: UIView! @IBOutlet weak var label_info: UILabel! @IBOutlet weak var cons_labelHei: NSLayoutConstraint! @IBOutlet weak var btn_detail: UIButton! @IBOutlet weak var img_status: UIImageView! @IBOutlet weak var btn_toUse: UIButton! @IBOutlet weak var img_header: UIImageView! @IBOutlet weak var img_footer: UIImageView! @IBOutlet weak var label_price: UILabel! @IBOutlet weak var label_useCon: UILabel! @IBOutlet weak var label_title: UILabel! @IBOutlet weak var label_dueDatetime: UILabel! @IBOutlet weak var label_storeUse: UILabel! @IBOutlet weak var btn_info: QMUIButton! @IBOutlet weak var view_line: UIView! @IBOutlet weak var label_info: UILabel! @IBOutlet weak var cons_labelHei: NSLayoutConstraint! @IBOutlet weak var btn_detail: UIButton! @IBOutlet weak var img_status: UIImageView! @IBOutlet weak var btn_toUse: UIButton! var indexPath:IndexPath! var couponModel:CouponModel!{ didSet{ label_price.text = couponModel.ruleModel?.deductionAmount var indexPath:IndexPath! var couponModel:CouponModel!{ didSet{ label_price.text = couponModel.ruleModel?.deductionAmount label_useCon.isHidden = couponModel.ruleModel?.conditionalAmount.isEmpty ?? true if let amount = couponModel.ruleModel?.conditionalAmount{ label_useCon.text = amount } if let amount = couponModel.ruleModel?.conditionalAmount{ label_useCon.text = amount } label_title.text = couponModel.name label_dueDatetime.text = "有效期至\(couponModel.effectiveTime)" label_storeUse.text = couponModel.useCondition.titleRaw label_title.text = couponModel.name label_dueDatetime.text = "有效期至\(couponModel.effectiveTime)" label_storeUse.text = couponModel.useCondition.titleRaw switch couponModel.useStatus{ case .overdue: btn_toUse.isHidden = true img_status.image = UIImage(named: "icon_coupon_due") img_status.isHidden = false img_header.image = UIImage(named: "icon_coupon_header")?.withTintColor(UIColor(hexStr: "#BEBEBE"), renderingMode: .alwaysOriginal) img_footer.image = UIImage(named: "icon_coupon_footer")?.withTintColor(UIColor(hexStr: "#BEBEBE"),renderingMode: .alwaysOriginal) case .unused: btn_toUse.isHidden = false img_status.isHidden = true img_header.image = UIImage(named: "icon_coupon_header") img_footer.image = UIImage(named: "icon_coupon_footer") case .used: btn_toUse.isHidden = true img_status.image = UIImage(named: "icon_coupon_used") img_status.isHidden = false img_header.image = UIImage(named: "icon_coupon_header")?.withTintColor(UIColor(hexStr: "#BEBEBE"), renderingMode: .alwaysOriginal) img_footer.image = UIImage(named: "icon_coupon_footer")?.withTintColor(UIColor(hexStr: "#BEBEBE"),renderingMode: .alwaysOriginal) switch couponModel.useStatus{ case .overdue: btn_toUse.isHidden = true img_status.image = UIImage(named: "icon_coupon_due") img_status.isHidden = false img_header.image = UIImage(named: "icon_coupon_header")?.withTintColor(UIColor(hexStr: "#BEBEBE"), renderingMode: .alwaysOriginal) img_footer.image = UIImage(named: "icon_coupon_footer")?.withTintColor(UIColor(hexStr: "#BEBEBE"),renderingMode: .alwaysOriginal) case .unused: btn_toUse.isHidden = false img_status.isHidden = true img_header.image = UIImage(named: "icon_coupon_header") img_footer.image = UIImage(named: "icon_coupon_footer") case .used: btn_toUse.isHidden = true img_status.image = UIImage(named: "icon_coupon_used") img_status.isHidden = false img_header.image = UIImage(named: "icon_coupon_header")?.withTintColor(UIColor(hexStr: "#BEBEBE"), renderingMode: .alwaysOriginal) img_footer.image = UIImage(named: "icon_coupon_footer")?.withTintColor(UIColor(hexStr: "#BEBEBE"),renderingMode: .alwaysOriginal) } btn_detail.isHidden = couponModel.useCondition == .nationwide label_info.text = couponModel.instructionsForUse } btn_detail.isHidden = couponModel.useCondition == .nationwide label_info.text = couponModel.instructionsForUse switch couponModel.type { case .none: @@ -73,43 +73,39 @@ case .voucher: break case .experience: label_price.text = "体验" label_price.text = "体验券" } } } } } override func awakeFromNib() { super.awakeFromNib() selectionStyle = .none btn_info.imagePosition = .right btn_info.spacingBetweenImageAndTitle = 3 view_line.isHidden = true label_info.isHidden = true } override func awakeFromNib() { super.awakeFromNib() selectionStyle = .none btn_info.imagePosition = .right btn_info.spacingBetweenImageAndTitle = 3 view_line.isHidden = true label_info.isHidden = true } @IBAction func infoTapAction(_ sender: QMUIButton) { sender.isSelected = !sender.isSelected view_line.isHidden = !sender.isSelected label_info.isHidden = !sender.isSelected couponModel.showAll = !couponModel.showAll NotificationCenter.default.post(name: WelfareCoupons_Noti, object: indexPath.row as Int) @IBAction func infoTapAction(_ sender: QMUIButton) { sender.isSelected = !sender.isSelected view_line.isHidden = !sender.isSelected label_info.isHidden = !sender.isSelected if !sender.isSelected{ cons_labelHei.constant = String.jq_getHeight(text: label_info.text!, width: JQ_ScreenW - 153, font: 12) }else{ cons_labelHei.constant = 17 } NotificationCenter.default.post(name: WelfareCoupons_Noti, object: indexPath.row as Int) } @IBAction func showDetailAction(_ sender: UIButton) { AgreentView.show(type: .other,content:couponModel.cityOrStore) } } @IBAction func showDetailAction(_ sender: UIButton) { AgreentView.show(type: .useStore,content:couponModel.cityOrStore) } @IBAction func toUseAction(_ sender: UIButton) { JQ_currentNavigationController().popToRootViewController(animated: true) DispatchQueue.main.asyncAfter(deadline: .now()+0.5) { JQ_currentViewController().tabBarController?.selectedIndex = 0 } } @IBAction func toUseAction(_ sender: UIButton) { JQ_currentNavigationController().popToRootViewController(animated: true) DispatchQueue.main.asyncAfter(deadline: .now()+0.5) { JQ_currentViewController().tabBarController?.selectedIndex = 0 } } } WanPai/Root/Welfare/TCell/WelfareCouponsTCell.xib
@@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES"> <device id="retina6_12" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21679"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/> <capability name="Named colors" minToolsVersion="9.0"/> <capability name="System colors in document resources" minToolsVersion="11.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> @@ -11,21 +11,21 @@ <objects> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="_WelfareCouponsTCell" rowHeight="212" id="KGk-i7-Jjw" customClass="WelfareCouponsTCell" customModule="WanPai" customModuleProvider="target"> <rect key="frame" x="0.0" y="0.0" width="409" height="212"/> <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="_WelfareCouponsTCell" rowHeight="346" id="KGk-i7-Jjw" customClass="WelfareCouponsTCell" customModule="WanPai" customModuleProvider="target"> <rect key="frame" x="0.0" y="0.0" width="409" height="346"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM"> <rect key="frame" x="0.0" y="0.0" width="409" height="212"/> <rect key="frame" x="0.0" y="0.0" width="409" height="346"/> <autoresizingMask key="autoresizingMask"/> <subviews> <view contentMode="scaleAspectFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZhQ-JM-XIl"> <rect key="frame" x="14" y="7.6666666666666714" width="100" height="135.66666666666663"/> <rect key="frame" x="14" y="7.6666666666666572" width="100" height="331.33333333333337"/> <subviews> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_coupon_header" translatesAutoresizingMaskIntoConstraints="NO" id="wLK-TU-eK6"> <rect key="frame" x="0.0" y="0.0" width="100" height="135.66666666666666"/> <rect key="frame" x="0.0" y="0.0" width="100" height="331.33333333333331"/> </imageView> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="m8J-DK-my1"> <rect key="frame" x="5" y="37.333333333333343" width="90" height="61"/> <rect key="frame" x="5" y="135" width="90" height="61"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥ 0" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="efu-ap-jzG"> <rect key="frame" x="0.0" y="0.0" width="90" height="28"/> @@ -37,7 +37,7 @@ <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="满0可用" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Swu-3s-t08"> <rect key="frame" x="0.0" y="43.999999999999993" width="90" height="17"/> <rect key="frame" x="0.0" y="44" width="90" height="17"/> <constraints> <constraint firstAttribute="height" constant="17" id="bJ6-wC-a6S"/> </constraints> @@ -62,10 +62,10 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="htP-hm-rxQ"> <rect key="frame" x="114" y="7.6666666666666714" width="281" height="135.33333333333331"/> <rect key="frame" x="114" y="7.6666666666666572" width="281" height="331"/> <subviews> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_coupon_footer" translatesAutoresizingMaskIntoConstraints="NO" id="fT4-6g-L0m"> <rect key="frame" x="0.0" y="0.0" width="281" height="135.33333333333334"/> <rect key="frame" x="0.0" y="0.0" width="281" height="331"/> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="G7I-Sh-sFL"> <rect key="frame" x="15" y="8" width="195" height="25"/> @@ -128,7 +128,7 @@ </connections> </button> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="9" translatesAutoresizingMaskIntoConstraints="NO" id="fpg-MK-829"> <rect key="frame" x="15" y="104" width="256" height="24.333333333333343"/> <rect key="frame" x="15" y="104" width="256" height="220"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Idc-Qp-xg4"> <rect key="frame" x="0.0" y="0.0" width="256" height="1"/> @@ -138,9 +138,9 @@ </constraints> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="otH-gu-7hx"> <rect key="frame" x="0.0" y="10" width="256" height="14.333333333333336"/> <rect key="frame" x="0.0" y="10" width="256" height="210"/> <constraints> <constraint firstAttribute="height" constant="17" id="Bhz-uE-F2F"/> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="17" id="Bhz-uE-F2F"/> </constraints> <fontDescription key="fontDescription" type="system" pointSize="12"/> <color key="textColor" red="0.23137254901960785" green="0.23137254901960785" blue="0.23137254901960785" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> @@ -229,7 +229,7 @@ <outlet property="label_useCon" destination="Swu-3s-t08" id="5lK-sO-Sbo"/> <outlet property="view_line" destination="Idc-Qp-xg4" id="qgz-C4-7oJ"/> </connections> <point key="canvasLocation" x="104.58015267175573" y="55.633802816901408"/> <point key="canvasLocation" x="104.58015267175573" y="102.8169014084507"/> </tableViewCell> </objects> <resources> WanPai/Root/Welfare/VC/WelfareBillListVC.swift
@@ -159,7 +159,7 @@ } @objc func fliterAction(){ JQ_MenuView().show(self, tapView: btn_filter, items: ["全部记录","充值","扣除"],tableHei: 140) { [weak self] index, str in JQ_MenuView().show(self, tapView: btn_filter, items: ["全部记录","增加","扣除"],tableHei: 140) { [weak self] index, str in self?.btn_filter.setTitle(str, for: .normal) if index == 0{ self?.viewModel?.type.accept(nil) WanPai/Root/Welfare/VC/WelfareCouponsSubListVC.swift
@@ -67,7 +67,7 @@ self.rows.insert(row) } self.tableView.beginUpdates() self.tableView.reloadRows(at: [IndexPath(row: row, section: 0)], with: .fade) self.tableView.reloadRows(at: [IndexPath(row: row, section: 0)], with: .fade) self.tableView.endUpdates() } }).disposed(by: disposeBag) @@ -84,7 +84,6 @@ func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { let cell = tableView.dequeueReusableCell(withIdentifier: "_WelfareCouponsTCell") as! WelfareCouponsTCell cell.indexPath = indexPath cell.label_info.text = "这里是优惠券使用说明…" cell.btn_info.isSelected = rows.contains(indexPath.row) cell.label_info.isHidden = !rows.contains(indexPath.row) cell.view_line.isHidden = !rows.contains(indexPath.row) WanPai/Root/Welfare/VC/WelfareVC.swift
@@ -42,12 +42,12 @@ override func viewWillDisappear(_ animated: Bool) { super.viewWillDisappear(animated) navigationController?.isNavigationBarHidden = false // navigationController?.isNavigationBarHidden = false } override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) navigationController?.isNavigationBarHidden = true // navigationController?.isNavigationBarHidden = true } override func viewDidAppear(_ animated: Bool) { @@ -197,7 +197,7 @@ } override var preferredStatusBarStyle: UIStatusBarStyle{ return .darkContent return .lightContent } }
@@ -42,7 +42,7 @@ override func viewDidLoad() { super.viewDidLoad() title = "课程详情" title = "运动营详情" Services.weekBenefitDetail(id: id).subscribe(onNext: {[weak self] data in guard let weakSelf = self else { return }
