WanPai/Common/CCell/CommonSingleImgCCell.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="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -17,7 +17,7 @@ <rect key="frame" x="0.0" y="0.0" width="320" height="150"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <subviews> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="gCZ-Wl-L6T"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="gCZ-Wl-L6T"> <rect key="frame" x="0.0" y="0.0" width="320" height="150"/> </imageView> </subviews> WanPai/Common/View/CommonBannerView.swift
@@ -104,7 +104,9 @@ private func startTimer(){ timer = Timer(timeInterval: TimeInterval(timeInterval), repeats: true, block: {[weak self] t in guard let weakSelf = self else { return } weakSelf.currentPage += 1 var page = weakSelf.collectionView.contentOffset.x / weakSelf.collectionView.width weakSelf.currentPage = Int(page + 1) if weakSelf.currentPage >= weakSelf.pageControl.numberOfPages{ weakSelf.currentPage = 0 @@ -136,13 +138,19 @@ } func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) { let page = scrollView.contentOffset.x / scrollView.width if page.int >= pageControl.numberOfPages{ pageControl.currentPage = 0 }else{ pageControl.currentPage = page.int } print("--结束滑动") timer?.fireDate = Date.init(timeIntervalSinceNow: 3.0) //3秒后开启 } func scrollViewDidEndScrollingAnimation(_ scrollView: UIScrollView) { let page = scrollView.contentOffset.x / scrollView.width if page.int > pageControl.numberOfPages{ if page.int >= pageControl.numberOfPages{ pageControl.currentPage = 0 }else{ pageControl.currentPage = page.int WanPai/Config/Def.swift
@@ -55,6 +55,13 @@ #endif } func LogResponse(_ items:Any...,separator:String=" ",file:String=#file,function:String=#function,line:Int=#line){ #if DEBUG print("返回数据") print(items); #endif } //提示框 func alert(msg: String) { // hiddenHUD() WanPai/Config/Enums.swift
@@ -316,8 +316,8 @@ } enum DetailType:Int,HandyJSONEnum{ case minus = 1 //负数 case positive = 2 //正数 case minus = 1 //正数 case positive = 2 //负数 }
@@ -197,6 +197,7 @@ var storeLon: String = "" var storeName: String = "" var storeInfos = [ActivityDetailStoreModel]() var hasPass = 0 // 0:正常，1:截止 } struct ActivityDetailStoreModel:HandyJSON{ @@ -485,6 +486,7 @@ var userPhone: String = "" var userId:Int = 0 var isVip = 0 //0:否 1:是 var needChange = 0 // 1需要改，0不需要 func save(){ UserDefaults.standard.set(self.toJSONString(), forKey: "UserInfoModel") @@ -530,7 +532,12 @@ var consumeAmount:Double = 0 var consumeName = "" var consumeTime = "" var detailsType:DetailType = .positive //1扣减 2增加 var type:DetailType = .positive //1扣减 2增加 // mutating func mapping(mapper: HelpingMapper) { // mapper <<< // self.type <-- "detailsType" // } } class CouponModel:HandyJSON{ WanPai/Network/NetworkRequest.swift
@@ -227,8 +227,8 @@ return } if let data = response.data,let jsonString = String(data: data, encoding: String.Encoding.utf8){ LogResponse(try! JSONSerialization.jsonObject(with: data)) if let next = BaseResponse<T>.deserialize(from: jsonString){ LogInfo("返回数据:\(jsonString)") switch next.code{ case 200:ob.onNext(next) case 501: WanPai/Network/Services.swift
@@ -274,6 +274,8 @@ class func benefitHome()->Observable<BaseResponse<BenefitHomeModel>>{ let params = ParamsAppender.build(url: All_Url) .interface(url: "/account/api/useBenefit/indexOfAppUser") .append(key: "lat", value: locationTool.currentLocation?.coordinate.latitude.string) .append(key: "lon", value: locationTool.currentLocation?.coordinate.longitude.string) return NetworkRequest.request(params: params, method: .post, progress: false) } @@ -415,7 +417,7 @@ .append(key: "lat", value: locationTool.currentLocation?.coordinate.latitude.string) .append(key: "lon", value: locationTool.currentLocation?.coordinate.longitude.string) .append(key: "price", value: "\(price)") return NetworkRequest.request(params: params, method: .post, progress: false) return NetworkRequest.request(params: params, method: .post, progress: true) } /// 获取学员列表 WanPai/Root/Activity/TCell/ActivityInfoTCell.swift
@@ -27,6 +27,7 @@ label_hot.text = "\(m.heat)" label_state.text = m.status.rawTitle label_state.isHidden = m.status.rawTitle.isEmpty switch m.status{ case .ongoing,.prepare: label_state.backgroundColor = Def_ThemeColor WanPai/Root/Activity/VC/ActivityDetailApplyVC.xib
@@ -293,8 +293,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="JYO-In-OJe"> <rect key="frame" x="22" y="6.0000000000000009" width="77.666666666666671" height="14.333333333333336"/> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="活动地址" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JYO-In-OJe"> <rect key="frame" x="22.000000000000004" y="6.0000000000000009" width="49.333333333333343" height="14.333333333333336"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -344,7 +344,7 @@ </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="Bcn-WG-l3X"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="活动门店" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bcn-WG-l3X"> <rect key="frame" x="22.000000000000004" y="6.0000000000000009" width="49.333333333333343" height="14.333333333333336"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/> @@ -404,7 +404,7 @@ <constraint firstAttribute="height" constant="1" id="inW-xF-bQt"/> </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="Ym3-ZD-GoB"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="活动费用" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ym3-ZD-GoB"> <rect key="frame" x="14" y="15" width="365" height="21"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/> <nil key="textColor"/> @@ -547,7 +547,7 @@ <constraint firstAttribute="height" constant="1" id="0Bu-N9-IBq"/> </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="QtX-Vo-ALs"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="活动简介" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QtX-Vo-ALs"> <rect key="frame" x="14" y="15" width="365" height="61"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/> <nil key="textColor"/> @@ -587,7 +587,7 @@ <constraint firstAttribute="height" constant="1" id="QUL-ul-Vnx"/> </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="M9g-qI-cqh"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="活动人员" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="M9g-qI-cqh"> <rect key="frame" x="14" y="15" width="65.333333333333329" height="29"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/> <nil key="textColor"/> WanPai/Root/Activity/VC/ActivityDetailVC.swift
@@ -74,10 +74,11 @@ label_coin.text = String(format: "%ld币/人", activityDetailModel.playPaiCoin) label_courseNum.text = String(format: "%ld课时/人", activityDetailModel.classPrice) // let name = activityDetailModel.apply == 1 ? "已报名":"立即报名" // let color = activityDetailModel.apply == 1 ? UIColor.gray.withAlphaComponent(0.5):Def_ThemeColor // btn_enroll.setTitle(name, for: .normal) // btn_enroll.backgroundColor = color if activityDetailModel.hasPass == 1{ btn_enroll.setTitle("报名已截止", for: .normal) btn_enroll.backgroundColor = UIColor.gray.withAlphaComponent(0.5) btn_enroll.isEnabled = false } let imgs = activityDetailModel.imgs.components(separatedBy: ",") var items = [CommonBannerModel]() WanPai/Root/Activity/VC/ActivityDetailVC.xib
@@ -292,8 +292,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="QkB-qj-0gR"> <rect key="frame" x="22" y="6.0000000000000009" width="77.666666666666671" height="14.333333333333336"/> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="活动地址" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QkB-qj-0gR"> <rect key="frame" x="22.000000000000004" y="6.0000000000000009" width="49.333333333333343" height="14.333333333333336"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -345,7 +345,7 @@ </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="iO3-v6-uS9"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="活动门店" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iO3-v6-uS9"> <rect key="frame" x="22.000000000000004" y="6.0000000000000009" width="49.333333333333343" height="14.333333333333336"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/> @@ -403,7 +403,7 @@ <constraint firstAttribute="height" constant="1" id="KEI-dt-Lcc"/> </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="EPl-lk-9fQ"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="活动费用" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EPl-lk-9fQ"> <rect key="frame" x="14" y="15" width="365" height="21"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/> <nil key="textColor"/> @@ -546,7 +546,7 @@ <constraint firstAttribute="height" constant="1" id="wae-YQ-vQ7"/> </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="yt1-6p-Qba"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="活动简介" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yt1-6p-Qba"> <rect key="frame" x="14" y="15" width="365" height="61"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/> <nil key="textColor"/> WanPai/Root/Activity/VC/ActivitySignupDetailVC.xib
@@ -289,8 +289,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="NB2-bd-teu"> <rect key="frame" x="22" y="6.0000000000000009" width="77.666666666666671" height="14.333333333333336"/> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="活动地址" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NB2-bd-teu"> <rect key="frame" x="22.000000000000004" y="6.0000000000000009" width="49.333333333333343" height="14.333333333333336"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -340,7 +340,7 @@ </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="S74-lc-MEg"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="活动门店" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="S74-lc-MEg"> <rect key="frame" x="22.000000000000004" y="6.0000000000000009" width="49.333333333333343" height="14.333333333333336"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/> @@ -393,7 +393,7 @@ <constraint firstAttribute="height" constant="1" id="Wv2-vJ-x4Q"/> </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="vvQ-IW-De4"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="活动人员" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vvQ-IW-De4"> <rect key="frame" x="14" y="15" width="65.333333333333329" height="29"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/> <nil key="textColor"/> @@ -437,7 +437,7 @@ <constraint firstAttribute="height" constant="1" id="bng-7M-THG"/> </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="kAL-8h-2oA"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="活动费用" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kAL-8h-2oA"> <rect key="frame" x="14" y="15" width="365" height="64"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/> <nil key="textColor"/> @@ -491,7 +491,7 @@ <constraint firstAttribute="height" constant="1" id="RKP-mR-awy"/> </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="ieh-s0-lkb"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="活动简介" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ieh-s0-lkb"> <rect key="frame" x="14" y="15" width="365" height="61"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/> <nil key="textColor"/> WanPai/Root/Activity/View/StoresInfoView.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"/> @@ -19,7 +19,7 @@ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YPc-hT-wLG"> <rect key="frame" x="14" y="242.66666666666666" width="365" height="391.66666666666674"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请确认报名门店" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OBY-uG-jKE"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请确认预约门店" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OBY-uG-jKE"> <rect key="frame" x="125.33333333333334" y="17.000000000000028" width="114.33333333333334" height="19.333333333333329"/> <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"/> @@ -182,7 +182,7 @@ <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </systemColor> <systemColor name="systemGray6Color"> <color red="0.94901960780000005" green="0.94901960780000005" blue="0.96862745100000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </systemColor> </resources> </document> WanPai/Root/Course/TCell/CourseTCell.swift
@@ -35,7 +35,7 @@ switch courseItemModel.payType { case .cash,.cashCoin: //显示原价 label_originPrice.isHidden = courseItemModel.originalPrice == 0 label_originPrice.isHidden = (courseItemModel.originalPrice == 0 || courseItemModel.originalPrice == courseItemModel.paymentPrice) label_originPrice.attributedText = AttributedStringbuilder.build().add(string: courseItemModel.originalPrice.currency() , withFont: UIFont.systemFont(ofSize: 14, weight: .semibold), withColor: UIColor(hexStr: "#C6C6C6")).delLine(color: UIColor(hexStr: "#C6C6C6")).mutableAttributedString if UserInfoModel.get()?.isVip == 1{ @@ -44,22 +44,34 @@ //默认展示VIP价格【会员】 label_price.text = courseItemModel.vipPrice.currency() // 会员价没有优惠 if courseItemModel.paymentPrice == 0 && courseItemModel.vipPrice != 0{ label_price.text = courseItemModel.vipPrice.currency() }else if courseItemModel.paymentPrice != 0 && courseItemModel.vipPrice == 0{ } // 有优惠价并且VIP价为0 else if courseItemModel.paymentPrice != 0 && courseItemModel.vipPrice == 0{ label_price.text = courseItemModel.paymentPrice.currency() }else{ //有优惠价与会员价 ，取最优价 label_price.text = min(courseItemModel.paymentPrice, courseItemModel.vipPrice).currency() } }else{ //展示会员价 label_vipPrice.text = courseItemModel.vipPrice.currency() //会员价与优惠价相同，隐藏VIP价格 stackView_vipPrice.isHidden = courseItemModel.vipPrice == 0 || courseItemModel.vipPrice == courseItemModel.paymentPrice //有原价没优惠价 if courseItemModel.paymentPrice == 0 && courseItemModel.originalPrice != 0{ label_price.text = courseItemModel.vipPrice.currency() }else if courseItemModel.paymentPrice != 0 && courseItemModel.originalPrice == 0{ } //有优惠价没原价 else if courseItemModel.paymentPrice != 0 && courseItemModel.originalPrice == 0{ label_price.text = courseItemModel.paymentPrice.currency() }else{ } //有优惠价与原价，取最优 else{ label_price.text = min(courseItemModel.paymentPrice, courseItemModel.originalPrice).currency() } } WanPai/Root/Course/TCell/StudentRemarkTCell.swift
@@ -82,10 +82,9 @@ lantern.pageIndex = indexPath.item lantern.reloadCellAtIndex = { context in let lanternCell = context.cell as? CommonSingleImgCCell let lanternCell = context.cell as? LanternImageCell let cell = collectionView.cellForItem(at: IndexPath(item:context.index, section: indexPath.section)) as! CommonSingleImgCCell lanternCell?.img.image = cell.img.image lanternCell?.imageView.image = cell.img.image } //不要使用push lantern.show() WanPai/Root/Course/VC/CourseDetailApplyVC.swift
@@ -85,7 +85,11 @@ cons_tableHei.constant = CGFloat(studentModels.count * 87) tableView.reloadData() changePrice(selectClassIndex) queryCouponInfo {[weak self] () in guard let weakSelf = self else { return } self?.changePrice(weakSelf.selectClassIndex) } let imgs = m.detailDrawing.components(separatedBy: ",") var items = [CommonBannerModel]() @@ -256,6 +260,7 @@ } } //计算价格 private func changePrice(_ index:Int){ if let subM = detailModel?.list[index]{ @@ -274,6 +279,9 @@ label_originPrice.isHidden = true label_vipPrice.isHidden = true //纯玩湃币没有优惠券项 btn_hasCoupon.isHidden = true //玩湃币 label_coin.attributedText = AttributedStringbuilder.build() .add(string: "玩湃币：", withFont: UIFont.systemFont(ofSize: 14, weight: .semibold), withColor: UIColor(hexStr: "#3F3F3F")) @@ -282,8 +290,12 @@ case .cash: label_coin.isHidden = true;fallthrough case .cashCoin: if subM.originalPrice == 0{label_originPrice.isHidden = true} label_originPrice.isHidden = (subM.paymentPrice == subM.originalPrice && subM.paymentPrice != 0 && subM.originalPrice != 0) if subM.originalPrice == 0 || subM.originalPrice == subM.paymentPrice{ label_originPrice.isHidden = true }else{ label_originPrice.isHidden = false } // label_originPrice.isHidden = (subM.paymentPrice == subM.originalPrice && subM.paymentPrice != 0 && subM.originalPrice != 0) //玩湃币 label_coin.attributedText = AttributedStringbuilder.build() @@ -299,8 +311,11 @@ label_vipPrice.isHidden = true if subM.paymentPrice < subM.vipPrice && subM.paymentPrice != 0{ label_price.text = (subM.paymentPrice * studentCount - (selectCouponModel?.favorable ?? 0)).currency() }else if subM.vipPrice != 0{ }else if subM.vipPrice < subM.paymentPrice && subM.vipPrice != 0{ label_price.text = (subM.vipPrice * studentCount - (selectCouponModel?.favorable ?? 0)).currency() }else if subM.vipPrice != 0 && subM.paymentPrice != 0{ let price = min(subM.vipPrice, subM.paymentPrice) label_price.text = (price * studentCount - (selectCouponModel?.favorable ?? 0)).currency() }else{ label_price.text = (subM.paymentPrice * studentCount - (selectCouponModel?.favorable ?? 0)).currency() } @@ -317,10 +332,12 @@ label_price.text = (subM.originalPrice * studentCount - (selectCouponModel?.favorable ?? 0)).currency() }else if subM.originalPrice == 0 && subM.paymentPrice != 0{ label_price.text = (subM.paymentPrice * studentCount - (selectCouponModel?.favorable ?? 0)).currency() }else{ }else if subM.originalPrice != 0 && subM.paymentPrice != 0{ var money = min(subM.originalPrice,subM.paymentPrice) money = money - (selectCouponModel?.favorable ?? 0) label_price.text = (money * studentCount).currency() }else{ label_price.text = (subM.originalPrice * studentCount - (selectCouponModel?.favorable ?? 0)).currency() } } } @@ -331,12 +348,15 @@ label_originPrice.isHidden = true label_vipPrice.isHidden = true } } queryCouponInfo() if label_originPrice.isHidden && label_vipPrice.isHidden && label_coin.isHidden{ label_coin.alpha = 0 } } } private func queryCouponInfo(){ //查询优惠券 private func queryCouponInfo(complete:(()->Void)? = nil){ if let subM = detailModel?.list[selectClassIndex]{ var price:Double? @@ -352,8 +372,18 @@ } Services.queryAvaiableCopons(id: detailModel!.id, price: price!).subscribe(onNext: { [weak self] data in guard let weakSelf = self else { return } self?.btn_hasCoupon.isHidden = (data.data?.count ?? 0) == 0 self?.couponModels = data.data ?? [] //重新获取优惠券，在切换套餐时触发 if let selectCoupon = self?.selectCouponModel{ if !weakSelf.couponModels.contains(where: {$0.id == selectCoupon.id}){ weakSelf.selectCouponModel = nil weakSelf.btn_couponInfo.setTitle("去选择", for: .normal) } } complete?() }).disposed(by: disposeBag) } } @@ -369,7 +399,9 @@ func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { selectClassIndex = indexPath.row collectionView.reloadData() changePrice(selectClassIndex) queryCouponInfo {[weak self] () in self?.changePrice(indexPath.row) } } }
@@ -444,33 +444,33 @@ <nil key="highlightedColor"/> </label> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="8n8-uF-nCb"> <rect key="frame" x="52.666666666666657" y="10" width="57.333333333333343" height="55"/> <rect key="frame" x="52.666666666666657" y="37.666666666666629" width="100" height="0.0"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="会员价：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hAD-m3-5Ns"> <rect key="frame" x="0.0" y="0.0" width="57.333333333333336" height="17"/> <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="会员价：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hAD-m3-5Ns"> <rect key="frame" x="0.0" y="0.0" width="57.333333333333336" height="0.0"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/> <color key="textColor" red="0.2470588235" green="0.2470588235" blue="0.2470588235" alpha="1" 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="55J-SL-KdW"> <rect key="frame" x="0.0" y="19" width="57.333333333333336" height="17"/> <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="会员价：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="55J-SL-KdW"> <rect key="frame" x="0.0" y="0.0" width="57.333333333333336" height="0.0"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/> <color key="textColor" red="0.2470588235" green="0.2470588235" blue="0.2470588235" alpha="1" 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="AuS-Gc-geQ"> <rect key="frame" x="0.0" y="38" width="57.333333333333336" height="17"/> <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="玩湃币：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AuS-Gc-geQ"> <rect key="frame" x="0.0" y="0.0" width="57.333333333333336" height="0.0"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/> <color key="textColor" red="0.2470588235" green="0.2470588235" blue="0.2470588235" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> </subviews> <constraints> <constraint firstAttribute="width" relation="lessThanOrEqual" constant="140" id="4uc-RX-08Q"/> <constraint firstAttribute="width" relation="lessThanOrEqual" constant="100" id="4uc-RX-08Q"/> </constraints> </stackView> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Dbs-38-o1O"> <rect key="frame" x="131" y="17.666666666666629" width="248" height="40"/> <rect key="frame" x="173.66666666666663" y="17.666666666666629" width="205.33333333333337" height="40"/> <color key="backgroundColor" name="FE6E0D"/> <constraints> <constraint firstAttribute="height" constant="40" id="bwe-LL-VPf"/> WanPai/Root/Course/VC/CourseDetailVC.swift
@@ -49,7 +49,6 @@ label_courseType.text = m.type.strTitle label_courseType.isHidden = m.type == .none view_vaildTime.isHidden = m.type == .normal // label_price.isHidden = (m.list.first?.paymentPrice ?? 0) == 0 let w = String.jq_getWidth(text: m.type.strTitle, height: 25, font: 14) label_courseType.jq_cornerPartWithNib(byRoundingCorners: [.topLeft,.bottomLeft], radii: 8, size: CGSize(width: w, height: 25)) @@ -83,8 +82,11 @@ case .cash: label_coin.isHidden = true;fallthrough case .cashCoin: if subM.originalPrice == 0{label_originPrice.isHidden = true} label_originPrice.isHidden = (subM.paymentPrice == subM.originalPrice && subM.paymentPrice != 0 && subM.originalPrice != 0) if subM.originalPrice == 0 || subM.originalPrice == subM.paymentPrice{ label_originPrice.isHidden = true }else{ label_originPrice.isHidden = false } //玩湃币 label_coin.attributedText = AttributedStringbuilder.build() .add(string: "玩湃币：", withFont: UIFont.systemFont(ofSize: 14, weight: .semibold), withColor: UIColor(hexStr: "#3F3F3F")) @@ -97,10 +99,16 @@ if UserInfoModel.get()?.isVip == 1{ //会员 label_vipPrice.isHidden = true //优惠价比会员价更优惠 if subM.paymentPrice < subM.vipPrice && subM.paymentPrice != 0{ label_price.text = subM.paymentPrice.currency() }else if subM.vipPrice < subM.paymentPrice && subM.vipPrice != 0{ } //会员价比优惠价更优惠 else if subM.vipPrice < subM.paymentPrice && subM.vipPrice != 0{ label_price.text = subM.vipPrice.currency() }else if subM.vipPrice != 0 && subM.paymentPrice != 0{ //会员价和优惠价一样 label_price.text = min(subM.vipPrice,subM.paymentPrice).currency() }else{ label_price.text = subM.paymentPrice.currency() } @@ -117,8 +125,10 @@ label_price.text = subM.originalPrice.currency() }else if subM.originalPrice == 0 && subM.paymentPrice != 0{ label_price.text = subM.paymentPrice.currency() }else{ }else if subM.originalPrice != 0 && subM.paymentPrice != 0{ label_price.text = min(subM.originalPrice,subM.paymentPrice).currency() }else{ label_price.text = subM.originalPrice.currency() } } } @@ -127,9 +137,8 @@ if m.type == .experience{ label_price.text = (m.list.first?.paymentPrice ?? 0).currency() label_vaildTime.text = "购买当天有效" label_originPrice.alpha = 0 label_vipPrice.alpha = 0 view_listen.alpha = 0 label_originPrice.isHidden = true label_vipPrice.isHidden = true view_listen.isHidden = true label_price.isHidden = (m.list.first?.paymentPrice ?? 0) == 0 } @@ -139,6 +148,10 @@ view_handle.isHidden = true cons_handleHei.constant = 0 } if label_originPrice.isHidden && label_vipPrice.isHidden && label_coin.isHidden{ label_coin.alpha = 0 } } } } WanPai/Root/Course/VC/CourseDetailVC.xib
@@ -258,33 +258,33 @@ <nil key="highlightedColor"/> </label> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="AaO-wm-Phu"> <rect key="frame" x="52.666666666666657" y="10" width="57.333333333333343" height="55"/> <rect key="frame" x="52.666666666666657" y="37.666666666666629" width="100" height="0.0"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="原价：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pXk-ET-NAX"> <rect key="frame" x="0.0" y="0.0" width="57.333333333333336" height="17"/> <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="原价：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pXk-ET-NAX"> <rect key="frame" x="0.0" y="0.0" width="57.333333333333336" height="0.0"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/> <color key="textColor" red="0.24705882352941178" green="0.24705882352941178" blue="0.24705882352941178" alpha="1" 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="Dqe-kc-hu1"> <rect key="frame" x="0.0" y="19" width="57.333333333333336" height="17"/> <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="会员价：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dqe-kc-hu1"> <rect key="frame" x="0.0" y="0.0" width="57.333333333333336" height="0.0"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/> <color key="textColor" red="0.2470588235" green="0.2470588235" blue="0.2470588235" alpha="1" 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="ldz-Xc-RZY"> <rect key="frame" x="0.0" y="38" width="57.333333333333336" height="17"/> <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="玩湃币：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ldz-Xc-RZY"> <rect key="frame" x="0.0" y="0.0" width="57.333333333333336" height="0.0"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/> <color key="textColor" red="0.2470588235" green="0.2470588235" blue="0.2470588235" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> </subviews> <constraints> <constraint firstAttribute="width" relation="lessThanOrEqual" constant="140" id="zoQ-0l-GPy"/> <constraint firstAttribute="width" relation="lessThanOrEqual" constant="100" id="zoQ-0l-GPy"/> </constraints> </stackView> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xz5-Ol-6OL"> <rect key="frame" x="131" y="17.666666666666629" width="248" height="40"/> <rect key="frame" x="173.66666666666663" y="17.666666666666629" width="205.33333333333337" height="40"/> <color key="backgroundColor" name="FE6E0D"/> <constraints> <constraint firstAttribute="height" constant="40" id="Sr1-FR-ZcT"/> WanPai/Root/Course/VC/CourseListVC.swift
@@ -187,6 +187,12 @@ let sortType = sender.isSelected ? SortType.desc:SortType.asc viewModel.salesRanking.accept(sortType) sender.setImage(viewModel.salesRanking.value?.img, for: .normal) //复原距离 viewModel.distanceSort.accept(nil) btn_distance.isSelected = false viewModel.beginRefresh() } @@ -196,6 +202,12 @@ let sortType = sender.isSelected ? SortType.desc:SortType.asc viewModel.distanceSort.accept(sortType) sender.setImage(viewModel.distanceSort.value?.img, for: .normal) //复原销量 viewModel.salesRanking.accept(nil) btn_sales.isSelected = false viewModel.beginRefresh() }
@@ -61,6 +61,7 @@ override func viewDidLoad() { super.viewDidLoad() title = "智慧球场" }
@@ -206,7 +206,23 @@ } @IBAction func scanAction(_ sender: UIButton) { let codeVC = CommonScanQRCodeVC { str, status in let codeVC = CommonScanQRCodeVC {[weak self] text, status in if status{ if let model = QRCodeModel.deserialize(from: text){ if model.scan_type == .games{ let gamesListVC = GamesListVC(model: model) self?.push(vc: gamesListVC) }else if model.scan_type == .yard{ let vc = YardDetailVC(id: model.id!) self?.push(vc: vc) }else if model.scan_type == .course{ let vc = CourseDetailVC(id: model.id!) self?.push(vc: vc) } }else{ alertError(msg: "识别失败") } } } push(vc: codeVC) WanPai/Root/Login/VC/LoginVC.swift
@@ -153,8 +153,16 @@ if let token = data.data{ UserViewModel.saveToken(token) Services.userDetails().subscribe(onNext: {data in if let m = data.data{m.save()} app.registerAndLoginSuccess() if let m = data.data{ //需要修改密码 if m.needChange == 1{ let vc = LoginRegOrForgotVC(type: .updatePwd) self?.push(vc: vc) }else{ m.save() app.registerAndLoginSuccess() } } }) { error in }.disposed(by: weakSelf.disposeBag) WanPai/Root/Other/CCell/CouponCCell.swift
@@ -41,7 +41,7 @@ case .none: label_fullMinus.isHidden = true } label_vaildTime.text = String(format: "有效期至%@", courseCouponModel.timePeriod) label_vaildTime.text = String(format: "有效期%@", courseCouponModel.timePeriod) } } } WanPai/Root/Other/VC/PaymentResultVC.swift
@@ -22,6 +22,7 @@ case yard //场地预约 case games //游戏 case exchange //替换 case recharge //充值 } @@ -69,6 +70,22 @@ } switch objType{ case .recharge: btn_backHome.isHidden = true switch result { case .success: label_content.text = "充值成功！" self.btn_back.setTitle("返回首页", for: .normal) self.btn_again.setTitle("查看详情", for: .normal) NotificationCenter.default.post(name: UpdateWelfare_Noti, object: nil) case .fail(let string, _): self.btn_back.setTitle("返回", for: .normal) self.btn_again.setTitle("再次支付", for: .normal) label_content.text = string case .none:break } case .member: btn_again.isHidden = result == .success btn_back.isHidden = result == .success @@ -226,9 +243,16 @@ let vc = ActivitySignupListVC() jumpAndRemoveSelfVC(vc) case "再次支付": navigationController?.popViewController(animated: true, {[weak self] in self?.againClouse?() }) if objType == .courseApply{ navigationController?.popViewController(animated: true, {[weak self] in self?.againClouse?() }) } if objType == .recharge{ navigationController?.popViewController() } case "去充值": let vc = RechargeCenterVC() jumpAndRemoveSelfVC(vc) @@ -238,14 +262,19 @@ }) case "查看详情": // guard let info = otherInfo else {return} // let id = info["id"] as! Int // let type = ExchangeType(rawValue: info["goodsType"] as! Int) // let vc = WelfareExchangeRecordDetailVC(id: id, goodsType: type!) let vc = WelfareExchangeRecordListVC(pageIndex: 1) jumpAndRemoveSelfVC(vc) if objType == .exchange{ let vc = WelfareExchangeRecordListVC(pageIndex: 1) jumpAndRemoveSelfVC(vc) } if objType == .recharge{ for (_,vc) in navigationController!.viewControllers.enumerated(){ if vc is RechargeRecordVC{ navigationController?.popToViewController(vc, animated: true) break } } } default:break } } WanPai/Root/Welfare/TCell/BillInfoTCell.swift
@@ -15,7 +15,7 @@ label_title.text = billingModel.consumeName label_datetime.text = billingModel.consumeTime label_price.text = billingModel.consumeAmount.currency() if billingModel.detailsType == .positive{ if billingModel.type == .positive{ label_price.text = billingModel.consumeAmount.jq_formatFloat label_price.textColor = UIColor(hexStr: "#FD2A02") }else{ WanPai/Root/Welfare/VC/RechargeCenterVC.swift
@@ -59,7 +59,7 @@ weakSelf.items.append(RechargeItem(coin: v.wpGold, money: v.amount)) } let h = ceil(Double(weakSelf.items.count) / 3.0) * weakSelf.cellH + (floor(Double(weakSelf.items.count) / 3.0) - 1) * 21.0 let h = ceil(Double(weakSelf.items.count) / 3.0) * weakSelf.cellH + (floor(Double(weakSelf.items.count) / 3.0)) * 21.0 weakSelf.cons_collectHei.constant = h weakSelf.collectionView.reloadData() }).disposed(by: disposeBag) @@ -112,7 +112,7 @@ YYPaymentManager.shared.sendPaymentRequest(YYAlipayRequest(orderString: m.orderString)) {[weak self] result in switch result { case .success: let vc = PaymentResultVC(result: .success, objType: .activityApply) let vc = PaymentResultVC(result: .success, objType: .recharge) self?.push(vc: vc) case .cancel: alert(msg: "交易已取消") WanPai/Root/Welfare/VC/RechargeRecordVC.swift
@@ -80,6 +80,19 @@ viewModel.configure(tableView) } override func setRx() { NotificationCenter.default.rx.notification(UpdateWelfare_Noti).take(until: self.rx.deallocated).subscribe(onNext: {[weak self] noti in guard let weakSelf = self else { return } Services.benefitHome().subscribe(onNext: {[weak self] data in if let model = data.data{ self?.viewModel.coin.accept(model.wpCoin) } }) { error in }.disposed(by: weakSelf.disposeBag) }).disposed(by: disposeBag) } override func viewDidLayoutSubviews() { super.viewDidLayoutSubviews() let colors = [UIColor(hexStr: "#FD8C02").cgColor, @@ -125,7 +138,7 @@ cell.billingModel = model if viewModel.subType.value == .coin{ if model.detailsType == .positive{ if model.type == .positive{ cell.label_price.textColor = UIColor(hexStr: "#FD7302") }else{ cell.label_price.textColor = UIColor(hexStr: "#FD2A02") WanPai/Root/Welfare/VC/WelfareExchangeRecordDetailVC.swift
@@ -79,7 +79,7 @@ case .coupon:break case .course: self?.view_duetime.isHidden = true self?.view_course.isHidden = true self?.view_course.isHidden = false case .goods: self?.view_course.isHidden = true case .ticket: @@ -90,7 +90,8 @@ self?.view_verifiStore.isHidden = model.writeOffName.isEmpty self?.view_verifitime.isHidden = model.writeOffTime.isEmpty self?.view_ordertime.isHidden = model.orderTime.isEmpty self?.view_assignStore.isHidden = model.exchangeAddrType != .store self?.view_assignStore.isHidden = model.belongs.isEmpty || model.useType == .used if model.contents.isEmpty{ self?.webView.loadHTMLString("暂无说明".jq_wrapHtml(), baseURL: nil) }else{ WanPai/Root/Welfare/VC/WelfareVC.swift
@@ -89,10 +89,6 @@ self?.btn_coupon.sd_setImage(with: URL(string: coupon), for: .normal, placeholderImage: nil,context: nil) } // if let onlineShop = model.image?.onlineShop{ // self?.btn_shoppping.sd_setImage(with: URL(string: onlineShop), for: .normal, placeholderImage: nil, context: nil) // } if let weeksBenefit = model.image?.weeksBenefit{ self?.btn_weekly.sd_setImage(with: URL(string: weeksBenefit), for: .normal, placeholderImage: nil, context: nil) } @@ -100,10 +96,6 @@ if let todayFree = model.image?.todayFree{ self?.btn_todayFree.sd_setImage(with: URL(string: todayFree), for: .normal, placeholderImage: nil, context: nil) } // if model.commodities.count > 5{ // self?.autoScroll() // } } }) { error in
@@ -60,18 +60,6 @@ weakSelf.label_coin.isHidden = model.wanpaiGold == 0 weakSelf.label_originPrice.isHidden = model.costPrice == 0 // if model.discountPrice > 0{ // weakSelf.label_price.text = model.discountPrice.currency() // weakSelf.label_originPrice.attributedText = AttributedStringbuilder.build().add(string: model.costPrice.currency(), withFont: UIFont.systemFont(ofSize: 16, weight: .semibold), withColor: UIColor(hexStr: "#C6C6C6")) // .delLine(color: UIColor(hexStr: "#C6C6C6")).mutableAttributedString // }else{ // weakSelf.label_price.text = model.costPrice.currency() // } // // weakSelf.label_vip.attributedText = AttributedStringbuilder.build().add(string: "会员价：", withFont: UIFont.systemFont(ofSize: 14, weight: .semibold), withColor: UIColor(hexStr: "#3F3F3F")).add(string: model.vipPrice.currency(), withFont: UIFont.systemFont(ofSize: 14, weight: .semibold), withColor: UIColor(hexStr: "#F21313")).mutableAttributedString // // weakSelf.label_coin.attributedText = AttributedStringbuilder.build().add(string: "玩湃币：", withFont: UIFont.systemFont(ofSize: 14, weight: .semibold), withColor: UIColor(hexStr: "#3F3F3F")).add(string: "\(model.wanpaiGold)币", withFont: UIFont.systemFont(ofSize: 14, weight: .semibold), withColor: UIColor(hexStr: "#F21313")).mutableAttributedString weakSelf.img_intro.sd_setImage(with: URL(string: model.detailDrawing)) {[weak self] image, error, type, url in if let img = image{ self?.img_intro.image = img @@ -86,16 +74,6 @@ items.append(CommonBannerModel(index: index,resource: img,mediaType: .imageUrl)) } self?.view_banner.setItems(items: items) // weakSelf.img_intro2.sd_setImage(with: URL(string: model.introduceDrawing)) {[weak self] image, error, type, url in // if let img = image{ // self?.img_intro2.image = img // let radio = img.size.width / img.size.height // self?.cons_imgIntro2Hei.constant = JQ_ScreenW / radio // } // } } }).disposed(by: disposeBag)
@@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <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"/> <device id="retina5_9" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/> @@ -39,17 +39,17 @@ </placeholder> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> <view clearsContextBeforeDrawing="NO" contentMode="scaleToFill" id="i5M-Pr-FkT"> <rect key="frame" x="0.0" y="0.0" width="393" height="852"/> <rect key="frame" x="0.0" y="0.0" width="375" height="812"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cvy-7v-Fan"> <rect key="frame" x="0.0" y="59" width="393" height="759"/> <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cvy-7v-Fan"> <rect key="frame" x="0.0" y="50" width="375" height="728"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xpg-cx-Jxe"> <rect key="frame" x="0.0" y="0.0" width="393" height="90.666666666666671"/> <rect key="frame" x="0.0" y="0.0" width="375" height="89"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="02s-YH-Vmf"> <rect key="frame" x="14" y="14.000000000000002" width="260" height="21.666666666666671"/> <rect key="frame" x="14" y="13.999999999999998" width="260" height="18.333333333333329"/> <constraints> <constraint firstAttribute="width" constant="260" id="59w-Wk-ord"/> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="18" id="lX0-Aw-6vq"/> @@ -59,10 +59,10 @@ <nil key="highlightedColor"/> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Dtc-xv-Gmh"> <rect key="frame" x="282" y="15.333333333333329" width="40" height="19"/> <rect key="frame" x="282" y="13.666666666666664" width="40" height="19"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aO5-bJ-0tv"> <rect key="frame" x="5" y="2" width="30" height="15"/> <rect key="frame" x="5" y="2.0000000000000071" width="30" height="15"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="10"/> <color key="textColor" red="0.99215686270000003" green="0.45098039220000002" blue="0.0078431372550000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -85,7 +85,7 @@ </userDefinedRuntimeAttributes> </view> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hZb-3a-H8Y"> <rect key="frame" x="338" y="20.333333333333329" width="50" height="50"/> <rect key="frame" x="320" y="19.666666666666671" width="50" height="50"/> <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> <state key="normal" image="btn_call"/> <connections> @@ -93,14 +93,14 @@ </connections> </button> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_local_mini_gray" translatesAutoresizingMaskIntoConstraints="NO" id="n3f-YT-qUk"> <rect key="frame" x="16" y="50.333333333333329" width="11" height="16"/> <rect key="frame" x="16" y="48.666666666666671" width="11" height="16"/> <constraints> <constraint firstAttribute="height" constant="16" id="gCS-Vo-zvV"/> <constraint firstAttribute="width" constant="11" id="wtm-Cg-Teu"/> </constraints> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JkO-ZN-GKx"> <rect key="frame" x="34" y="51.333333333333329" width="299" height="14.333333333333329"/> <rect key="frame" x="34" y="49.666666666666671" width="281" height="14.333333333333329"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -111,7 +111,7 @@ <constraint firstItem="Dtc-xv-Gmh" firstAttribute="centerY" secondItem="02s-YH-Vmf" secondAttribute="centerY" id="ADt-Sz-r5Z"/> <constraint firstAttribute="trailing" secondItem="hZb-3a-H8Y" secondAttribute="trailing" constant="5" id="HQa-LT-Odn"/> <constraint firstAttribute="trailing" secondItem="JkO-ZN-GKx" secondAttribute="trailing" constant="60" id="IFR-NL-cP1"/> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="89" id="Iex-jg-RFk"/> <constraint firstAttribute="height" constant="89" id="Iex-jg-RFk"/> <constraint firstItem="n3f-YT-qUk" firstAttribute="top" secondItem="Dtc-xv-Gmh" secondAttribute="bottom" constant="16" id="JSh-wn-KeP"/> <constraint firstItem="hZb-3a-H8Y" firstAttribute="centerY" secondItem="xpg-cx-Jxe" secondAttribute="centerY" id="LLh-b4-keS"/> <constraint firstItem="n3f-YT-qUk" firstAttribute="leading" secondItem="xpg-cx-Jxe" secondAttribute="leading" constant="16" id="MgX-Yl-8No"/> @@ -138,19 +138,19 @@ </userDefinedRuntimeAttributes> </view> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="APi-0y-Lwg"> <rect key="frame" x="0.0" y="100.66666666666669" width="393" height="601.33333333333326"/> <rect key="frame" x="0.0" y="99" width="375" height="615.66666666666663"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7th-09-VZ3"> <rect key="frame" x="0.0" y="0.0" width="393" height="36"/> <rect key="frame" x="0.0" y="0.0" width="375" height="36"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="场地名称：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FTZ-VW-8Y4"> <rect key="frame" x="14" y="9.3333333333333428" width="71.666666666666671" height="17"/> <rect key="frame" x="14" y="9.6666666666666572" 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.81000000000000005" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7h1-Dw-eHi"> <rect key="frame" x="365.66666666666669" y="9.3333333333333428" width="13.333333333333314" height="17"/> <rect key="frame" x="347.66666666666669" y="9.6666666666666572" 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.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -165,16 +165,16 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ngy-Jf-hpg"> <rect key="frame" x="0.0" y="36" width="393" height="36"/> <rect key="frame" x="0.0" y="36" width="375" height="36"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="预约类型：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="n2c-5u-5u3"> <rect key="frame" x="14" y="9.3333333333333428" width="71.666666666666671" height="17"/> <rect key="frame" x="14" y="9.6666666666666572" 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.81000000000000005" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Tax-DA-fLa"> <rect key="frame" x="365.66666666666669" y="9.3333333333333428" width="13.333333333333314" height="17"/> <rect key="frame" x="347.66666666666669" y="9.6666666666666572" 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.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -189,16 +189,16 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nqL-6S-ZE7"> <rect key="frame" x="0.0" y="72" width="393" height="36"/> <rect key="frame" x="0.0" y="72" width="375" height="36"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="半场名称：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MDR-Bl-xpc"> <rect key="frame" x="14" y="9.3333333333333428" width="71.666666666666671" height="17"/> <rect key="frame" x="14" y="9.6666666666666572" 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.81000000000000005" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yc7-sN-J8Y"> <rect key="frame" x="365.66666666666669" y="9.3333333333333428" width="13.333333333333314" height="17"/> <rect key="frame" x="347.66666666666669" y="9.6666666666666572" 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.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -213,16 +213,16 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mCF-Zv-Uz7"> <rect key="frame" x="0.0" y="108.00000000000003" width="393" height="36"/> <rect key="frame" x="0.0" y="108" width="375" height="36"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="预约人：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WEa-Fe-jjL"> <rect key="frame" x="14.000000000000004" y="9.3333333333333144" width="57.333333333333343" height="17"/> <rect key="frame" x="14.000000000000004" y="9.6666666666666856" 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.81000000000000005" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TjH-kW-XLP"> <rect key="frame" x="365.66666666666669" y="9.3333333333333144" width="13.333333333333314" height="17"/> <rect key="frame" x="347.66666666666669" y="9.6666666666666856" 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.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -237,16 +237,16 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gZ2-Hg-Lze"> <rect key="frame" x="0.0" y="144.00000000000003" width="393" height="36"/> <rect key="frame" x="0.0" y="144" width="375" height="36"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="联系方式：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tZJ-w7-Rk5"> <rect key="frame" x="14" y="9.3333333333333144" width="71.666666666666671" height="17"/> <rect key="frame" x="14" y="9.6666666666666856" 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.81000000000000005" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UEJ-0E-4LG"> <rect key="frame" x="365.66666666666669" y="9.3333333333333144" width="13.333333333333314" height="17"/> <rect key="frame" x="347.66666666666669" y="9.6666666666666856" 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.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -261,16 +261,16 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5uD-Hq-hdB"> <rect key="frame" x="0.0" y="180.00000000000003" width="393" height="36"/> <rect key="frame" x="0.0" y="180" width="375" height="36"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="支付价格：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BkC-g1-ALf"> <rect key="frame" x="14" y="9.3333333333333144" width="71.666666666666671" height="17"/> <rect key="frame" x="14" y="9.6666666666666856" 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.81000000000000005" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bhs-Kk-wqY"> <rect key="frame" x="365.66666666666669" y="9.3333333333333144" width="13.333333333333314" height="17"/> <rect key="frame" x="347.66666666666669" y="9.6666666666666856" 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.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -285,16 +285,16 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1um-i0-ebp"> <rect key="frame" x="0.0" y="216.00000000000003" width="393" height="36"/> <rect key="frame" x="0.0" y="216" width="375" height="36"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="预约时间：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LdA-R6-bgF"> <rect key="frame" x="14" y="9.3333333333333144" width="71.666666666666671" height="17"/> <rect key="frame" x="14" y="9.6666666666666856" 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.81000000000000005" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aED-6E-ahn"> <rect key="frame" x="365.66666666666669" y="9.3333333333333144" width="13.333333333333314" height="17"/> <rect key="frame" x="347.66666666666669" y="9.6666666666666856" 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.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -309,16 +309,16 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="icd-To-U0G"> <rect key="frame" x="0.0" y="252" width="393" height="36"/> <rect key="frame" x="0.0" y="252" width="375" height="36"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="支付时间：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="A31-ts-d37"> <rect key="frame" x="14" y="9.3333333333333144" width="71.666666666666671" height="17"/> <rect key="frame" x="14" y="9.6666666666666856" 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.81000000000000005" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nvO-eE-GmQ"> <rect key="frame" x="365.66666666666669" y="9.3333333333333144" width="13.333333333333314" height="17"/> <rect key="frame" x="347.66666666666669" y="9.6666666666666856" 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.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -333,16 +333,16 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QNO-fd-DI5"> <rect key="frame" x="0.0" y="288" width="393" height="36"/> <rect key="frame" x="0.0" y="288" width="375" height="36"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="使用状态：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mZW-ep-qju"> <rect key="frame" x="14" y="9.3333333333333144" width="71.666666666666671" height="17"/> <rect key="frame" x="14" y="9.6666666666666856" 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.81000000000000005" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sQU-vw-kAC"> <rect key="frame" x="365.66666666666669" y="9.3333333333333144" width="13.333333333333314" height="17"/> <rect key="frame" x="347.66666666666669" y="9.6666666666666856" 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.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -357,30 +357,33 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1hl-Kq-mul"> <rect key="frame" x="0.0" y="324" width="393" height="277.33333333333326"/> <rect key="frame" x="0.0" y="324" width="375" height="291.66666666666674"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="二维码：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Aqc-YZ-cGf"> <rect key="frame" x="14" y="9.6666666666666288" width="365" height="49"/> <rect key="frame" x="14" y="9.6666666666666856" width="347" height="49"/> <constraints> <constraint firstAttribute="height" constant="49" id="6Lf-Xz-nRs"/> </constraints> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.81000000000000005" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="wXP-uX-2IS"> <rect key="frame" x="130.66666666666666" y="67.666666666666686" width="131.99999999999997" height="132"/> <rect key="frame" x="121.66666666666669" y="67.666666666666629" width="132" height="132"/> <constraints> <constraint firstAttribute="width" constant="132" id="MbL-wn-fcX"/> <constraint firstAttribute="height" constant="132" id="gNu-15-mek"/> </constraints> </imageView> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_warning" translatesAutoresizingMaskIntoConstraints="NO" id="rsN-wi-9X2"> <rect key="frame" x="9" y="231.66666666666669" width="24" height="24"/> <rect key="frame" x="9" y="231.66666666666663" width="24" height="24"/> <constraints> <constraint firstAttribute="height" constant="24" id="kv8-0l-CIL"/> <constraint firstAttribute="width" constant="24" id="osm-5P-MFM"/> </constraints> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="headTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bxh-OX-GPj"> <rect key="frame" x="36" y="231.66666666666669" width="354" height="28.666666666666686"/> <rect key="frame" x="36" y="231.66666666666663" width="336" height="43"/> <string key="text">您已经预约成功，请在预约时段扫码此二维码入场。您可以在“预 约场地-已预约场地-详情”页面找到此二维码。</string> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/> @@ -388,7 +391,7 @@ <nil key="highlightedColor"/> </label> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="cX9-gN-ngz"> <rect key="frame" x="140" y="206.66666666666669" width="113" height="18"/> <rect key="frame" x="131" y="206.66666666666663" width="113" height="18"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="距可入场时间：--" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CBH-nG-pZC"> <rect key="frame" x="0.0" y="0.0" width="113" height="18"/> @@ -446,14 +449,15 @@ <constraint firstItem="APi-0y-Lwg" firstAttribute="top" secondItem="xpg-cx-Jxe" secondAttribute="bottom" constant="10" id="XDw-Zp-pOd"/> <constraint firstAttribute="trailing" secondItem="xpg-cx-Jxe" secondAttribute="trailing" id="alm-nO-JSD"/> <constraint firstItem="APi-0y-Lwg" firstAttribute="leading" secondItem="cvy-7v-Fan" secondAttribute="leading" id="as0-Xr-Ckg"/> <constraint firstAttribute="bottom" secondItem="APi-0y-Lwg" secondAttribute="bottom" constant="60" id="fnO-lF-7la"/> <constraint firstItem="xpg-cx-Jxe" firstAttribute="leading" secondItem="cvy-7v-Fan" secondAttribute="leading" id="zQP-Ij-H58"/> </constraints> </scrollView> <stackView opaque="NO" contentMode="scaleToFill" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="w3D-k7-De5"> <rect key="frame" x="41" y="755" width="311" height="40"/> <rect key="frame" x="41" y="715" width="293" height="40"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0fI-TF-CeW"> <rect key="frame" x="0.0" y="0.0" width="144" height="40"/> <rect key="frame" x="0.0" y="0.0" width="129" height="40"/> <color key="backgroundColor" red="0.95686274509803915" green="0.26666666666666666" blue="0.26666666666666666" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="width" constant="144" id="fsB-D3-nPL"/> @@ -472,7 +476,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1rP-aH-JyB"> <rect key="frame" x="164" y="0.0" width="147" height="40"/> <rect key="frame" x="149" y="0.0" width="144" height="40"/> <color key="backgroundColor" red="0.99215686274509807" green="0.53333333333333333" blue="0.0078431372549019607" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="width" constant="144" id="H7X-XL-CLs"/> @@ -506,8 +510,9 @@ <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="w3D-k7-De5" secondAttribute="bottom" constant="23" id="dK7-S9-KBv"/> <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="w3D-k7-De5" secondAttribute="trailing" constant="41" id="lrg-OX-0OX"/> <constraint firstItem="cvy-7v-Fan" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="vrv-NA-5Yu"/> <constraint firstAttribute="bottom" secondItem="cvy-7v-Fan" secondAttribute="bottom" id="w91-4G-qqO"/> </constraints> <point key="canvasLocation" x="52.671755725190835" y="20.422535211267608"/> <point key="canvasLocation" x="52" y="20.239880059970016"/> </view> </objects> <resources>
