Commit fd7464d2 authored by 刘俊宏's avatar 刘俊宏

完成下运单(寄托物UI)

parent edcd0e80
......@@ -9,7 +9,7 @@
import UIKit
protocol JiTuoWuXinXiViewDelegate {
func JiTuoWuXinXiViewClose()
func JiTuoWuXinXiViewSubmit(itemName:String,tiJi:Float,weight:Float,count:Int,isCheck:Bool,chang:String?,kuang:String?,gao:String?)
func JiTuoWuXinXiViewSubmit(itemName:String,itemBaoName:String,tiJi:Float,weight:Float,count:Int,isCheck:Bool,chang:String?,kuang:String?,gao:String?)
}
class JiTuoWuXinXiView: UIView,UITextFieldDelegate{
var contentView:UIView!
......@@ -25,6 +25,8 @@ class JiTuoWuXinXiView: UIView,UITextFieldDelegate{
@IBOutlet weak var gaoTf: UITextField!
@IBOutlet weak var kuanTf: UITextField!
@IBOutlet weak var changTf: UITextField!
@IBOutlet weak var itemBaoTf: UITextField!//寄托物品包装
@IBAction func jiaJianMethod(_ sender: UIButton) {
switch sender.tag {
......@@ -82,7 +84,7 @@ class JiTuoWuXinXiView: UIView,UITextFieldDelegate{
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,chang: changTf.text,kuang: kuanTf.text,gao: gaoTf.text)
delegate?.JiTuoWuXinXiViewSubmit(itemName: itemNameTF.text!,itemBaoName:itemBaoTf.text!, tiJi: tiji.floatValue, weight: weight.floatValue, count: count.integerValue, isCheck: infoSw.isOn,chang: changTf.text,kuang: kuanTf.text,gao: gaoTf.text)
}
@IBOutlet weak var tiJiTF: UITextField!
@IBOutlet weak var itemNameTF: UITextField!
......
......@@ -16,6 +16,7 @@
<outlet property="countTf" destination="xT3-6M-vtU" id="3Qs-lY-VyP"/>
<outlet property="gaoTf" destination="Ccw-5O-TIs" id="4vD-69-zxj"/>
<outlet property="infoSw" destination="n6W-Cn-03r" id="7Cp-xO-kfJ"/>
<outlet property="itemBaoTf" destination="hlo-EC-mgW" id="bPZ-at-Fm5"/>
<outlet property="itemNameTF" destination="jQJ-ZH-wxQ" id="sy3-Jc-pvu"/>
<outlet property="kuanTf" destination="VMY-3D-Df9" id="ycj-dg-1bV"/>
<outlet property="tiJiTF" destination="oYB-7R-ZKc" id="cwv-iS-Kfl"/>
......@@ -35,7 +36,7 @@
</connections>
</button>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rW2-Ka-gAx">
<rect key="frame" x="0.0" y="533" width="414" height="280"/>
<rect key="frame" x="0.0" y="473" width="414" height="340"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ufe-WI-qAR">
<rect key="frame" x="0.0" y="0.0" width="414" height="51"/>
......@@ -53,14 +54,14 @@
</attributedString>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HOF-TP-XRe">
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HOF-TP-XRe" userLabel="View1">
<rect key="frame" x="0.0" y="51" width="414" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="ub8-7X-pZN"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="P6u-9D-ZKm">
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="P6u-9D-ZKm" userLabel="View2">
<rect key="frame" x="0.0" y="52" width="414" height="48"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="寄托物品名称:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CMJ-fG-dCt">
......@@ -121,7 +122,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="G9X-pI-5Ce">
<rect key="frame" x="0.0" y="100" width="414" height="85"/>
<rect key="frame" x="0.0" y="148" width="414" height="85"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="jia " translatesAutoresizingMaskIntoConstraints="NO" id="Ltu-VH-zad">
<rect key="frame" x="379" y="20" width="20" height="20"/>
......@@ -294,7 +295,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3m5-vv-wjM">
<rect key="frame" x="0.0" y="185" width="414" height="45"/>
<rect key="frame" x="0.0" y="233" width="414" height="45"/>
<subviews>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="1" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="dXi-t1-G5Y">
<rect key="frame" x="319" y="15" width="80" height="30"/>
......@@ -333,7 +334,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9xb-ef-BR6">
<rect key="frame" x="0.0" y="230" width="414" height="45"/>
<rect key="frame" x="0.0" y="278" width="414" height="45"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="jia " translatesAutoresizingMaskIntoConstraints="NO" id="0Zy-eC-BOB">
<rect key="frame" x="379" y="20" width="20" height="20"/>
......@@ -416,7 +417,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Trf-1A-2UZ">
<rect key="frame" x="0.0" y="275" width="414" height="0.0"/>
<rect key="frame" x="0.0" y="323" width="414" height="0.0"/>
<subviews>
<switch hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="n6W-Cn-03r">
<rect key="frame" x="350" y="-15.5" width="51" height="31"/>
......@@ -438,14 +439,61 @@
<constraint firstAttribute="trailing" secondItem="n6W-Cn-03r" secondAttribute="trailing" constant="15" id="zxA-c4-De6"/>
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="j7A-oC-j4G" userLabel="Viewl">
<rect key="frame" x="0.0" y="100" width="414" height="48"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="寄托物品包装:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RDW-8a-LwT">
<rect key="frame" x="15" y="21" width="84" height="18.5"/>
<constraints>
<constraint firstAttribute="width" constant="84" id="LF0-sz-XzR"/>
<constraint firstAttribute="height" constant="18.5" id="NEN-Y4-Bn2"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GjP-qm-Koz">
<rect key="frame" x="114" y="15.5" width="285" height="30"/>
<subviews>
<textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="最多输入十个汉字喔。" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="hlo-EC-mgW">
<rect key="frame" x="5" y="0.0" width="133" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="textColor" name="灰色字体颜色"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<textInputTraits key="textInputTraits"/>
</textField>
</subviews>
<color key="backgroundColor" name="app底色"/>
<constraints>
<constraint firstAttribute="height" constant="30" id="6yV-2z-xgo"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="3"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</view>
</subviews>
<color key="backgroundColor" name="白色背景色"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="GjP-qm-Koz" secondAttribute="trailing" constant="15" id="6ma-OH-Og5"/>
<constraint firstItem="RDW-8a-LwT" firstAttribute="leading" secondItem="j7A-oC-j4G" secondAttribute="leading" constant="15" id="F1w-cZ-8DJ"/>
<constraint firstItem="GjP-qm-Koz" firstAttribute="centerY" secondItem="RDW-8a-LwT" secondAttribute="centerY" id="MGH-mf-EYA"/>
<constraint firstItem="RDW-8a-LwT" firstAttribute="top" secondItem="j7A-oC-j4G" secondAttribute="top" constant="21" id="R6a-jQ-v2d"/>
<constraint firstItem="GjP-qm-Koz" firstAttribute="leading" secondItem="RDW-8a-LwT" secondAttribute="trailing" constant="15" id="cVt-cC-x9W"/>
<constraint firstAttribute="height" constant="48" id="i0W-bq-I2p"/>
</constraints>
</view>
</subviews>
<color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
<constraints>
<constraint firstAttribute="trailing" secondItem="j7A-oC-j4G" secondAttribute="trailing" id="5tV-gW-2Pb"/>
<constraint firstItem="3m5-vv-wjM" firstAttribute="top" secondItem="G9X-pI-5Ce" secondAttribute="bottom" id="6HS-cH-xzB"/>
<constraint firstAttribute="trailing" secondItem="P6u-9D-ZKm" secondAttribute="trailing" id="9NH-ae-s2d"/>
<constraint firstItem="Ufe-WI-qAR" firstAttribute="top" secondItem="rW2-Ka-gAx" secondAttribute="top" id="9tx-oZ-KLE"/>
<constraint firstItem="9xb-ef-BR6" firstAttribute="leading" secondItem="rW2-Ka-gAx" secondAttribute="leading" id="F1k-rF-Jdo"/>
<constraint firstItem="G9X-pI-5Ce" firstAttribute="top" secondItem="P6u-9D-ZKm" secondAttribute="bottom" id="HwL-CO-LHP"/>
<constraint firstItem="j7A-oC-j4G" firstAttribute="top" secondItem="P6u-9D-ZKm" secondAttribute="bottom" id="Fe2-2y-lOP"/>
<constraint firstItem="G9X-pI-5Ce" firstAttribute="top" secondItem="j7A-oC-j4G" secondAttribute="bottom" id="HwL-CO-LHP"/>
<constraint firstItem="G9X-pI-5Ce" firstAttribute="leading" secondItem="rW2-Ka-gAx" secondAttribute="leading" id="J32-7j-OpU"/>
<constraint firstItem="3m5-vv-wjM" firstAttribute="leading" secondItem="rW2-Ka-gAx" secondAttribute="leading" id="Qdd-rt-qFk"/>
<constraint firstItem="HOF-TP-XRe" firstAttribute="leading" secondItem="rW2-Ka-gAx" secondAttribute="leading" id="Rle-2X-fot"/>
......@@ -455,13 +503,14 @@
<constraint firstAttribute="trailing" secondItem="3m5-vv-wjM" secondAttribute="trailing" id="aED-IL-b0O"/>
<constraint firstItem="Trf-1A-2UZ" firstAttribute="leading" secondItem="rW2-Ka-gAx" secondAttribute="leading" id="bQ1-nz-kvy"/>
<constraint firstAttribute="trailing" secondItem="HOF-TP-XRe" secondAttribute="trailing" id="diI-HO-EFh"/>
<constraint firstAttribute="height" constant="280" id="eAp-Aj-L92"/>
<constraint firstAttribute="height" constant="340" id="eAp-Aj-L92"/>
<constraint firstItem="9xb-ef-BR6" firstAttribute="top" secondItem="3m5-vv-wjM" secondAttribute="bottom" id="eTx-WO-ZrZ"/>
<constraint firstItem="Ufe-WI-qAR" firstAttribute="leading" secondItem="rW2-Ka-gAx" secondAttribute="leading" id="gTo-oN-cLg"/>
<constraint firstAttribute="trailing" secondItem="Ufe-WI-qAR" secondAttribute="trailing" id="hV8-R6-19E"/>
<constraint firstItem="P6u-9D-ZKm" firstAttribute="leading" secondItem="rW2-Ka-gAx" secondAttribute="leading" id="hq6-OF-b5V"/>
<constraint firstAttribute="trailing" secondItem="Trf-1A-2UZ" secondAttribute="trailing" id="jne-sK-XiQ"/>
<constraint firstItem="P6u-9D-ZKm" firstAttribute="top" secondItem="HOF-TP-XRe" secondAttribute="bottom" id="qWH-3f-0Ca"/>
<constraint firstItem="j7A-oC-j4G" firstAttribute="leading" secondItem="rW2-Ka-gAx" secondAttribute="leading" id="rB1-12-h2J"/>
<constraint firstItem="Trf-1A-2UZ" firstAttribute="top" secondItem="9xb-ef-BR6" secondAttribute="bottom" id="rt6-MH-8ac"/>
</constraints>
</view>
......
......@@ -16,8 +16,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{
var isLoadingTime = true
let nonce_str = String.randomStr(len: 30)
var xiaDanRenMsg:NSString = ""
......@@ -553,6 +552,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
//MARK:--寄托物信息
var itemName = ""
var itemBaoName = ""
var tiJi:Float?
var weight:Float?
var count:Int?
......@@ -560,9 +560,9 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
var chang:String?
var kuang:String?
var gao:String?
func JiTuoWuXinXiViewSubmit(itemName: String, tiJi: Float, weight: Float, count: Int, isCheck: Bool,chang:String?,kuang:String?,gao:String?) {
func JiTuoWuXinXiViewSubmit(itemName: String, itemBaoName: String, tiJi: Float, weight: Float, count: Int, isCheck: Bool, chang: String?, kuang: String?, gao: String?) {
self.itemName = itemName
self.itemBaoName = itemBaoName
self.tiJi = tiJi
self.weight = weight
self.count = count
......@@ -575,7 +575,8 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
listView.reloadData()
getLogPayPrice()
}
func AdressSelectCellBtnCLick(row: Int) {
let vc = DZGLViewController()
vc.isSelectlogAddress = true
......@@ -1370,6 +1371,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
jtwxxView?.changTf.text = chang
jtwxxView?.kuanTf.text = kuang
jtwxxView?.gaoTf.text = gao
jtwxxView?.itemBaoTf.text = self.itemBaoName
}
}
break
......
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