Skip to content

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

物流基本连通

parent c97a320e
Hide whitespace changes
Inline Side-by-side
Showing with 304 additions and 30 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ ee46a966
......@@ -8,6 +8,8 @@
/* Begin PBXBuildFile section */
9C3AD0BD567C3C122CCE3169 /* Pods_GeliBusinessPlatform.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DA2D518C6159EA47DCD8E0C /* Pods_GeliBusinessPlatform.framework */; };
E002465224A8697B00049DBC /* TitleAndTFBtnCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E002465024A8697B00049DBC /* TitleAndTFBtnCell.swift */; };
E002465324A8697B00049DBC /* TitleAndTFBtnCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E002465124A8697B00049DBC /* TitleAndTFBtnCell.xib */; };
E007B1D4248F6880004D14CC /* CGDDayCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E007B1D2248F6880004D14CC /* CGDDayCell.swift */; };
E007B1D5248F6880004D14CC /* CGDDayCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E007B1D3248F6880004D14CC /* CGDDayCell.xib */; };
E007B1D8248F7276004D14CC /* CGDCell1.swift in Sources */ = {isa = PBXBuildFile; fileRef = E007B1D6248F7276004D14CC /* CGDCell1.swift */; };
......@@ -552,6 +554,8 @@
073EFCE4E1CBD26A64719EC0 /* Pods-GeliBusinessPlatform.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GeliBusinessPlatform.release.xcconfig"; path = "Target Support Files/Pods-GeliBusinessPlatform/Pods-GeliBusinessPlatform.release.xcconfig"; sourceTree = "<group>"; };
5DA2D518C6159EA47DCD8E0C /* Pods_GeliBusinessPlatform.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_GeliBusinessPlatform.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6FA79EFC99FED0CA28AA1444 /* Pods-GeliBusinessPlatform.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-GeliBusinessPlatform.debug.xcconfig"; path = "Target Support Files/Pods-GeliBusinessPlatform/Pods-GeliBusinessPlatform.debug.xcconfig"; sourceTree = "<group>"; };
E002465024A8697B00049DBC /* TitleAndTFBtnCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleAndTFBtnCell.swift; sourceTree = "<group>"; };
E002465124A8697B00049DBC /* TitleAndTFBtnCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TitleAndTFBtnCell.xib; sourceTree = "<group>"; };
E007B1D2248F6880004D14CC /* CGDDayCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGDDayCell.swift; sourceTree = "<group>"; };
E007B1D3248F6880004D14CC /* CGDDayCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CGDDayCell.xib; sourceTree = "<group>"; };
E007B1D6248F7276004D14CC /* CGDCell1.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGDCell1.swift; sourceTree = "<group>"; };
......@@ -2166,6 +2170,8 @@
E0B5307D247266F400FFCC15 /* DKXDAdrCell.xib */,
E0CC848524823EC1009B1FE9 /* CRKCell.swift */,
E0CC848624823EC1009B1FE9 /* CRKCell.xib */,
E002465024A8697B00049DBC /* TitleAndTFBtnCell.swift */,
E002465124A8697B00049DBC /* TitleAndTFBtnCell.xib */,
);
path = Cell;
sourceTree = "<group>";
......@@ -2853,6 +2859,7 @@
E0CC848824823EC1009B1FE9 /* CRKCell.xib in Resources */,
E0337EF62464FCFC00952EF4 /* GYSListViewController.xib in Resources */,
E0337EF22464F69000952EF4 /* YingFuZKListViewController.xib in Resources */,
E002465324A8697B00049DBC /* TitleAndTFBtnCell.xib in Resources */,
E0B9462C2456AABE00FBEC9A /* YuShouWeiKuanFaHuoCell.xib in Resources */,
E0A2E81F24552F0A00D6DB34 /* TilteAndTextViewCell.xib in Resources */,
E0F97B0D24516B1F001BD600 /* AddImgCell.xib in Resources */,
......@@ -3144,6 +3151,7 @@
F961D27724503F51007FBE70 /* OrderSelectMoreView.swift in Sources */,
F933F6C62452C68B00189561 /* PKHUDAssets.swift in Sources */,
F95D9B522448530E0080D6E3 /* GeliAlertView.swift in Sources */,
E002465224A8697B00049DBC /* TitleAndTFBtnCell.swift in Sources */,
E0B5308624728FB600FFCC15 /* WarehouseInterface.swift in Sources */,
E02FD9EC2455627300E10E27 /* ChuKuViewController.swift in Sources */,
E095C42A24874E6100922571 /* CKGmCell.swift in Sources */,
......
GeliBusinessPlatform/View/Cell/AdressSelectCell.swift
View file @ ee46a966
......@@ -7,14 +7,21 @@
//
import UIKit
protocol AdressSelectCellDelegate {
func AdressSelectCellBtnCLick(row:Int)
func AdressSelectCellTap(row:Int)
}
class AdressSelectCell: UITableViewCell {
@IBOutlet weak var contentV: UIView!
@IBOutlet weak var nameLbl: UILabel!
@IBOutlet weak var phoneLbl: UILabel!
@IBOutlet weak var adrLbl: UILabel!
var delegate:AdressSelectCellDelegate?
@objc func tapAction(gesture:UITapGestureRecognizer){
delegate?.AdressSelectCellTap(row: self.tag)
}
@IBAction func btnClick(_ sender: UIButton) {
delegate?.AdressSelectCellBtnCLick(row: self.tag)
}
@IBOutlet weak var titleLbl: UILabel!
......@@ -25,8 +32,8 @@ class AdressSelectCell: UITableViewCell {
selectionStyle = .none
let tap = UITapGestureRecognizer()
tap.addTarget(self, action: #selector(tapAction(gesture:)))
titleLbl.isUserInteractionEnabled = true
titleLbl.addGestureRecognizer(tap)
contentLbl.isUserInteractionEnabled = true
contentLbl.addGestureRecognizer(tap)
// Initialization code
}
......
GeliBusinessPlatform/View/Cell/AdressSelectCell.xib
View file @ ee46a966
......@@ -65,33 +65,91 @@
<color key="textColor" name="灰色字体颜色"/>
<nil key="highlightedColor"/>
</label>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oqa-0J-dZm">
<rect key="frame" x="62" y="0.0" width="233" height="70"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IkE-uy-vvg">
<rect key="frame" x="5" y="15" width="37.5" height="18"/>
<fontDescription key="fontDescription" type="system" pointSize="15"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uyw-mM-8VB">
<rect key="frame" x="52.5" y="16" width="33" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="749" text="LabelLabelLabelLabelLabelLabelLabelLabel" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qOO-6Q-NPW">
<rect key="frame" x="5" y="38" width="223" height="17"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="个人中心灰色字体"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstItem="qOO-6Q-NPW" firstAttribute="leading" secondItem="oqa-0J-dZm" secondAttribute="leading" constant="5" id="3my-Hh-DOK"/>
<constraint firstAttribute="trailing" secondItem="qOO-6Q-NPW" secondAttribute="trailing" constant="5" id="DZ3-ld-7tA"/>
<constraint firstItem="uyw-mM-8VB" firstAttribute="centerY" secondItem="IkE-uy-vvg" secondAttribute="centerY" id="EJo-97-OTK"/>
<constraint firstItem="qOO-6Q-NPW" firstAttribute="top" secondItem="IkE-uy-vvg" secondAttribute="bottom" constant="5" id="L9m-do-ZPd"/>
<constraint firstAttribute="bottom" secondItem="qOO-6Q-NPW" secondAttribute="bottom" constant="15" id="Pvg-QQ-nGM"/>
<constraint firstItem="IkE-uy-vvg" firstAttribute="leading" secondItem="oqa-0J-dZm" secondAttribute="leading" constant="5" id="fjU-sy-4QN"/>
<constraint firstItem="uyw-mM-8VB" firstAttribute="leading" secondItem="IkE-uy-vvg" secondAttribute="trailing" constant="10" id="g0T-ag-Emh"/>
<constraint firstItem="IkE-uy-vvg" firstAttribute="top" secondItem="oqa-0J-dZm" secondAttribute="top" constant="15" id="tKX-Xn-33W"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1GY-m9-q40">
<rect key="frame" x="15" y="69" width="360" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="7yq-Go-HMp"/>
</constraints>
</view>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="rbl-Qi-BcX" secondAttribute="bottom" id="2TY-y3-1H7"/>
<constraint firstItem="oqa-0J-dZm" firstAttribute="top" secondItem="hMc-rU-TYs" secondAttribute="top" id="8LF-ro-Plm"/>
<constraint firstItem="rbl-Qi-BcX" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="9Hb-Xl-fM8"/>
<constraint firstItem="QuB-p7-CHF" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="ANp-As-KpI"/>
<constraint firstItem="1GY-m9-q40" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="Apo-9u-lAM"/>
<constraint firstAttribute="bottom" secondItem="1GY-m9-q40" secondAttribute="bottom" id="E08-j4-FDj"/>
<constraint firstItem="XGU-Qy-3Mg" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="30" id="Q0Z-zW-A2s"/>
<constraint firstItem="oqa-0J-dZm" firstAttribute="trailing" secondItem="hMc-rU-TYs" secondAttribute="trailing" id="Ryx-T7-Z6a"/>
<constraint firstItem="rbl-Qi-BcX" firstAttribute="leading" secondItem="QuB-p7-CHF" secondAttribute="trailing" id="aOg-4L-fmY"/>
<constraint firstAttribute="trailing" secondItem="rbl-Qi-BcX" secondAttribute="trailing" id="aaI-ng-Fx1"/>
<constraint firstItem="QuB-p7-CHF" firstAttribute="leading" secondItem="hMc-rU-TYs" secondAttribute="trailing" constant="10" id="awM-tZ-yzY"/>
<constraint firstItem="oqa-0J-dZm" firstAttribute="leading" secondItem="hMc-rU-TYs" secondAttribute="leading" id="fQL-Qx-JKc"/>
<constraint firstItem="hMc-rU-TYs" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="fuf-Fc-Try"/>
<constraint firstAttribute="bottom" secondItem="hMc-rU-TYs" secondAttribute="bottom" id="gxe-bT-IsT"/>
<constraint firstItem="oqa-0J-dZm" firstAttribute="bottom" secondItem="hMc-rU-TYs" secondAttribute="bottom" id="mHf-Oo-NIu"/>
<constraint firstItem="XGU-Qy-3Mg" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="nro-GX-XJb"/>
<constraint firstItem="hMc-rU-TYs" firstAttribute="leading" secondItem="XGU-Qy-3Mg" secondAttribute="trailing" constant="10" id="yVj-9o-zzg"/>
<constraint firstAttribute="trailing" secondItem="1GY-m9-q40" secondAttribute="trailing" id="zpK-oc-tSP"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="adrLbl" destination="qOO-6Q-NPW" id="SdQ-7C-psd"/>
<outlet property="contentLbl" destination="hMc-rU-TYs" id="82E-gu-O7F"/>
<outlet property="contentV" destination="oqa-0J-dZm" id="fUu-EB-9aJ"/>
<outlet property="nameLbl" destination="IkE-uy-vvg" id="3Nr-K2-8mM"/>
<outlet property="phoneLbl" destination="uyw-mM-8VB" id="gpZ-JC-WhP"/>
<outlet property="titleLbl" destination="XGU-Qy-3Mg" id="sZy-8Z-owR"/>
</connections>
<point key="canvasLocation" x="131.15942028985509" y="121.875"/>
</tableViewCell>
</objects>
<resources>
<namedColor name="个人中心灰色字体">
<color red="0.3919999897480011" green="0.3919999897480011" blue="0.3919999897480011" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="按钮渐变色下,字体颜色">
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色分界线">
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
......
GeliBusinessPlatform/View/Cell/TitleAndTFBtnCell.swift 0 → 100644
View file @ ee46a966
//
// TitleAndTFBtnCell.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/6/28.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
class TitleAndTFBtnCell: UITableViewCell {
@IBOutlet weak var contentTf: UITextField!
@IBOutlet weak var nameLbl: UILabel!
override func awakeFromNib() {
super.awakeFromNib()
self.selectionStyle = .none
// Initialization code
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
}
GeliBusinessPlatform/View/Cell/TitleAndTFBtnCell.xib 0 → 100644
View file @ ee46a966
<?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">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<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>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="TitleAndTFBtnCell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<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="eEh-wt-CxR">
<rect key="frame" x="15" y="14" width="33" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1yW-Sq-DuX">
<rect key="frame" x="15" y="43" width="305" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="kua-X1-bjq"/>
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="csp-CC-Bh9">
<rect key="frame" x="270" y="0.0" width="50" height="44"/>
<constraints>
<constraint firstAttribute="width" constant="50" id="fl0-7h-Dzg"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<state key="normal" title="编辑">
<color key="titleColor" name="蓝色字体颜色"/>
</state>
</button>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="bnV-l5-VU7">
<rect key="frame" x="58" y="0.0" width="197" height="43"/>
<color key="textColor" name="标题字颜色"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<textInputTraits key="textInputTraits"/>
</textField>
</subviews>
<constraints>
<constraint firstAttribute="bottom" secondItem="csp-CC-Bh9" secondAttribute="bottom" id="17A-qC-7MM"/>
<constraint firstItem="1yW-Sq-DuX" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="25Y-KS-6Ms"/>
<constraint firstItem="eEh-wt-CxR" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="DpM-YR-SI8"/>
<constraint firstItem="csp-CC-Bh9" firstAttribute="leading" secondItem="bnV-l5-VU7" secondAttribute="trailing" constant="15" id="Edd-jM-zFM"/>
<constraint firstAttribute="trailing" secondItem="csp-CC-Bh9" secondAttribute="trailing" id="UdC-iH-aYR"/>
<constraint firstItem="csp-CC-Bh9" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="WZm-ba-TjF"/>
<constraint firstItem="eEh-wt-CxR" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="Zut-kd-0de"/>
<constraint firstAttribute="bottom" secondItem="1yW-Sq-DuX" secondAttribute="bottom" id="cHt-Z3-tBn"/>
<constraint firstAttribute="trailing" secondItem="1yW-Sq-DuX" secondAttribute="trailing" id="iax-vp-gCI"/>
<constraint firstItem="bnV-l5-VU7" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="nbr-R8-C0W"/>
<constraint firstItem="1yW-Sq-DuX" firstAttribute="top" secondItem="bnV-l5-VU7" secondAttribute="bottom" id="tyI-dF-GXp"/>
<constraint firstItem="bnV-l5-VU7" firstAttribute="leading" secondItem="eEh-wt-CxR" secondAttribute="trailing" constant="10" id="v1Z-6u-O4O"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="contentTf" destination="bnV-l5-VU7" id="DEi-VP-3Tz"/>
<outlet property="nameLbl" destination="eEh-wt-CxR" id="14K-Uu-GY2"/>
</connections>
<point key="canvasLocation" x="131.8840579710145" y="111.83035714285714"/>
</tableViewCell>
</objects>
<resources>
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色分界线">
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="蓝色字体颜色">
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift
View file @ ee46a966
......@@ -7,8 +7,56 @@
//
import UIKit
import WebKit
class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,JiTuoWuXinXiViewDelegate,JiPaiFangShiViewControllerDelegate,ZengZhiServicesViewControllerDelegate{
class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,JiTuoWuXinXiViewDelegate,JiPaiFangShiViewControllerDelegate,ZengZhiServicesViewControllerDelegate,AdressSelectCellDelegate,DZGLViewControllerDelegate,XinZengDiZhiViewControllerDelegate{
var sender:String?
var sendPhone:String?
var sendAdr:String?
var receiver:String?
var receivePhone:String?
var receiveAdr:String?
func XinZengDiZhiViewControllerFinishAction(name: String, phone: String, adr: String) {
if isSend {
sender = name
sendPhone = phone
sendAdr = adr
}else{
receiver = name
receivePhone = phone
receiveAdr = adr
}
listView.reloadData()
}
func DZGLViewControllerSelect(data: GetAddrsInfoDataModel) {
}
func AdressSelectCellBtnCLick(row: Int) {
let vc = DZGLViewController()
vc.cus_id = 365
vc.isSelectMotion = true
vc.delegate = self
self.navigationController?.pushViewController(vc, animated: true )
}
var isSend = true
func AdressSelectCellTap(row: Int) {
let vc = XinZengDiZhiViewController()
vc.navTitle = "新增地址"
vc.delegate = self
isSend = true
if row == 1 {
isSend = false
}
self.navigationController?.pushViewController(vc, animated: true)
}
var price:Float?
var commend = ""
func ZengZhiServicesViewControllerFinish(price: Float, content: String) {
......@@ -18,8 +66,8 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
}
var send:Int?
var receive:Int?
var send = 0
var receive = 0
func JiPaiFangShiViewControllerDelegateFinish(send: Int, receive: Int, time: Double) {
self.send = send
self.receive = receive
......@@ -73,15 +121,18 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
listView.separatorStyle = .none
listView.register(UINib(nibName: "AdressSelectCell", bundle: nil), forCellReuseIdentifier: "AdressSelect")
listView.register(UINib(nibName: "PersonCenterCell", bundle: nil), forCellReuseIdentifier: "PersonCenter")
listView.register(UINib(nibName: "TitleAndOnlyBtnCell", bundle: nil), forCellReuseIdentifier: "TitleAndOnlyBtn")
listView.register(UINib(nibName: "TitleAndTFBtnCell", bundle: nil), forCellReuseIdentifier: "TitleAndTFBtnCell")
listView.register(UINib(nibName: "WenDuCell", bundle: nil), forCellReuseIdentifier: "WenDu")
// Do any additional setup after loading the view.
}
@objc func selectBtnClick(sender:UIButton){
if sender.tag == 99 {
//跳转查看合同页面
print("跳转查看合同页面")
let vc = WebViewController()
vc.urlStr = "https://www.baidu.com"
self.navigationController?.pushViewController(vc, animated: true)
return
}
selectBtn!.isSelected = !selectBtn!.isSelected
......@@ -107,7 +158,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
btn2.addTarget(self, action: #selector(selectBtnClick(sender:)), for: .touchUpInside)
btn2.snp.makeConstraints { (make) in
make.top.left.bottom.equalTo(0)
make.width.equalTo(30)
make.width.equalTo(105)
}
let lbl1 = UILabel()
......@@ -117,7 +168,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
lbl1.sizeToFit()
view.addSubview(lbl1)
lbl1.snp.makeConstraints { (make) in
make.left.equalTo(btn2.snp_right).offset(3)
make.left.equalTo(btn.snp_right).offset(3)
make.top.bottom.equalTo(0)
make.width.equalTo(lbl1.bounds.size.width)
}
......@@ -191,6 +242,16 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if indexPath.section == 0 {
if indexPath.row == 0 {
if sender != nil {
return 93
}
}
if indexPath.row == 1 {
if receiver != nil {
return 93
}
}
return 70
}
if indexPath.section == 1{
......@@ -206,9 +267,30 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
case 0:
let cell = tableView.dequeueReusableCell(withIdentifier: "AdressSelect") as! AdressSelectCell
cell.titleLbl.text = "寄"
cell.tag = indexPath.row
cell.delegate = self
cell.contentLbl.isHidden = false
cell.contentV.isHidden = true
if indexPath.row == 0 {
if sender != nil {
cell.contentLbl.isHidden = true
cell.contentV.isHidden = false
cell.nameLbl.text = sender!
cell.phoneLbl.text = sendPhone!
cell.adrLbl.text = sendAdr!
}
}
if indexPath.row == 1 {
cell.titleLbl.backgroundColor = UIColor(named: "标题背景色")
cell.titleLbl.backgroundColor = UIColor(named: "企业、预售字体")
cell.titleLbl.text = "收"
if receiver != nil {
cell.contentLbl.isHidden = true
cell.contentV.isHidden = false
cell.nameLbl.text = receiver!
cell.phoneLbl.text = receivePhone!
cell.adrLbl.text = receiveAdr!
}
}
return cell
case 1:
......@@ -250,8 +332,8 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
return cell
default:
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndOnlyBtn") as! TitleAndOnlyBtnCell
cell.titleLbl.text = title2Arr[indexPath.row]
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFBtnCell") as! TitleAndTFBtnCell
cell.nameLbl.text = title2Arr[indexPath.row]
return cell
}
}
......
GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.xib
View file @ ee46a966
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" 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" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<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>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="XiaYunDanViewController" customModule="GeliBusinessPlatform" customModuleProvider="target">
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="XiaYunDanViewController" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="bottomView" destination="BXb-QP-ceT" id="mix-bc-FvQ"/>
<outlet property="listView" destination="Try-UC-8fP" id="plR-El-hxN"/>
......
GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuViewController.xib
View file @ ee46a966
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" 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" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<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"/>
......
GeliBusinessPlatform/ViewController/地址管理/DZGLViewController.swift
View file @ ee46a966
......@@ -13,6 +13,10 @@ protocol DZGLViewControllerDelegate {
func DZGLViewControllerSelect(data:GetAddrsInfoDataModel)
}
class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,SwipeTableViewCellDelegate,UISearchBarDelegate,SearchBarViewDelegate,XinZengDiZhiViewControllerDelegate,GeliAlertViewDelegate{
func XinZengDiZhiViewControllerFinishAction(name: String, phone: String, adr: String) {
listView.mj_header?.beginRefreshing()
}
func sureGeliAlertViewAction(sender: UIButton) {
let model = adrArrs[sender.tag]
......@@ -24,9 +28,7 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData
}
let UserToken = UserDefaults.standard.value(forKey: "user_token")
func XinZengDiZhiViewControllerFinishAction() {
listView.mj_header?.beginRefreshing()
}
//MARK:--搜索模块
//MAKR:--调起搜索后添加个蒙版本
......@@ -94,6 +96,10 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData
var searchV : SearchBarView? = nil
@IBOutlet weak var btmBtn: LGButton!
@IBAction func btmClick(_ sender: Any) {
if selectIdx == nil {
HUD.flash(.label("请选择地址"), delay: 1.2)
return
}
delegate?.DZGLViewControllerSelect(data: (adrInfo?.data![selectIdx!.row])!)
self.navigationController?.popViewController(animated: true)
}
......@@ -104,8 +110,6 @@ class DZGLViewController: BaseViewController,UITableViewDelegate,UITableViewData
navbar.title = "地址管理"
self.view.addSubview(navbar)
if cus_id != nil {
HUD.flash(.progress)
searchBgH.constant = 0
......
GeliBusinessPlatform/ViewController/地址管理/XinZengDiZhiViewController.swift
View file @ ee46a966
......@@ -9,7 +9,7 @@
import UIKit
import SwiftyJSON
protocol XinZengDiZhiViewControllerDelegate {
func XinZengDiZhiViewControllerFinishAction()
func XinZengDiZhiViewControllerFinishAction(name:String,phone:String,adr:String)
}
class XinZengDiZhiViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndTFAndBtnCellDelegate, UIPickerViewDelegate, UIPickerViewDataSource,SJMapViewControllerDelegate,UITextFieldDelegate,TitleAndSwitchCellDelegate,GeliAlertViewDelegate{
var address_id:Int?
......@@ -18,7 +18,7 @@ class XinZengDiZhiViewController: BaseViewController,UITableViewDelegate,UITable
if sender.tag == 999 {
AddressDel(["user_token":UserToken as Any,"address_id":address_id as Any], success: { (data) in
self.delegate?.XinZengDiZhiViewControllerFinishAction()
self.delegate?.XinZengDiZhiViewControllerFinishAction(name: self.nameStr, phone: self.phone, adr: self.adrStr)
self.navigationController?.popViewController(animated: true)
}) { (error) in
......@@ -64,7 +64,7 @@ class XinZengDiZhiViewController: BaseViewController,UITableViewDelegate,UITable
"is_send_default":send_default as Any,
]
EditAddress(dict, success: { (data) in
self.delegate?.XinZengDiZhiViewControllerFinishAction()
self.delegate?.XinZengDiZhiViewControllerFinishAction(name: self.nameStr, phone: self.phone, adr: self.adrStr)
self.navigationController?.popViewController(animated: true)
HUD.hide()
}) { (error) in
......@@ -87,7 +87,7 @@ class XinZengDiZhiViewController: BaseViewController,UITableViewDelegate,UITable
"is_send_default":send_default as Any,
]
AddAddress(dict, success: { (data) in
self.delegate?.XinZengDiZhiViewControllerFinishAction()
self.delegate?.XinZengDiZhiViewControllerFinishAction(name: self.nameStr, phone: self.phone, adr: self.adrStr)
self.navigationController?.popViewController(animated: true)
HUD.hide()
}) { (error) in
......
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