Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
GeliBusinessPlatform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
CI / CD Analytics
Repository Analytics
Value Stream Analytics
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ljy
GeliBusinessPlatform
Commits
50f58458
Commit
50f58458
authored
Jul 29, 2020
by
lujunye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
限制下单成功,备注内容左边距离
parent
6003a60d
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
41 additions
and
8 deletions
+41
-8
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
...erdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/View/Cell/TitleAndTFCell.xib
GeliBusinessPlatform/View/Cell/TitleAndTFCell.xib
+2
-1
GeliBusinessPlatform/ViewController/代客下单(货运)/下单成功/BtmBtnCell.xib
...inessPlatform/ViewController/代客下单(货运)/下单成功/BtmBtnCell.xib
+1
-1
GeliBusinessPlatform/ViewController/代客下单(货运)/下单成功/XiaDanChengGongViewController.swift
...troller/代客下单(货运)/下单成功/XiaDanChengGongViewController.swift
+3
-0
GeliBusinessPlatform/ViewController/代客下单(货运)/下单成功/XiaDanChengGongViewController.xib
...ontroller/代客下单(货运)/下单成功/XiaDanChengGongViewController.xib
+2
-2
GeliBusinessPlatform/ViewController/代客下单(货运)/下运单/XiaYunDanViewController.swift
...ViewController/代客下单(货运)/下运单/XiaYunDanViewController.swift
+31
-3
GeliBusinessPlatform/ViewController/货拉拉/收发货地址/ToAndFormSelectViewController.swift
...wController/货拉拉/收发货地址/ToAndFormSelectViewController.swift
+1
-0
GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/WayBillStautsTableViewCell.xib
...ewController/货拉拉/运单详情/cell/WayBillStautsTableViewCell.xib
+1
-1
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
View file @
50f58458
No preview for this file type
GeliBusinessPlatform/View/Cell/TitleAndTFCell.xib
View file @
50f58458
...
@@ -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>
...
...
GeliBusinessPlatform/ViewController/代客下单(货运)/下单成功/BtmBtnCell.xib
View file @
50f58458
<?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"
/>
...
...
GeliBusinessPlatform/ViewController/代客下单(货运)/下单成功/XiaDanChengGongViewController.swift
View file @
50f58458
...
@@ -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
}
}
...
...
GeliBusinessPlatform/ViewController/代客下单(货运)/下单成功/XiaDanChengGongViewController.xib
View file @
50f58458
<?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>
...
...
GeliBusinessPlatform/ViewController/代客下单(货运)/下运单/XiaYunDanViewController.swift
View file @
50f58458
...
@@ -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
)
...
@@ -1007,5 +1035,5 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
...
@@ -1007,5 +1035,5 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
}
}
}
}
}
}
GeliBusinessPlatform/ViewController/货拉拉/收发货地址/ToAndFormSelectViewController.swift
View file @
50f58458
...
@@ -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
!
...
...
GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/WayBillStautsTableViewCell.xib
View file @
50f58458
...
@@ -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>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment