WanPai/Common/View/CommonBannerView.swift
@@ -62,6 +62,7 @@ scrollView.contentOffset = CGPoint(x:width,y:0) scrollView.isUserInteractionEnabled = true scrollView.isPagingEnabled = true scrollView.isScrollEnabled = images.count > 1 scrollView.showsHorizontalScrollIndicator = false scrollView.delegate = self self.addSubview(scrollView) @@ -90,13 +91,18 @@ scrollView.addSubview(image) setImage(image: image, index: 0) pageControl.center = CGPoint(x:width/2,y:height - CGFloat(15)) // pageControl.center = CGPoint(x:width/2,y:height - CGFloat(15)) pageControl.isEnabled = true pageControl.numberOfPages = images.count pageControl.currentPageIndicatorTintColor = UIColor.green pageControl.pageIndicatorTintColor = UIColor.gray pageControl.currentPageIndicatorTintColor = UIColor.white pageControl.pageIndicatorTintColor = UIColor.gray.withAlphaComponent(0.5) pageControl.isUserInteractionEnabled = false pageControl.isHidden = images.count == 1 self.addSubview(pageControl) pageControl.snp.makeConstraints { make in make.bottom.equalToSuperview().offset(0) make.centerX.equalToSuperview() } //当前显示的只有 center_image 其他两个只是⽤来增加滑动时效果⽽已，不 //addTapGesWithImage(image: center_image) WanPai/Config/Enums.swift
@@ -11,14 +11,12 @@ enum BannerPositionType:Int{ /// 首页 case homeTop = 1 ///首页底部 case homeBottom = 2 ///线上课得积分 case onlineCourse = 3 case onlineCourse = 2 ///看视频得奖励 case video = 4 case video = 3 ///常见问题 case qusition = 5 case qusition = 4 } /// 登录类型 WanPai/Network/Services.swift
@@ -218,7 +218,7 @@ /// 获取banner图 /// - Parameter position: 位置（1=首页，2=首页底部，3=线上课得积分，4=看视频得奖励，5=常见问题） /// - Parameter position: 位置（1=首页，2=线上课得积分，3=看视频得奖励，4=常见问题） class func bannerList(position:BannerPositionType)->Observable<BaseResponse<[BannerModel]>>{ let params = ParamsAppender.build(url: All_Url) .interface(url: "/other/base/banner/queryBannerList") WanPai/Root/Activity/VC/ActivityListVC.swift
@@ -49,7 +49,7 @@ tableView.dataSource = self tf_search.delegate = self tableView.register(UINib(nibName: "ActivityInfoTCell", bundle: nil), forCellReuseIdentifier: "_ActivityInfoTCell") tableView.jq_setEmptyView() // tableView.jq_setEmptyView() btn_holdCity.imagePosition = .right btn_holdCity.spacingBetweenImageAndTitle = 5 WanPai/Root/Activity/VC/ActivitySignupListSubVC.swift
@@ -42,7 +42,7 @@ super.viewDidLoad() view.backgroundColor = .white tableView.jq_setEmptyView() // tableView.jq_setEmptyView() viewModel.configure(tableView) viewModel.beginRefresh() } WanPai/Root/Activity/VC/ActivityStudentListVC.swift
@@ -39,7 +39,7 @@ tableView.dataSource = self tableView.separatorStyle = .none tableView.register(UINib(nibName: "StudentInfo_2_TCell", bundle: nil), forCellReuseIdentifier: "_StudentInfo_2_TCell") tableView.jq_setEmptyView("暂无参赛人员") // tableView.jq_setEmptyView("暂无参赛人员") } override func setRx() { WanPai/Root/Activity/View/StoresInfoView.swift
@@ -34,7 +34,7 @@ storesView.img_logo.sd_setImage(with: URL(string: detailModel.storeCoverDrawing)) storesView.label_title.text = detailModel.name storesView.label_address.text = detailModel.storeAddress storesView.label_address.text = detailModel.storeName storesView.label_distance.text = String(format: "距你%.2lfkm", detailModel.distance) storesView.clouse = clouse sceneDelegate?.window?.addSubview(storesView) @@ -51,7 +51,7 @@ storesView.img_logo.sd_setImage(with: URL(string: activityModel.storeCoverDrawing)) storesView.label_title.text = activityModel.name storesView.label_address.text = activityModel.storeAddress storesView.label_address.text = activityModel.storeName storesView.label_distance.text = String(format: "距你%.2lfkm", activityModel.distance) storesView.clouse = clouse sceneDelegate?.window?.addSubview(storesView) @@ -68,7 +68,7 @@ storesView.img_logo.sd_setImage(with: URL(string: siteDetailModel.storeCoverDrawing)) storesView.label_title.text = siteDetailModel.name storesView.label_address.text = siteDetailModel.storeAddress storesView.label_address.text = siteDetailModel.storeName storesView.label_distance.text = String(format: "距你%.2lfkm", siteDetailModel.distance) storesView.clouse = clouse sceneDelegate?.window?.addSubview(storesView) WanPai/Root/Course/VC/AddStudentVC.swift
@@ -165,7 +165,7 @@ func textFieldShouldBeginEditing(_ textField: UITextField) -> Bool { if textField == tf_birthday{ view.endEditing(true) CommonDatePickerView.show(before: 18, after: 0, type: .YMD) { year, month, day,_,_ in CommonDatePickerView.show(before: 60, after: 0, type: .YMD) { year, month, day,_,_ in textField.text = String(format: "%ld-%02ld-%02ld", year!,month!,day!) } return false WanPai/Root/Course/VC/CourseBookingSubListVC.swift
@@ -60,7 +60,7 @@ tableView.snp.makeConstraints { make in make.edges.equalToSuperview() } tableView.jq_setEmptyView() // tableView.jq_setEmptyView() } override func setRx() { WanPai/Root/Course/VC/CourseDetailApplyVC.swift
@@ -55,7 +55,7 @@ title = "课程详情" if let m = detailModel{ img_cover.sd_setImage(with: URL(string: m.storeCoverDrawing)) img_cover.sd_setImage(with: URL(string: m.detailDrawing)) label_title.text = m.name label_listenWeek.text = "每" + m.weeks.joined(separator: "、") label_listenTime.text = m.times.joined(separator: "｜") WanPai/Root/Course/VC/CourseDetailVC.swift
@@ -19,9 +19,9 @@ @IBOutlet weak var view_listen: UIView! @IBOutlet weak var label_listenTime: UILabel! @IBOutlet weak var img_1: UIImageView! @IBOutlet weak var img_2: UIImageView! // @IBOutlet weak var img_2: UIImageView! @IBOutlet weak var cons_img1Height: NSLayoutConstraint! @IBOutlet weak var cons_img2Height: NSLayoutConstraint! // @IBOutlet weak var cons_img2Height: NSLayoutConstraint! @IBOutlet weak var label_courseType: UILabel! @IBOutlet weak var label_vaildTime: UILabel! @IBOutlet weak var view_vaildTime: UIView! @@ -42,7 +42,7 @@ didSet{ if let m = detailModel{ img_cover.sd_setImage(with: URL(string: m.storeCoverDrawing)) img_cover.sd_setImage(with: URL(string: m.detailDrawing)) label_title.text = m.name label_distance.text = String(format: "距离我%.2lfkm", m.distance) label_local.text = String(format: "%@(%@)", m.storeName,m.storeAddress) @@ -64,10 +64,10 @@ } img_2.sd_setImage(with: URL(string: m.detailDrawing)) { image, error, type, url in let radio = image!.size.width / image!.size.height self.cons_img2Height.constant = JQ_ScreenW / radio } // img_2.sd_setImage(with: URL(string: m.storeCoverDrawing)) { image, error, type, url in // let radio = image!.size.width / image!.size.height // self.cons_img2Height.constant = JQ_ScreenW / radio // } label_price.text = m.list.first!.paymentPrice.currency() if let subM = m.list.first { WanPai/Root/Course/VC/CourseDetailVC.xib
@@ -15,9 +15,7 @@ <outlet property="btn_enroll" destination="xz5-Ol-6OL" id="a6w-84-ZYd"/> <outlet property="cons_handleHei" destination="mg0-k1-0Lc" id="P6Q-xo-9Jz"/> <outlet property="cons_img1Height" destination="ra0-2L-YY8" id="zQn-ar-ffC"/> <outlet property="cons_img2Height" destination="xwL-l2-kBa" id="qmV-Wg-NqV"/> <outlet property="img_1" destination="OTP-xt-gbB" id="ndO-dv-UDx"/> <outlet property="img_2" destination="UC8-uA-Izr" id="JBD-Yf-pWV"/> <outlet property="img_cover" destination="Z8w-gF-Zqx" id="8kq-hZ-b27"/> <outlet property="label_coin" destination="ldz-Xc-RZY" id="jPO-eU-nzM"/> <outlet property="label_courseType" destination="9Kl-Ol-UVv" id="zMk-G4-rfa"/> @@ -46,7 +44,7 @@ <rect key="frame" x="0.0" y="59" width="393" height="684"/> <subviews> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="4lq-ly-hwP"> <rect key="frame" x="0.0" y="0.0" width="393" height="646.66666666666663"/> <rect key="frame" x="0.0" y="0.0" width="393" height="546.66666666666663"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dyh-ku-yPw"> <rect key="frame" x="0.0" y="0.0" width="393" height="221.66666666666666"/> @@ -246,12 +244,6 @@ <rect key="frame" x="0.0" y="446.66666666666669" width="393" height="100.00000000000006"/> <constraints> <constraint firstAttribute="height" constant="100" id="ra0-2L-YY8"/> </constraints> </imageView> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="UC8-uA-Izr"> <rect key="frame" x="0.0" y="546.66666666666663" width="393" height="100"/> <constraints> <constraint firstAttribute="height" constant="100" id="xwL-l2-kBa"/> </constraints> </imageView> </subviews> WanPai/Root/Course/VC/CourseExerciseSubListVC.swift
@@ -53,7 +53,7 @@ tableView.dataSource = self tableView.separatorStyle = .none viewModel.configure(tableView) tableView.jq_setEmptyView() // tableView.jq_setEmptyView() }
@@ -137,8 +137,8 @@ exerciseCollectionView.reloadData() label_totalNums.text = "总课时数\( m.courseList.first?.totalNums ?? 0)" label_deductedNums.text = "已扣学时数\( m.courseList.first?.deductedNums ?? 0)" label_remainingNums.text = "剩余学时数\( m.courseList.first?.remainingNums ?? 0)" label_deductedNums.text = "已扣课时数\( m.courseList.first?.deductedNums ?? 0)" label_remainingNums.text = "剩余课时数\( m.courseList.first?.remainingNums ?? 0)" exerciseCollectionView.isHidden = m.exerciseVideoList.isEmpty view_exerciseTitle.isHidden = m.exerciseVideoList.isEmpty @@ -328,7 +328,7 @@ @objc func localDetailAction(btn:UIButton){ let index = btn.tag - 10 if let model = weeklyCourseModel?.data[index]{ JQ_MapNavigationTool.startNav(CLLocationCoordinate2D(latitude: weeklyCourseModel!.lat, longitude: weeklyCourseModel!.lon), distanceName: weeklyCourseModel!.name, scheme: "weparklife") JQ_MapNavigationTool.startNav(CLLocationCoordinate2D(latitude: weeklyCourseModel!.lat, longitude: weeklyCourseModel!.lon), distanceName: weeklyCourseModel?.name ?? "未命名地址", scheme: "weparklife") } } } WanPai/Root/Course/VC/CourseListVC.swift
@@ -91,7 +91,7 @@ tableView.separatorStyle = .none tf_search.delegate = self viewModel.configure(tableView,needMore: false) tableView.jq_setEmptyView() // tableView.jq_setEmptyView() btn_stores.setTitle(viewModel.selectStore.value?.name ?? "所在门店", for: .normal) }
@@ -58,9 +58,9 @@ viewModel.configure(collectionView,needMore: false) viewModel.beginRefresh() collectionView.jq_setEmptyView { setView in setView.verticalOffset(-300) } // collectionView.jq_setEmptyView { setView in // setView.verticalOffset(-300) // } } override func setUI() { WanPai/Root/Course/VC/CourseOnlineSubListVC.swift
@@ -36,7 +36,7 @@ viewModel.beginRefresh() viewModel.classificationId.accept(classificationId!) tableView.jq_setEmptyView() // tableView.jq_setEmptyView() }
@@ -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"/> @@ -31,7 +31,7 @@ <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="icon_search" translatesAutoresizingMaskIntoConstraints="NO" id="gVt-a0-Kw9"> <rect key="frame" x="4" y="10.666666666666671" width="17" height="17"/> </imageView> <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="输入课程名称，门店名称" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="PDm-tU-THg" customClass="QMUITextField"> <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="输入分类名称" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="PDm-tU-THg" customClass="QMUITextField"> <rect key="frame" x="25" y="0.0" width="291" height="38"/> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="14"/> <textInputTraits key="textInputTraits" returnKeyType="search"/> WanPai/Root/Course/VC/CourseVideoDetailVC.xib
@@ -52,7 +52,8 @@ <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="QR3-va-22V"> <rect key="frame" x="13.999999999999998" y="14" width="16.333333333333329" height="25"/> <constraints> <constraint firstAttribute="height" constant="25" id="Pn3-Ra-oZL"/> <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="25" id="Pn3-Ra-oZL"/> <constraint firstAttribute="width" relation="lessThanOrEqual" constant="260" id="YL6-Yk-eQr"/> </constraints> <fontDescription key="fontDescription" type="system" weight="medium" pointSize="18"/> <nil key="textColor"/> WanPai/Root/Course/VC/SignUpCourseVC.swift
@@ -62,7 +62,7 @@ tableView.separatorStyle = .none tf_search.delegate = self viewModel.configure(tableView,needMore: false) tableView.jq_setEmptyView() // tableView.jq_setEmptyView() } override func setRx() { WanPai/Root/Course/VC/StudentCourseDetailVC.swift
@@ -106,7 +106,7 @@ make.width.equalToSuperview() make.height.greaterThanOrEqualTo(0) } tableView.jq_setEmptyView() // tableView.jq_setEmptyView() viewModel.configure(tableView,needMore: false) headView.layoutIfNeeded() } WanPai/Root/Course/VC/StudentExchangeVC.swift
@@ -37,7 +37,7 @@ tableView.dataSource = self tableView.separatorStyle = .none tableView.register(UINib(nibName: "StudentInfo_3_TCell", bundle: nil), forCellReuseIdentifier: "_StudentInfo_3_TCell") tableView.jq_setEmptyView() // tableView.jq_setEmptyView() } override func setRx() { WanPai/Root/Course/VC/StudentRemarkListVC.swift
@@ -51,7 +51,7 @@ tableView.snp.makeConstraints { make in make.edges.equalToSuperview() } tableView.jq_setEmptyView() // tableView.jq_setEmptyView() } }
@@ -51,7 +51,7 @@ tableView.jq_setEmptyView() // tableView.jq_setEmptyView() viewModel.configure(tableView) Services.userDetails().subscribe(onNext: {[weak self] data in if let userId = data.data?.userId{ WanPai/Root/Games/VC/GamesSubListVC.swift
@@ -70,7 +70,7 @@ make.edges.equalToSuperview() } tableView.jq_setEmptyView() // tableView.jq_setEmptyView() } }
@@ -73,7 +73,7 @@ collectionView.dataSource = self collectionView.backgroundColor = .white collectionView.register(UINib(nibName: "HomeCCell", bundle: nil), forCellWithReuseIdentifier: "_HomeCCell") collectionView.jq_setEmptyView("无数据", image: UIImage(named: "icon_LOGO")?.jq_imageWithTintColor(color: .gray), foregroundColor: .gray, clouse: nil) // collectionView.jq_setEmptyView("无数据", image: UIImage(named: "icon_LOGO")?.jq_imageWithTintColor(color: .gray), foregroundColor: .gray, clouse: nil) } private func getStoreInfo(){ @@ -89,26 +89,6 @@ UserDefaults.standard.set(m.toJSONString(), forKey: "CurrentStore") UserDefaults.standard.synchronize() self?.getStoreItemList() // if let storeStr = UserDefaults.standard.object(forKey: "CurrentStore") as? String{ // if let deserModel = HomeStoreModel.deserialize(from: storeStr){ // self?.label_store.text = deserModel.name.isEmpty ? "门店获取失败":deserModel.name // self?.storeModel = deserModel // self?.storeId = deserModel.storeId // if deserModel.isVip == 0{text.append("\n加入我们 成为会员")} // self?.label_vipInfo.text = text // } // }else{ // self?.label_store.text = m.name.isEmpty ? "门店获取失败":m.name // UserDefaults.standard.set(m.toJSONString(), forKey: "CurrentStore") // UserDefaults.standard.synchronize() // self?.storeModel = m // self?.storeId = m.storeId // if m.isVip == 0{text.append("\n加入我们 成为会员")} // self?.label_vipInfo.text = text // } // self?.getStoreItemList() } } }) { [weak self] error in @@ -267,8 +247,9 @@ vc.title = "线上课得积分" push(vc: vc) case .ticket: let vc = WelfareWeeklyListVC() let vc = CoinStoreCenterVC(selectStore: simpleModel) push(vc: vc) case .wisdomCourt: guard storeId != 0 else {alert(msg: "请先选择门店");return} let vc = GamesVC() WanPai/Root/Other/View/CommonDatePickerView.swift
@@ -178,7 +178,12 @@ case .YMD: let year = years[pickerView.selectedRow(inComponent: 0)] let month = months[pickerView.selectedRow(inComponent: 1)] if year == Date().jq_nowYear() && month == Date().jq_nowMonth(){ return Date().jq_nowDay() }else{ return Date.jq_getDays(year, month) } default:return 0 } } WanPai/Root/Search/VC/CustomerSubListVC.swift
@@ -68,7 +68,7 @@ viewModel.configure(tableView,needMore: false) viewModel.beginRefresh() tableView.jq_setEmptyView() // tableView.jq_setEmptyView() } override func setUI() { WanPai/Root/Search/VC/SearchStoreDetailVC.swift
@@ -56,6 +56,10 @@ Services.exploreStoreDetail(storeId: id).subscribe(onNext: {[weak self] data in if let model = data.data{ self?.searchStoreDetailModel = model DispatchQueue.main.asyncAfter(deadline: .now()+1.5){ self?.tableView.tableHeaderView?.height = 500 } } }).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="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,7 @@ <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> <view contentMode="scaleToFill" id="iN0-l3-epB" customClass="SearchStoreDetailHeadView" customModule="WanPai" customModuleProvider="target"> <rect key="frame" x="0.0" y="0.0" width="393" height="407"/> <rect key="frame" x="0.0" y="0.0" width="393" height="740"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES" flexibleMaxY="YES"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fnG-1M-O7B"> @@ -23,7 +23,10 @@ </constraints> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BLD-qG-SkK"> <rect key="frame" x="13.999999999999996" y="234" width="45.666666666666657" height="21.666666666666657"/> <rect key="frame" x="14" y="234" width="295" height="21.666666666666657"/> <constraints> <constraint firstAttribute="height" constant="21.670000000000002" id="P8y-mY-ess"/> </constraints> <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="18"/> <nil key="textColor"/> <nil key="highlightedColor"/> @@ -148,13 +151,13 @@ </constraints> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WSq-v8-MBS"> <rect key="frame" x="14" y="357.66666666666669" width="365" height="17"/> <rect key="frame" x="14" y="357.66666666666674" width="365" height="367.33333333333326"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.80000000000000004" colorSpace="custom" customColorSpace="sRGB"/> <nil key="highlightedColor"/> </label> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="F7r-jD-foF"> <rect key="frame" x="13" y="388.66666666666669" width="380" height="1"/> <rect key="frame" x="13" y="739" width="380" height="1"/> <color key="backgroundColor" red="0.59215686274509804" green="0.59215686274509804" blue="0.59215686274509804" alpha="0.22" colorSpace="custom" customColorSpace="sRGB"/> <constraints> <constraint firstAttribute="height" constant="1" id="Vvf-kb-2Im"/> @@ -164,8 +167,9 @@ <color key="backgroundColor" systemColor="systemBackgroundColor"/> <constraints> <constraint firstItem="26L-GM-v2t" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="14" id="0As-DR-sxU"/> <constraint firstItem="Qij-Fp-PqX" firstAttribute="leading" secondItem="BLD-qG-SkK" secondAttribute="trailing" constant="10" id="2Y6-ff-7Tt"/> <constraint firstItem="26L-GM-v2t" firstAttribute="centerY" secondItem="yAu-Fs-X4T" secondAttribute="centerY" id="2s0-gG-JzC"/> <constraint firstAttribute="bottom" secondItem="F7r-jD-foF" secondAttribute="bottom" priority="250" id="3WP-V9-klR"/> <constraint firstAttribute="bottom" secondItem="F7r-jD-foF" secondAttribute="bottom" id="3WP-V9-klR"/> <constraint firstItem="S9g-7r-Wt1" firstAttribute="top" secondItem="oRn-Uj-bSc" secondAttribute="bottom" constant="13" id="5zP-Mp-9zH"/> <constraint firstAttribute="trailing" secondItem="fnG-1M-O7B" secondAttribute="trailing" id="9Tt-VW-oLh"/> <constraint firstItem="yAu-Fs-X4T" firstAttribute="top" secondItem="BLD-qG-SkK" secondAttribute="bottom" constant="9" id="BH6-T5-Kvp"/> @@ -188,7 +192,7 @@ <constraint firstAttribute="trailing" secondItem="Qij-Fp-PqX" secondAttribute="trailing" constant="14" id="oBZ-zg-7Bo"/> <constraint firstItem="fnG-1M-O7B" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="obN-m7-bch"/> <constraint firstItem="yAu-Fs-X4T" firstAttribute="leading" secondItem="26L-GM-v2t" secondAttribute="trailing" constant="5" id="y8r-SN-pQA"/> <constraint firstItem="F7r-jD-foF" firstAttribute="top" secondItem="WSq-v8-MBS" secondAttribute="bottom" constant="14" id="z9Q-xj-dc3"/> <constraint firstItem="F7r-jD-foF" firstAttribute="top" secondItem="WSq-v8-MBS" secondAttribute="bottom" priority="750" constant="14" id="z9Q-xj-dc3"/> </constraints> <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/> <connections> @@ -201,7 +205,7 @@ <outlet property="label_workTime" destination="YGq-0Z-lO5" id="sCn-jn-Yd0"/> <outlet property="view_banner" destination="fnG-1M-O7B" id="sVO-t7-A10"/> </connections> <point key="canvasLocation" x="61.832061068702288" y="-105.98591549295776"/> <point key="canvasLocation" x="61.832061068702288" y="11.267605633802818"/> </view> </objects> <resources> @@ -216,7 +220,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/Welfare/VC/CoinStoreCenterVC.swift
@@ -51,15 +51,31 @@ var benefitHomeModel:BenefitHomeModel? private var selectStore:NormalSimpleModel? init(selectStore:NormalSimpleModel? = nil) { super.init(nibName: nil, bundle: nil) self.selectStore = selectStore } required init?(coder: NSCoder) { fatalError("init(coder:) has not been implemented") } override func viewDidLoad() { super.viewDidLoad() title = "积分商城" if let store = selectStore{ viewModel.shopId.accept(store.id) headView.btn_store.setTitle(store.name, for: .normal) } headView.viewModel = viewModel headView.innerView = self.view viewModel.configure(collectionView) collectionView.jq_setEmptyView() // collectionView.jq_setEmptyView() viewModel.beginRefresh() @@ -70,7 +86,6 @@ headView.integral = model.userIntegral }else{ Services.benefitHome().subscribe(onNext: {[weak self] data in guard let weakSelf = self else { return } if let model = data.data{ self?.headView.label_coin.text = "\(model.userIntegral)积分" self?.headView.label_username.text = model.userName WanPai/Root/Welfare/VC/RechargeRecordVC.swift
@@ -73,7 +73,7 @@ tableView.dataSource = self tableView.separatorStyle = .none tableView.register(UINib(nibName: "BillInfoTCell", bundle: nil), forCellReuseIdentifier:"_BillInfoTCell") tableView.jq_setEmptyView() // tableView.jq_setEmptyView() viewModel.yearMonth.accept(Date().jq_format("yyyy-MM")) btn_date.setTitle("\(Date().jq_format("yyyy年MM月"))>", for: .normal) WanPai/Root/Welfare/VC/WelfareBillListVC.swift
@@ -44,7 +44,7 @@ } override func setUI() { tableView.jq_setEmptyView() // tableView.jq_setEmptyView() view.addSubview(tableView) tableView.snp.makeConstraints { make in make.edges.equalToSuperview() WanPai/Root/Welfare/VC/WelfareCouponsSubListVC.swift
@@ -55,7 +55,7 @@ tableView.snp.makeConstraints { make in make.edges.equalToSuperview() } tableView.jq_setEmptyView() // tableView.jq_setEmptyView() } override func setRx() { WanPai/Root/Welfare/VC/WelfareExchangeRecordSubListVC.swift
@@ -43,7 +43,7 @@ super.viewDidLoad() view.backgroundColor = .white viewModel.configure(tableView) tableView.jq_setEmptyView() // tableView.jq_setEmptyView() viewModel.beginRefresh() }
@@ -57,9 +57,9 @@ self?.btn_todayFree.sd_setImage(with: URL(string: todayFree), for: .normal, placeholderImage: nil, context: nil) } if model.commodities.count > 5{ self?.autoScroll() } // if model.commodities.count > 5{ // self?.autoScroll() // } } }) { error in @@ -86,9 +86,9 @@ if timer != nil{ recoverTimer() }else{ if (benefitHomeModel?.commodities.count ?? 0) > 5{ autoScroll() } // if (benefitHomeModel?.commodities.count ?? 0) > 5{ // autoScroll() // } } } @@ -180,9 +180,9 @@ func scrollViewDidEndDragging(_ scrollView: UIScrollView, willDecelerate decelerate: Bool) { self.timerOffsetX = max(0,scrollView.contentOffset.x) self.timer?.invalidate() DispatchQueue.main.asyncAfter(deadline: .now()+2.5) { self.recoverTimer() } // DispatchQueue.main.asyncAfter(deadline: .now()+2.5) { // self.recoverTimer() // } } override var preferredStatusBarStyle: UIStatusBarStyle{ WanPai/Root/Welfare/VC/WelfareWeeklyDetailVC.swift
@@ -23,9 +23,8 @@ @IBOutlet weak var img_intro: UIImageView! @IBOutlet weak var cons_imgIntroHei: NSLayoutConstraint! @IBOutlet weak var img_intro2: UIImageView! @IBOutlet weak var cons_imgIntro2Hei: NSLayoutConstraint! // @IBOutlet weak var img_intro2: UIImageView! // @IBOutlet weak var cons_imgIntro2Hei: NSLayoutConstraint! @IBOutlet weak var label_price: UILabel! @IBOutlet weak var label_originPrice: UILabel! @@ -53,7 +52,7 @@ guard let weakSelf = self else { return } if let model = data.data{ weakSelf.weeklyItemDetailModel = model weakSelf.img_cover.sd_setImage(with: URL(string: model.coverDrawing)) weakSelf.img_cover.sd_setImage(with: URL(string: model.detailDrawing)) weakSelf.label_name.text = model.coursePackageName weakSelf.label_address.text = model.storeNameAddr weakSelf.label_courseNum.text = "\(model.classHours)课时" @@ -86,13 +85,13 @@ } } weakSelf.img_intro2.sd_setImage(with: URL(string: model.introduceDrawing)) {[weak self] image, error, type, url in if let img = image{ self?.img_intro2.image = img let radio = img.size.width / img.size.height self?.cons_imgIntro2Hei.constant = JQ_ScreenW / radio } } // weakSelf.img_intro2.sd_setImage(with: URL(string: model.introduceDrawing)) {[weak self] image, error, type, url in // if let img = image{ // self?.img_intro2.image = img // let radio = img.size.width / img.size.height // self?.cons_imgIntro2Hei.constant = JQ_ScreenW / radio // } // } } WanPai/Root/Welfare/VC/WelfareWeeklyDetailVC.xib
@@ -13,11 +13,9 @@ <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="WelfareWeeklyDetailVC" customModule="WanPai" customModuleProvider="target"> <connections> <outlet property="btn_handle" destination="fo2-mD-30Z" id="cWq-FD-kkO"/> <outlet property="cons_imgIntro2Hei" destination="XcJ-9a-vwU" id="Oxh-8m-dZA"/> <outlet property="cons_imgIntroHei" destination="LTT-Lg-ST4" id="ISY-yQ-jZX"/> <outlet property="img_cover" destination="N0o-wc-kbY" id="FHX-0M-qxy"/> <outlet property="img_intro" destination="9fb-wg-pcf" id="CHi-xu-9ip"/> <outlet property="img_intro2" destination="rkq-O0-4a4" id="WTa-Wh-SEu"/> <outlet property="label_address" destination="h4W-X0-Pgw" id="0nc-FT-5XB"/> <outlet property="label_attendWeeks" destination="oZw-he-MSe" id="BMD-YM-tz3"/> <outlet property="label_coin" destination="ecn-wz-vwc" id="79x-GY-7Ib"/> @@ -42,7 +40,7 @@ <rect key="frame" x="0.0" y="59" width="393" height="684"/> <subviews> <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="Idk-Wv-zLx"> <rect key="frame" x="0.0" y="0.0" width="393" height="696.33333333333337"/> <rect key="frame" x="0.0" y="0.0" width="393" height="596.33333333333337"/> <subviews> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9x3-OB-26n"> <rect key="frame" x="0.0" y="0.0" width="393" height="221.66666666666666"/> @@ -252,12 +250,6 @@ <rect key="frame" x="0.0" y="496.33333333333337" width="393" height="100"/> <constraints> <constraint firstAttribute="height" constant="100" id="LTT-Lg-ST4"/> </constraints> </imageView> <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="rkq-O0-4a4"> <rect key="frame" x="0.0" y="596.33333333333337" width="393" height="100"/> <constraints> <constraint firstAttribute="height" constant="100" id="XcJ-9a-vwU"/> </constraints> </imageView> </subviews> WanPai/Root/Welfare/VC/WelfareWeeklySubListVC.swift
@@ -42,7 +42,7 @@ viewModel.configure(tableView) viewModel.beginRefresh() tableView.jq_setEmptyView() // tableView.jq_setEmptyView() } override func setUI() { WanPai/Root/Yard/VC/YardBookingSubListVC.swift
@@ -55,7 +55,7 @@ make.edges.equalToSuperview() } tableView.jq_setEmptyView() // tableView.jq_setEmptyView() } override func setRx() { WanPai/Root/Yard/VC/YardListVC.swift
@@ -90,7 +90,7 @@ tableView.dataSource = self tableView.separatorStyle = .none tableView.register(UINib(nibName: "YardTCell", bundle: nil), forCellReuseIdentifier: "_YardTCell") tableView.jq_setEmptyView() // tableView.jq_setEmptyView() btn_stores.setTitle(viewModel.selectStore.value?.name ?? "所在门店", for: .normal) }
