| Podfile | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Podfile.lock | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WanPai.xcodeproj/project.pbxproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WanPai/Config/Enums.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WanPai/Root/Home/VC/HomeVC.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WanPai/Root/Home/VC/JoinMemberVC.swift | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WanPai/Root/Home/VC/JoinMemberVC.xib | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Podfile
@@ -6,7 +6,7 @@ use_frameworks! # Pods for WanPai pod 'JQTools',:path=> '/Users/JQTools' # 个人开发库 pod 'JQTools',:path=> '/Users/ls/JQTools' # 个人开发库 pod 'SwifterSwift' # Swift便捷常用工具库 pod 'FFPage' # 分页 pod 'SPPageMenu' # 配合FFPage 顶部导航分页 Podfile.lock
@@ -440,7 +440,7 @@ - CryptoSwift - FFPage - FSCalendar - JQTools (from `/Users/JQTools`) - JQTools (from `/Users/ls/JQTools`) - Lantern - SPPageMenu - SVProgressHUD @@ -489,7 +489,7 @@ EXTERNAL SOURCES: JQTools: :path: "/Users/JQTools" :path: "/Users/ls/JQTools" SPEC CHECKSUMS: Alamofire: 7193b3b92c74a07f85569e1a6c4f4237291e7496 @@ -510,7 +510,7 @@ IQKeyboardToolbarManager: 6c693c8478d6327a7ef2107528d29698b3514dbb IQTextInputViewNotification: f5e954d8881fd9808b744e49e024cc0d4bcfe572 IQTextView: ae13b4922f22e6f027f62c557d9f4f236b19d5c7 JQTools: 9bab551ab1200f2d47ea9d40ddca6ea90563a0dc JQTools: 1967cc465c5f11247f094c0ba46ecc58fe81283c Lantern: b192e7146c6d04e15e627f37281254a6a8593703 MJRefresh: ff9e531227924c84ce459338414550a05d2aea78 ObjcExceptionBridging: d3d37d62981bb7f252ecb31b62d7e23a96bbfb8a @@ -531,6 +531,6 @@ WechatOpenSDK: a363db41205f57abbc05bb6b80bf2d2ed1ea40bf XCGLogger: 399c5885210b4e2ad79d9f7a29b105d672ef724f PODFILE CHECKSUM: 0e980c2e598112169188637756da8b7582905065 PODFILE CHECKSUM: 9741d51f243238edc9a3fe4e16e61f50667c0d43 COCOAPODS: 1.16.2 WanPai.xcodeproj/project.pbxproj
@@ -1983,9 +1983,13 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-WanPai/Pods-WanPai-resources-${CONFIGURATION}-input-files.xcfilelist", ); inputPaths = ( ); name = "[CP] Copy Pods Resources"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-WanPai/Pods-WanPai-resources-${CONFIGURATION}-output-files.xcfilelist", ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -2000,9 +2004,13 @@ inputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-WanPai/Pods-WanPai-frameworks-${CONFIGURATION}-input-files.xcfilelist", ); inputPaths = ( ); name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( "${PODS_ROOT}/Target Support Files/Pods-WanPai/Pods-WanPai-frameworks-${CONFIGURATION}-output-files.xcfilelist", ); outputPaths = ( ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -2394,7 +2402,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 19; DEVELOPMENT_TEAM = 67658A7VFB; DEVELOPMENT_TEAM = 2MWV8K39DV; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/WanPai/YYPaymentManager/Alipay", @@ -2576,7 +2584,7 @@ SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_COMPILATION_MODE = singlefile; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OBJC_BRIDGING_HEADER = "/Users/luoshuang/PlayPai/WanPai-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "/Users/ls/PlayPai/WanPai-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; @@ -2593,7 +2601,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 19; DEVELOPMENT_TEAM = 67658A7VFB; DEVELOPMENT_TEAM = 2MWV8K39DV; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/WanPai/YYPaymentManager/Alipay", @@ -2776,7 +2784,7 @@ SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_COMPILATION_MODE = singlefile; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OBJC_BRIDGING_HEADER = "/Users/luoshuang/PlayPai/WanPai-Bridging-Header.h"; SWIFT_OBJC_BRIDGING_HEADER = "/Users/ls/PlayPai/WanPai-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-O"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; WanPai/Config/Enums.swift
@@ -129,6 +129,8 @@ case worldcupDetail = 9 case huimin = 10 //会员 case huiyuan = 11 case nothing = -999
@@ -430,7 +430,10 @@ push(vc: vc) case .nothing: break } case .huiyuan: let joinMemberVC = JoinMemberVC() push(vc: joinMemberVC) } } if let m = item as? HomeStoreTopBannerModel{ WanPai/Root/Home/VC/JoinMemberVC.swift
@@ -28,6 +28,7 @@ }else if indexPath.row > 0 && indexPath.row < ((model?.vipList[selectIndex].couponList.count ?? 0) + 1) { let cell = tableView.dequeueReusableCell(withIdentifier: "_WelfareCouponsTCell", for: indexPath) as! WelfareCouponsTCell cell.indexPath = indexPath // cell.moneyLab.text = model?.vipList[selectIndex].couponList[indexPath.row - 1].ruleModel?.deductionAmount // cell.remarksLab.text = model?.vipList[selectIndex].couponList[indexPath.row - 1].ruleModel?.conditionalAmount // cell.nameLab.text = model?.vipList[selectIndex].couponList[indexPath.row - 1].name @@ -55,7 +56,13 @@ return 295 }else if indexPath.row > 0 && indexPath.row < ((model?.vipList[selectIndex].couponList.count ?? 0) + 1) { return 170 let model = model?.vipList[selectIndex].couponList[indexPath.row - 1] if rows.contains(where: {$0 == indexPath.row}){ let h = max(String.jq_getHeight(text: model?.instructionsForUse ?? "", width: UIScreen.main.bounds.size.width - 200, font: 12), 30) return h + 125 }else{ return 125 } }else{ return 110 } @@ -65,7 +72,7 @@ @IBOutlet weak var scrBackView: UIView! var model: VipDataModel? var selectIndex: Int = 0 private var rows = Set<Int>() @IBOutlet weak var headerImg: UIImageView! @IBOutlet weak var memberLab: UILabel! @IBOutlet weak var nameLab: UILabel! @@ -83,14 +90,26 @@ self?.model = data.data self?.tabView.reloadData() self?.nameLab.text = data.data?.name if data.data?.isVip ?? 0 > 0 { if data.data?.isVip ?? 0 == 0 { self?.memberLab.text = "当前暂未开通会员" }else{ self?.memberLab.text = "Vip" } self?.headerImg.sd_setImage(with: URL(string: self?.model?.headImg ?? "")) self?.headerImg.sd_setImage(with: URL(string: self?.model?.headImg ?? "") ,placeholderImage: UIImage(named: "user_default")) }).disposed(by: disposeBag) NotificationCenter.default.rx.notification(WelfareCoupons_Noti).take(until: self.rx.deallocated).subscribe(onNext: {noti in if let row = noti.object as? Int{ if self.rows.contains(row){ self.rows.remove(row) }else{ self.rows.insert(row) } self.tabView.beginUpdates() self.tabView.reloadRows(at: [IndexPath(row: row, section: 0)], with: .fade) self.tabView.endUpdates() } }).disposed(by: disposeBag) }
@@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> <document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="23727" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES"> <device id="retina6_12" orientation="portrait" appearance="light"/> <dependencies> <deployment identifier="iOS"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23721"/> <capability name="System colors in document resources" minToolsVersion="11.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> </dependencies> @@ -32,7 +32,7 @@ <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JCJ-e1-WjV"> <rect key="frame" x="14" y="120" width="365" height="130"/> <subviews> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="eXB-k6-87a"> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="user_default" translatesAutoresizingMaskIntoConstraints="NO" id="eXB-k6-87a"> <rect key="frame" x="20" y="30" width="70" height="70"/> <constraints> <constraint firstAttribute="height" constant="70" id="Wh1-bt-uB8"/> @@ -217,6 +217,7 @@ <image name="Rectangle" width="390" height="379.66665649414062"/> <image name="btn_choose_1" width="24" height="24"/> <image name="btn_choose_s" width="25" height="25"/> <image name="user_default" width="50" height="50"/> <systemColor name="systemBackgroundColor"> <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/> </systemColor>
