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
1badabca
Commit
1badabca
authored
Apr 13, 2021
by
lujunye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sadfsadfasdfasdfasf
parent
02c23b49
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
161 additions
and
36 deletions
+161
-36
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
...erdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/Model/pph/getVehicleType_model.swift
GeliBusinessPlatform/Model/pph/getVehicleType_model.swift
+38
-0
GeliBusinessPlatform/ViewController/代客下单(货运)/下运单/XiaYunDanViewController.swift
...ViewController/代客下单(货运)/下运单/XiaYunDanViewController.swift
+34
-8
GeliBusinessPlatform/ViewController/供应商管理/GYSGLViewController.swift
...ssPlatform/ViewController/供应商管理/GYSGLViewController.swift
+1
-1
GeliBusinessPlatform/ViewController/地图/SJMapViewController.swift
...inessPlatform/ViewController/地图/SJMapViewController.swift
+3
-5
GeliBusinessPlatform/ViewController/地址管理/XinZengDiZhiViewController.swift
...form/ViewController/地址管理/XinZengDiZhiViewController.swift
+1
-1
GeliBusinessPlatform/ViewController/拼拼货group/P_P_H_Adr_VC.swift
...sinessPlatform/ViewController/拼拼货group/P_P_H_Adr_VC.swift
+68
-4
GeliBusinessPlatform/ViewController/拼拼货group/P_P_H_Adr_VC.xib
...BusinessPlatform/ViewController/拼拼货group/P_P_H_Adr_VC.xib
+10
-9
GeliBusinessPlatform/ViewController/拼拼货group/下单成功/Suc_LOG_Cell.xib
...essPlatform/ViewController/拼拼货group/下单成功/Suc_LOG_Cell.xib
+6
-6
GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/HLLTopCell.swift
...essPlatform/ViewController/货拉拉/运单详情/cell/HLLTopCell.swift
+0
-2
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
View file @
1badabca
No preview for this file type
GeliBusinessPlatform/Model/pph/getVehicleType_model.swift
View file @
1badabca
...
@@ -8,6 +8,44 @@
...
@@ -8,6 +8,44 @@
import
Foundation
import
Foundation
import
ObjectMapper
import
ObjectMapper
//addinfos
class
addPinPinOrder_adrInfo
:
Mappable
{
var
province_name
:
String
?
var
city_name
:
String
?
var
district_name
:
String
?
var
street_name
:
String
?
var
linkman
:
String
?
var
shopName
:
String
?
var
mobile
:
String
?
var
type
:
String
?
var
lng
:
Double
?
var
lat
:
Double
?
var
note
:
String
?
required
init
?(
map
:
Map
)
{
}
func
mapping
(
map
:
Map
)
{
province_name
<-
map
[
"province_name"
]
city_name
<-
map
[
"city_name"
]
district_name
<-
map
[
"district_name"
]
street_name
<-
map
[
"street_name"
]
linkman
<-
map
[
"linkman"
]
shopName
<-
map
[
"shopName"
]
mobile
<-
map
[
"mobile"
]
type
<-
map
[
"type"
]
lng
<-
map
[
"lng"
]
lat
<-
map
[
"lat"
]
note
<-
map
[
"note"
]
}
}
//MARK: - 查询是否开通格利支付和余额是否足够
//MARK: - 查询是否开通格利支付和余额是否足够
class
stateJudge_model
:
Mappable
{
class
stateJudge_model
:
Mappable
{
var
code
:
Int
?
var
code
:
Int
?
...
...
GeliBusinessPlatform/ViewController/代客下单(货运)/下运单/XiaYunDanViewController.swift
View file @
1badabca
...
@@ -19,6 +19,8 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
...
@@ -19,6 +19,8 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
var
isPPH
=
false
var
isPPH
=
false
//MARK: - 拼拼货
//MARK: - 拼拼货
var
pph_send_arr
:
Array
<
addPinPinOrder_adrInfo
>
=
[]
var
pph_receive_arr
:
Array
<
addPinPinOrder_adrInfo
>
=
[]
var
pph_time
=
""
var
pph_time
=
""
func
P_P_H_Time_Select_View_Time_Select
(
time
:
String
)
{
func
P_P_H_Time_Select_View_Time_Select
(
time
:
String
)
{
pph_time
=
time
pph_time
=
time
...
@@ -946,7 +948,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
...
@@ -946,7 +948,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
pin_pin_huo
.
isSelected
=
false
pin_pin_huo
.
isSelected
=
false
hllView
.
isHidden
=
true
hllView
.
isHidden
=
true
}
else
{
//拼拼货
}
else
{
//
MARK: -
拼拼货
isPPH
=
true
isPPH
=
true
rightBtn
.
isSelected
=
false
rightBtn
.
isSelected
=
false
leftBtn
.
isSelected
=
false
leftBtn
.
isSelected
=
false
...
@@ -1290,7 +1292,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
...
@@ -1290,7 +1292,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
}
}
func
tableView
(
_
tableView
:
UITableView
,
viewForFooterInSection
section
:
Int
)
->
UIView
?
{
func
tableView
(
_
tableView
:
UITableView
,
viewForFooterInSection
section
:
Int
)
->
UIView
?
{
if
tableView
==
pph_listView
{
//拼拼货
if
tableView
==
pph_listView
{
//
MARK: -
拼拼货
return
UIView
()
return
UIView
()
}
}
if
tableView
==
listView
{
if
tableView
==
listView
{
...
@@ -1704,9 +1706,18 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
...
@@ -1704,9 +1706,18 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
view
.
delegate
=
self
view
.
delegate
=
self
self
.
view
.
addSubview
(
view
)
self
.
view
.
addSubview
(
view
)
}
}
if
indexPath
.
section
==
1
&&
pph_send_arr
.
count
==
0
{
let
vc
=
P_P_H_Adr_VC
()
vc
.
isSend
=
true
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
}
if
indexPath
.
section
==
2
&&
pph_receive_arr
.
count
==
0
{
}
return
}
}
//
if
tableView
==
listView
{
if
tableView
==
listView
{
if
indexPath
.
section
==
1
{
if
indexPath
.
section
==
1
{
if
indexPath
.
row
<
3
{
if
indexPath
.
row
<
3
{
...
@@ -1723,9 +1734,6 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
...
@@ -1723,9 +1734,6 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
jtwxxView
?
.
weightTf
.
text
=
String
(
format
:
"%.f"
,
(
weight
)
!
)
jtwxxView
?
.
weightTf
.
text
=
String
(
format
:
"%.f"
,
(
weight
)
!
)
jtwxxView
?
.
countTf
.
text
=
String
(
format
:
"%.d"
,
(
count
)
!
)
jtwxxView
?
.
countTf
.
text
=
String
(
format
:
"%.d"
,
(
count
)
!
)
jtwxxView
?
.
infoSw
.
isOn
=
isCheck
!
jtwxxView
?
.
infoSw
.
isOn
=
isCheck
!
// jtwxxView?.changTf.text = chang
// jtwxxView?.kuanTf.text = kuang
// jtwxxView?.gaoTf.text = gao
jtwxxView
?
.
itemBaoTf
.
text
=
self
.
itemBaoName
jtwxxView
?
.
itemBaoTf
.
text
=
self
.
itemBaoName
}
}
}
}
...
@@ -1948,7 +1956,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
...
@@ -1948,7 +1956,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
return
UITableView
.
automaticDimension
return
UITableView
.
automaticDimension
}
}
return
49
return
49
}
else
{
//拼拼货
}
else
{
//
MARK: -
拼拼货
if
indexPath
.
section
==
0
{
if
indexPath
.
section
==
0
{
if
indexPath
.
row
==
0
{
if
indexPath
.
row
==
0
{
return
181
return
181
...
@@ -1956,6 +1964,12 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
...
@@ -1956,6 +1964,12 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
return
UITableView
.
automaticDimension
return
UITableView
.
automaticDimension
}
}
if
indexPath
.
section
==
1
||
indexPath
.
section
==
2
{
if
indexPath
.
section
==
1
||
indexPath
.
section
==
2
{
if
pph_send_arr
.
count
==
0
&&
indexPath
.
section
==
1
{
return
49
}
if
pph_receive_arr
.
count
==
0
&&
indexPath
.
section
==
2
{
return
49
}
return
UITableView
.
automaticDimension
return
UITableView
.
automaticDimension
}
}
if
indexPath
.
section
==
5
{
if
indexPath
.
section
==
5
{
...
@@ -2218,6 +2232,12 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
...
@@ -2218,6 +2232,12 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
if
indexPath
.
row
==
0
{
if
indexPath
.
row
==
0
{
cell
.
top_line
.
isHidden
=
true
cell
.
top_line
.
isHidden
=
true
}
}
if
pph_send_arr
.
count
==
0
{
cell
.
name_lbl
.
text
=
"添加装货点"
cell
.
name_lbl
.
textColor
=
UIColor
(
named
:
"多选按钮字体颜色"
)
cell
.
commend_lbl
.
removeFromSuperview
()
cell
.
adr_lbl
.
removeFromSuperview
()
}
return
cell
return
cell
}
}
if
indexPath
.
section
==
2
{
if
indexPath
.
section
==
2
{
...
@@ -2227,6 +2247,12 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
...
@@ -2227,6 +2247,12 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
if
indexPath
.
row
==
0
{
if
indexPath
.
row
==
0
{
cell
.
btm_line
.
isHidden
=
true
cell
.
btm_line
.
isHidden
=
true
}
}
if
pph_receive_arr
.
count
==
0
{
cell
.
name_lbl
.
text
=
"添加卸货点"
cell
.
name_lbl
.
textColor
=
UIColor
(
named
:
"多选按钮字体颜色"
)
cell
.
commend_lbl
.
removeFromSuperview
()
cell
.
adr_lbl
.
removeFromSuperview
()
}
return
cell
return
cell
}
}
if
indexPath
.
section
==
3
{
if
indexPath
.
section
==
3
{
...
@@ -2283,7 +2309,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
...
@@ -2283,7 +2309,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
var
pph_btnArr
:
Array
<
UIButton
>
=
[]
var
pph_btnArr
:
Array
<
UIButton
>
=
[]
var
pph_lineArr
:
Array
<
UIView
>
=
[]
var
pph_lineArr
:
Array
<
UIView
>
=
[]
var
pph_topBtnScv
:
UIScrollView
!
var
pph_topBtnScv
:
UIScrollView
!
//拼拼货
//
MARK: -
拼拼货
func
setPPHBtnUI
(
carTypesArr
:
Array
<
getVehicleTypeData_model
>
,
view
:
UIView
){
func
setPPHBtnUI
(
carTypesArr
:
Array
<
getVehicleTypeData_model
>
,
view
:
UIView
){
isPPH_Already
=
false
isPPH_Already
=
false
pph_btnArr
.
removeAll
()
pph_btnArr
.
removeAll
()
...
...
GeliBusinessPlatform/ViewController/供应商管理/GYSGLViewController.swift
View file @
1badabca
...
@@ -108,7 +108,7 @@ class GYSGLViewController: BaseViewController,UITableViewDelegate,UITableViewDat
...
@@ -108,7 +108,7 @@ class GYSGLViewController: BaseViewController,UITableViewDelegate,UITableViewDat
}
}
var
delegate
:
GYSGLViewControllerDelegate
?
var
delegate
:
GYSGLViewControllerDelegate
?
func
SJMapViewControllerSelectArd
(
adr
:
String
,
cityData
:
String
)
{
func
SJMapViewControllerSelectArd
(
adr
:
String
,
cityData
:
String
,
loc
:
String
)
{
dzStr
=
cityData
dzStr
=
cityData
let
arr
=
cityData
.
components
(
separatedBy
:
"-"
)
let
arr
=
cityData
.
components
(
separatedBy
:
"-"
)
for
i
in
0
..<
addressArray
.
count
{
for
i
in
0
..<
addressArray
.
count
{
...
...
GeliBusinessPlatform/ViewController/地图/SJMapViewController.swift
View file @
1badabca
...
@@ -16,7 +16,7 @@ import IQKeyboardManagerSwift
...
@@ -16,7 +16,7 @@ import IQKeyboardManagerSwift
protocol
SJMapViewControllerDelegate
{
protocol
SJMapViewControllerDelegate
{
func
SJMapViewControllerSelectArd
(
adr
:
String
,
cityData
:
String
)
func
SJMapViewControllerSelectArd
(
adr
:
String
,
cityData
:
String
,
loc
:
String
)
}
}
class
SJMapViewController
:
UIViewController
,
NavBarViewDelegate
,
AMapLocationManagerDelegate
,
MAMapViewDelegate
,
AMapSearchDelegate
,
UISearchBarDelegate
,
SearchBarViewDelegate
,
UITableViewDelegate
,
UITableViewDataSource
,
CLLocationManagerDelegate
{
class
SJMapViewController
:
UIViewController
,
NavBarViewDelegate
,
AMapLocationManagerDelegate
,
MAMapViewDelegate
,
AMapSearchDelegate
,
UISearchBarDelegate
,
SearchBarViewDelegate
,
UITableViewDelegate
,
UITableViewDataSource
,
CLLocationManagerDelegate
{
var
isPPH
=
false
var
isPPH
=
false
...
@@ -210,7 +210,7 @@ class SJMapViewController: UIViewController,NavBarViewDelegate,AMapLocationManag
...
@@ -210,7 +210,7 @@ class SJMapViewController: UIViewController,NavBarViewDelegate,AMapLocationManag
@objc
func
submitAction
(){
@objc
func
submitAction
(){
if
adrStr
!=
nil
{
if
adrStr
!=
nil
{
delegate
?
.
SJMapViewControllerSelectArd
(
adr
:
adrStr
!
,
cityData
:
cityData
!
)
delegate
?
.
SJMapViewControllerSelectArd
(
adr
:
adrStr
!
,
cityData
:
cityData
!
,
loc
:
"
\(
lat
)
-
\(
lng
)
"
)
self
.
navigationController
?
.
popViewController
(
animated
:
true
)
self
.
navigationController
?
.
popViewController
(
animated
:
true
)
}
else
{
}
else
{
HUD
.
flash
(
.
label
(
"请选择地址"
),
delay
:
1.2
)
HUD
.
flash
(
.
label
(
"请选择地址"
),
delay
:
1.2
)
...
@@ -326,10 +326,8 @@ class SJMapViewController: UIViewController,NavBarViewDelegate,AMapLocationManag
...
@@ -326,10 +326,8 @@ class SJMapViewController: UIViewController,NavBarViewDelegate,AMapLocationManag
mapView
.
setCenter
(
CLLocationCoordinate2D
(
latitude
:
CLLocationDegrees
(
cell
.
lat
!
),
longitude
:
CLLocationDegrees
(
cell
.
lng
!
)),
animated
:
false
)
mapView
.
setCenter
(
CLLocationCoordinate2D
(
latitude
:
CLLocationDegrees
(
cell
.
lat
!
),
longitude
:
CLLocationDegrees
(
cell
.
lng
!
)),
animated
:
false
)
listView
?
.
reloadData
()
listView
?
.
reloadData
()
adrStr
=
cell
.
nameLbl
.
text
adrStr
=
cell
.
nameLbl
.
text
print
(
"abc == "
,
isSearchMode
)
if
isSearchMode
{
if
isSearchMode
{
print
(
"abc == "
)
delegate
?
.
SJMapViewControllerSelectArd
(
adr
:
cell
.
nameLbl
.
text
!
,
cityData
:
cityData
!
,
loc
:
"
\(
cell
.
lat
)
-
\(
cell
.
lng
)
"
)
delegate
?
.
SJMapViewControllerSelectArd
(
adr
:
cell
.
nameLbl
.
text
!
,
cityData
:
cell
.
cityData
)
self
.
navigationController
?
.
popViewController
(
animated
:
true
)
self
.
navigationController
?
.
popViewController
(
animated
:
true
)
}
}
}
}
...
...
GeliBusinessPlatform/ViewController/地址管理/XinZengDiZhiViewController.swift
View file @
1badabca
...
@@ -550,7 +550,7 @@ class XinZengDiZhiViewController: BaseViewController,UITableViewDelegate,UITable
...
@@ -550,7 +550,7 @@ class XinZengDiZhiViewController: BaseViewController,UITableViewDelegate,UITable
return
genderLbl
return
genderLbl
}
}
func
SJMapViewControllerSelectArd
(
adr
:
String
,
cityData
:
String
)
{
func
SJMapViewControllerSelectArd
(
adr
:
String
,
cityData
:
String
,
loc
:
String
)
{
holderArr
.
insert
(
cityData
,
at
:
1
)
holderArr
.
insert
(
cityData
,
at
:
1
)
holderArr
.
remove
(
at
:
2
)
holderArr
.
remove
(
at
:
2
)
let
arr
=
cityData
.
components
(
separatedBy
:
"-"
)
let
arr
=
cityData
.
components
(
separatedBy
:
"-"
)
...
...
GeliBusinessPlatform/ViewController/拼拼货group/P_P_H_Adr_VC.swift
View file @
1badabca
...
@@ -9,8 +9,14 @@
...
@@ -9,8 +9,14 @@
import
UIKit
import
UIKit
import
SwiftyJSON
import
SwiftyJSON
protocol
P_P_H_Adr_VC_Delegate
{
func
P_P_H_Adr_VC_Data
(
adrData
:
addPinPinOrder_adrInfo
)
}
class
P_P_H_Adr_VC
:
BaseViewController
,
SJMapViewControllerDelegate
,
UIPickerViewDataSource
,
UIPickerViewDelegate
,
UITextViewDelegate
{
class
P_P_H_Adr_VC
:
BaseViewController
,
SJMapViewControllerDelegate
,
UIPickerViewDataSource
,
UIPickerViewDelegate
,
UITextViewDelegate
{
var
isSend
=
false
var
delegate
:
P_P_H_Adr_VC_Delegate
?
var
adrInfo
:
addPinPinOrder_adrInfo
?
@IBOutlet
weak
var
count_lbl
:
UILabel
!
@IBOutlet
weak
var
count_lbl
:
UILabel
!
@IBOutlet
weak
var
textTV
:
UITextView
!
@IBOutlet
weak
var
textTV
:
UITextView
!
@IBOutlet
weak
var
phoneTf
:
UITextField
!
@IBOutlet
weak
var
phoneTf
:
UITextField
!
...
@@ -25,9 +31,10 @@ class P_P_H_Adr_VC: BaseViewController,SJMapViewControllerDelegate, UIPickerView
...
@@ -25,9 +31,10 @@ class P_P_H_Adr_VC: BaseViewController,SJMapViewControllerDelegate, UIPickerView
var
cityIndex
=
0
var
cityIndex
=
0
//选择的区(县)索引
//选择的区(县)索引
var
areaIndex
=
0
var
areaIndex
=
0
var
loc
=
""
func
SJMapViewControllerSelectArd
(
adr
:
String
,
cityData
:
String
)
{
func
SJMapViewControllerSelectArd
(
adr
:
String
,
cityData
:
String
,
loc
:
String
)
{
city_lbl
.
text
=
cityData
city_lbl
.
text
=
cityData
self
.
loc
=
loc
let
arr
=
cityData
.
components
(
separatedBy
:
"-"
)
let
arr
=
cityData
.
components
(
separatedBy
:
"-"
)
for
i
in
0
..<
addressArray
.
count
{
for
i
in
0
..<
addressArray
.
count
{
let
provinceData
=
addressArray
[
i
]
as!
Dictionary
<
String
,
Any
>
let
provinceData
=
addressArray
[
i
]
as!
Dictionary
<
String
,
Any
>
...
@@ -51,13 +58,42 @@ class P_P_H_Adr_VC: BaseViewController,SJMapViewControllerDelegate, UIPickerView
...
@@ -51,13 +58,42 @@ class P_P_H_Adr_VC: BaseViewController,SJMapViewControllerDelegate, UIPickerView
}
}
}
}
adrTf
.
text
=
adr
adrTf
.
text
=
adr
checkInfo
()
}
}
@IBAction
func
submit_action
(
_
sender
:
Any
)
{
@IBAction
func
submit_action
(
_
sender
:
Any
)
{
let
arr
=
city_lbl
.
text
?
.
components
(
separatedBy
:
"-"
)
let
arr2
=
loc
.
components
(
separatedBy
:
"-"
)
if
arr
?
.
count
==
0
{
return
}
var
type
=
3
if
isSend
{
type
=
4
}
let
dict
=
[
"province_name"
:
arr
!
[
0
]
as
Any
,
"city_name"
:
arr
!
[
1
]
as
Any
,
"district_name"
:
arr
!
[
2
]
as
Any
,
"street_name"
:
adrTf
.
text
as
Any
,
"linkman"
:
nameTf
.
text
as
Any
,
"shopName"
:
adrTf
.
text
as
Any
,
"mobile"
:
phoneTf
.
text
as
Any
,
"type"
:
type
as
Any
,
"lat"
:
arr2
[
0
]
as
Any
,
"lng"
:
arr2
[
1
]
as
Any
,
"note"
:
textTV
.
text
as
Any
]
adrInfo
=
addPinPinOrder_adrInfo
(
JSON
:
dict
)
delegate
?
.
P_P_H_Adr_VC_Data
(
adrData
:
adrInfo
!
)
}
}
@IBAction
func
map_select_loc
(
_
sender
:
Any
)
{
@IBAction
func
map_select_loc
(
_
sender
:
Any
)
{
nameTf
.
resignFirstResponder
()
phoneTf
.
resignFirstResponder
()
textTV
.
resignFirstResponder
()
adrTf
.
resignFirstResponder
()
let
vc
=
SJMapViewController
()
let
vc
=
SJMapViewController
()
vc
.
delegate
=
self
vc
.
delegate
=
self
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
...
@@ -108,8 +144,19 @@ class P_P_H_Adr_VC: BaseViewController,SJMapViewControllerDelegate, UIPickerView
...
@@ -108,8 +144,19 @@ class P_P_H_Adr_VC: BaseViewController,SJMapViewControllerDelegate, UIPickerView
}
}
}
}
count_lbl
.
text
=
"
\(
textView
.
text
.
count
)
/200"
count_lbl
.
text
=
"
\(
textView
.
text
.
count
)
/200"
checkInfo
()
}
}
@IBOutlet
weak
var
clearBtn
:
UIButton
!
@IBAction
func
clearAction
(
_
sender
:
Any
)
{
adrTf
.
text
=
""
phoneTf
.
text
=
""
nameTf
.
text
=
""
city_lbl
.
text
=
"请选择城市"
loc
=
""
textTV
.
text
=
""
checkInfo
()
}
@objc
func
closeAction
(
sender
:
UIButton
){
@objc
func
closeAction
(
sender
:
UIButton
){
bgBtn
?
.
removeFromSuperview
()
bgBtn
?
.
removeFromSuperview
()
btmView
?
.
subviews
.
forEach
({
(
view
)
in
btmView
?
.
subviews
.
forEach
({
(
view
)
in
...
@@ -120,6 +167,7 @@ class P_P_H_Adr_VC: BaseViewController,SJMapViewControllerDelegate, UIPickerView
...
@@ -120,6 +167,7 @@ class P_P_H_Adr_VC: BaseViewController,SJMapViewControllerDelegate, UIPickerView
bgBtn
=
nil
bgBtn
=
nil
}
}
@IBAction
func
adr_select_action
(
_
sender
:
UIButton
)
{
@IBAction
func
adr_select_action
(
_
sender
:
UIButton
)
{
let
vc
=
SJMapViewController
()
let
vc
=
SJMapViewController
()
vc
.
delegate
=
self
vc
.
delegate
=
self
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
...
@@ -172,13 +220,28 @@ class P_P_H_Adr_VC: BaseViewController,SJMapViewControllerDelegate, UIPickerView
...
@@ -172,13 +220,28 @@ class P_P_H_Adr_VC: BaseViewController,SJMapViewControllerDelegate, UIPickerView
// }
// }
// }
// }
}
}
func
checkInfo
(){
if
adrTf
.
text
?
.
count
!=
0
||
phoneTf
.
text
?
.
count
!=
0
||
nameTf
.
text
?
.
count
!=
0
||
textTV
.
text
.
count
!=
0
||
city_lbl
.
text
!=
"请选择城市"
{
clearBtn
.
isUserInteractionEnabled
=
true
clearBtn
.
alpha
=
1
}
else
{
print
(
"abc === "
)
clearBtn
.
isUserInteractionEnabled
=
false
clearBtn
.
alpha
=
0.5
}
}
@IBOutlet
weak
var
city_lbl
:
UILabel
!
@IBOutlet
weak
var
city_lbl
:
UILabel
!
@IBOutlet
weak
var
top_view
:
UIView
!
@IBOutlet
weak
var
top_view
:
UIView
!
@objc
func
textChangeTf
(
tf
:
UITextField
){
checkInfo
()
}
override
func
viewDidLoad
()
{
override
func
viewDidLoad
()
{
super
.
viewDidLoad
()
super
.
viewDidLoad
()
navbar
.
title
=
"信息填写"
navbar
.
title
=
"信息填写"
self
.
view
.
addSubview
(
navbar
)
self
.
view
.
addSubview
(
navbar
)
nameTf
.
addTarget
(
self
,
action
:
#selector(
textChangeTf(tf:)
)
,
for
:
.
allEditingEvents
)
phoneTf
.
addTarget
(
self
,
action
:
#selector(
textChangeTf(tf:)
)
,
for
:
.
allEditingEvents
)
adrTf
.
addTarget
(
self
,
action
:
#selector(
textChangeTf(tf:)
)
,
for
:
.
allEditingEvents
)
top_view
.
snp
.
makeConstraints
{
(
make
)
in
top_view
.
snp
.
makeConstraints
{
(
make
)
in
make
.
top
.
equalTo
(
NavCGRect
.
height
+
10
)
make
.
top
.
equalTo
(
NavCGRect
.
height
+
10
)
...
@@ -190,6 +253,7 @@ class P_P_H_Adr_VC: BaseViewController,SJMapViewControllerDelegate, UIPickerView
...
@@ -190,6 +253,7 @@ class P_P_H_Adr_VC: BaseViewController,SJMapViewControllerDelegate, UIPickerView
getIndex
()
getIndex
()
textTV
.
delegate
=
self
textTV
.
delegate
=
self
checkInfo
()
}
}
...
...
GeliBusinessPlatform/ViewController/拼拼货group/P_P_H_Adr_VC.xib
View file @
1badabca
...
@@ -14,6 +14,7 @@
...
@@ -14,6 +14,7 @@
<connections>
<connections>
<outlet
property=
"adrTf"
destination=
"c79-WN-La1"
id=
"lqQ-rc-8Ck"
/>
<outlet
property=
"adrTf"
destination=
"c79-WN-La1"
id=
"lqQ-rc-8Ck"
/>
<outlet
property=
"city_lbl"
destination=
"qSB-h2-bQB"
id=
"IgF-C6-mjv"
/>
<outlet
property=
"city_lbl"
destination=
"qSB-h2-bQB"
id=
"IgF-C6-mjv"
/>
<outlet
property=
"clearBtn"
destination=
"Sya-Y4-SHc"
id=
"U7f-h0-3kb"
/>
<outlet
property=
"count_lbl"
destination=
"Vv5-0g-G5Q"
id=
"j8d-11-Hua"
/>
<outlet
property=
"count_lbl"
destination=
"Vv5-0g-G5Q"
id=
"j8d-11-Hua"
/>
<outlet
property=
"nameTf"
destination=
"K6G-YC-k50"
id=
"hRS-18-XCj"
/>
<outlet
property=
"nameTf"
destination=
"K6G-YC-k50"
id=
"hRS-18-XCj"
/>
<outlet
property=
"phoneTf"
destination=
"Xw0-ZF-SNA"
id=
"2aS-a6-39Z"
/>
<outlet
property=
"phoneTf"
destination=
"Xw0-ZF-SNA"
id=
"2aS-a6-39Z"
/>
...
@@ -182,9 +183,6 @@
...
@@ -182,9 +183,6 @@
<constraint
firstAttribute=
"width"
constant=
"60"
id=
"uUx-C1-i6n"
/>
<constraint
firstAttribute=
"width"
constant=
"60"
id=
"uUx-C1-i6n"
/>
</constraints>
</constraints>
<state
key=
"normal"
image=
"Gloc"
/>
<state
key=
"normal"
image=
"Gloc"
/>
<connections>
<action
selector=
"map_select_loc:"
destination=
"-1"
eventType=
"touchUpInside"
id=
"zwk-BV-FQf"
/>
</connections>
</button>
</button>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"地址:"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"hi6-hO-U5J"
>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"地址:"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"hi6-hO-U5J"
>
<rect
key=
"frame"
x=
"10"
y=
"0.0"
width=
"39"
height=
"49"
/>
<rect
key=
"frame"
x=
"10"
y=
"0.0"
width=
"39"
height=
"49"
/>
...
@@ -202,32 +200,32 @@
...
@@ -202,32 +200,32 @@
<nil
key=
"highlightedColor"
/>
<nil
key=
"highlightedColor"
/>
</label>
</label>
<button
opaque=
"NO"
contentMode=
"scaleToFill"
contentHorizontalAlignment=
"center"
contentVerticalAlignment=
"center"
buttonType=
"system"
lineBreakMode=
"middleTruncation"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"0Pr-So-pa9"
>
<button
opaque=
"NO"
contentMode=
"scaleToFill"
contentHorizontalAlignment=
"center"
contentVerticalAlignment=
"center"
buttonType=
"system"
lineBreakMode=
"middleTruncation"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"0Pr-So-pa9"
>
<rect
key=
"frame"
x=
"
49"
y=
"0.0"
width=
"265
"
height=
"49"
/>
<rect
key=
"frame"
x=
"
0.0"
y=
"0.0"
width=
"384
"
height=
"49"
/>
<connections>
<connections>
<action
selector=
"
adr_select_action:"
destination=
"-1"
eventType=
"touchUpInside"
id=
"QHy-fC-VQ8
"
/>
<action
selector=
"
map_select_loc:"
destination=
"-1"
eventType=
"touchUpInside"
id=
"TYx-ra-Ogw
"
/>
</connections>
</connections>
</button>
</button>
</subviews>
</subviews>
<color
key=
"backgroundColor"
systemColor=
"systemBackgroundColor"
/>
<color
key=
"backgroundColor"
systemColor=
"systemBackgroundColor"
/>
<constraints>
<constraints>
<constraint
firstItem=
"hi6-hO-U5J"
firstAttribute=
"top"
secondItem=
"VhN-lm-X43"
secondAttribute=
"top"
id=
"3oA-ug-En0"
/>
<constraint
firstItem=
"hi6-hO-U5J"
firstAttribute=
"top"
secondItem=
"VhN-lm-X43"
secondAttribute=
"top"
id=
"3oA-ug-En0"
/>
<constraint
firstItem=
"
mGz-tr-rWW"
firstAttribute=
"leading"
secondItem=
"0Pr-So-pa9"
secondAttribute=
"trailing"
constant=
"10"
id=
"9OD-Nb-PHh
"
/>
<constraint
firstItem=
"
0Pr-So-pa9"
firstAttribute=
"leading"
secondItem=
"VhN-lm-X43"
secondAttribute=
"leading"
id=
"4KP-36-QCU
"
/>
<constraint
firstAttribute=
"bottom"
secondItem=
"KmU-92-tla"
secondAttribute=
"bottom"
id=
"CMj-3q-jhG"
/>
<constraint
firstAttribute=
"bottom"
secondItem=
"KmU-92-tla"
secondAttribute=
"bottom"
id=
"CMj-3q-jhG"
/>
<constraint
firstItem=
"0Pr-So-pa9"
firstAttribute=
"leading"
secondItem=
"hi6-hO-U5J"
secondAttribute=
"trailing"
id=
"CkE-fm-eVi"
/>
<constraint
firstItem=
"KmU-92-tla"
firstAttribute=
"top"
secondItem=
"qSB-h2-bQB"
secondAttribute=
"bottom"
id=
"JZE-jY-DfC"
/>
<constraint
firstItem=
"KmU-92-tla"
firstAttribute=
"top"
secondItem=
"qSB-h2-bQB"
secondAttribute=
"bottom"
id=
"JZE-jY-DfC"
/>
<constraint
firstAttribute=
"trailing"
secondItem=
"KmU-92-tla"
secondAttribute=
"trailing"
constant=
"10"
id=
"JuS-di-1wR"
/>
<constraint
firstAttribute=
"trailing"
secondItem=
"KmU-92-tla"
secondAttribute=
"trailing"
constant=
"10"
id=
"JuS-di-1wR"
/>
<constraint
firstItem=
"KmU-92-tla"
firstAttribute=
"top"
secondItem=
"0Pr-So-pa9"
secondAttribute=
"bottom"
id=
"LgE-LU-AEF"
/>
<constraint
firstItem=
"hi6-hO-U5J"
firstAttribute=
"leading"
secondItem=
"VhN-lm-X43"
secondAttribute=
"leading"
constant=
"10"
id=
"NHs-J0-lU6"
/>
<constraint
firstItem=
"hi6-hO-U5J"
firstAttribute=
"leading"
secondItem=
"VhN-lm-X43"
secondAttribute=
"leading"
constant=
"10"
id=
"NHs-J0-lU6"
/>
<constraint
firstItem=
"KmU-92-tla"
firstAttribute=
"top"
secondItem=
"0Pr-So-pa9"
secondAttribute=
"bottom"
id=
"NWO-E2-UYn"
/>
<constraint
firstItem=
"KmU-92-tla"
firstAttribute=
"top"
secondItem=
"mGz-tr-rWW"
secondAttribute=
"bottom"
id=
"Rd6-T3-HOy"
/>
<constraint
firstItem=
"KmU-92-tla"
firstAttribute=
"top"
secondItem=
"mGz-tr-rWW"
secondAttribute=
"bottom"
id=
"Rd6-T3-HOy"
/>
<constraint
firstAttribute=
"height"
constant=
"50"
id=
"Tzi-rB-xZH"
/>
<constraint
firstAttribute=
"height"
constant=
"50"
id=
"Tzi-rB-xZH"
/>
<constraint
firstItem=
"mGz-tr-rWW"
firstAttribute=
"leading"
secondItem=
"qSB-h2-bQB"
secondAttribute=
"trailing"
constant=
"10"
id=
"Yiw-vO-5wz"
/>
<constraint
firstItem=
"mGz-tr-rWW"
firstAttribute=
"leading"
secondItem=
"qSB-h2-bQB"
secondAttribute=
"trailing"
constant=
"10"
id=
"Yiw-vO-5wz"
/>
<constraint
firstItem=
"0Pr-So-pa9"
firstAttribute=
"top"
secondItem=
"VhN-lm-X43"
secondAttribute=
"top"
id=
"Zsv-Xe-faq"
/>
<constraint
firstAttribute=
"trailing"
secondItem=
"mGz-tr-rWW"
secondAttribute=
"trailing"
id=
"cHq-7U-kni"
/>
<constraint
firstAttribute=
"trailing"
secondItem=
"mGz-tr-rWW"
secondAttribute=
"trailing"
id=
"cHq-7U-kni"
/>
<constraint
firstItem=
"qSB-h2-bQB"
firstAttribute=
"top"
secondItem=
"VhN-lm-X43"
secondAttribute=
"top"
id=
"dM2-UI-eQQ"
/>
<constraint
firstItem=
"qSB-h2-bQB"
firstAttribute=
"top"
secondItem=
"VhN-lm-X43"
secondAttribute=
"top"
id=
"dM2-UI-eQQ"
/>
<constraint
firstItem=
"KmU-92-tla"
firstAttribute=
"top"
secondItem=
"hi6-hO-U5J"
secondAttribute=
"bottom"
id=
"dMU-84-DNq"
/>
<constraint
firstItem=
"KmU-92-tla"
firstAttribute=
"top"
secondItem=
"hi6-hO-U5J"
secondAttribute=
"bottom"
id=
"dMU-84-DNq"
/>
<constraint
firstItem=
"qSB-h2-bQB"
firstAttribute=
"leading"
secondItem=
"hi6-hO-U5J"
secondAttribute=
"trailing"
id=
"ejR-Pa-t6W"
/>
<constraint
firstItem=
"qSB-h2-bQB"
firstAttribute=
"leading"
secondItem=
"hi6-hO-U5J"
secondAttribute=
"trailing"
id=
"ejR-Pa-t6W"
/>
<constraint
firstAttribute=
"trailing"
secondItem=
"0Pr-So-pa9"
secondAttribute=
"trailing"
id=
"pCd-JS-hCy"
/>
<constraint
firstItem=
"KmU-92-tla"
firstAttribute=
"leading"
secondItem=
"VhN-lm-X43"
secondAttribute=
"leading"
constant=
"10"
id=
"pKb-yW-O5C"
/>
<constraint
firstItem=
"KmU-92-tla"
firstAttribute=
"leading"
secondItem=
"VhN-lm-X43"
secondAttribute=
"leading"
constant=
"10"
id=
"pKb-yW-O5C"
/>
<constraint
firstItem=
"mGz-tr-rWW"
firstAttribute=
"top"
secondItem=
"VhN-lm-X43"
secondAttribute=
"top"
id=
"sQp-uM-REf"
/>
<constraint
firstItem=
"mGz-tr-rWW"
firstAttribute=
"top"
secondItem=
"VhN-lm-X43"
secondAttribute=
"top"
id=
"sQp-uM-REf"
/>
<constraint
firstItem=
"0Pr-So-pa9"
firstAttribute=
"top"
secondItem=
"VhN-lm-X43"
secondAttribute=
"top"
id=
"tRS-6T-xmb"
/>
</constraints>
</constraints>
</view>
</view>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"详细地址:"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"Vx9-sb-QcV"
>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"详细地址:"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"Vx9-sb-QcV"
>
...
@@ -392,6 +390,9 @@
...
@@ -392,6 +390,9 @@
<real
key=
"value"
value=
"9"
/>
<real
key=
"value"
value=
"9"
/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</userDefinedRuntimeAttributes>
<connections>
<action
selector=
"clearAction:"
destination=
"-1"
eventType=
"touchUpInside"
id=
"fZv-9j-Mcq"
/>
</connections>
</button>
</button>
</subviews>
</subviews>
<viewLayoutGuide
key=
"safeArea"
id=
"fnl-2z-Ty3"
/>
<viewLayoutGuide
key=
"safeArea"
id=
"fnl-2z-Ty3"
/>
...
...
GeliBusinessPlatform/ViewController/拼拼货group/下单成功/Suc_LOG_Cell.xib
View file @
1badabca
...
@@ -48,12 +48,6 @@
...
@@ -48,12 +48,6 @@
<constraint
firstAttribute=
"width"
constant=
"1"
id=
"Hjr-JA-zi5"
/>
<constraint
firstAttribute=
"width"
constant=
"1"
id=
"Hjr-JA-zi5"
/>
</constraints>
</constraints>
</imageView>
</imageView>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
text=
"Label"
textAlignment=
"natural"
lineBreakMode=
"tailTruncation"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"Irg-02-L3a"
>
<rect
key=
"frame"
x=
"47"
y=
"12"
width=
"33"
height=
"18.5"
/>
<fontDescription
key=
"fontDescription"
name=
"PingFangSC-Regular"
family=
"PingFang SC"
pointSize=
"13"
/>
<color
key=
"textColor"
name=
"标题字颜色"
/>
<nil
key=
"highlightedColor"
/>
</label>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
usesAttributedText=
"YES"
lineBreakMode=
"tailTruncation"
numberOfLines=
"0"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"htU-bv-LVR"
>
<label
opaque=
"NO"
userInteractionEnabled=
"NO"
contentMode=
"left"
horizontalHuggingPriority=
"251"
verticalHuggingPriority=
"251"
usesAttributedText=
"YES"
lineBreakMode=
"tailTruncation"
numberOfLines=
"0"
baselineAdjustment=
"alignBaselines"
adjustsFontSizeToFit=
"NO"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"htU-bv-LVR"
>
<rect
key=
"frame"
x=
"47"
y=
"35.5"
width=
"326"
height=
"36"
/>
<rect
key=
"frame"
x=
"47"
y=
"35.5"
width=
"326"
height=
"36"
/>
<constraints>
<constraints>
...
@@ -111,6 +105,12 @@
...
@@ -111,6 +105,12 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</userDefinedRuntimeAttributes>
</label>
</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=
"Irg-02-L3a"
>
<rect
key=
"frame"
x=
"47"
y=
"12"
width=
"33"
height=
"18.5"
/>
<fontDescription
key=
"fontDescription"
name=
"PingFangSC-Regular"
family=
"PingFang SC"
pointSize=
"13"
/>
<color
key=
"textColor"
name=
"标题字颜色"
/>
<nil
key=
"highlightedColor"
/>
</label>
<button
opaque=
"NO"
contentMode=
"scaleToFill"
contentHorizontalAlignment=
"center"
contentVerticalAlignment=
"center"
buttonType=
"system"
lineBreakMode=
"middleTruncation"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"ulV-iw-bED"
>
<button
opaque=
"NO"
contentMode=
"scaleToFill"
contentHorizontalAlignment=
"center"
contentVerticalAlignment=
"center"
buttonType=
"system"
lineBreakMode=
"middleTruncation"
translatesAutoresizingMaskIntoConstraints=
"NO"
id=
"ulV-iw-bED"
>
<rect
key=
"frame"
x=
"398"
y=
"20.5"
width=
"50"
height=
"50"
/>
<rect
key=
"frame"
x=
"398"
y=
"20.5"
width=
"50"
height=
"50"
/>
<constraints>
<constraints>
...
...
GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/HLLTopCell.swift
View file @
1badabca
...
@@ -296,7 +296,5 @@ class HLLTopCell: UITableViewCell,UIScrollViewDelegate {
...
@@ -296,7 +296,5 @@ class HLLTopCell: UITableViewCell,UIScrollViewDelegate {
override
func
setSelected
(
_
selected
:
Bool
,
animated
:
Bool
)
{
override
func
setSelected
(
_
selected
:
Bool
,
animated
:
Bool
)
{
super
.
setSelected
(
selected
,
animated
:
animated
)
super
.
setSelected
(
selected
,
animated
:
animated
)
// Configure the view for the selected state
}
}
}
}
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