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
7c601074
Commit
7c601074
authored
Aug 15, 2020
by
lujunye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
隐藏京东物流
parent
bf1a2143
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
84 additions
and
51 deletions
+84
-51
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
...erdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/View/LogisticalSelectView/LogisticalSelectView.swift
...form/View/LogisticalSelectView/LogisticalSelectView.swift
+16
-2
GeliBusinessPlatform/View/LogisticalSelectView/LogisticalSelectView.xib
...atform/View/LogisticalSelectView/LogisticalSelectView.xib
+62
-48
GeliBusinessPlatform/ViewController/代客下单(货运)/下运单/XiaYunDanViewController.swift
...ViewController/代客下单(货运)/下运单/XiaYunDanViewController.swift
+6
-1
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
View file @
7c601074
No preview for this file type
GeliBusinessPlatform/View/LogisticalSelectView/LogisticalSelectView.swift
View file @
7c601074
...
...
@@ -17,6 +17,7 @@ protocol LogisticalSelectViewDelegate {
class
LogisticalSelectView
:
UIView
{
var
delegate
:
LogisticalSelectViewDelegate
?
@IBOutlet
weak
var
jdBgViewH
:
NSLayoutConstraint
!
@IBOutlet
weak
var
jdSelectBtn
:
UIButton
!
@IBOutlet
weak
var
sfSelectBtn
:
UIButton
!
@IBAction
func
blackAction
(
_
sender
:
Any
)
{
...
...
@@ -35,7 +36,10 @@ class LogisticalSelectView: UIView {
tempArr
.
forEach
{
(
item
)
in
item
.
removeFromSuperview
()
}
//有京东
selectBgHeight
.
constant
=
CGFloat
(
265
)
//没京东
// selectBgHeight.constant = CGFloat(265 - 68)
return
}
for
i
in
0
..<
fuTitleArr
.
count
{
...
...
@@ -50,7 +54,10 @@ class LogisticalSelectView: UIView {
}
tempArr
.
append
(
lbl
)
}
//有京东
selectBgHeight
.
constant
=
CGFloat
(
265
+
fuTitleArr
.
count
*
19
)
//没京东
// selectBgHeight.constant = CGFloat(265 + fuTitleArr.count * 19 - 68)
}
}
...
...
@@ -95,12 +102,17 @@ class LogisticalSelectView: UIView {
}
else
{
delegate
?
.
LogisticalSelectViewBtnclick
(
idx
:
2
)
}
// selectBgView.isHidden = false
// selectBgHeight.constant = CGFloat(265 + fuTitleArr.count * 19)
}
}
@IBOutlet
weak
var
jdBgView
:
UIView
!
var
contentView
:
UIView
!
func
setJD
(){
// jdBgViewH.constant = 0
// jdBgView.isHidden = true
}
//初始化时将xib中的view添加进来
override
init
(
frame
:
CGRect
)
{
super
.
init
(
frame
:
frame
)
...
...
@@ -109,6 +121,7 @@ class LogisticalSelectView: UIView {
contentView
.
snp
.
makeConstraints
{
(
make
)
in
make
.
left
.
top
.
right
.
bottom
.
equalToSuperview
()
}
setJD
()
}
// /初始化时将xib中的view添加进来
required
init
?(
coder
aDecoder
:
NSCoder
)
{
...
...
@@ -118,6 +131,7 @@ class LogisticalSelectView: UIView {
contentView
.
snp
.
makeConstraints
{
(
make
)
in
make
.
left
.
top
.
right
.
bottom
.
equalToSuperview
()
}
setJD
()
}
//加载xib
func
loadViewFromNib
()
->
UIView
{
...
...
GeliBusinessPlatform/View/LogisticalSelectView/LogisticalSelectView.xib
View file @
7c601074
This diff is collapsed.
Click to expand it.
GeliBusinessPlatform/ViewController/代客下单(货运)/下运单/XiaYunDanViewController.swift
View file @
7c601074
...
...
@@ -18,7 +18,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
{
let
datasArr
=
[
"https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1597299369034&di=e29ff315ddeadcfc8b785c8060995b3c&imgtype=0&src=http%3A%2F%2F5b0988e595225.cdn.sohucs.com%2Fimages%2F20180520%2Fcfc6bc7922824542b3b3186041ba49de.jpeg"
,
"https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1597300858041&di=52f336ce7e6b501eb560fbf0848c754b&imgtype=0&src=http%3A%2F%2Fdingyue.ws.126.net%2FxprlH2GfSd8xmPWwqfyILcSqUCcHtdrfYuTBNezAfGJKi1545980365722.jpg"
,
"https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=2992387834,114733111&fm=26&gp=0.jpg"
]
var
isLoadingTime
=
true
let
nonce_str
=
String
.
randomStr
(
len
:
30
)
var
xiaDanRenMsg
:
NSString
=
""
func
XiaDanUserInfoViewControllerData
(
str
:
NSString
)
{
...
...
@@ -1485,8 +1485,12 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
//时间
if
indexPath
.
row
==
0
{
HUD
.
flash
(
.
progress
)
if
isLoadingTime
{
isLoadingTime
=
false
getHllTime
([
"user_token"
:
UserToken
as
Any
],
success
:
{
(
data
)
in
let
model
=
data
as!
getHllTimeModel
self
.
isLoadingTime
=
true
if
self
.
bgBtn
==
nil
{
let
btn
=
UIButton
()
self
.
view
.
addSubview
(
btn
)
...
...
@@ -1525,6 +1529,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
}
}
}
}
var
glSelectView
:
GLAlertSelectView
?
@objc
func
closeAc
(){
...
...
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