WanPai.xcodeproj/project.pbxproj
@@ -159,6 +159,7 @@ 13AFABC12A4AE3DC001FEA16 /* StudentRemarkListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13AFABC02A4AE3DC001FEA16 /* StudentRemarkListVC.swift */; }; 13AFABC42A4AE492001FEA16 /* StudentRemarkTCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13AFABC22A4AE492001FEA16 /* StudentRemarkTCell.swift */; }; 13AFABC52A4AE492001FEA16 /* StudentRemarkTCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13AFABC32A4AE492001FEA16 /* StudentRemarkTCell.xib */; }; 13B2DEFC2AE12A7E00FCD31E /* LaunchImageHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13B2DEFB2AE12A7E00FCD31E /* LaunchImageHelper.swift */; }; 13B640C02A54108B00EA33ED /* UploadImgCCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13B640BE2A54108B00EA33ED /* UploadImgCCell.swift */; }; 13B640C12A54108B00EA33ED /* UploadImgCCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B640BF2A54108B00EA33ED /* UploadImgCCell.xib */; }; 13B6BB9D2ABAE000006D0C0E /* SignUpCourseVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13B6BB9B2ABAE000006D0C0E /* SignUpCourseVC.swift */; }; @@ -452,6 +453,7 @@ 13AFABC02A4AE3DC001FEA16 /* StudentRemarkListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StudentRemarkListVC.swift; sourceTree = "<group>"; }; 13AFABC22A4AE492001FEA16 /* StudentRemarkTCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StudentRemarkTCell.swift; sourceTree = "<group>"; }; 13AFABC32A4AE492001FEA16 /* StudentRemarkTCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = StudentRemarkTCell.xib; sourceTree = "<group>"; }; 13B2DEFB2AE12A7E00FCD31E /* LaunchImageHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LaunchImageHelper.swift; sourceTree = "<group>"; }; 13B640BE2A54108B00EA33ED /* UploadImgCCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UploadImgCCell.swift; sourceTree = "<group>"; }; 13B640BF2A54108B00EA33ED /* UploadImgCCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = UploadImgCCell.xib; sourceTree = "<group>"; }; 13B6BB9B2ABAE000006D0C0E /* SignUpCourseVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignUpCourseVC.swift; sourceTree = "<group>"; }; @@ -1137,6 +1139,7 @@ 8DAEB5512A305B2D00814766 /* Fronts.swift */, 8DA51DF62A32BE270085F4BA /* Enums.swift */, 1319386A2AC2EC8300FC63F1 /* WeChatTools.swift */, 13B2DEFB2AE12A7E00FCD31E /* LaunchImageHelper.swift */, ); path = Config; sourceTree = "<group>"; @@ -1670,6 +1673,7 @@ 136E0EE92AB30DD200EDBB8F /* QRPreview.swift in Sources */, 137546432A57F56F001FA77A /* CommonModels.swift in Sources */, 1393B3962A4AD03A00B73072 /* CourseExerciseTCell.swift in Sources */, 13B2DEFC2AE12A7E00FCD31E /* LaunchImageHelper.swift in Sources */, 137546402A57F545001FA77A /* UserModel.swift in Sources */, 13019C7D2A42ADA2004880CD /* CourseInfoVC.swift in Sources */, 138D8B8E2A3FFE36009DCA9E /* YardListVC.swift in Sources */, WanPai/AppDelegate.swift
@@ -9,6 +9,7 @@ import JQTools import Alamofire import AMapFoundationKit import SDWebImage @main class AppDelegate: UIResponder, UIApplicationDelegate { @@ -19,17 +20,20 @@ func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { Services.startNetworkMonitor() // WXApi.startLog(by: .normal) { text in // print("LOGO====>\(text)\n") // } YYPaymentManager.shared.configuredWeChat(appID: WeChatAPPID, universalLink: WechatUniversalLinks) YYPaymentManager.shared.configuredAlipay(appScheme: APPScheme) AMapServices.shared().enableHTTPS = true AMapServices.shared().apiKey = AMapKey // WXApi.checkUniversalLinkReady { step, result in // print("====>\(step.rawValue):\(result.errorInfo)====\(result.suggestion)\n") // // } Services.querySystemImg(type: .launch).subscribe(onNext: {data in if let img = data.data{ SDWebImageDownloader.shared.downloadImage(with: URL(string: img)) { image, _, _, _ in if let img = image{ LaunchImageHelper.changePortraitLaunchImage(img) } } } }).disposed(by: JQ_disposeBag) return true }
@@ -3,7 +3,7 @@ <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="22130"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> <objects> @@ -18,6 +18,10 @@ <subviews> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_notice" translatesAutoresizingMaskIntoConstraints="NO" id="YpM-0L-Tqf"> <rect key="frame" x="16" y="90.666666666666671" width="26" height="32"/> <constraints> <constraint firstAttribute="width" constant="26" id="QcV-e8-vsD"/> <constraint firstAttribute="height" constant="32" id="wT6-6B-Z3q"/> </constraints> </imageView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sab-cX-vOn"> <rect key="frame" x="15" y="131.66666666666666" width="377" height="0.33333333333334281"/> @@ -26,20 +30,24 @@ <constraint firstAttribute="height" constant="0.40000000000000002" id="vy4-JA-JJS"/> </constraints> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="XXX课" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yos-Zb-QtR"> <rect key="frame" x="56" y="97" width="49" height="19.333333333333329"/> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="1000" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yos-Zb-QtR"> <rect key="frame" x="56" y="97" width="14.666666666666671" height="19.333333333333329"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="（剩余：0课时）" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TI1-WT-C7h"> <rect key="frame" x="119" y="97" width="124.33333333333331" height="19.333333333333329"/> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="1000" text="（剩余：0课时）" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TI1-WT-C7h"> <rect key="frame" x="84.666666666666657" y="97" width="278.33333333333337" height="19.333333333333329"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/> <color key="textColor" red="0.93333333333333335" green="0.043137254901960784" blue="0.043137254901960784" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="btn_choose" translatesAutoresizingMaskIntoConstraints="NO" id="xRc-r8-tFC"> <rect key="frame" x="368" y="94" width="25" height="25"/> <constraints> <constraint firstAttribute="height" constant="25" id="ClL-r1-RcH"/> <constraint firstAttribute="width" constant="25" id="HKJ-nO-e8r"/> </constraints> </imageView> </subviews> <constraints> @@ -52,6 +60,7 @@ <constraint firstItem="sab-cX-vOn" firstAttribute="top" secondItem="YpM-0L-Tqf" secondAttribute="bottom" constant="9" id="b6B-rU-AmJ"/> <constraint firstItem="Yos-Zb-QtR" firstAttribute="centerY" secondItem="YpM-0L-Tqf" secondAttribute="centerY" id="h1j-YY-gdz"/> <constraint firstItem="Yos-Zb-QtR" firstAttribute="leading" secondItem="YpM-0L-Tqf" secondAttribute="trailing" constant="14" id="jzD-4N-GO2"/> <constraint firstItem="xRc-r8-tFC" firstAttribute="leading" secondItem="TI1-WT-C7h" secondAttribute="trailing" constant="5" id="q7o-Wh-CMl"/> <constraint firstItem="TI1-WT-C7h" firstAttribute="centerY" secondItem="YpM-0L-Tqf" secondAttribute="centerY" id="vbJ-g2-hOa"/> <constraint firstItem="sab-cX-vOn" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="yDY-jC-yA9"/> </constraints> WanPai/Common/View/AgreentView.swift
@@ -14,16 +14,16 @@ @IBOutlet weak var label_title: UILabel! @IBOutlet weak var view_container: UIView! @IBOutlet weak var webView: WKWebView! // @IBOutlet weak var webView: WKWebView! @IBOutlet weak var bottom_cons: NSLayoutConstraint! @IBOutlet weak var label_content: UILabel! private var type:AgreentType! private var content:String? private let disposeBag = DisposeBag() override func awakeFromNib() { super.awakeFromNib() webView.backgroundColor = .white bottom_cons.constant = -(JQ_ScreenH - JQ_ScreenW * 0.9) bottom_cons.constant = -(JQ_ScreenH - JQ_ScreenW * 0.69) layoutIfNeeded() } @@ -41,15 +41,19 @@ alertView.layoutIfNeeded() } let attributed = AttributedStringbuilder.build() if type != .other && type != .matchStore{ Services.queryProtocol(type,progress: false).subscribe(onNext: { result in if let text = result.data?.jq_wrapHtml(){ alertView.webView.loadHTMLString(text, baseURL: nil) attributed.add(string: text, withFont: UIFont.systemFont(ofSize: 14, weight: .semibold), withColor: UIColor(hexStr: "727272"), lineSpace: 4) } }).disposed(by: alertView.disposeBag) }else{ alertView.webView.loadHTMLString(content?.jq_wrapHtml() ?? "", baseURL: nil) attributed.add(string: content!, withFont: UIFont.systemFont(ofSize: 14, weight: .semibold), withColor: UIColor(hexStr: "727272"), lineSpace: 4) } alertView.label_content.attributedText = attributed.mutableAttributedString alertView.label_content.textAlignment = .center } @@ -59,7 +63,7 @@ } @IBAction func completeAction(_ sender: UIButton) { bottom_cons.constant = -(JQ_ScreenH - JQ_ScreenW * 0.9) bottom_cons.constant = -(JQ_ScreenH - JQ_ScreenW * 0.69) UIView.animate(withDuration: 0.4) { self.layoutIfNeeded() self.alpha = 0 WanPai/Common/View/AgreentView.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="22154" 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="22130"/> <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"/> @@ -16,10 +16,10 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RL2-Pc-fjv"> <rect key="frame" x="0.0" y="498.33333333333326" width="393" height="353.66666666666674"/> <rect key="frame" x="0.0" y="580.66666666666663" width="393" height="271.33333333333337"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="60u-g2-ZcS"> <rect key="frame" x="359" y="18.000000000000057" width="20" height="22"/> <rect key="frame" x="357.66666666666669" y="18" width="21.333333333333314" height="22"/> <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> <state key="normal" image="btn_close"/> <connections> @@ -27,30 +27,28 @@ </connections> </button> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="G2G-hL-VpJ"> <rect key="frame" x="176.33333333333334" y="16.000000000000057" width="40.666666666666657" height="19.333333333333329"/> <rect key="frame" x="176.33333333333334" y="15.999999999999998" width="40.666666666666657" height="19.333333333333329"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/> <nil key="textColor"/> <nil key="highlightedColor"/> </label> <wkWebView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EJM-vb-bxZ"> <rect key="frame" x="0.0" y="56.333333333333314" width="393" height="297.33333333333331"/> <wkWebViewConfiguration key="configuration"> <audiovisualMediaTypes key="mediaTypesRequiringUserActionForPlayback" none="YES"/> <wkPreferences key="preferences"/> </wkWebViewConfiguration> </wkWebView> <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="WwM-c0-8lx"> <rect key="frame" x="20" y="55.333333333333371" width="353" height="17"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/> <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> </subviews> <color key="backgroundColor" systemColor="systemBackgroundColor"/> <constraints> <constraint firstItem="WwM-c0-8lx" firstAttribute="leading" secondItem="RL2-Pc-fjv" secondAttribute="leading" constant="20" id="2I6-TI-Y16"/> <constraint firstAttribute="trailing" secondItem="WwM-c0-8lx" secondAttribute="trailing" constant="20" id="3wR-Q8-bxO"/> <constraint firstItem="G2G-hL-VpJ" firstAttribute="centerX" secondItem="RL2-Pc-fjv" secondAttribute="centerX" id="7sw-Tj-tyj"/> <constraint firstAttribute="width" secondItem="RL2-Pc-fjv" secondAttribute="height" multiplier="1:0.9" id="LAf-wU-ZYv"/> <constraint firstAttribute="bottom" secondItem="EJM-vb-bxZ" secondAttribute="bottom" id="NZi-lM-Pc5"/> <constraint firstAttribute="trailing" secondItem="EJM-vb-bxZ" secondAttribute="trailing" id="TO7-ye-UUb"/> <constraint firstAttribute="width" secondItem="RL2-Pc-fjv" secondAttribute="height" multiplier="1:0.69" id="LAf-wU-ZYv"/> <constraint firstItem="WwM-c0-8lx" firstAttribute="top" secondItem="G2G-hL-VpJ" secondAttribute="bottom" constant="20" id="R4E-SG-VQK"/> <constraint firstAttribute="trailing" secondItem="60u-g2-ZcS" secondAttribute="trailing" constant="14" id="bdC-7d-9G5"/> <constraint firstItem="EJM-vb-bxZ" firstAttribute="top" secondItem="G2G-hL-VpJ" secondAttribute="bottom" constant="21" id="dwh-F7-0vL"/> <constraint firstItem="G2G-hL-VpJ" firstAttribute="top" secondItem="RL2-Pc-fjv" secondAttribute="top" constant="16" id="ftE-Xk-5Qu"/> <constraint firstItem="60u-g2-ZcS" firstAttribute="top" secondItem="RL2-Pc-fjv" secondAttribute="top" constant="18" id="sqJ-gr-MIZ"/> <constraint firstItem="EJM-vb-bxZ" firstAttribute="leading" secondItem="RL2-Pc-fjv" secondAttribute="leading" id="xca-G8-wLv"/> </constraints> </view> </subviews> @@ -63,15 +61,15 @@ </constraints> <connections> <outlet property="bottom_cons" destination="mzT-t7-Ph5" id="s3O-fR-X42"/> <outlet property="label_content" destination="WwM-c0-8lx" id="J6a-VU-XUF"/> <outlet property="label_title" destination="G2G-hL-VpJ" id="B9O-8S-yCu"/> <outlet property="view_container" destination="RL2-Pc-fjv" id="r9b-Cn-uAS"/> <outlet property="webView" destination="EJM-vb-bxZ" id="hZC-uh-Xle"/> </connections> <point key="canvasLocation" x="20.610687022900763" y="20.422535211267608"/> </view> </objects> <resources> <image name="btn_close" width="20" height="20"/> <image name="btn_close" width="21.333333969116211" height="21.333333969116211"/> <systemColor name="systemBackgroundColor"> <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </systemColor> WanPai/Common/View/PaymentCourseView.swift
@@ -71,8 +71,20 @@ self.models = models self.tableView.reloadData() } }) { error in }) { [weak self] error in guard let weakSelf = self else { return } if let er = error as? NetworkRequest.NetRequestError{ switch er { case .Other(_,let string): let vc = PaymentResultVC(result: .fail(string), objType: .yard,handleVC: nil) vc.modalPresentationStyle = .fullScreen JQ_currentViewController().present(vc, animated: true) default: let vc = PaymentResultVC(result: .fail("支付失败"), objType: .yard,handleVC: nil) vc.modalPresentationStyle = .fullScreen JQ_currentViewController().present(vc, animated: true) } } }.disposed(by: disposeBag) }
@@ -3,7 +3,7 @@ <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="22130"/> <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"/> @@ -16,7 +16,7 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CjF-zA-4Hi"> <rect key="frame" x="0.0" y="504" width="393" height="348"/> <rect key="frame" x="0.0" y="491" width="393" height="361"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="所需课时数：0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="28h-Pc-Ao5"> <rect key="frame" x="13.999999999999993" y="28" width="108.33333333333331" height="22"/> @@ -28,7 +28,7 @@ <nil key="highlightedColor"/> </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pkZ-I9-7Ww"> <rect key="frame" x="206.66666666666663" y="240" width="145.33333333333337" height="40"/> <rect key="frame" x="206.66666666666663" y="253" width="145.33333333333337" height="40"/> <color key="backgroundColor" name="FE6E0D"/> <constraints> <constraint firstAttribute="height" constant="40" id="GXY-x6-yjs"/> @@ -46,7 +46,7 @@ </connections> </button> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dGE-gy-H9V"> <rect key="frame" x="41" y="240" width="145.66666666666666" height="40"/> <rect key="frame" x="41" y="253" width="145.66666666666666" height="40"/> <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> <constraints> <constraint firstAttribute="height" constant="40" id="cRG-BH-7sN"/> @@ -84,7 +84,7 @@ <constraint firstItem="dGE-gy-H9V" firstAttribute="leading" secondItem="CjF-zA-4Hi" secondAttribute="leading" constant="41" id="48j-B3-bW1"/> <constraint firstItem="pkZ-I9-7Ww" firstAttribute="width" secondItem="dGE-gy-H9V" secondAttribute="width" id="BdR-IA-LCz"/> <constraint firstItem="BP3-c0-m5T" firstAttribute="top" secondItem="28h-Pc-Ao5" secondAttribute="bottom" id="JkA-Aj-Krf"/> <constraint firstItem="pkZ-I9-7Ww" firstAttribute="top" secondItem="BP3-c0-m5T" secondAttribute="bottom" constant="10" id="UrI-Pz-kuw"/> <constraint firstItem="pkZ-I9-7Ww" firstAttribute="top" secondItem="BP3-c0-m5T" secondAttribute="bottom" constant="23" id="UrI-Pz-kuw"/> <constraint firstItem="pkZ-I9-7Ww" firstAttribute="top" secondItem="dGE-gy-H9V" secondAttribute="top" id="VCt-i4-vO2"/> <constraint firstItem="BP3-c0-m5T" firstAttribute="leading" secondItem="CjF-zA-4Hi" secondAttribute="leading" id="VZr-zl-q6b"/> <constraint firstAttribute="bottomMargin" secondItem="pkZ-I9-7Ww" secondAttribute="bottom" constant="26" id="Wtt-ZA-xs5"/> WanPai/Common/View/PaymentView.xib
@@ -252,7 +252,7 @@ <constraint firstAttribute="height" constant="0.40000000000000002" id="5k6-hd-aob"/> </constraints> </view> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_coin" translatesAutoresizingMaskIntoConstraints="NO" id="cCG-Q7-Q0C"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_notice" translatesAutoresizingMaskIntoConstraints="NO" id="cCG-Q7-Q0C"> <rect key="frame" x="15" y="21" width="28" height="29"/> <constraints> <constraint firstAttribute="width" constant="28" id="0kD-VT-hw3"/> WanPai/Config/Def.swift
@@ -128,9 +128,8 @@ switch name { case "加入玩湃": if page == "主页"{ if page == "主页"{} } if page == "课程列表"{ if type == "详情"{ JQ_currentViewController().jq_push(vc: CourseDetailVC(id:id ?? 0)) WanPai/Config/Enums.swift
@@ -78,7 +78,7 @@ case .privacy:return "隐私协议" case .safe:return "运动安全告知书" case .user:return "用户协议" case .matchStore:return "参赛门店" case .matchStore:return "参与门店" case .other:return "" } } @@ -91,6 +91,7 @@ case shoppingOnline = 4 case welfareWeekly = 5 case freeToday = 6 case launch = 7 }
New file @@ -0,0 +1,253 @@ // // LaunchImageHelper.swift // WanPai // // Created by 无故事王国 on 2023/10/19. // import Foundation class LaunchImageHelper { static func snapshotStoryboard(sbName: String, isPortrait: Bool) -> UIImage? { if sbName.isEmpty { return nil } let storyboard = UIStoryboard(name: sbName, bundle: nil) guard let vc = storyboard.instantiateInitialViewController() else { return nil } vc.view.frame = UIScreen.main.bounds if isPortrait { if vc.view.frame.size.width > vc.view.frame.size.height { vc.view.frame = CGRect(x: 0, y: 0, width: vc.view.frame.size.height, height: vc.view.frame.size.width) } } else { if vc.view.frame.size.width < vc.view.frame.size.height { vc.view.frame = CGRect(x: 0, y: 0, width: vc.view.frame.size.height, height: vc.view.frame.size.width) } } vc.view.setNeedsLayout() vc.view.layoutIfNeeded() UIGraphicsBeginImageContextWithOptions(vc.view.frame.size, false, UIScreen.main.scale) vc.view.layer.render(in: UIGraphicsGetCurrentContext()!) let image = UIGraphicsGetImageFromCurrentImageContext() UIGraphicsEndImageContext() return image } static func snapshotStoryboardForPortrait(sbName: String) -> UIImage? { return snapshotStoryboard(sbName: sbName, isPortrait: true) } static func snapshotStoryboardForLandscape(sbName: String) -> UIImage? { return snapshotStoryboard(sbName: sbName, isPortrait: false) } static func changeAllLaunchImageToPortrait(_ image: UIImage?) { guard let image = image else { return } // 全部替换为竖屏启动图 let resizedImage = resizeImage(image, toPortraitScreenSize: true) BBADynamicLaunchImage.replaceLaunchImage(resizedImage) } static func changeAllLaunchImageToLandscape(_ image: UIImage?) { guard let image = image else { return } // 全部替换为横屏启动图 let resizedImage = resizeImage(image, toPortraitScreenSize: false) BBADynamicLaunchImage.replaceLaunchImage(resizedImage) } static func changePortraitLaunchImage(_ p: UIImage) { // Implementation for this function is missing } static func resizeImage(_ image: UIImage, toPortraitScreenSize: Bool) -> UIImage { // Implementation for this function is missing return image } } private class BBADynamicLaunchImage { static func launchImageCacheDirectory() -> String? { let bundleID = Bundle.main.infoDictionary?["CFBundleIdentifier"] as? String let fm = FileManager.default // iOS13之前 if var cachesDirectory = NSSearchPathForDirectoriesInDomains(.cachesDirectory, .userDomainMask, true).first { cachesDirectory.append(contentsOf: "Snapshots") cachesDirectory.append(contentsOf: bundleID!) if fm.fileExists(atPath: cachesDirectory) { return cachesDirectory } } // iOS13 if let libraryDirectory = NSSearchPathForDirectoriesInDomains(.libraryDirectory, .userDomainMask, true).first { let snapshotsPath = String(format: "%@/SplashBoard/Snapshots/%@ - {DEFAULT GROUP}", libraryDirectory, bundleID ?? "") if fm.fileExists(atPath: snapshotsPath) { return snapshotsPath } } return nil } static func isSnapShotName(_ name: String) -> Bool { // 新系统后缀 let snapshotSuffixs = ".ktx" if name.hasSuffix(snapshotSuffixs) { return true } // 老系统后缀 let snapshotSuffixs2 = ".png" if name.hasSuffix(snapshotSuffixs2) { return true } return false } @discardableResult static func replaceLaunchImage(_ replacementImage: UIImage?) -> Bool { guard let image = replacementImage else {return false} return self.replaceLaunchImage(replacementImage: image, compressionQuality: 0.8, customValidation: nil) } @discardableResult static func replaceLaunchImage(_ replacementImage: UIImage?, compressionQuality: CGFloat) -> Bool { guard let image = replacementImage else {return false} return self.replaceLaunchImage(replacementImage: image, compressionQuality: compressionQuality, customValidation: nil) } static func replaceLaunchImage(replacementImage: UIImage, compressionQuality: CGFloat, customValidation: ((UIImage,UIImage) -> Bool)?) -> Bool { let data = replacementImage.jpegData(compressionQuality: compressionQuality) if data == nil { return false } // if !checkImageMatchScreenSize(image: replacementImage) { // return false // } guard let cacheDir = launchImageCacheDirectory() else { return false } let cachesParentDir = NSSearchPathForDirectoriesInDomains(.cachesDirectory, .userDomainMask, true)[0] let tmpDir = (cachesParentDir as NSString).appendingPathComponent("_tmpLaunchImageCaches") let fm = FileManager.default if fm.fileExists(atPath: tmpDir) { do { try fm.removeItem(atPath: tmpDir) } catch { return false } } do { try fm.moveItem(atPath: cacheDir, toPath: tmpDir) } catch { return false } var cacheImageNames = [String]() if let contents = try? fm.contentsOfDirectory(atPath: tmpDir) { for name in contents { if isSnapShotName(name) { cacheImageNames.append(name) } } } for name in cacheImageNames { let filePath = (tmpDir as NSString).appendingPathComponent(name) var result = true if customValidation != nil{ if let cachedImageData = try? Data(contentsOf: URL(string: filePath)!),let cachedImage = imageFromData(data: cachedImageData as NSData){ result = customValidation!(cachedImage,replacementImage) } } if result { do { try data?.write(to: URL(fileURLWithPath: filePath), options: .atomic) } catch { return false } } } try? fm.moveItem(atPath: tmpDir, toPath: cacheDir) if fm.fileExists(atPath: tmpDir) { do { try fm.removeItem(atPath: tmpDir) } catch { return false } } return true } static func imageFromData(data: NSData) -> UIImage? { guard let source = CGImageSourceCreateWithData(data, nil) else { return nil } if let imageRef = CGImageSourceCreateImageAtIndex(source, 0, nil) { let originImage = UIImage(cgImage: imageRef) return originImage } return nil } func getImageSize(imageData: NSData) -> CGSize { guard let source = CGImageSourceCreateWithData(imageData, nil) else { return CGSize.zero } if let imageRef = CGImageSourceCreateImageAtIndex(source, 0, nil) { let width = CGFloat(imageRef.width) let height = CGFloat(imageRef.height) return CGSize(width: width, height: height) } return CGSize.zero } /// 检查图片大小 static func checkImageMatchScreenSize(image: UIImage) -> Bool { let screenSize = CGSize(width: UIScreen.main.bounds.size.width * UIScreen.main.scale, height: UIScreen.main.bounds.size.height * UIScreen.main.scale) let imageSize = CGSize(width: image.size.width * image.scale, height: image.size.height * image.scale) if imageSize.equalTo(screenSize) { return true } if imageSize.equalTo(CGSize(width: screenSize.height, height: screenSize.width)) { return true } return false } } WanPai/Model/CommonModels.swift
@@ -212,6 +212,10 @@ var name = "" var residueClassHour = 0 var phone = "" var birthday = "" var gender:GenderType = .man var height:Double = 0 var weight:Double = 0 } @@ -475,6 +479,21 @@ var userName: String = "" var userPhone: String = "" var userId:Int = 0 var isVip = 0 //0:否 1:是 func save(){ UserDefaults.standard.set(self.toJSONString(), forKey: "UserInfoModel") UserDefaults.standard.synchronize() } static func get()->UserInfoModel?{ if let string = UserDefaults.standard.string(forKey: "UserInfoModel"){ return UserInfoModel.deserialize(from: string) }else{ return nil } } } struct BenefitHomeModel:HandyJSON{ WanPai/Network/Services.swift
@@ -1037,6 +1037,10 @@ class func editParticipant(id:Int,height:Int,weight:Int,phone:String?)->Observable<BaseResponse<SimpleModel>>{ let params = ParamsAppender.build(url: All_Url) .interface(url: "competition/api/participant/editParticipant") .append(key: "id", value: id) .append(key: "height", value: height) .append(key: "weight", value: weight) .append(key: "phone", value: phone) return NetworkRequest.request(params: params, method: .post, progress: true) } @@ -1055,6 +1059,14 @@ return NetworkRequest.request(params: params, method: .post, progress: true) } /// 编辑参赛人员 class func editParticipant(_ model:ActivityDetailPartModel)->Observable<BaseResponse<SimpleModel>>{ let params = ParamsAppender.build(url: All_Url) .interface(url: "/competition/api/participant/editParticipant") .append(key: "id", value: model.id) .append(key: "idcard", value: model.idcard) return NetworkRequest.request(params: params, method: .post, progress: true) } /// 删除参赛人员 class func deleParticipant(id:Int)->Observable<BaseResponse<SimpleModel>>{ WanPai/Root/Activity/TCell/ActivityInfoTCell.xib
@@ -33,7 +33,7 @@ </userDefinedRuntimeAttribute> </userDefinedRuntimeAttributes> </imageView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="750" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" text="--" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="3" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rom-jP-xgQ"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="750" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" text="--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rom-jP-xgQ"> <rect key="frame" x="130.99999999999997" y="21" width="303.33333333333326" height="22"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="22" id="AOB-7s-rct"/> @@ -51,7 +51,7 @@ <color key="textColor" red="0.99607843137254903" green="0.47843137254901957" blue="0.011764705882352941" 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" numberOfLines="5" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6i5-yn-dMM"> <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="6i5-yn-dMM"> <rect key="frame" x="131" y="69" width="347" height="13.333333333333329"/> <fontDescription key="fontDescription" type="system" pointSize="11"/> <color key="textColor" red="0.23921568627450979" green="0.24313725490196078" blue="0.27058823529411763" alpha="0.69999999999999996" colorSpace="custom" customColorSpace="sRGB"/> WanPai/Root/Activity/VC/ActivityDetailApplyVC.swift
@@ -61,7 +61,7 @@ btn_moreMatchStore.isHidden = (label_storeNames.text?.count ?? 0) < 50 label_title.text = activityDetailModel.name label_joinCondition.text = activityDetailModel.registerCondition.strTitle label_joinCondition.text = activityDetailModel.registerCondition.strTitle + "参与" label_address.text = activityDetailModel.address label_duetime.text = activityDetailModel.registerEndTime label_starttime.text = activityDetailModel.startTime @@ -137,6 +137,8 @@ weakSelf.payment(type: type) } } }else{ NotificationCenter.default.post(name: ChooseHomeStore_Noti, object: nil) } } } @@ -155,8 +157,8 @@ let vc = PaymentResultVC(result: .success, objType: .activityApply) vc.modalPresentationStyle = .fullScreen weakSelf.present(vc, animated: true) weakSelf.btn_enroll.setTitle("已报名", for: .normal) weakSelf.btn_enroll.backgroundColor = UIColor.gray.withAlphaComponent(0.5) // weakSelf.btn_enroll.setTitle("已报名", for: .normal) // weakSelf.btn_enroll.backgroundColor = UIColor.gray.withAlphaComponent(0.5) case .cancel: alert(msg: "已取消") case .failure(let error): @@ -170,11 +172,25 @@ let vc = PaymentResultVC(result: .success, objType: .activityApply) vc.modalPresentationStyle = .fullScreen weakSelf.present(vc, animated: true) weakSelf.btn_enroll.setTitle("已报名", for: .normal) weakSelf.btn_enroll.backgroundColor = UIColor.gray.withAlphaComponent(0.5) // weakSelf.btn_enroll.setTitle("已报名", for: .normal) // weakSelf.btn_enroll.backgroundColor = UIColor.gray.withAlphaComponent(0.5) default:break } } },onError: {[weak self] error in guard let weakSelf = self else { return } if let er = error as? NetworkRequest.NetRequestError{ switch er { case .Other(_,let string): let vc = PaymentResultVC(result: .fail(string), objType: .yard,handleVC: nil) vc.modalPresentationStyle = .fullScreen weakSelf.present(vc, animated: true) default: let vc = PaymentResultVC(result: .fail("支付失败"), objType: .yard,handleVC: nil) vc.modalPresentationStyle = .fullScreen weakSelf.present(vc, animated: true) } } }).disposed(by: disposeBag) } } WanPai/Root/Activity/VC/ActivityDetailApplyVC.xib
@@ -3,7 +3,7 @@ <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="22130"/> <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"/> @@ -44,25 +44,25 @@ <rect key="frame" x="0.0" y="59" width="393" height="711"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XMe-LD-M9B"> <rect key="frame" x="0.0" y="0.0" width="393" height="957.33333333333337"/> <rect key="frame" x="0.0" y="0.0" width="393" height="971.33333333333337"/> <subviews> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="fI5-pl-psr"> <rect key="frame" x="0.0" y="220.00000000000006" width="393" height="737.33333333333348"/> <rect key="frame" x="0.0" y="220.00000000000006" width="393" height="751.33333333333348"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="y11-gN-dh6"> <rect key="frame" x="0.0" y="0.0" width="393" height="52"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mnc-lb-0cc"> <rect key="frame" x="14" y="16" width="259" height="20"/> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" text="--" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Mnc-lb-0cc"> <rect key="frame" x="14" y="14" width="329.66666666666669" height="28"/> <constraints> <constraint firstAttribute="height" constant="20" id="k9H-4h-1Lv"/> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="25" id="k9H-4h-1Lv"/> </constraints> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/> <nil key="textColor"/> <nil key="highlightedColor"/> </label> <view contentMode="scaleToFill" horizontalHuggingPriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="smc-R7-GjI"> <rect key="frame" x="353.66666666666669" y="15.666666666666686" width="25.333333333333314" height="21"/> <view contentMode="scaleToFill" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="smc-R7-GjI"> <rect key="frame" x="353.66666666666669" y="17.666666666666686" width="25.333333333333314" height="21"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Bd-9P-C67"> <rect key="frame" x="7.0000000000000009" y="0.0" width="11.333333333333336" height="21"/> @@ -90,12 +90,12 @@ </subviews> <color key="backgroundColor" systemColor="systemBackgroundColor"/> <constraints> <constraint firstAttribute="trailing" secondItem="Mnc-lb-0cc" secondAttribute="trailing" constant="120" id="00j-Dm-IYh"/> <constraint firstItem="ux7-Ei-5Ed" firstAttribute="leading" secondItem="y11-gN-dh6" secondAttribute="leading" constant="14" id="2D8-rs-0mh"/> <constraint firstItem="smc-R7-GjI" firstAttribute="centerY" secondItem="Mnc-lb-0cc" secondAttribute="centerY" id="CGD-zX-l5G"/> <constraint firstItem="Mnc-lb-0cc" firstAttribute="centerY" secondItem="y11-gN-dh6" secondAttribute="centerY" id="Llq-fm-dAg"/> <constraint firstItem="ux7-Ei-5Ed" firstAttribute="top" secondItem="Mnc-lb-0cc" secondAttribute="bottom" constant="9" id="ROB-L9-6Gk"/> <constraint firstItem="smc-R7-GjI" firstAttribute="leading" secondItem="Mnc-lb-0cc" secondAttribute="trailing" constant="10" id="Ua2-lW-5WK"/> <constraint firstItem="Mnc-lb-0cc" firstAttribute="top" secondItem="y11-gN-dh6" secondAttribute="top" constant="14" id="V2Q-7r-522"/> <constraint firstAttribute="trailing" secondItem="ux7-Ei-5Ed" secondAttribute="trailing" id="cUH-rz-HRq"/> <constraint firstAttribute="height" constant="52" id="fBs-zq-gC5"/> <constraint firstAttribute="trailing" secondItem="smc-R7-GjI" secondAttribute="trailing" constant="14" id="pf6-kQ-T4S"/> <constraint firstAttribute="bottom" secondItem="ux7-Ei-5Ed" secondAttribute="bottom" id="qGI-ae-hwK"/> <constraint firstItem="Mnc-lb-0cc" firstAttribute="leading" secondItem="y11-gN-dh6" secondAttribute="leading" constant="14" id="t44-X9-4QP"/> @@ -107,13 +107,13 @@ </userDefinedRuntimeAttributes> </view> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="sei-fq-5Wo"> <rect key="frame" x="0.0" y="52" width="393" height="306"/> <rect key="frame" x="0.0" y="52" width="393" height="320"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jIC-yz-bTR"> <rect key="frame" x="0.0" y="0.0" width="393" height="46"/> <rect key="frame" x="0.0" y="0.0" width="393" height="60"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nOq-fO-Rnm"> <rect key="frame" x="14" y="11" width="4" height="4"/> <rect key="frame" x="14" y="18" width="4" height="4"/> <color key="backgroundColor" name="FE6E0D"/> <constraints> <constraint firstAttribute="height" constant="4" id="R4N-6r-sDH"/> @@ -127,13 +127,13 @@ </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="DDv-6Q-KEz"> <rect key="frame" x="22" y="6.0000000000000009" width="73.666666666666671" height="14.333333333333336"/> <rect key="frame" x="22" y="13" width="73.666666666666671" 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"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yFh-cd-Oew"> <rect key="frame" x="22" y="28.333333333333311" width="11.666666666666664" height="14.333333333333332"/> <rect key="frame" x="22" y="35.333333333333314" width="11.666666666666664" height="14.333333333333336"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/> <nil key="textColor"/> <nil key="highlightedColor"/> @@ -144,14 +144,14 @@ <constraint firstItem="DDv-6Q-KEz" firstAttribute="centerY" secondItem="nOq-fO-Rnm" secondAttribute="centerY" id="6Vp-Ih-8tS"/> <constraint firstItem="DDv-6Q-KEz" firstAttribute="leading" secondItem="nOq-fO-Rnm" secondAttribute="trailing" constant="4" id="Aik-sN-4pK"/> <constraint firstItem="yFh-cd-Oew" firstAttribute="leading" secondItem="DDv-6Q-KEz" secondAttribute="leading" id="J5C-dM-Rxc"/> <constraint firstAttribute="height" constant="46" id="Lqw-Ph-tql"/> <constraint firstAttribute="height" constant="60" id="Lqw-Ph-tql"/> <constraint firstItem="yFh-cd-Oew" firstAttribute="top" secondItem="DDv-6Q-KEz" secondAttribute="bottom" constant="8" id="MRz-Yj-52d"/> <constraint firstItem="nOq-fO-Rnm" firstAttribute="top" secondItem="jIC-yz-bTR" secondAttribute="top" constant="11" id="NTS-JY-Lo7"/> <constraint firstItem="nOq-fO-Rnm" firstAttribute="top" secondItem="jIC-yz-bTR" secondAttribute="top" constant="18" id="NTS-JY-Lo7"/> <constraint firstItem="nOq-fO-Rnm" firstAttribute="leading" secondItem="jIC-yz-bTR" secondAttribute="leading" constant="14" id="rKC-0L-P1T"/> </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Q8L-Ts-iSB"> <rect key="frame" x="0.0" y="46" width="393" height="46"/> <rect key="frame" x="0.0" y="60" width="393" height="46"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KhD-1l-VNz"> <rect key="frame" x="14" y="11" width="4" height="4"/> @@ -192,7 +192,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HyE-bG-Tse"> <rect key="frame" x="0.0" y="92" width="393" height="46"/> <rect key="frame" x="0.0" y="106" width="393" height="46"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BxP-HT-qPW"> <rect key="frame" x="14" y="11" width="4" height="4"/> @@ -233,7 +233,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RtG-w2-M9c"> <rect key="frame" x="0.0" y="138" width="393" height="46"/> <rect key="frame" x="0.0" y="152" width="393" height="46"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HQL-eN-aC6"> <rect key="frame" x="14" y="11" width="4" height="4"/> @@ -274,7 +274,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CDe-Ud-awC"> <rect key="frame" x="0.0" y="184" width="393" height="46"/> <rect key="frame" x="0.0" y="198" width="393" height="46"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QYt-ST-Wg9"> <rect key="frame" x="14" y="11" width="4" height="4"/> @@ -290,8 +290,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.000000000000004" y="6.0000000000000009" width="49.333333333333343" 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" y="6.0000000000000009" width="77.666666666666671" 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"/> @@ -323,7 +323,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pab-I9-at1"> <rect key="frame" x="0.0" y="230" width="393" height="76"/> <rect key="frame" x="0.0" y="244" width="393" height="76"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZWf-WG-HMN"> <rect key="frame" x="14" y="11" width="4" height="4"/> @@ -383,7 +383,7 @@ </subviews> </stackView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oxi-DH-KVR"> <rect key="frame" x="0.0" y="358" width="393" height="115"/> <rect key="frame" x="0.0" y="372" width="393" height="115"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8N9-5a-Lyf"> <rect key="frame" x="13" y="0.0" width="380" height="1"/> @@ -470,7 +470,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="w7j-PS-NjY"> <rect key="frame" x="0.0" y="473" width="393" height="115"/> <rect key="frame" x="0.0" y="487" width="393" height="115"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kpL-cg-Mmm"> <rect key="frame" x="13" y="0.0" width="380" height="1"/> @@ -517,7 +517,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HJQ-FF-uCj"> <rect key="frame" x="0.0" y="588" width="393" height="149.33333333333337"/> <rect key="frame" x="0.0" y="602" width="393" height="149.33333333333337"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tyD-F3-iK7"> <rect key="frame" x="13" y="0.0" width="380" height="1"/> WanPai/Root/Activity/VC/ActivityDetailVC.swift
@@ -43,7 +43,7 @@ btn_moreMatchStore.isHidden = (label_storeNames.text?.count ?? 0) < 50 label_title.text = activityDetailModel.name label_joinCondition.text = activityDetailModel.registerCondition.strTitle label_joinCondition.text = activityDetailModel.registerCondition.strTitle + "参与" label_address.text = activityDetailModel.address label_duetime.text = activityDetailModel.registerEndTime label_starttime.text = activityDetailModel.startTime WanPai/Root/Activity/VC/ActivityDetailVC.xib
@@ -43,22 +43,25 @@ <rect key="frame" x="0.0" y="59" width="393" height="711"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="L7Z-R8-Jpz"> <rect key="frame" x="0.0" y="0.0" width="393" height="957.33333333333337"/> <rect key="frame" x="0.0" y="0.0" width="393" height="971.33333333333337"/> <subviews> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="HXl-f8-gCo"> <rect key="frame" x="0.0" y="220.00000000000006" width="393" height="737.33333333333348"/> <rect key="frame" x="0.0" y="220.00000000000006" width="393" height="751.33333333333348"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SAx-1o-0mX"> <rect key="frame" x="0.0" y="0.0" width="393" height="52"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uIe-np-Pwt"> <rect key="frame" x="14" y="15.333333333333316" width="259" height="21.666666666666671"/> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" horizontalCompressionResistancePriority="250" text="--" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uIe-np-Pwt"> <rect key="frame" x="14" y="14" width="329.66666666666669" height="28"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="25" id="RTg-BY-VbI"/> </constraints> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/> <nil key="textColor"/> <nil key="highlightedColor"/> </label> <view contentMode="scaleToFill" horizontalHuggingPriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="eyg-vz-Etv"> <rect key="frame" x="353.66666666666669" y="15.666666666666686" width="25.333333333333314" height="21"/> <view contentMode="scaleToFill" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="eyg-vz-Etv"> <rect key="frame" x="353.66666666666669" y="17.666666666666686" width="25.333333333333314" height="21"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0xj-gh-rFl"> <rect key="frame" x="7.0000000000000009" y="0.0" width="11.333333333333336" height="21"/> @@ -86,14 +89,14 @@ </subviews> <color key="backgroundColor" systemColor="systemBackgroundColor"/> <constraints> <constraint firstItem="uIe-np-Pwt" firstAttribute="centerY" secondItem="SAx-1o-0mX" secondAttribute="centerY" id="4Fi-Tx-MZh"/> <constraint firstAttribute="height" constant="52" id="6bc-un-Lud"/> <constraint firstAttribute="bottom" secondItem="rEa-cp-c8e" secondAttribute="bottom" id="Cs1-ko-rQB"/> <constraint firstItem="rEa-cp-c8e" firstAttribute="leading" secondItem="SAx-1o-0mX" secondAttribute="leading" constant="14" id="F6h-YV-kQe"/> <constraint firstItem="eyg-vz-Etv" firstAttribute="centerY" secondItem="uIe-np-Pwt" secondAttribute="centerY" id="Fzs-98-QHm"/> <constraint firstAttribute="trailing" secondItem="rEa-cp-c8e" secondAttribute="trailing" id="KZL-2v-eAF"/> <constraint firstItem="eyg-vz-Etv" firstAttribute="leading" secondItem="uIe-np-Pwt" secondAttribute="trailing" constant="10" id="T1Z-6L-Yn9"/> <constraint firstItem="uIe-np-Pwt" firstAttribute="top" secondItem="SAx-1o-0mX" secondAttribute="top" constant="14" id="bhl-Pm-Y2u"/> <constraint firstItem="uIe-np-Pwt" firstAttribute="leading" secondItem="SAx-1o-0mX" secondAttribute="leading" constant="14" id="fnd-oE-YSC"/> <constraint firstAttribute="trailing" secondItem="uIe-np-Pwt" secondAttribute="trailing" constant="120" id="rdF-wv-hBj"/> <constraint firstItem="rEa-cp-c8e" firstAttribute="top" secondItem="uIe-np-Pwt" secondAttribute="bottom" constant="9" id="tkT-4G-yp0"/> <constraint firstAttribute="trailing" secondItem="eyg-vz-Etv" secondAttribute="trailing" constant="14" id="y8g-7E-XCX"/> </constraints> <userDefinedRuntimeAttributes> @@ -103,13 +106,13 @@ </userDefinedRuntimeAttributes> </view> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="U7K-JT-5nW"> <rect key="frame" x="0.0" y="52" width="393" height="230"/> <rect key="frame" x="0.0" y="52" width="393" height="244"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uhl-1b-oQQ"> <rect key="frame" x="0.0" y="0.0" width="393" height="46"/> <rect key="frame" x="0.0" y="0.0" width="393" height="60"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="pkr-Fb-poe"> <rect key="frame" x="14" y="11" width="4" height="4"/> <rect key="frame" x="14" y="18" width="4" height="4"/> <color key="backgroundColor" name="FE6E0D"/> <constraints> <constraint firstAttribute="width" constant="4" id="fvE-Mw-O4f"/> @@ -123,13 +126,13 @@ </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="ATj-Jx-1Jv"> <rect key="frame" x="22" y="6.0000000000000009" width="73.666666666666671" height="14.333333333333336"/> <rect key="frame" x="22" y="13" width="73.666666666666671" 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"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nPn-v2-ONf"> <rect key="frame" x="22" y="28.333333333333311" width="11.666666666666664" height="14.333333333333332"/> <rect key="frame" x="22" y="35.333333333333314" width="11.666666666666664" height="14.333333333333336"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/> <nil key="textColor"/> <nil key="highlightedColor"/> @@ -138,16 +141,16 @@ <color key="backgroundColor" systemColor="systemBackgroundColor"/> <constraints> <constraint firstItem="pkr-Fb-poe" firstAttribute="leading" secondItem="uhl-1b-oQQ" secondAttribute="leading" constant="14" id="YAi-h0-sTQ"/> <constraint firstAttribute="height" constant="46" id="jHs-in-Zps"/> <constraint firstAttribute="height" constant="60" id="jHs-in-Zps"/> <constraint firstItem="ATj-Jx-1Jv" firstAttribute="leading" secondItem="pkr-Fb-poe" secondAttribute="trailing" constant="4" id="loJ-Ze-UEO"/> <constraint firstItem="ATj-Jx-1Jv" firstAttribute="centerY" secondItem="pkr-Fb-poe" secondAttribute="centerY" id="mOX-2j-bym"/> <constraint firstItem="pkr-Fb-poe" firstAttribute="top" secondItem="uhl-1b-oQQ" secondAttribute="top" constant="11" id="n4m-wd-h8l"/> <constraint firstItem="pkr-Fb-poe" firstAttribute="top" secondItem="uhl-1b-oQQ" secondAttribute="top" constant="18" id="n4m-wd-h8l"/> <constraint firstItem="nPn-v2-ONf" firstAttribute="top" secondItem="ATj-Jx-1Jv" secondAttribute="bottom" constant="8" id="qAV-Zw-JvO"/> <constraint firstItem="nPn-v2-ONf" firstAttribute="leading" secondItem="ATj-Jx-1Jv" secondAttribute="leading" id="sms-Z4-0fT"/> </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7Kv-8i-8E5"> <rect key="frame" x="0.0" y="46" width="393" height="46"/> <rect key="frame" x="0.0" y="60" width="393" height="46"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="RSB-eL-cpn"> <rect key="frame" x="14" y="11" width="4" height="4"/> @@ -188,7 +191,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="q0j-g5-qyn"> <rect key="frame" x="0.0" y="92" width="393" height="46"/> <rect key="frame" x="0.0" y="106" width="393" height="46"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="J7b-A1-V3V"> <rect key="frame" x="14" y="11" width="4" height="4"/> @@ -229,7 +232,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XEX-h4-Kvw"> <rect key="frame" x="0.0" y="138" width="393" height="46"/> <rect key="frame" x="0.0" y="152" width="393" height="46"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KN1-kw-ke7"> <rect key="frame" x="14" y="11" width="4" height="4"/> @@ -270,7 +273,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6rj-zE-gaO"> <rect key="frame" x="0.0" y="184" width="393" height="46"/> <rect key="frame" x="0.0" y="198" width="393" height="46"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="22y-iZ-rPZ"> <rect key="frame" x="14" y="11" width="4" height="4"/> @@ -286,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="QkB-qj-0gR"> <rect key="frame" x="22.000000000000004" y="6.0000000000000009" width="49.333333333333343" 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" y="6.0000000000000009" width="77.666666666666671" 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"/> @@ -321,7 +324,7 @@ </subviews> </stackView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zH8-Qr-0vY"> <rect key="frame" x="0.0" y="282" width="393" height="76"/> <rect key="frame" x="0.0" y="296" width="393" height="76"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Doo-bg-XfQ"> <rect key="frame" x="14" y="11" width="4" height="4"/> @@ -379,7 +382,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="U3c-u6-JHg"> <rect key="frame" x="0.0" y="358" width="393" height="115"/> <rect key="frame" x="0.0" y="372" width="393" height="115"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="vfd-ih-YL5"> <rect key="frame" x="13" y="0.0" width="380" height="1"/> @@ -466,7 +469,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jja-qF-gfn"> <rect key="frame" x="0.0" y="473" width="393" height="115"/> <rect key="frame" x="0.0" y="487" width="393" height="115"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rk4-aZ-B6H"> <rect key="frame" x="13" y="0.0" width="380" height="1"/> @@ -513,7 +516,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="89v-i4-b0B"> <rect key="frame" x="0.0" y="588" width="393" height="149.33333333333337"/> <rect key="frame" x="0.0" y="602" width="393" height="149.33333333333337"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aLI-Yu-lpC"> <rect key="frame" x="13" y="0.0" width="380" height="1"/> WanPai/Root/Activity/VC/ActivitySignupDetailVC.swift
@@ -44,7 +44,7 @@ label_storeNames.text = m.storeInfos.map({$0.name}).joined(separator: "，") btn_moreMatchStore.isHidden = (label_storeNames.text?.count ?? 0) < 50 label_title.text = m.name label_joinCondition.text = m.registerCondition.strTitle label_joinCondition.text = m.registerCondition.strTitle + "参与" label_address.text = m.address label_duetime.text = m.registerEndTime label_starttime.text = m.startTime WanPai/Root/Activity/VC/ActivitySignupDetailVC.xib
@@ -44,7 +44,7 @@ <rect key="frame" x="0.0" y="59" width="393" height="759"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="u6Z-PS-k1D"> <rect key="frame" x="0.0" y="0.0" width="393" height="1153.6666666666667"/> <rect key="frame" x="0.0" y="0.0" width="393" height="1167.6666666666667"/> <subviews> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="eXP-qo-kfo"> <rect key="frame" x="0.0" y="0.0" width="393" height="220"/> @@ -54,22 +54,25 @@ </constraints> </imageView> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="TUv-Fz-UHV"> <rect key="frame" x="0.0" y="219.99999999999994" width="393" height="885.66666666666652"/> <rect key="frame" x="0.0" y="219.99999999999994" width="393" height="899.66666666666652"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="edY-He-yWT"> <rect key="frame" x="0.0" y="0.0" width="393" height="51"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UMG-EM-0dd"> <rect key="frame" x="14" y="14.666666666666687" width="259" height="21.666666666666671"/> <rect key="frame" x="14" y="14" width="329.66666666666669" height="27"/> <constraints> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="25" id="bDX-fp-jFg"/> </constraints> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/> <nil key="textColor"/> <nil key="highlightedColor"/> </label> <view contentMode="scaleToFill" horizontalHuggingPriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="EOr-Ck-3py"> <rect key="frame" x="334" y="15" width="45" height="21"/> <view contentMode="scaleToFill" horizontalCompressionResistancePriority="1000" translatesAutoresizingMaskIntoConstraints="NO" id="EOr-Ck-3py"> <rect key="frame" x="353.66666666666669" y="15" width="25.333333333333314" height="21"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i4P-8X-bJm"> <rect key="frame" x="7" y="0.0" width="31" height="21"/> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i4P-8X-bJm"> <rect key="frame" x="7.0000000000000009" y="0.0" width="11.333333333333336" height="21"/> <fontDescription key="fontDescription" type="system" pointSize="12"/> <color key="textColor" red="0.99607843139999996" green="0.43137254899999999" blue="0.050980392159999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> @@ -95,14 +98,14 @@ <color key="backgroundColor" systemColor="systemBackgroundColor"/> <constraints> <constraint firstAttribute="trailing" secondItem="EOr-Ck-3py" secondAttribute="trailing" constant="14" id="1lk-gw-iv1"/> <constraint firstItem="UMG-EM-0dd" firstAttribute="centerY" secondItem="edY-He-yWT" secondAttribute="centerY" id="I4Y-SL-0KN"/> <constraint firstItem="F8G-lx-1Z2" firstAttribute="leading" secondItem="edY-He-yWT" secondAttribute="leading" constant="14" id="NR4-22-mfa"/> <constraint firstItem="UMG-EM-0dd" firstAttribute="leading" secondItem="edY-He-yWT" secondAttribute="leading" constant="14" id="OcR-2w-c1I"/> <constraint firstItem="F8G-lx-1Z2" firstAttribute="top" secondItem="UMG-EM-0dd" secondAttribute="bottom" constant="9" id="Zt2-Hq-U1l"/> <constraint firstAttribute="bottom" secondItem="F8G-lx-1Z2" secondAttribute="bottom" id="atv-m5-PcQ"/> <constraint firstAttribute="trailing" secondItem="UMG-EM-0dd" secondAttribute="trailing" constant="120" id="ciB-fm-QLh"/> <constraint firstAttribute="height" constant="51" id="hfk-cB-sno"/> <constraint firstItem="EOr-Ck-3py" firstAttribute="centerY" secondItem="edY-He-yWT" secondAttribute="centerY" id="kRa-M7-C3t"/> <constraint firstAttribute="trailing" secondItem="F8G-lx-1Z2" secondAttribute="trailing" id="r5i-HM-PwW"/> <constraint firstItem="EOr-Ck-3py" firstAttribute="leading" secondItem="UMG-EM-0dd" secondAttribute="trailing" constant="10" id="vDd-BT-jvq"/> <constraint firstItem="UMG-EM-0dd" firstAttribute="top" secondItem="edY-He-yWT" secondAttribute="top" constant="14" id="w2c-nx-Y1l"/> </constraints> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="number" keyPath="ld_cornerRadiusXIB"> @@ -111,13 +114,13 @@ </userDefinedRuntimeAttributes> </view> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="jgm-Kx-ReO"> <rect key="frame" x="0.0" y="51" width="393" height="306"/> <rect key="frame" x="0.0" y="51" width="393" height="320"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ReX-iz-v11"> <rect key="frame" x="0.0" y="0.0" width="393" height="46"/> <rect key="frame" x="0.0" y="0.0" width="393" height="60"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8Eb-9r-932"> <rect key="frame" x="14" y="11" width="4" height="4"/> <rect key="frame" x="14" y="18" width="4" height="4"/> <color key="backgroundColor" name="FE6E0D"/> <constraints> <constraint firstAttribute="width" constant="4" id="dnc-e6-1oU"/> @@ -131,13 +134,13 @@ </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="Zkg-6k-XcP"> <rect key="frame" x="22" y="6.0000000000000009" width="73.666666666666671" height="14.333333333333336"/> <rect key="frame" x="22" y="13" width="73.666666666666671" 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"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XNr-7p-cOy"> <rect key="frame" x="22" y="28.333333333333311" width="11.666666666666664" height="14.333333333333332"/> <rect key="frame" x="22" y="35.333333333333314" width="11.666666666666664" height="14.333333333333336"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="12"/> <nil key="textColor"/> <nil key="highlightedColor"/> @@ -145,17 +148,17 @@ </subviews> <color key="backgroundColor" systemColor="systemBackgroundColor"/> <constraints> <constraint firstAttribute="height" constant="46" id="7N1-EM-v1u"/> <constraint firstAttribute="height" constant="60" id="7N1-EM-v1u"/> <constraint firstItem="XNr-7p-cOy" firstAttribute="leading" secondItem="Zkg-6k-XcP" secondAttribute="leading" id="9zV-rH-wHC"/> <constraint firstItem="8Eb-9r-932" firstAttribute="leading" secondItem="ReX-iz-v11" secondAttribute="leading" constant="14" id="HOj-sR-2uM"/> <constraint firstItem="8Eb-9r-932" firstAttribute="top" secondItem="ReX-iz-v11" secondAttribute="top" constant="11" id="MBS-aQ-JCY"/> <constraint firstItem="8Eb-9r-932" firstAttribute="top" secondItem="ReX-iz-v11" secondAttribute="top" constant="18" id="MBS-aQ-JCY"/> <constraint firstItem="XNr-7p-cOy" firstAttribute="top" secondItem="Zkg-6k-XcP" secondAttribute="bottom" constant="8" id="nag-1l-YHP"/> <constraint firstItem="Zkg-6k-XcP" firstAttribute="centerY" secondItem="8Eb-9r-932" secondAttribute="centerY" id="pd8-SH-mM0"/> <constraint firstItem="Zkg-6k-XcP" firstAttribute="leading" secondItem="8Eb-9r-932" secondAttribute="trailing" constant="4" id="zwd-6u-Gbt"/> </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="BLJ-lc-YEB"> <rect key="frame" x="0.0" y="46" width="393" height="46"/> <rect key="frame" x="0.0" y="60" width="393" height="46"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ltj-DL-lb4"> <rect key="frame" x="14" y="11" width="4" height="4"/> @@ -196,7 +199,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GpD-dt-0jE"> <rect key="frame" x="0.0" y="92" width="393" height="46"/> <rect key="frame" x="0.0" y="106" width="393" height="46"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="reL-36-mqI"> <rect key="frame" x="14" y="11" width="4" height="4"/> @@ -237,7 +240,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fKp-tk-BMZ"> <rect key="frame" x="0.0" y="138" width="393" height="46"/> <rect key="frame" x="0.0" y="152" width="393" height="46"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Sp6-JJ-i7i"> <rect key="frame" x="14" y="11" width="4" height="4"/> @@ -278,7 +281,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="a9Z-e0-RVA"> <rect key="frame" x="0.0" y="184" width="393" height="46"/> <rect key="frame" x="0.0" y="198" width="393" height="46"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9pI-Ea-HrZ"> <rect key="frame" x="14" y="11" width="4" height="4"/> @@ -294,8 +297,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.000000000000004" y="6.0000000000000009" width="49.333333333333343" 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" y="6.0000000000000009" width="77.666666666666671" 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"/> @@ -327,7 +330,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wxl-Nh-Q0h"> <rect key="frame" x="0.0" y="230" width="393" height="76"/> <rect key="frame" x="0.0" y="244" width="393" height="76"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="J5H-Bq-WaZ"> <rect key="frame" x="14" y="11" width="4" height="4"/> @@ -387,7 +390,7 @@ </subviews> </stackView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zJ5-21-kLx"> <rect key="frame" x="0.0" y="357" width="393" height="149.33333333333337"/> <rect key="frame" x="0.0" y="371" width="393" height="149.33333333333337"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="d2i-mV-pu5"> <rect key="frame" x="13" y="0.0" width="380" height="1"/> @@ -424,7 +427,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dan-qg-cLQ"> <rect key="frame" x="0.0" y="506.33333333333337" width="393" height="115"/> <rect key="frame" x="0.0" y="520.33333333333337" width="393" height="115"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ELv-4d-A6p"> <rect key="frame" x="13" y="0.0" width="380" height="1"/> @@ -478,7 +481,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5wv-LK-WEg"> <rect key="frame" x="0.0" y="621.33333333333337" width="393" height="115"/> <rect key="frame" x="0.0" y="635.33333333333337" width="393" height="115"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qxw-c2-zsl"> <rect key="frame" x="13" y="0.0" width="380" height="1"/> @@ -488,7 +491,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gG3-fm-qze"> <rect key="frame" x="13" y="114" width="380" height="1"/> <rect key="frame" x="13" y="113.99999999999989" width="380" height="1"/> <color key="backgroundColor" red="0.59215686270000001" green="0.59215686270000001" blue="0.59215686270000001" alpha="0.22" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="1" id="RKP-mR-awy"/> @@ -525,7 +528,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yFM-tU-dMy"> <rect key="frame" x="0.0" y="736.33333333333337" width="393" height="149.33333333333337"/> <rect key="frame" x="0.0" y="750.33333333333326" width="393" height="149.33333333333337"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="53b-9u-D2e"> <rect key="frame" x="13" y="0.0" width="380" height="1"/> @@ -535,13 +538,13 @@ </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="qEc-jv-Bpx"> <rect key="frame" x="14" y="14.999999999999885" width="365" height="19.333333333333329"/> <rect key="frame" x="14" y="14.999999999999998" width="365" height="19.333333333333329"/> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="16"/> <nil key="textColor"/> <nil key="highlightedColor"/> </label> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="SpQ-0k-1EN"> <rect key="frame" x="0.0" y="49.333333333333371" width="393" height="100"/> <rect key="frame" x="0.0" y="49.333333333333485" width="393" height="100"/> <constraints> <constraint firstAttribute="height" constant="100" id="mAy-Ng-8UL"/> </constraints> WanPai/Root/Activity/VC/ActivityStudentListVC.swift
@@ -64,6 +64,7 @@ cell.indexPath = indexPath cell.img_radio.isHidden = true cell.activityDetailPartModel = viewModel.dataSource.value[indexPath.row] cell.btn_verifiy.isHidden = !viewModel.dataSource.value[indexPath.row].idcard.isEmpty cell.delClouse = {index in CommonAlertView.show(title: "提示", content: "确认删除当前人员吗？") { [weak self] status in guard let weakSelf = self else { return } WanPai/Root/Activity/View/StudentUpdateInfoView.swift
@@ -55,6 +55,9 @@ storesView.frame = sceneDelegate?.window?.frame ?? .zero sceneDelegate?.window?.addSubview(storesView) storesView.cons_bottom.constant = 0 storesView.tf_phone.text = model.phone storesView.tf_height.text = model.height.string storesView.tf_weight.text = model.weight.string UIView.animate(withDuration: 0.4) { storesView.alpha = 1 @@ -95,4 +98,9 @@ self.removeFromSuperview() } } override func layoutSubviews() { super.layoutSubviews() view_container.jq_addCorners(corner: [.topLeft,.topRight], radius: 20,width: JQ_ScreenW,height: JQ_ScreenW) } } WanPai/Root/Activity/View/StudentUpdateInfoView.xib
@@ -40,7 +40,7 @@ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入运动营成员身高" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Zec-I5-pJT" customClass="QMUITextField"> <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入身高" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Zec-I5-pJT" customClass="QMUITextField"> <rect key="frame" x="120" y="0.0" width="233" height="50"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/> <textInputTraits key="textInputTraits" keyboardType="numberPad"/> @@ -94,7 +94,7 @@ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入运动营成员体重" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="U4X-od-m4c" customClass="QMUITextField"> <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入体重" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="U4X-od-m4c" customClass="QMUITextField"> <rect key="frame" x="120" y="0.0" width="233" height="50"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/> <textInputTraits key="textInputTraits" keyboardType="numberPad"/> @@ -145,7 +145,7 @@ <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入运动营成员联系方式" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Cui-v0-oxz" customClass="QMUITextField"> <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入联系方式" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Cui-v0-oxz" customClass="QMUITextField"> <rect key="frame" x="120" y="0.0" width="233" height="50"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/> <textInputTraits key="textInputTraits" keyboardType="numberPad"/> WanPai/Root/Course/VC/AddStudentVC.swift
@@ -12,10 +12,14 @@ class AddStudentVC: BaseVC { @IBOutlet weak var img_profile: UIImageView! @IBOutlet weak var view_profile: UIView! @IBOutlet weak var tf_name: QMUITextField! @IBOutlet weak var tf_gender: UITextField! @IBOutlet weak var tf_idCard: UITextField! @IBOutlet weak var tf_height: QMUITextField! @IBOutlet weak var view_height: UIView! @IBOutlet weak var view_weight: UIView! @IBOutlet weak var view_phone: UIView! @IBOutlet weak var tf_weight: QMUITextField! @IBOutlet weak var tf_phone: QMUITextField! @IBOutlet weak var tf_birthday: UITextField! @@ -24,6 +28,7 @@ var studentModel = StudentProfileModel() var studentInfo:StudentProfile1Model? var activityDetailPartModel:ActivityDetailPartModel? var type:ItemType! var verifyIdCard:Bool = false @@ -34,6 +39,12 @@ self.studentInfo = studentInfo } init(activityDetailPartModel:ActivityDetailPartModel? = nil) { super.init(nibName: nil, bundle: nil) self.type = .activity self.activityDetailPartModel = activityDetailPartModel } required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") } @@ -42,6 +53,7 @@ super.viewDidLoad() if type == .course{ title = "添加运动营成员" view_profile.isHidden = false if studentInfo != nil{ title = "编辑运动营成员" tf_name.placeholder = "请输入运动营成员姓名" @@ -60,12 +72,30 @@ studentModel.stuId = studentInfo!.stuId } }else{ view_profile.isHidden = true title = "添加人员" tf_name.placeholder = "请输入人员姓名" tf_height.placeholder = "请输入人员身高" tf_weight.placeholder = "请输入人员体重" tf_phone.placeholder = "请输入人员联系方式" tf_idCard.placeholder = "请输入人员身份证号" if let m = activityDetailPartModel{ title = "编辑人员" tf_name.text = m.name tf_idCard.text = m.idcard tf_height.text = String(format: "%.0lf", m.height) tf_weight.text = String(format: "%.0lf", m.weight) tf_phone.text = m.phone tf_birthday.text = m.birthday tf_gender.text = m.gender == .man ? "男":"女" view_height.isHidden = true view_weight.isHidden = true view_phone.isHidden = true tf_name.isEnabled = false tf_birthday.isEnabled = false tf_gender.isEnabled = false } } let idCardView = IDCardView() @@ -93,23 +123,26 @@ @IBAction func completeAction(_ sender: UIButton) { if studentInfo == nil{ if studentInfo == nil && type == .course{ guard profileImg != nil else {alertError(msg: "请上传运动营成员头像");return} } guard !tf_name.text!.isEmpty else {alertError(msg: tf_name.placeholder!);return} guard !tf_birthday.text!.isEmpty else {alertError(msg: "请选择生日");return} guard !tf_gender.text!.isEmpty else {alertError(msg: "请选择性别");return} if type == .course{ guard !tf_height.text!.isEmpty else {alertError(msg: tf_height.placeholder!);return} guard !tf_weight.text!.isEmpty else {alertError(msg: tf_weight.placeholder!);return} guard tf_height.text != "0" else {alertError(msg: "请输入正确的身高");return} guard tf_weight.text != "0" else {alertError(msg: "请输入正确的体重");return} } if !tf_phone.isEmpty{ guard tf_phone.text!.jq_isPhone else {alertError(msg: "请输入正确的手机号");return} } if !tf_idCard.isEmpty{ if !tf_idCard.isEmpty || activityDetailPartModel != nil{ guard tf_idCard.text!.jq_idCard() else {alertError(msg: "请输入正确的身份证号码");return} } @@ -150,6 +183,12 @@ }.disposed(by: disposeBag) } }else{ if activityDetailPartModel != nil{ activityDetailPartModel!.idcard = tf_idCard.text! Services.editParticipant(activityDetailPartModel!).subscribe(onNext: {[weak self] data in self?.addStudentSuccess(text: "编辑成功") }).disposed(by: disposeBag) }else{ Services.addParticipant(studentModel).subscribe(onNext: {[weak self] data in @@ -157,6 +196,7 @@ }).disposed(by: disposeBag) } } } private func addStudentSuccess(text:String){ alertSuccess(msg: text) WanPai/Root/Course/VC/AddStudentVC.xib
@@ -21,6 +21,10 @@ <outlet property="tf_phone" destination="eT7-mO-3I8" id="1JO-Qe-MwA"/> <outlet property="tf_weight" destination="XDz-T3-HBc" id="POj-aw-Njj"/> <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/> <outlet property="view_height" destination="R0d-XL-DhI" id="kCz-Hc-g8o"/> <outlet property="view_phone" destination="2nU-pk-phu" id="7Kt-bt-pxh"/> <outlet property="view_profile" destination="jtt-Cf-G95" id="7Mp-Gj-moY"/> <outlet property="view_weight" destination="iPl-pJ-Ftu" id="p9V-tb-1GS"/> </connections> </placeholder> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> @@ -28,8 +32,14 @@ <rect key="frame" x="0.0" y="0.0" width="393" height="852"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="d3m-we-29R"> <rect key="frame" x="0.0" y="59.000000000000028" width="393" height="503.66666666666674"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jtt-Cf-G95"> <rect key="frame" x="0.0" y="0.0" width="393" height="151"/> <subviews> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="btn_add_large" translatesAutoresizingMaskIntoConstraints="NO" id="5oh-CW-AiU"> <rect key="frame" x="145.66666666666666" y="81" width="102" height="102"/> <rect key="frame" x="145.66666666666666" y="24.666666666666671" width="102" height="102"/> <constraints> <constraint firstAttribute="width" constant="102" id="Pfw-bl-ayh"/> <constraint firstAttribute="height" constant="102" id="Udg-me-xe5"/> @@ -41,11 +51,16 @@ </userDefinedRuntimeAttribute> </userDefinedRuntimeAttributes> </imageView> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="d3m-we-29R"> <rect key="frame" x="0.0" y="204.00000000000003" width="393" height="352.66666666666674"/> <subviews> </subviews> <color key="backgroundColor" systemColor="systemBackgroundColor"/> <constraints> <constraint firstItem="5oh-CW-AiU" firstAttribute="centerX" secondItem="jtt-Cf-G95" secondAttribute="centerX" id="5tT-SS-QDP"/> <constraint firstAttribute="height" constant="151" id="XM9-a5-PlT"/> <constraint firstItem="5oh-CW-AiU" firstAttribute="centerY" secondItem="jtt-Cf-G95" secondAttribute="centerY" id="fFX-we-lw7"/> </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sgk-Rq-GPl"> <rect key="frame" x="0.0" y="0.0" width="393" height="50.333333333333336"/> <rect key="frame" x="0.0" y="151" width="393" height="50.333333333333343"/> <subviews> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_item_p" translatesAutoresizingMaskIntoConstraints="NO" id="3Gg-cy-Mrj"> <rect key="frame" x="15" y="19.333333333333343" width="12" height="12"/> @@ -91,20 +106,20 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PXO-vA-az9"> <rect key="frame" x="0.0" y="50.333333333333343" width="393" height="50.333333333333343"/> <rect key="frame" x="0.0" y="201.33333333333331" width="393" height="50.333333333333343"/> <subviews> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_item_p" translatesAutoresizingMaskIntoConstraints="NO" id="waQ-bZ-tyt"> <rect key="frame" x="15" y="19.333333333333343" width="12" height="12"/> <rect key="frame" x="15" y="19.333333333333371" width="12" height="12"/> </imageView> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="c21-81-tiw"> <rect key="frame" x="14" y="49.999999999999972" width="365" height="0.3333333333333357"/> <rect key="frame" x="14" y="50" 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="yBJ-iI-HbF"/> </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="Fjk-Kb-cDF"> <rect key="frame" x="30" y="16.666666666666657" width="28.666666666666671" height="17"/> <rect key="frame" x="30" y="16.666666666666686" 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"/> @@ -115,7 +130,7 @@ <textInputTraits key="textInputTraits"/> </textField> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_calendar" translatesAutoresizingMaskIntoConstraints="NO" id="BoR-bb-Uqf"> <rect key="frame" x="361" y="16.333333333333343" width="18" height="18"/> <rect key="frame" x="361" y="16.333333333333371" width="18" height="18"/> </imageView> </subviews> <color key="backgroundColor" systemColor="systemBackgroundColor"/> @@ -137,7 +152,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Fst-1Q-XPB"> <rect key="frame" x="0.0" y="100.66666666666669" width="393" height="50.666666666666657"/> <rect key="frame" x="0.0" y="251.66666666666666" width="393" height="50.666666666666657"/> <subviews> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_item_p" translatesAutoresizingMaskIntoConstraints="NO" id="Gbp-P5-iwf"> <rect key="frame" x="15" y="19.333333333333314" width="12" height="12"/> @@ -183,7 +198,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="R0d-XL-DhI"> <rect key="frame" x="0.0" y="151.33333333333331" width="393" height="50.333333333333343"/> <rect key="frame" x="0.0" y="302.33333333333331" width="393" height="50.333333333333314"/> <subviews> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_item_p" translatesAutoresizingMaskIntoConstraints="NO" id="3dp-Mn-mBX"> <rect key="frame" x="15" y="19" width="12" height="12"/> @@ -237,7 +252,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iPl-pJ-Ftu"> <rect key="frame" x="0.0" y="201.66666666666669" width="393" height="50.333333333333343"/> <rect key="frame" x="0.0" y="352.66666666666669" width="393" height="50.333333333333314"/> <subviews> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_item_p" translatesAutoresizingMaskIntoConstraints="NO" id="tDX-uz-7Lt"> <rect key="frame" x="15" y="19" width="12" height="12"/> @@ -291,7 +306,7 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2nU-pk-phu"> <rect key="frame" x="0.0" y="252.00000000000003" width="393" height="50.333333333333343"/> <rect key="frame" x="0.0" y="403" width="393" height="50.333333333333314"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="c6a-Ai-3Np"> <rect key="frame" x="14" y="50" width="365" height="0.3333333333333357"/> @@ -332,17 +347,17 @@ </constraints> </view> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eXg-lM-iFa"> <rect key="frame" x="0.0" y="302.33333333333331" width="393" height="50.333333333333314"/> <rect key="frame" x="0.0" y="453.33333333333337" width="393" height="50.333333333333314"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="NlW-dD-gIp"> <rect key="frame" x="14" y="50.000000000000057" width="365" height="0.3333333333333357"/> <rect key="frame" x="14" y="50" 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="i2J-rI-rHl"/> </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="JjF-jS-GPH"> <rect key="frame" x="14.000000000000004" y="16.666666666666686" width="57.333333333333343" height="17"/> <rect key="frame" x="14.000000000000004" y="16.666666666666629" 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"/> @@ -370,7 +385,7 @@ </subviews> </stackView> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="KyK-7A-Oi3"> <rect key="frame" x="100" y="595.66666666666663" width="193" height="40"/> <rect key="frame" x="100" y="601.66666666666663" width="193" height="40"/> <color key="backgroundColor" name="FE6E0D"/> <constraints> <constraint firstAttribute="height" constant="40" id="ftL-wZ-RWw"/> @@ -396,10 +411,8 @@ <constraint firstItem="KyK-7A-Oi3" firstAttribute="top" secondItem="d3m-we-29R" secondAttribute="bottom" constant="39" id="8HH-th-KGV"/> <constraint firstItem="KyK-7A-Oi3" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" constant="100" id="GQG-YU-FM0"/> <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="d3m-we-29R" secondAttribute="trailing" id="GUV-89-fyH"/> <constraint firstItem="5oh-CW-AiU" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" constant="22" id="QvX-15-W0k"/> <constraint firstItem="d3m-we-29R" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="Oq1-zv-ea2"/> <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="KyK-7A-Oi3" secondAttribute="trailing" constant="100" id="gh3-61-wYy"/> <constraint firstItem="5oh-CW-AiU" firstAttribute="centerX" secondItem="fnl-2z-Ty3" secondAttribute="centerX" id="nOm-Zk-VjG"/> <constraint firstItem="d3m-we-29R" firstAttribute="top" secondItem="5oh-CW-AiU" secondAttribute="bottom" constant="21" id="qXQ-dq-ECr"/> </constraints> <point key="canvasLocation" x="40" y="21"/> </view> WanPai/Root/Course/VC/CourseDetailApplyVC.swift
@@ -250,6 +250,7 @@ } }else{ self?.navigationController?.popToRootViewController(animated: true) NotificationCenter.default.post(name: ChooseHomeStore_Noti, object: nil) } } } WanPai/Root/Login/VC/LoginVC.swift
@@ -144,10 +144,16 @@ guard !tf_verify.text!.isEmpty else {alertError(msg: tf_verify.placeholder!);return} guard btn_reader.isSelected else {alert(msg: "请阅读并同意《隐私协议》《用户协议》《运动安全告知书》");return} Services.login(phone: tf_phone.text!, verity: tf_verify.text!, type: type).subscribe(onNext: {data in Services.login(phone: tf_phone.text!, verity: tf_verify.text!, type: type).subscribe(onNext: {[weak self] data in guard let weakSelf = self else { return } if let token = data.data{ UserViewModel.saveToken(token) Services.userDetails().subscribe(onNext: {data in if let m = data.data{m.save()} app.registerAndLoginSuccess() }) { error in }.disposed(by: weakSelf.disposeBag) } }) { error in
@@ -6,6 +6,7 @@ // import UIKit import JQTools class StudentInfo_2_TCell: UITableViewCell { @@ -18,6 +19,7 @@ @IBOutlet weak var label_age: UILabel! @IBOutlet weak var label_phone: UILabel! @IBOutlet weak var view_container: UIView! @IBOutlet weak var btn_verifiy: UIButton! var indexPath:IndexPath? @@ -56,4 +58,9 @@ delClouse?(index) } } @IBAction func verifyAction(_ sender: UIButton) { let vc = AddStudentVC(activityDetailPartModel: activityDetailPartModel) JQ_currentViewController().jq_push(vc: vc) } } WanPai/Root/Other/TCell/StudentInfo_2_TCell.xib
@@ -4,6 +4,7 @@ <dependencies> <deployment identifier="iOS"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22130"/> <capability name="Named colors" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -36,16 +37,17 @@ <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="gOu-3c-tKG"> <rect key="frame" x="114" y="13" width="71.666666666666686" height="20"/> <rect key="frame" x="114" y="13" width="72" height="20"/> <constraints> <constraint firstAttribute="width" constant="72" id="QOb-bt-3AB"/> <constraint firstAttribute="height" constant="20" id="RGA-qN-hRc"/> </constraints> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" 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="YtF-LX-bzG"> <rect key="frame" x="185.66666666666666" y="14.666666666666668" width="13.333333333333343" height="17"/> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="YtF-LX-bzG"> <rect key="frame" x="186" y="14.666666666666668" width="121" height="17"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/> <nil key="textColor"/> <nil key="highlightedColor"/> @@ -67,6 +69,10 @@ </label> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uRT-PP-Jry"> <rect key="frame" x="320" y="12" width="16" height="22"/> <constraints> <constraint firstAttribute="height" constant="22" id="ZuO-vl-7nt"/> <constraint firstAttribute="width" constant="16" id="nGC-eN-Hyj"/> </constraints> <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> <state key="normal" image="btn_delete"/> <connections> @@ -98,15 +104,32 @@ </button> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="btn_select_u" translatesAutoresizingMaskIntoConstraints="NO" id="lvC-v3-2oB"> <rect key="frame" x="317" y="13" width="20" height="20"/> <constraints> <constraint firstAttribute="height" constant="20" id="KAC-Uk-jLD"/> <constraint firstAttribute="width" constant="20" id="d3f-O4-daf"/> </constraints> </imageView> <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1mF-lo-cuA"> <rect key="frame" x="186" y="8.6666666666666643" width="61" height="29"/> <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="去实名>>"> <color key="titleColor" name="FE6E0D"/> </state> <connections> <action selector="verifyAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="1rK-v5-8Fl"/> </connections> </button> </subviews> <color key="backgroundColor" red="1" green="0.90588235289999997" blue="0.80000000000000004" alpha="0.080000000000000002" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstItem="1mF-lo-cuA" firstAttribute="leading" secondItem="gOu-3c-tKG" secondAttribute="trailing" id="061-Lq-xu1"/> <constraint firstItem="FQi-mi-aCF" firstAttribute="top" secondItem="uRT-PP-Jry" secondAttribute="bottom" constant="19" id="1FK-NS-dpb"/> <constraint firstItem="uRT-PP-Jry" firstAttribute="centerY" secondItem="sgg-OU-d22" secondAttribute="centerY" id="4Jr-EZ-QqL"/> <constraint firstItem="eQZ-Ha-dGW" firstAttribute="leading" secondItem="yyi-BO-9d9" secondAttribute="trailing" id="6na-ib-giW"/> <constraint firstItem="ea1-1b-JMG" firstAttribute="top" secondItem="sgg-OU-d22" secondAttribute="bottom" constant="11" id="6o3-4f-K5H"/> <constraint firstItem="YtF-LX-bzG" firstAttribute="centerY" secondItem="gOu-3c-tKG" secondAttribute="centerY" id="Alx-c5-GYf"/> <constraint firstItem="1mF-lo-cuA" firstAttribute="centerY" secondItem="gOu-3c-tKG" secondAttribute="centerY" id="As6-by-08T"/> <constraint firstAttribute="height" constant="76" id="BY0-d9-3cK"/> <constraint firstAttribute="trailing" secondItem="lvC-v3-2oB" secondAttribute="trailing" constant="7" id="FhT-yd-etx"/> <constraint firstItem="yyi-BO-9d9" firstAttribute="centerY" secondItem="ea1-1b-JMG" secondAttribute="centerY" id="G4R-IV-a20"/> @@ -125,6 +148,7 @@ <constraint firstItem="sgg-OU-d22" firstAttribute="top" secondItem="6Lm-Eu-daG" secondAttribute="top" constant="13" id="nmT-EF-UXS"/> <constraint firstItem="U15-qH-Kc3" firstAttribute="leading" secondItem="ea1-1b-JMG" secondAttribute="trailing" id="oae-cJ-fcE"/> <constraint firstItem="iDi-s9-qiA" firstAttribute="centerY" secondItem="sgg-OU-d22" secondAttribute="centerY" id="sex-Q8-Jzw"/> <constraint firstItem="lvC-v3-2oB" firstAttribute="leading" secondItem="YtF-LX-bzG" secondAttribute="trailing" constant="10" id="yDP-cM-9Ec"/> </constraints> <userDefinedRuntimeAttributes> <userDefinedRuntimeAttribute type="color" keyPath="borderColor"> @@ -151,6 +175,7 @@ <connections> <outlet property="btn_delete" destination="uRT-PP-Jry" id="oVl-2n-p1K"/> <outlet property="btn_edit" destination="FQi-mi-aCF" id="Utm-lZ-OLO"/> <outlet property="btn_verifiy" destination="1mF-lo-cuA" id="C1N-7C-mBl"/> <outlet property="img_radio" destination="lvC-v3-2oB" id="8h7-kF-JB2"/> <outlet property="label_age" destination="U15-qH-Kc3" id="1Dv-0w-hQ8"/> <outlet property="label_idCard" destination="YtF-LX-bzG" id="tut-IZ-HEr"/> @@ -165,5 +190,8 @@ <image name="btn_delete" width="16" height="18"/> <image name="btn_edit" width="17" height="18"/> <image name="btn_select_u" width="20" height="20"/> <namedColor name="FE6E0D"> <color red="0.99199998378753662" green="0.53299999237060547" blue="0.0080000003799796104" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> </namedColor> </resources> </document> WanPai/Root/Other/VC/PaymentResultVC.swift
@@ -192,10 +192,12 @@ handleVC.navigationController?.popToRootViewController(animated: true) } dismiss(animated: true) { if sender.titleLabel?.text == "我的数据"{ JQ_currentViewController().jq_push(vc: GamesDataSourceVC()) } } } } extension PaymentResultVC:UICollectionViewDelegate{ func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) { WanPai/Root/Other/VC/ProfileVC.swift
@@ -17,6 +17,7 @@ @IBOutlet weak var label_birthday: UILabel! @IBOutlet weak var label_address: UILabel! @IBOutlet weak var label_vipDutime: UILabel! @IBOutlet weak var view_vipExpired: UIView! private var profileImg:UIImage? @@ -33,6 +34,7 @@ self?.label_address.text = model.address self?.label_vipDutime.text = model.memberLifespan self?.btn_userProfile.sd_setImage(with: URL(string: model.userImage), for: .normal,placeholderImage: UIImage(named: "btn_userProfile")) self?.view_vipExpired.isHidden = model.isVip == 0 } }).disposed(by: disposeBag) 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="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="22154" 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="22130"/> <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"/> @@ -20,6 +20,7 @@ <outlet property="label_username" destination="eQF-2k-COB" id="5jd-xX-OHH"/> <outlet property="label_vipDutime" destination="Xkh-Hd-htf" id="bim-Pe-zm1"/> <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/> <outlet property="view_vipExpired" destination="2K0-H1-xLC" id="4Ve-Pj-Dog"/> </connections> </placeholder> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> @@ -334,7 +335,7 @@ <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </systemColor> <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/Other/View/StudentChooseView.swift
@@ -32,6 +32,8 @@ @IBOutlet weak var cons_bottom: NSLayoutConstraint! @IBOutlet weak var btn_add: QMUIButton! @IBOutlet weak var cons_tableHei: NSLayoutConstraint! @IBOutlet weak var cons_tableLeading: NSLayoutConstraint! @IBOutlet weak var cons_tableTrailing: NSLayoutConstraint! private var clickClouse:(([Any])->Void)! private var needAddClouse:(()->Void)! @@ -87,6 +89,8 @@ }else{ studentChooseView.actViewModel.configure(studentChooseView.tableView,needMore: false) studentChooseView.actViewModel.beginRefresh() studentChooseView.cons_tableLeading.constant = 0 studentChooseView.cons_tableTrailing.constant = 0 } UIView.animate(withDuration: 0.4) { WanPai/Root/Other/View/StudentChooseView.xib
@@ -96,6 +96,8 @@ <outlet property="btn_add" destination="yxv-pI-vBX" id="5Sm-2V-OfF"/> <outlet property="cons_bottom" destination="kSV-Gg-P7I" id="IdC-Sg-7gc"/> <outlet property="cons_tableHei" destination="fgN-xg-prK" id="YHx-Rk-5nD"/> <outlet property="cons_tableLeading" destination="71u-e0-gHp" id="K9v-zT-5Nd"/> <outlet property="cons_tableTrailing" destination="txc-2I-Rlo" id="CZ2-pt-4gN"/> <outlet property="tableView" destination="qk4-DP-KiI" id="YQX-20-evD"/> <outlet property="view_container" destination="7ap-MY-Ney" id="CmC-MB-qxC"/> </connections> WanPai/Root/Welfare/VC/WelfareVC.swift
@@ -21,7 +21,7 @@ @IBOutlet weak var scrollView: UIScrollView! @IBOutlet weak var coinCollectionView: UICollectionView! @IBOutlet weak var btn_coupon: UIButton! @IBOutlet weak var btn_shoppping: UIButton! // @IBOutlet weak var btn_shoppping: UIButton! @IBOutlet weak var btn_weekly: UIButton! @IBOutlet weak var btn_todayFree: UIButton! @@ -89,9 +89,9 @@ 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 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) WanPai/Root/Welfare/VC/WelfareVC.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="22154" 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="22130"/> <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"/> @@ -12,7 +12,6 @@ <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="WelfareVC" customModule="WanPai" customModuleProvider="target"> <connections> <outlet property="btn_coupon" destination="Kte-Xd-tVd" id="Xg6-k9-w88"/> <outlet property="btn_shoppping" destination="QmB-HQ-3Lg" id="1WQ-j1-yHd"/> <outlet property="btn_todayFree" destination="r4f-Ay-EGJ" id="zTX-Pu-U2q"/> <outlet property="btn_vip" destination="6lk-Nd-Tug" id="fed-2F-KP6"/> <outlet property="btn_weekly" destination="hBk-90-GU4" id="R7h-4s-dyR"/> @@ -34,7 +33,7 @@ <rect key="frame" x="0.0" y="59" width="393" height="759"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1kO-ug-2Gd"> <rect key="frame" x="0.0" y="0.0" width="393" height="1694"/> <rect key="frame" x="0.0" y="0.0" width="393" height="1296"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qtJ-Db-Js8"> <rect key="frame" x="0.0" y="0.0" width="393" height="152"/> @@ -289,28 +288,8 @@ </button> </subviews> </stackView> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="线上商城" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z6m-j5-DLh"> <rect key="frame" x="30" y="763" width="65.333333333333329" height="22"/> <constraints> <constraint firstAttribute="height" constant="22" id="Rfd-bP-qtd"/> </constraints> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="16"/> <color key="textColor" red="0.28235294117647058" green="0.28235294117647058" blue="0.28235294117647058" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <button opaque="NO" contentMode="scaleAspectFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QmB-HQ-3Lg"> <rect key="frame" x="0.0" y="804" width="393" height="282.33333333333326"/> <constraints> <constraint firstAttribute="width" secondItem="QmB-HQ-3Lg" secondAttribute="height" multiplier="1:0.7179" id="5Sz-EM-r1Q"/> </constraints> <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> <state key="normal" backgroundImage="bg_welfare_shop"/> <connections> <action selector="storeAction:" destination="-1" eventType="touchUpInside" id="1bD-Kq-ja9"/> </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="01D-ex-NB6"> <rect key="frame" x="40.999999999999993" y="1161.3333333333333" width="65.333333333333314" height="22"/> <rect key="frame" x="40.999999999999993" y="763" width="65.333333333333314" height="22"/> <constraints> <constraint firstAttribute="height" constant="22" id="cZB-Sn-Vhw"/> </constraints> @@ -319,7 +298,7 @@ <nil key="highlightedColor"/> </label> <button opaque="NO" contentMode="scaleAspectFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="hBk-90-GU4"> <rect key="frame" x="41" y="1202.3333333333333" width="311" height="202.66666666666674"/> <rect key="frame" x="41" y="804" width="311" height="203"/> <constraints> <constraint firstAttribute="width" secondItem="hBk-90-GU4" secondAttribute="height" multiplier="1:0.6525" id="iMt-GH-OCP"/> </constraints> @@ -330,7 +309,7 @@ </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="8KD-JW-do0"> <rect key="frame" x="40.999999999999993" y="1440" width="65.333333333333314" height="22"/> <rect key="frame" x="40.999999999999993" y="1042" width="65.333333333333314" height="22"/> <constraints> <constraint firstAttribute="height" constant="22" id="pc0-0u-NIz"/> </constraints> @@ -339,7 +318,10 @@ <nil key="highlightedColor"/> </label> <button opaque="NO" contentMode="scaleAspectFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="r4f-Ay-EGJ"> <rect key="frame" x="41" y="1481" width="311" height="203"/> <rect key="frame" x="41" y="1083" width="311" height="203"/> <constraints> <constraint firstAttribute="width" secondItem="r4f-Ay-EGJ" secondAttribute="height" multiplier="1:0.6525" id="WOq-qS-ptG"/> </constraints> <inset key="imageEdgeInsets" minX="0.0" minY="0.0" maxX="2.2250738585072014e-308" maxY="0.0"/> <state key="normal" backgroundImage="bg_welfare_today"/> <connections> @@ -354,26 +336,20 @@ <constraint firstAttribute="trailing" secondItem="qtJ-Db-Js8" secondAttribute="trailing" id="3Ja-c5-h01"/> <constraint firstItem="8KD-JW-do0" firstAttribute="leading" secondItem="1kO-ug-2Gd" secondAttribute="leading" constant="41" id="3oG-S6-2FT"/> <constraint firstItem="01D-ex-NB6" firstAttribute="leading" secondItem="1kO-ug-2Gd" secondAttribute="leading" constant="41" id="4mE-Yh-4C3"/> <constraint firstItem="z6m-j5-DLh" firstAttribute="top" secondItem="3kA-cL-Ed9" secondAttribute="bottom" constant="47" id="5t0-cg-kKY"/> <constraint firstAttribute="trailing" secondItem="hBk-90-GU4" secondAttribute="trailing" constant="41" id="65D-Zy-aO7"/> <constraint firstItem="qtJ-Db-Js8" firstAttribute="top" secondItem="1kO-ug-2Gd" secondAttribute="top" id="ArH-VK-Ih1"/> <constraint firstItem="hBk-90-GU4" firstAttribute="leading" secondItem="1kO-ug-2Gd" secondAttribute="leading" constant="41" id="DM6-A0-eq8"/> <constraint firstItem="01D-ex-NB6" firstAttribute="top" secondItem="QmB-HQ-3Lg" secondAttribute="bottom" constant="75" id="DxU-LT-Arm"/> <constraint firstItem="15P-Xn-N3C" firstAttribute="leading" secondItem="1kO-ug-2Gd" secondAttribute="leading" constant="30" id="E7I-5W-IU3"/> <constraint firstAttribute="trailing" secondItem="r4f-Ay-EGJ" secondAttribute="trailing" constant="41" id="IEF-Ks-rrX"/> <constraint firstAttribute="trailing" secondItem="yBw-of-rdU" secondAttribute="trailing" id="IP4-Gn-Ai6"/> <constraint firstItem="3kA-cL-Ed9" firstAttribute="top" secondItem="GiC-Xf-dhQ" secondAttribute="bottom" constant="11" id="Kru-uw-J4P"/> <constraint firstItem="r4f-Ay-EGJ" firstAttribute="leading" secondItem="1kO-ug-2Gd" secondAttribute="leading" constant="41" id="Oze-fE-LkT"/> <constraint firstItem="z6m-j5-DLh" firstAttribute="leading" secondItem="1kO-ug-2Gd" secondAttribute="leading" constant="30" id="VE5-2E-Taq"/> <constraint firstItem="r4f-Ay-EGJ" firstAttribute="width" secondItem="r4f-Ay-EGJ" secondAttribute="height" multiplier="1:0.6525" id="WOq-qS-ptG"/> <constraint firstItem="QmB-HQ-3Lg" firstAttribute="top" secondItem="z6m-j5-DLh" secondAttribute="bottom" constant="19" id="WPp-b5-ds2"/> <constraint firstItem="3kA-cL-Ed9" firstAttribute="leading" secondItem="1kO-ug-2Gd" secondAttribute="leading" id="WeR-P6-ZdV"/> <constraint firstAttribute="trailing" secondItem="3kA-cL-Ed9" secondAttribute="trailing" id="bts-6y-Zk6"/> <constraint firstAttribute="trailing" secondItem="QmB-HQ-3Lg" secondAttribute="trailing" id="eil-SP-gTT"/> <constraint firstItem="GiC-Xf-dhQ" firstAttribute="leading" secondItem="1kO-ug-2Gd" secondAttribute="leading" constant="30" id="gY0-D8-1VM"/> <constraint firstItem="01D-ex-NB6" firstAttribute="top" secondItem="3kA-cL-Ed9" secondAttribute="bottom" constant="47" id="nA0-zN-Mne"/> <constraint firstItem="GiC-Xf-dhQ" firstAttribute="top" secondItem="yBw-of-rdU" secondAttribute="bottom" constant="47" id="nqA-X1-BoF"/> <constraint firstItem="hBk-90-GU4" firstAttribute="top" secondItem="01D-ex-NB6" secondAttribute="bottom" constant="19" id="p7O-Nf-d3F"/> <constraint firstItem="QmB-HQ-3Lg" firstAttribute="leading" secondItem="1kO-ug-2Gd" secondAttribute="leading" id="pir-RR-dRc"/> <constraint firstItem="r4f-Ay-EGJ" firstAttribute="top" secondItem="8KD-JW-do0" secondAttribute="bottom" constant="19" id="rIa-aO-Ceb"/> <constraint firstItem="yBw-of-rdU" firstAttribute="top" secondItem="15P-Xn-N3C" secondAttribute="bottom" constant="9" id="tn6-cH-k2u"/> <constraint firstItem="qtJ-Db-Js8" firstAttribute="leading" secondItem="1kO-ug-2Gd" secondAttribute="leading" id="vz9-lC-ac4"/> @@ -404,7 +380,6 @@ <resources> <image name="bg_welfare" width="308" height="201"/> <image name="bg_welfare_coupon" width="390" height="281"/> <image name="bg_welfare_shop" width="390" height="280"/> <image name="bg_welfare_today" width="308" height="201"/> <image name="icon_coin_tiny" width="14" height="14"/> <image name="icon_score" width="16" height="16"/> @@ -416,7 +391,7 @@ <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </systemColor> <systemColor name="tertiarySystemGroupedBackgroundColor"> <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/Yard/VC/YardDetailVC.swift
@@ -378,7 +378,6 @@ case .courseNum:break } } },onError: { error in if let er = error as? NetworkRequest.NetRequestError{ switch er { @@ -396,6 +395,7 @@ } }else{ weakSelf.navigationController?.popToRootViewController(animated: true) NotificationCenter.default.post(name: ChooseHomeStore_Noti, object: nil) } } }
