Commit 50f58458 authored by lujunye's avatar lujunye

限制下单成功,备注内容左边距离

parent 6003a60d
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入内容" textAlignment="right" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="Q6V-I9-aNd"> <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入内容" textAlignment="right" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="Q6V-I9-aNd">
<rect key="frame" x="293.5" y="15.5" width="66.5" height="19"/> <rect key="frame" x="70" y="15.5" width="290" height="19"/>
<color key="textColor" name="标题字颜色"/> <color key="textColor" name="标题字颜色"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<textInputTraits key="textInputTraits"/> <textInputTraits key="textInputTraits"/>
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
<constraint firstItem="6wI-Bk-Hnz" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="NXV-5U-lIO"/> <constraint firstItem="6wI-Bk-Hnz" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="NXV-5U-lIO"/>
<constraint firstItem="6wI-Bk-Hnz" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="aLi-6W-mr9"/> <constraint firstItem="6wI-Bk-Hnz" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="aLi-6W-mr9"/>
<constraint firstItem="Q6V-I9-aNd" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="lmF-E2-VqK"/> <constraint firstItem="Q6V-I9-aNd" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="lmF-E2-VqK"/>
<constraint firstItem="Q6V-I9-aNd" firstAttribute="leading" secondItem="6wI-Bk-Hnz" secondAttribute="trailing" constant="15" id="mma-bX-li1"/>
<constraint firstAttribute="bottom" secondItem="zvz-cN-gmt" secondAttribute="bottom" id="oe1-RM-1UU"/> <constraint firstAttribute="bottom" secondItem="zvz-cN-gmt" secondAttribute="bottom" id="oe1-RM-1UU"/>
</constraints> </constraints>
</tableViewCellContentView> </tableViewCellContentView>
......
<?xml version="1.0" encoding="UTF-8"?> <?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"/> <device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
......
...@@ -111,6 +111,9 @@ class XiaDanChengGongViewController: BaseViewController,UITableViewDelegate,UITa ...@@ -111,6 +111,9 @@ class XiaDanChengGongViewController: BaseViewController,UITableViewDelegate,UITa
} }
return 30 return 30
default: default:
if indexPath.row == 8{
return UITableView.automaticDimension
}
if indexPath.row == 9 { if indexPath.row == 9 {
return 108.5 return 108.5
} }
......
<?xml version="1.0" encoding="UTF-8"?> <?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="retina4_7" orientation="portrait" appearance="light"/> <device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies> <dependencies>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews> <subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Hgm-Vh-hNf"> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="Hgm-Vh-hNf">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/> <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<color key="backgroundColor" name="app底色"/> <color key="backgroundColor" name="app底色"/>
<connections> <connections>
......
...@@ -8,8 +8,9 @@ ...@@ -8,8 +8,9 @@
import UIKit import UIKit
import WebKit import WebKit
import MAMapKit
class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,JiTuoWuXinXiViewDelegate,JiPaiFangShiViewControllerDelegate,ZengZhiServicesViewControllerDelegate,AdressSelectCellDelegate,DZGLViewControllerDelegate,XinZengDiZhiViewControllerDelegate,TitleAndTFBtnCellDelegate,WenDuCellDelegate,LogisticalSelectViewDelegate{ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,JiTuoWuXinXiViewDelegate,JiPaiFangShiViewControllerDelegate,ZengZhiServicesViewControllerDelegate,AdressSelectCellDelegate,DZGLViewControllerDelegate,XinZengDiZhiViewControllerDelegate,TitleAndTFBtnCellDelegate,WenDuCellDelegate,LogisticalSelectViewDelegate, CLLocationManagerDelegate{
...@@ -238,7 +239,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -238,7 +239,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
leftBtn.isSelected = false leftBtn.isSelected = false
lineV.frame.origin.x = fullScreenWidth * 0.5 lineV.frame.origin.x = fullScreenWidth * 0.5
hllView.isHidden = false hllView.isHidden = false
locBtn.isUserInteractionEnabled = true
if fullScreenHeight > 736 { if fullScreenHeight > 736 {
hBtnViewH.constant = 83 hBtnViewH.constant = 83
}else{ }else{
...@@ -260,6 +261,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -260,6 +261,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
} }
}else{ }else{
locBtn.isUserInteractionEnabled = false
rightBtn.isSelected = false rightBtn.isSelected = false
leftBtn.isSelected = true leftBtn.isSelected = true
lineV.frame.origin.x = 0 lineV.frame.origin.x = 0
...@@ -275,9 +277,35 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -275,9 +277,35 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
@objc func locSelect(){ @objc func locSelect(){
print("locSelect") print("locSelect")
} }
// var manger:CLLocationManager = CLLocationManager()
// func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
// print("test===")
// manger.stopUpdatingLocation()
// let location = locations.last
//
// CLGeocoder().reverseGeocodeLocation(location!) { (placemarks, error) in
// if error != nil {
// return
// }
// if placemarks!.count > 0 {
// let pm = (placemarks?.first)! as CLPlacemark
// print("pm == ",pm.locality)
// }else{
// print("Problem with the data received from geocoder")
// }
// }
// }
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
// manger.delegate = self
// manger.startUpdatingLocation()
locBtn.isUserInteractionEnabled = false
navbar.title = "运单列表" navbar.title = "运单列表"
self.view.addSubview(navbar) self.view.addSubview(navbar)
......
...@@ -13,6 +13,7 @@ import AMapFoundationKit ...@@ -13,6 +13,7 @@ import AMapFoundationKit
import MAMapKit import MAMapKit
import AMapSearchKit import AMapSearchKit
import IQKeyboardManagerSwift import IQKeyboardManagerSwift
class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLocationManagerDelegate, AMapSearchDelegate, UISearchBarDelegate, SearchBarViewDelegate { class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLocationManagerDelegate, AMapSearchDelegate, UISearchBarDelegate, SearchBarViewDelegate {
@IBOutlet weak var navBgView: UIView! @IBOutlet weak var navBgView: UIView!
@IBOutlet weak var citySelectBtn: UIButton! @IBOutlet weak var citySelectBtn: UIButton!
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
</tableViewCell> </tableViewCell>
</objects> </objects>
<resources> <resources>
<image name="wancheng" width="32" height="32"/> <image name="wancheng" width="64" height="64"/>
<namedColor name="灰色分界线"> <namedColor name="灰色分界线">
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
......
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