Skip to content

G
GeliBusinessPlatform
Commit 7c601074 authored by lujunye's avatar lujunye
Browse files
Options

隐藏京东物流

parent bf1a2143
Show whitespace changes
Inline Side-by-side
Showing with 84 additions and 51 deletions
GeliBusinessPlatform/View/LogisticalSelectView/LogisticalSelectView.swift
View file @ 7c601074
......@@ -17,6 +17,7 @@ protocol LogisticalSelectViewDelegate {
class LogisticalSelectView: UIView {
var delegate:LogisticalSelectViewDelegate?
@IBOutlet weak var jdBgViewH: NSLayoutConstraint!
@IBOutlet weak var jdSelectBtn: UIButton!
@IBOutlet weak var sfSelectBtn: UIButton!
@IBAction func blackAction(_ sender: Any) {
......@@ -35,7 +36,10 @@ class LogisticalSelectView: UIView {
tempArr.forEach { (item) in
item.removeFromSuperview()
}
//有京东
selectBgHeight.constant = CGFloat(265)
//没京东
// selectBgHeight.constant = CGFloat(265 - 68)
return
}
for i in 0..<fuTitleArr.count {
......@@ -50,7 +54,10 @@ class LogisticalSelectView: UIView {
}
tempArr.append(lbl)
}
//有京东
selectBgHeight.constant = CGFloat(265 + fuTitleArr.count * 19)
//没京东
// selectBgHeight.constant = CGFloat(265 + fuTitleArr.count * 19 - 68)
}
}
......@@ -95,12 +102,17 @@ class LogisticalSelectView: UIView {
}else{
delegate?.LogisticalSelectViewBtnclick(idx: 2)
}
// selectBgView.isHidden = false
// selectBgHeight.constant = CGFloat(265 + fuTitleArr.count * 19)
}
}
@IBOutlet weak var jdBgView: UIView!
var contentView:UIView!
func setJD(){
// jdBgViewH.constant = 0
// jdBgView.isHidden = true
}
//初始化时将xib中的view添加进来
override init(frame: CGRect) {
super.init(frame: frame)
......@@ -109,6 +121,7 @@ class LogisticalSelectView: UIView {
contentView.snp.makeConstraints { (make) in
make.left.top.right.bottom.equalToSuperview()
}
setJD()
}
// /初始化时将xib中的view添加进来
required init?(coder aDecoder: NSCoder) {
......@@ -118,6 +131,7 @@ class LogisticalSelectView: UIView {
contentView.snp.makeConstraints { (make) in
make.left.top.right.bottom.equalToSuperview()
}
setJD()
}
//加载xib
func loadViewFromNib() -> UIView {
......
GeliBusinessPlatform/View/LogisticalSelectView/LogisticalSelectView.xib
View file @ 7c601074
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
......@@ -11,6 +11,8 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="LogisticalSelectView">
<connections>
<outlet property="jdBgView" destination="65a-vB-vRu" id="R3o-9U-Hl6"/>
<outlet property="jdBgViewH" destination="nbI-Ve-Hmg" id="GyX-ox-TDx"/>
<outlet property="jdPriceLbl" destination="NjJ-Ja-GKH" id="Gxb-tF-ubD"/>
<outlet property="jdSelectBtn" destination="5iJ-FB-kNk" id="EZu-xj-5I9"/>
<outlet property="selectBgHeight" destination="wtX-OJ-Tbg" id="hzS-Oo-oIC"/>
......@@ -50,24 +52,13 @@
<constraint firstAttribute="height" constant="1" id="l0k-2P-8Xo"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0lW-V0-f3m">
<rect key="frame" x="15" y="119" width="299" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="fB0-Ez-quY"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ehz-QO-9SI">
<rect key="frame" x="0.0" y="214" width="314" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="J9N-FF-47K"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="65a-vB-vRu" userLabel="bgView">
<rect key="frame" x="0.0" y="51" width="314" height="67"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5iJ-FB-kNk">
<rect key="frame" x="15" y="64" width="19" height="42"/>
<rect key="frame" x="15" y="0.0" width="19" height="67"/>
<constraints>
<constraint firstAttribute="height" constant="42" id="wJ2-9i-wMi"/>
<constraint firstAttribute="width" constant="19" id="7YU-Kz-7Wc"/>
</constraints>
<state key="normal" image="daixuan"/>
<userDefinedRuntimeAttributes>
......@@ -81,11 +72,54 @@
</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="NjJ-Ja-GKH">
<rect key="frame" x="49" y="66" width="151" height="18.5"/>
<rect key="frame" x="49" y="15" width="151" height="18.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Gbw-ID-cFn">
<rect key="frame" x="126" y="32.5" width="88" height="28"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
<state key="normal" title="《快件服务协议》"/>
<connections>
<action selector="kuaijianAction:" destination="-1" eventType="touchUpInside" id="FFE-zu-68j"/>
</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="ejE-yd-OuT">
<rect key="frame" x="49" y="38.5" width="77" height="16"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
<color key="textColor" name="灰色字体颜色"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="Gbw-ID-cFn" firstAttribute="centerY" secondItem="ejE-yd-OuT" secondAttribute="centerY" id="Gfe-b9-YdS"/>
<constraint firstItem="5iJ-FB-kNk" firstAttribute="leading" secondItem="65a-vB-vRu" secondAttribute="leading" constant="15" id="O43-zA-J6L"/>
<constraint firstItem="ejE-yd-OuT" firstAttribute="top" secondItem="NjJ-Ja-GKH" secondAttribute="bottom" constant="5" id="OJX-h7-dlQ"/>
<constraint firstItem="5iJ-FB-kNk" firstAttribute="top" secondItem="65a-vB-vRu" secondAttribute="top" id="Vyy-42-UiX"/>
<constraint firstItem="ejE-yd-OuT" firstAttribute="leading" secondItem="5iJ-FB-kNk" secondAttribute="trailing" constant="15" id="fzi-df-lKZ"/>
<constraint firstItem="Gbw-ID-cFn" firstAttribute="leading" secondItem="ejE-yd-OuT" secondAttribute="trailing" id="g05-Nw-dfe"/>
<constraint firstAttribute="bottom" secondItem="5iJ-FB-kNk" secondAttribute="bottom" id="naS-iR-4AZ"/>
<constraint firstAttribute="height" constant="67" id="nbI-Ve-Hmg"/>
<constraint firstItem="NjJ-Ja-GKH" firstAttribute="leading" secondItem="5iJ-FB-kNk" secondAttribute="trailing" constant="15" id="wH1-e6-D6H"/>
<constraint firstItem="NjJ-Ja-GKH" firstAttribute="top" secondItem="65a-vB-vRu" secondAttribute="top" constant="15" id="zOd-bU-dXJ"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0lW-V0-f3m">
<rect key="frame" x="15" y="119" width="299" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="fB0-Ez-quY"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ehz-QO-9SI">
<rect key="frame" x="0.0" y="214" width="314" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="J9N-FF-47K"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4U6-AL-8Yv">
<rect key="frame" x="15" y="133" width="19" height="42"/>
<constraints>
......@@ -141,20 +175,6 @@
<action selector="xiadanAction:" destination="-1" eventType="touchUpInside" id="q4c-2A-EkE"/>
</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="ejE-yd-OuT">
<rect key="frame" x="49" y="88" width="77" height="16"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
<color key="textColor" name="灰色字体颜色"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Gbw-ID-cFn">
<rect key="frame" x="126" y="82" width="88" height="28"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
<state key="normal" title="《快件服务协议》"/>
<connections>
<action selector="kuaijianAction:" destination="-1" eventType="touchUpInside" id="FFE-zu-68j"/>
</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="Uzk-gy-02b">
<rect key="frame" x="49" y="157.5" width="77" height="16"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
......@@ -175,32 +195,27 @@
<constraint firstAttribute="trailing" secondItem="Ehz-QO-9SI" secondAttribute="trailing" id="3GE-fn-5AT"/>
<constraint firstItem="Ehz-QO-9SI" firstAttribute="top" secondItem="HHt-YQ-28E" secondAttribute="bottom" constant="10" id="6rM-0h-sV5"/>
<constraint firstItem="HHt-YQ-28E" firstAttribute="leading" secondItem="Jkx-2x-8N8" secondAttribute="leading" constant="15" id="AEs-ar-Gz8"/>
<constraint firstItem="NjJ-Ja-GKH" firstAttribute="leading" secondItem="5iJ-FB-kNk" secondAttribute="trailing" constant="15" id="Cvn-SV-7Ir"/>
<constraint firstAttribute="trailing" secondItem="65a-vB-vRu" secondAttribute="trailing" id="Cdg-pc-VH5"/>
<constraint firstItem="HlP-uj-tfd" firstAttribute="centerY" secondItem="Uzk-gy-02b" secondAttribute="centerY" id="EcH-Ig-use"/>
<constraint firstAttribute="trailing" secondItem="Hg7-oO-Btb" secondAttribute="trailing" id="G3E-PX-0UV"/>
<constraint firstItem="5iJ-FB-kNk" firstAttribute="top" secondItem="u3x-lb-S3o" secondAttribute="bottom" constant="13" id="GUl-BM-s1F"/>
<constraint firstItem="Uzk-gy-02b" firstAttribute="leading" secondItem="4U6-AL-8Yv" secondAttribute="trailing" constant="15" id="Gld-X0-OyU"/>
<constraint firstItem="9NS-Ze-kBV" firstAttribute="leading" secondItem="Jkx-2x-8N8" secondAttribute="leading" id="HLg-Im-7FW"/>
<constraint firstItem="vJM-Qj-NrI" firstAttribute="top" secondItem="Jkx-2x-8N8" secondAttribute="top" constant="15" id="Htw-TH-uwQ"/>
<constraint firstItem="NjJ-Ja-GKH" firstAttribute="top" secondItem="u3x-lb-S3o" secondAttribute="bottom" constant="15" id="Jn0-jV-BvX"/>
<constraint firstAttribute="trailing" secondItem="HHt-YQ-28E" secondAttribute="trailing" constant="15" id="KnR-33-2gH"/>
<constraint firstItem="Gbw-ID-cFn" firstAttribute="leading" secondItem="ejE-yd-OuT" secondAttribute="trailing" id="M26-2s-Apj"/>
<constraint firstAttribute="bottom" secondItem="rVk-uJ-IxU" secondAttribute="bottom" constant="5" id="MCo-Wm-eV0"/>
<constraint firstItem="0lW-V0-f3m" firstAttribute="top" secondItem="u3x-lb-S3o" secondAttribute="bottom" constant="68" id="N06-w3-d2s"/>
<constraint firstItem="Gbw-ID-cFn" firstAttribute="centerY" secondItem="ejE-yd-OuT" secondAttribute="centerY" id="Nhw-6X-7Gp"/>
<constraint firstItem="0lW-V0-f3m" firstAttribute="top" secondItem="65a-vB-vRu" secondAttribute="bottom" constant="1" id="N06-w3-d2s"/>
<constraint firstItem="HlP-uj-tfd" firstAttribute="leading" secondItem="Uzk-gy-02b" secondAttribute="trailing" id="OgY-0A-eg5"/>
<constraint firstItem="ejE-yd-OuT" firstAttribute="leading" secondItem="5iJ-FB-kNk" secondAttribute="trailing" constant="15" id="QJ8-3D-rkX"/>
<constraint firstItem="0lW-V0-f3m" firstAttribute="top" secondItem="ejE-yd-OuT" secondAttribute="bottom" constant="15" id="SHt-vq-fPe"/>
<constraint firstAttribute="trailing" secondItem="u3x-lb-S3o" secondAttribute="trailing" id="Tbp-DN-asD"/>
<constraint firstItem="65a-vB-vRu" firstAttribute="leading" secondItem="Jkx-2x-8N8" secondAttribute="leading" id="XDm-Rl-pGf"/>
<constraint firstAttribute="bottom" secondItem="9NS-Ze-kBV" secondAttribute="bottom" id="YPs-4i-hbC"/>
<constraint firstItem="wwr-FR-oJl" firstAttribute="top" secondItem="0lW-V0-f3m" secondAttribute="bottom" constant="15" id="aiv-Hj-LGU"/>
<constraint firstItem="65a-vB-vRu" firstAttribute="top" secondItem="u3x-lb-S3o" secondAttribute="bottom" id="bCb-Ho-ERf"/>
<constraint firstAttribute="trailing" secondItem="0lW-V0-f3m" secondAttribute="trailing" id="eAB-fI-zpX"/>
<constraint firstItem="Hg7-oO-Btb" firstAttribute="top" secondItem="Ehz-QO-9SI" secondAttribute="bottom" id="h3h-M1-tyl"/>
<constraint firstItem="u3x-lb-S3o" firstAttribute="leading" secondItem="Jkx-2x-8N8" secondAttribute="leading" id="hTB-St-x4g"/>
<constraint firstItem="9NS-Ze-kBV" firstAttribute="top" secondItem="Ehz-QO-9SI" secondAttribute="bottom" id="hUF-eY-nga"/>
<constraint firstItem="wwr-FR-oJl" firstAttribute="leading" secondItem="4U6-AL-8Yv" secondAttribute="trailing" constant="15" id="k4L-r2-eDF"/>
<constraint firstItem="Uzk-gy-02b" firstAttribute="top" secondItem="wwr-FR-oJl" secondAttribute="bottom" constant="3.5" id="lYg-1T-2Vc"/>
<constraint firstItem="5iJ-FB-kNk" firstAttribute="leading" secondItem="Jkx-2x-8N8" secondAttribute="leading" constant="15" id="m4P-Jg-qsk"/>
<constraint firstItem="4U6-AL-8Yv" firstAttribute="top" secondItem="0lW-V0-f3m" secondAttribute="bottom" constant="13" id="m4c-hv-ClD"/>
<constraint firstItem="rVk-uJ-IxU" firstAttribute="top" secondItem="Ehz-QO-9SI" secondAttribute="bottom" constant="5" id="m8m-lQ-9MD"/>
<constraint firstItem="Ehz-QO-9SI" firstAttribute="leading" secondItem="Jkx-2x-8N8" secondAttribute="leading" id="nDY-M9-F1h"/>
......@@ -211,7 +226,6 @@
<constraint firstItem="rVk-uJ-IxU" firstAttribute="leading" secondItem="9NS-Ze-kBV" secondAttribute="trailing" id="tsl-ho-qYB"/>
<constraint firstItem="vJM-Qj-NrI" firstAttribute="centerX" secondItem="Jkx-2x-8N8" secondAttribute="centerX" id="uxj-bL-uIL"/>
<constraint firstAttribute="bottom" secondItem="Ehz-QO-9SI" secondAttribute="bottom" constant="50" id="v12-zh-k8Q"/>
<constraint firstItem="0lW-V0-f3m" firstAttribute="top" secondItem="5iJ-FB-kNk" secondAttribute="bottom" constant="13" id="veN-dY-Z4f"/>
<constraint firstItem="u3x-lb-S3o" firstAttribute="top" secondItem="vJM-Qj-NrI" secondAttribute="bottom" constant="14" id="wCM-oT-wEO"/>
<constraint firstAttribute="height" constant="265" id="wtX-OJ-Tbg"/>
<constraint firstItem="4U6-AL-8Yv" firstAttribute="leading" secondItem="Jkx-2x-8N8" secondAttribute="leading" constant="15" id="x3A-h5-Xuy"/>
......@@ -240,7 +254,7 @@
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<point key="canvasLocation" x="-748" y="78"/>
<point key="canvasLocation" x="-749.27536231884062" y="77.678571428571431"/>
</view>
</objects>
<resources>
......
GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift
View file @ 7c601074
......@@ -18,7 +18,7 @@ import IQKeyboardManagerSwift
class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,JiTuoWuXinXiViewDelegate,JiPaiFangShiViewControllerDelegate,ZengZhiServicesViewControllerDelegate,AdressSelectCellDelegate,DZGLViewControllerDelegate,XinZengDiZhiViewControllerDelegate,TitleAndTFBtnCellDelegate,WenDuCellDelegate,LogisticalSelectViewDelegate, UIPickerViewDataSource, UIPickerViewDelegate, GLAlertSelectViewDelegate,CLLocationManagerDelegate, CityListViewControllerDelegate,ToAndFormSelectViewControllerDelegate,WayBillAddressCanDelItemCellDelegate,HLLTopCellDelegate,OtherDemandViewControllerDelegate,OnlyViewCellDelegate, XiaDanUserInfoViewControllerDelegate{
let datasArr = ["https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1597299369034&di=e29ff315ddeadcfc8b785c8060995b3c&imgtype=0&src=http%3A%2F%2F5b0988e595225.cdn.sohucs.com%2Fimages%2F20180520%2Fcfc6bc7922824542b3b3186041ba49de.jpeg","https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1597300858041&di=52f336ce7e6b501eb560fbf0848c754b&imgtype=0&src=http%3A%2F%2Fdingyue.ws.126.net%2FxprlH2GfSd8xmPWwqfyILcSqUCcHtdrfYuTBNezAfGJKi1545980365722.jpg","https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=2992387834,114733111&fm=26&gp=0.jpg"]
var isLoadingTime = true
let nonce_str = String.randomStr(len: 30)
var xiaDanRenMsg:NSString = ""
func XiaDanUserInfoViewControllerData(str: NSString) {
......@@ -1485,8 +1485,12 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
//时间
if indexPath.row == 0 {
HUD.flash(.progress)
if isLoadingTime {
isLoadingTime = false
getHllTime(["user_token":UserToken as Any], success: { (data) in
let model = data as! getHllTimeModel
self.isLoadingTime = true
if self.bgBtn == nil {
let btn = UIButton()
self.view.addSubview(btn)
......@@ -1525,6 +1529,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
}
}
}
}
var glSelectView:GLAlertSelectView?
@objc func closeAc(){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment