Skip to content

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

物流流程

parent 1bd7971d
Show whitespace changes
Inline Side-by-side
Showing with 311 additions and 96 deletions
GeliBusinessPlatform/View/Cell/AdressSelectCell.xib
View file @ c97a320e
<?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"/>
......@@ -10,7 +11,7 @@
<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="AdressSelectCell" customModule="GeliBusinessPlatform" customModuleProvider="target">
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="AdressSelectCell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="375" height="70"/>
<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">
......@@ -101,7 +102,7 @@
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="蓝色字体颜色">
<color red="0.27799999713897705" green="0.56099998950958252" blue="0.88999998569488525" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/JiTuoWuXinXiView.swift
View file @ c97a320e
......@@ -7,15 +7,19 @@
//
import UIKit
@objc protocol JiTuoWuXinXiViewDelegate {
protocol JiTuoWuXinXiViewDelegate {
func JiTuoWuXinXiViewClose()
func JiTuoWuXinXiViewSubmit(itemName:String,tiJi:Float,weight:Float,count:Int,isCheck:Bool)
}
class JiTuoWuXinXiView: UIView {
class JiTuoWuXinXiView: UIView,UITextFieldDelegate{
var contentView:UIView!
var delegate:JiTuoWuXinXiViewDelegate?
@IBOutlet weak var infoSw: UISwitch!
@IBOutlet weak var bottomView: UIView!
@IBAction func closeAction(_ sender: Any) {
delegate?.JiTuoWuXinXiViewClose()
}
@IBOutlet weak var countTf: UITextField!
@IBOutlet weak var weightTf: UITextField!
@IBOutlet weak var gaoTf: UITextField!
......@@ -23,13 +27,69 @@ class JiTuoWuXinXiView: UIView {
@IBOutlet weak var changTf: UITextField!
@IBAction func jiaJianMethod(_ sender: UIButton) {
switch sender.tag {
case 0:
changTf.text = ""
kuanTf.text = ""
gaoTf.text = ""
var str = tiJiTF.text as! NSString
str = "\(str.integerValue + 1)" as NSString
tiJiTF.text = str as String
break
case 1:
changTf.text = ""
kuanTf.text = ""
gaoTf.text = ""
var str = tiJiTF.text as! NSString
if str.integerValue > 1 {
str = "\(str.integerValue - 1)" as NSString
tiJiTF.text = str as String
}
break
case 2:
var str = countTf.text as! NSString
str = "\(str.integerValue + 1)" as NSString
countTf.text = str as String
break
default:
var str = countTf.text as! NSString
if str.integerValue > 1 {
str = "\(str.integerValue - 1)" as NSString
countTf.text = str as String
}
break
}
@IBAction func submitAction(_ sender: Any) {
}
@IBAction func submitAction(_ sender: Any) {
// delegate?.JiTuoWuXinXiViewSubmit()
if itemNameTF.text!.count == 0 {
HUD.flash(.label("请输入寄托物名称"), delay: 1.2)
return
}
if tiJiTF.text!.count == 0 {
HUD.flash(.label("请输入体积"), delay: 1.2)
return
}
if weightTf.text!.count == 0 {
HUD.flash(.label("请输入重量"), delay: 1.2)
return
}
if countTf.text!.count == 0 {
HUD.flash(.label("请输入数量"), delay: 1.2)
return
}
let tiji = tiJiTF.text as! NSString
let weight = weightTf.text as! NSString
let count = countTf.text as! NSString
delegate?.JiTuoWuXinXiViewSubmit(itemName: itemNameTF.text!, tiJi: tiji.floatValue, weight: weight.floatValue, count: count.integerValue, isCheck: infoSw.isOn)
}
@IBOutlet weak var tiJiTF: UITextField!
@IBOutlet weak var itemNameTF: UITextField!
func setUI(){
weightTf.keyboardType = .decimalPad
countTf.keyboardType = .numberPad
tiJiTF.keyboardType = .decimalPad
infoSw.transform = CGAffineTransform(scaleX: 0.8, y: 0.8)
let maskPath = UIBezierPath(roundedRect: bottomView.bounds,
byRoundingCorners:[.topLeft, .topRight], cornerRadii:CGSize(width:3, height:3))
......@@ -37,7 +97,33 @@ class JiTuoWuXinXiView: UIView {
masklayer.frame = bottomView.bounds
masklayer.path = maskPath.cgPath
bottomView.layer.mask = masklayer
changTf.delegate = self
kuanTf.delegate = self
gaoTf.delegate = self
tiJiTF.delegate = self
changTf.keyboardType = .numberPad
kuanTf.keyboardType = .numberPad
gaoTf.keyboardType = .numberPad
}
func textFieldDidEndEditing(_ textField: UITextField) {
if textField == tiJiTF {
changTf.text = ""
kuanTf.text = ""
gaoTf.text = ""
}
if changTf.text!.count > 0 && kuanTf.text!.count > 0 && gaoTf.text!.count > 0 {
let chang = changTf.text as! NSString
let kuan = kuanTf.text as! NSString
let gao = gaoTf.text as! NSString
let c = chang.floatValue / 100
let k = kuan.floatValue / 100
let g = gao.floatValue / 100
tiJiTF.text = String(format: "%.2f", c * k * g)
}
}
//初始化时将xib中的view添加进来
override init(frame: CGRect) {
super.init(frame: frame)
......
GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/JiTuoWuXinXiView.xib
View file @ c97a320e
<?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"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="JiTuoWuXinXiView" customModule="GeliBusinessPlatform" customModuleProvider="target">
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="JiTuoWuXinXiView" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="bottomView" destination="rW2-Ka-gAx" id="QZC-w2-eDD"/>
<outlet property="changTf" destination="5E2-xz-YWP" id="PZv-hI-SaR"/>
......@@ -29,6 +30,9 @@
<button opaque="NO" alpha="0.5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6Sh-qF-UK5">
<rect key="frame" x="0.0" y="-92" width="414" height="1108"/>
<color key="backgroundColor" name="标题字颜色"/>
<connections>
<action selector="closeAction:" destination="-1" eventType="touchUpInside" id="ki1-Cn-gjP"/>
</connections>
</button>
<view alpha="0.5" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tDf-Te-gP3">
<rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
......@@ -130,7 +134,7 @@
<constraint firstAttribute="width" constant="20" id="mRp-L3-0ok"/>
</constraints>
</imageView>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="oYB-7R-ZKc">
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="0" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="oYB-7R-ZKc">
<rect key="frame" x="284" y="15" width="80" height="30"/>
<color key="backgroundColor" name="app底色"/>
<constraints>
......@@ -342,7 +346,7 @@
<constraint firstAttribute="height" constant="20" id="VQb-9i-u8A"/>
</constraints>
</imageView>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="0.01" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="xT3-6M-vtU">
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="1" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="xT3-6M-vtU">
<rect key="frame" x="284" y="15" width="80" height="30"/>
<color key="backgroundColor" name="app底色"/>
<constraints>
......@@ -375,21 +379,27 @@
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" alpha="0.5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OY2-Kj-DtJ">
<button opaque="NO" alpha="0.5" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OY2-Kj-DtJ">
<rect key="frame" x="374" y="15" width="30" height="30"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" constant="30" id="6qt-S2-Th8"/>
<constraint firstAttribute="height" constant="30" id="lGM-HW-82S"/>
</constraints>
<connections>
<action selector="jiaJianMethod:" destination="-1" eventType="touchUpInside" id="rsg-7J-8Jx"/>
</connections>
</button>
<button opaque="NO" alpha="0.5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3OQ-Ur-PSr">
<button opaque="NO" alpha="0.5" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3OQ-Ur-PSr">
<rect key="frame" x="244" y="15" width="30" height="30"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<constraints>
<constraint firstAttribute="width" constant="30" id="eI4-bS-mqu"/>
<constraint firstAttribute="height" constant="30" id="sqJ-Ed-vN2"/>
</constraints>
<connections>
<action selector="jiaJianMethod:" destination="-1" eventType="touchUpInside" id="sPM-tE-WWE"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" name="白色背景色"/>
......@@ -472,7 +482,7 @@
<userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="submitAction:" destination="-1" eventType="valueChanged" id="bci-rS-ceQ"/>
<action selector="submitAction:" destination="-1" eventType="touchUpInside" id="pHA-Ms-I2k"/>
</connections>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="i2O-Lc-NwB">
......@@ -548,7 +558,7 @@
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="蓝色字体颜色">
<color red="0.27799999713897705" green="0.56099998950958252" blue="0.88999998569488525" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<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 @ c97a320e
......@@ -8,13 +8,56 @@
import UIKit
class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource {
class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,JiTuoWuXinXiViewDelegate,JiPaiFangShiViewControllerDelegate,ZengZhiServicesViewControllerDelegate{
var price:Float?
var commend = ""
func ZengZhiServicesViewControllerFinish(price: Float, content: String) {
self.price = price
commend = content
listView.reloadData()
}
var send:Int?
var receive:Int?
func JiPaiFangShiViewControllerDelegateFinish(send: Int, receive: Int, time: Double) {
self.send = send
self.receive = receive
listView.reloadData()
}
var itemName = ""
var tiJi:Float?
var weight:Float?
var count:Int?
var isCheck:Bool?
func JiTuoWuXinXiViewSubmit(itemName: String, tiJi: Float, weight: Float, count: Int, isCheck: Bool) {
self.itemName = itemName
self.tiJi = tiJi
self.weight = weight
self.count = count
self.isCheck = isCheck
jtwxxView?.removeFromSuperview()
jtwxxView = nil
listView.reloadData()
}
func JiTuoWuXinXiViewClose() {
jtwxxView?.removeFromSuperview()
jtwxxView = nil
}
var jtwxxView:JiTuoWuXinXiView?
var selectBtn:UIButton?
let titleArr = ["物品寄托","寄派方式","增值服务","温控范围"]
let title2Arr = ["关联订单号","关联平台"]
@IBOutlet weak var priceLbl: UILabel!
@IBAction func orderAction(_ sender: Any) {
}
@IBOutlet weak var bottomView: UIView!
@IBOutlet weak var listView: UITableView!
......@@ -127,13 +170,21 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
case 0:
if jtwxxView == nil {
let view = JiTuoWuXinXiView(frame: self.view.bounds)
view.delegate = self
self.view.addSubview(view)
jtwxxView = view
}
break
case 1:break
default:break
case 1:
let vc = JiPaiFangShiViewController()
vc.delegate = self
self.navigationController?.pushViewController(vc, animated: true)
break
default:
let vc = ZengZhiServicesViewController()
vc.delegate = self
self.navigationController?.pushViewController(vc, animated: true)
break
}
}
}
......@@ -167,9 +218,28 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
cell.introLbl.text = "（必填）"
cell.introLbl.textColor = UIColor(named: "蓝色字体颜色")
cell.introLbl.isHidden = false
if isCheck != nil {
cell.contentStr = itemName + "; \(count!)箱; \(weight!)kg"
}
}
if indexPath.row == 1 {
if send != nil {
var sendStr = "上门提货"
if send != 0 {
sendStr = "自送到库"
}
var receiveStr = "送货上门"
if receive != 0 {
receiveStr = "到库自取"
}
cell.contentStr = sendStr + "; " + receiveStr
}
}
if indexPath.row == 2 {
cell.introLbl.isHidden = false
if price != nil {
cell.contentStr = "报价金额:\(price!)"
}
}
if indexPath.row == 3 {
let cell = tableView.dequeueReusableCell(withIdentifier: "WenDu") as! WenDuCell
......@@ -177,7 +247,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
return cell
}
cell.contentStr = "1"
return cell
default:
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndOnlyBtn") as! TitleAndOnlyBtnCell
......
GeliBusinessPlatform/ViewController/代客下单（货运）/运单详情/YunDanXiangQingViewController.swift
View file @ c97a320e
......@@ -13,7 +13,6 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
@IBOutlet weak var listView: UITableView!
@IBOutlet weak var btmView: UIView!
let btnTitleArr = ["1","2","3"]
override func viewDidLoad() {
super.viewDidLoad()
......
GeliBusinessPlatform/ViewController/增值服务/ZengZhiServicesViewController.swift
View file @ c97a320e
......@@ -7,18 +7,25 @@
//
import UIKit
protocol ZengZhiServicesViewControllerDelegate {
func ZengZhiServicesViewControllerFinish(price:Float,content:String)
}
class ZengZhiServicesViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,TitleAndSelectCellDelegate,UITextViewDelegate{
var delegate:ZengZhiServicesViewControllerDelegate?
//MARK: - 数据汇总提交
@IBAction func submitAction(_ sender: Any) {
print("submit")
print(selectIdx)//0 送货 1 清真 2 污染
print(fanHuanIdx)//0 无签单 1 纸质 2 电子
print(price)//报价金额
print(commend)//评论
if price.count == 0 {
HUD.flash(.label("请输入报价金额"), delay: 1.2)
return
}
let str = price as NSString
delegate?.ZengZhiServicesViewControllerFinish(price:str.floatValue, content: commend)
self.navigationController?.popViewController(animated: true)
}
var titleArr = ["送货入仓","清真","易污染"]
......@@ -36,7 +43,7 @@ class ZengZhiServicesViewController: BaseViewController,UITableViewDelegate,UITa
@IBOutlet weak var listView: UITableView!
var selectIdx:Int?
var fanHuanIdx:Int?
var fanHuanIdx = 0
var price:String = ""
var commend:String = ""
override func viewDidLoad() {
......@@ -56,10 +63,17 @@ class ZengZhiServicesViewController: BaseViewController,UITableViewDelegate,UITa
textView.text = commend
inputTF.addTarget(self, action: #selector(textViewEdit(sender:)), for: .allEditingEvents)
inputTF.text = price
nBtn.isSelected = true
nBtn.backgroundColor = UIColor(named: "蓝色字体颜色")
nBtn.layer.borderWidth = 0
switch fanHuanIdx {
case 0:
nSet()
break
case 1:
pSet()
break
default:
eSet()
break
}
// Do any additional setup after loading the view.
}
......@@ -109,14 +123,8 @@ class ZengZhiServicesViewController: BaseViewController,UITableViewDelegate,UITa
holderLbl.isHidden = false
}
}
@IBAction func selectAction(_ sender: UIButton) {
fanHuanIdx = sender.tag
if sender == nBtn{
if nBtn.isSelected == true {
nBtn.isSelected = false
nBtn.backgroundColor = UIColor.clear
nBtn.layer.borderWidth = 1
}else{
func nSet(){
pBtn.backgroundColor = UIColor.clear
pBtn.isSelected = false
pBtn.layer.borderWidth = 1
......@@ -128,13 +136,7 @@ class ZengZhiServicesViewController: BaseViewController,UITableViewDelegate,UITa
nBtn.backgroundColor = UIColor(named: "蓝色字体颜色")
nBtn.layer.borderWidth = 0
}
}
if sender == pBtn {
if pBtn.isSelected == true {
pBtn.isSelected = false
pBtn.backgroundColor = UIColor.clear
pBtn.layer.borderWidth = 1
}else{
func pSet(){
nBtn.backgroundColor = UIColor.clear
nBtn.isSelected = false
nBtn.layer.borderWidth = 1
......@@ -146,13 +148,7 @@ class ZengZhiServicesViewController: BaseViewController,UITableViewDelegate,UITa
pBtn.backgroundColor = UIColor(named: "蓝色字体颜色")
pBtn.layer.borderWidth = 0
}
}
if sender == eBtn{
if eBtn.isSelected == true {
eBtn.isSelected = false
eBtn.backgroundColor = UIColor.clear
eBtn.layer.borderWidth = 1
}else{
func eSet(){
nBtn.backgroundColor = UIColor.clear
nBtn.isSelected = false
nBtn.layer.borderWidth = 1
......@@ -164,6 +160,34 @@ class ZengZhiServicesViewController: BaseViewController,UITableViewDelegate,UITa
eBtn.backgroundColor = UIColor(named: "蓝色字体颜色")
eBtn.layer.borderWidth = 0
}
@IBAction func selectAction(_ sender: UIButton) {
fanHuanIdx = sender.tag
if sender == nBtn{
if nBtn.isSelected == true {
nBtn.isSelected = false
nBtn.backgroundColor = UIColor.clear
nBtn.layer.borderWidth = 1
}else{
nSet()
}
}
if sender == pBtn {
if pBtn.isSelected == true {
pBtn.isSelected = false
pBtn.backgroundColor = UIColor.clear
pBtn.layer.borderWidth = 1
}else{
pSet()
}
}
if sender == eBtn{
if eBtn.isSelected == true {
eBtn.isSelected = false
eBtn.backgroundColor = UIColor.clear
eBtn.layer.borderWidth = 1
}else{
eSet()
}
}
}
......
GeliBusinessPlatform/ViewController/增值服务/ZengZhiServicesViewController.xib
View file @ c97a320e
<?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"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ZengZhiServicesViewController" customModule="GeliBusinessPlatform" customModuleProvider="target">
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ZengZhiServicesViewController" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="countingLbl" destination="O91-lP-TJl" id="jai-yn-1Zp"/>
<outlet property="eBtn" destination="59P-Nt-KTc" id="bZu-Xu-Jj3"/>
......@@ -121,7 +122,7 @@
<rect key="frame" x="10" y="0.0" width="253" height="30"/>
<color key="textColor" name="标题字颜色"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<textInputTraits key="textInputTraits"/>
<textInputTraits key="textInputTraits" keyboardType="decimalPad"/>
</textField>
</subviews>
<color key="backgroundColor" name="灰色分界线"/>
......@@ -183,13 +184,13 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="02i-nE-RIf">
<rect key="frame" x="0.0" y="193.5" width="414" height="355"/>
<rect key="frame" x="0.0" y="193.5" width="414" height="153.5"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KXe-pB-M4x">
<rect key="frame" x="0.0" y="150" width="414" height="50"/>
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KXe-pB-M4x">
<rect key="frame" x="0.0" y="0.0" width="414" height="0.0"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="签单返还" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hJv-Hm-Xb3">
<rect key="frame" x="15" y="17" width="54" height="16"/>
<rect key="frame" x="15" y="-8" width="54" height="16"/>
<constraints>
<constraint firstAttribute="height" constant="16" id="42N-3m-6fj"/>
<constraint firstAttribute="width" constant="54" id="lDd-qZ-f45"/>
......@@ -199,7 +200,7 @@
<nil key="highlightedColor"/>
</label>
<button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="59P-Nt-KTc">
<rect key="frame" x="335" y="13.5" width="64" height="23.5"/>
<rect key="frame" x="335" y="-11.5" width="64" height="23.5"/>
<constraints>
<constraint firstAttribute="height" constant="23.5" id="76E-9N-Ruw"/>
<constraint firstAttribute="width" constant="64" id="NvH-wK-X1T"/>
......@@ -228,7 +229,7 @@
</connections>
</button>
<button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iJJ-Tn-rGC">
<rect key="frame" x="256" y="13.5" width="64" height="23.5"/>
<rect key="frame" x="256" y="-11.5" width="64" height="23.5"/>
<constraints>
<constraint firstAttribute="width" constant="64" id="KAX-5m-7VU"/>
<constraint firstAttribute="height" constant="23.5" id="h20-eG-nAK"/>
......@@ -257,7 +258,7 @@
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="28k-xF-svg">
<rect key="frame" x="188" y="13.5" width="53" height="23.5"/>
<rect key="frame" x="188" y="-11.5" width="53" height="23.5"/>
<constraints>
<constraint firstAttribute="height" constant="23.5" id="7kg-ub-1bf"/>
<constraint firstAttribute="width" constant="53" id="MDK-Sj-1Zb"/>
......@@ -286,7 +287,7 @@
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mqQ-2q-VNY">
<rect key="frame" x="15" y="49" width="399" height="1"/>
<rect key="frame" x="15" y="-1" width="399" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="4MI-gC-4AC"/>
......@@ -306,11 +307,11 @@
<constraint firstAttribute="trailing" secondItem="59P-Nt-KTc" secondAttribute="trailing" constant="15" id="gWv-e0-wga"/>
<constraint firstAttribute="trailing" secondItem="mqQ-2q-VNY" secondAttribute="trailing" id="iFG-X0-T3Q"/>
<constraint firstItem="59P-Nt-KTc" firstAttribute="centerY" secondItem="KXe-pB-M4x" secondAttribute="centerY" id="mRa-aK-qLc"/>
<constraint firstAttribute="height" constant="50" id="z0b-hR-hRv"/>
<constraint firstAttribute="height" id="z0b-hR-hRv"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FYB-Ka-A4Y">
<rect key="frame" x="0.0" y="200" width="414" height="155"/>
<rect key="frame" x="0.0" y="0.0" width="414" height="153.5"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="特殊说明" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="hAc-jV-lew">
<rect key="frame" x="15" y="15" width="54" height="18.5"/>
......@@ -323,7 +324,7 @@
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="5Db-7u-QH0">
<rect key="frame" x="15" y="38.5" width="384" height="101.5"/>
<rect key="frame" x="15" y="38.5" width="384" height="100"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请输入你的其它需要" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qbM-rC-Ad8">
<rect key="frame" x="10" y="10" width="364" height="15"/>
......@@ -335,7 +336,7 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0/50" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O91-lP-TJl">
<rect key="frame" x="10" y="76.5" width="364" height="15"/>
<rect key="frame" x="10" y="75" width="364" height="15"/>
<constraints>
<constraint firstAttribute="height" constant="15" id="uKI-aZ-FLK"/>
</constraints>
......@@ -344,7 +345,7 @@
<nil key="highlightedColor"/>
</label>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="hGp-we-mjh">
<rect key="frame" x="5" y="0.0" width="374" height="76.5"/>
<rect key="frame" x="5" y="0.0" width="374" height="75"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="textColor" name="标题字颜色"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
......@@ -382,10 +383,10 @@
</constraints>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="39t-yU-vBX">
<rect key="frame" x="0.0" y="0.0" width="414" height="150"/>
<rect key="frame" x="0.0" y="0.0" width="414" height="0.0"/>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="height" constant="150" id="e6F-WT-FWA"/>
<constraint firstAttribute="height" id="e6F-WT-FWA"/>
</constraints>
<connections>
<outlet property="dataSource" destination="-1" id="EGY-nJ-zxG"/>
......@@ -404,7 +405,7 @@
<constraint firstAttribute="trailing" secondItem="FYB-Ka-A4Y" secondAttribute="trailing" id="VFY-AO-rbQ"/>
<constraint firstItem="39t-yU-vBX" firstAttribute="top" secondItem="02i-nE-RIf" secondAttribute="top" id="Www-7P-rsD"/>
<constraint firstItem="FYB-Ka-A4Y" firstAttribute="top" secondItem="KXe-pB-M4x" secondAttribute="bottom" id="idB-PT-HSw"/>
<constraint firstAttribute="height" constant="355" id="tmt-MV-qJM"/>
<constraint firstAttribute="height" constant="153.5" id="tmt-MV-qJM"/>
<constraint firstAttribute="trailing" secondItem="39t-yU-vBX" secondAttribute="trailing" id="wA1-rr-gaX"/>
</constraints>
</view>
......@@ -436,7 +437,7 @@
<color red="0.3880000114440918" green="0.62400001287460327" blue="0.90200001001358032" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="按钮渐变色下,字体颜色">
<color red="0.27450980392156865" green="0.5607843137254902" blue="0.88627450980392153" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="搜索框背景色">
<color red="0.9137254901960784" green="0.90588235294117647" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......@@ -451,7 +452,7 @@
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色字体颜色">
<color red="0.40000000596046448" green="0.40000000596046448" blue="0.40000000596046448" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="白色背景色">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......
GeliBusinessPlatform/ViewController/寄派方式/JiPaiFangShiViewController.swift
View file @ c97a320e
......@@ -7,9 +7,11 @@
//
import UIKit
protocol JiPaiFangShiViewControllerDelegate {
func JiPaiFangShiViewControllerDelegateFinish(send:Int,receive:Int,time:Double)
}
class JiPaiFangShiViewController: BaseViewController ,SendTimeSelectViewDeleagte{
var delegate:JiPaiFangShiViewControllerDelegate?
var sendTimeView:SendTimeSelectView?
@IBAction func selectTimeAction(_ sender: UIButton) {
if sendTimeView == nil {
......@@ -19,6 +21,18 @@ class JiPaiFangShiViewController: BaseViewController ,SendTimeSelectViewDeleagte
sendTimeView = view
}
}
@IBAction func submitAction(_ sender: Any) {
var send = 0
var receive = 0
if JLeftBtn.isSelected == false {
send = 1
}
if PLeftBtn.isSelected == false {
receive = 1
}
delegate?.JiPaiFangShiViewControllerDelegateFinish(send: send, receive: receive, time: 2)
self.navigationController?.popViewController(animated: true)
}
@IBOutlet weak var topView: UIView!
@IBOutlet weak var PLBL: UILabel!
@IBOutlet weak var JLBL: UILabel!
......
GeliBusinessPlatform/ViewController/寄派方式/JiPaiFangShiViewController.xib
View file @ c97a320e
<?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"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="JiPaiFangShiViewController" customModule="GeliBusinessPlatform" customModuleProvider="target">
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="JiPaiFangShiViewController" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="JLBL" destination="aQt-1Y-nhZ" id="pve-cQ-ViP"/>
<outlet property="JLeftBtn" destination="HSp-eJ-pG9" id="suW-JW-uqO"/>
......@@ -203,7 +204,7 @@
<color key="textColor" name="白色背景色"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="寄件方式" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gcr-eI-ae4">
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="派件方式" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gcr-eI-ae4">
<rect key="frame" x="30" y="18" width="60" height="21"/>
<constraints>
<constraint firstAttribute="width" constant="60" id="HuD-a9-gbb"/>
......@@ -250,7 +251,7 @@
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<state key="normal" title="上门提货">
<state key="normal" title="送货上门">
<color key="titleColor" name="灰色字体颜色"/>
</state>
<state key="selected" title="上门提货">
......@@ -299,12 +300,15 @@
<color key="value" name="按钮渐变色下,字体颜色"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
<userDefinedRuntimeAttribute type="string" keyPath="titleString" value="保存"/>
<userDefinedRuntimeAttribute type="string" keyPath="titleString" value="确定"/>
<userDefinedRuntimeAttribute type="number" keyPath="titleFontSize">
<real key="value" value="17"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="string" keyPath="titleFontName" value="PingFangSC"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="submitAction:" destination="-1" eventType="touchUpInside" id="oie-pN-E9a"/>
</connections>
</view>
<view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WUe-Rh-Z7p" customClass="LGButton" customModule="LGButton">
<rect key="frame" x="0.0" y="862" width="414" height="60"/>
......@@ -354,7 +358,7 @@
<color red="0.3880000114440918" green="0.62400001287460327" blue="0.90200001001358032" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="按钮渐变色下,字体颜色">
<color red="0.27450980392156865" green="0.5607843137254902" blue="0.88627450980392153" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<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"/>
......@@ -366,7 +370,7 @@
<color red="1" green="0.68999999761581421" blue="0.47099998593330383" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色字体颜色">
<color red="0.40000000596046448" green="0.40000000596046448" blue="0.40000000596046448" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="白色背景色">
<color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
......
GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift
View file @ c97a320e
......@@ -403,10 +403,9 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
NotificationCenter.default.post(name: NSNotification.Name(rawValue: "changgeTabItem"), object: nil, userInfo: ["tag":1])
return
case 51: //品牌列表
HUD.flash(.label("敬请期待"),delay: 1.2)
// let vc = PinPaiListViewController()
// self.navigationController?.pushViewController(vc, animated: true)
// HUD.flash(.label("敬请期待"),delay: 1.2)
let vc = PinPaiListViewController()
self.navigationController?.pushViewController(vc, animated: true)
return
case 53: //销售下单-代客下单
let vc = DaiKeXiaDanGouWuViewController()
......@@ -523,7 +522,9 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
self.navigationController?.pushViewController(vc, animated: true)
return
case 89: //物流公司列表
HUD.flash(.label("敬请期待"),delay: 1.2)
// HUD.flash(.label("敬请期待"),delay: 1.2)
let vc = YDLBVc()
self.navigationController?.pushViewController(vc, animated: true)
return
case 90: //下运单
HUD.flash(.label("敬请期待"),delay: 1.2)
......
GeliBusinessPlatform/ViewController/运单列表/YDLBVc.swift
View file @ c97a320e
......@@ -31,8 +31,8 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
@IBOutlet weak var blackBtn: UIButton!
@IBAction func closeAction(_ sender: UIButton) {
sender.isHidden = true
preView.isHidden = true
preView.isHidden = !preView.isHidden
blackBtn.isHidden = !blackBtn.isHidden
}
var searchV : SearchBarView? = nil
var datas:Array<Any> = [1,2]
......@@ -137,13 +137,17 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
break
case "确定":
preView.isHidden = true
blackBtn.isHidden = true
listView.mj_header?.beginRefreshing()
break
default:
break
}
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let vc = XiaYunDanViewController()
self.navigationController?.pushViewController(vc, animated: true)
}
@IBAction func timeSelectAction(_ sender: Any) {
print("选择时间")
......@@ -151,6 +155,7 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
//MARK: - 加载数据
@objc func loadData(){
print("加载数据")
removeBlackBtnView()
self.listView.mj_header?.endRefreshing()
}
//MARK:--搜索模块
......
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