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
f75be8af
Commit
f75be8af
authored
Aug 26, 2020
by
lujunye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复修改价格bug
parent
d0d6eb17
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
24 additions
and
21 deletions
+24
-21
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
...erdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/ViewController/代客下单(购物)/DaiKeXiaDanGouWuViewController.swift
...wController/代客下单(购物)/DaiKeXiaDanGouWuViewController.swift
+1
-1
GeliBusinessPlatform/ViewController/商品详情/EPViewController.swift
...sinessPlatform/ViewController/商品详情/EPViewController.swift
+10
-4
GeliBusinessPlatform/ViewController/物流跟踪/WuLiuGenZongViewController.swift
...form/ViewController/物流跟踪/WuLiuGenZongViewController.swift
+0
-1
GeliBusinessPlatform/ViewController/运单列表/YDLBVc.swift
GeliBusinessPlatform/ViewController/运单列表/YDLBVc.swift
+13
-15
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
View file @
f75be8af
No preview for this file type
GeliBusinessPlatform/ViewController/代客下单(购物)/DaiKeXiaDanGouWuViewController.swift
View file @
f75be8af
...
...
@@ -95,7 +95,7 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
"is_adsale"
:
is_adsale
as
Any
,
"goods_info"
:
goods_info
as
Any
,
"order_info"
:
order_info
as
Any
]
as
[
String
:
Any
]
print
(
order
)
orderData
=
order
let
alertView
=
GeliAlertView
(
frame
:
self
.
view
.
window
!.
bounds
)
alertView
.
delegate
=
self
;
...
...
GeliBusinessPlatform/ViewController/商品详情/EPViewController.swift
View file @
f75be8af
...
...
@@ -1666,16 +1666,22 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
var
skuArr
:
Array
<
Any
>
=
[]
for
i
in
0
..<
dataArr
.
count
{
let
item
=
dataArr
[
i
]
if
isPurnNumber
(
str
:
item
.
price
)
{
var
pData
=
""
if
item
.
price
.
contains
(
","
)
{
let
pArr
=
item
.
price
.
components
(
separatedBy
:
","
)
pData
=
pArr
.
joined
(
separator
:
""
)
}
else
{
pData
=
item
.
price
}
if
isPurnNumber
(
str
:
pData
)
{
if
isgetP
{
let
peiceP
=
Float
(
item
.
price
)
!
//第n个售价(n > 1)
let
peiceP
=
Float
(
pData
)
!
//第n个售价(n > 1)
if
peiceP
<
price
{
price
=
peiceP
model
=
item
}
}
else
{
price
=
Float
(
item
.
price
)
!
//第一个售价
price
=
Float
(
pData
)
!
//第一个售价
model
=
item
isgetP
=
true
}
...
...
GeliBusinessPlatform/ViewController/物流跟踪/WuLiuGenZongViewController.swift
View file @
f75be8af
...
...
@@ -46,7 +46,6 @@ class WuLiuGenZongViewController: BaseViewController,UITableViewDelegate,UITable
}
else
if
self
.
dataModel
?
.
lc_name
==
"顺丰冷运"
{
if
self
.
dataModel
?
.
sf_tracking
?
.
code
==
200
{
self
.
dataArr
=
self
.
dataModel
?
.
sf_tracking
?
.
model
!
as!
Array
<
Any
>
}
}
self
.
listView
.
reloadData
()
...
...
GeliBusinessPlatform/ViewController/运单列表/YDLBVc.swift
View file @
f75be8af
...
...
@@ -559,7 +559,7 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
func
tableView
(
_
tableView
:
UITableView
,
didSelectRowAt
indexPath
:
IndexPath
)
{
let
rowModel
=
datas
[
indexPath
.
row
]
if
rowModel
.
lc_name
==
"货拉拉"
{
let
vc
=
WaybillDetailViewController
()
vc
.
lwb_no
=
rowModel
.
lwb_no
!
...
...
@@ -569,8 +569,8 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
vc
.
orderID
=
rowModel
.
id
self
.
navigationController
?
.
pushViewController
(
vc
,
animated
:
true
)
}
}
var
BeginDate
:
Date
!
=
nil
var
EndDate
:
Date
!
=
nil
@IBAction
func
timeSelectAction
(
_
sender
:
Any
)
{
...
...
@@ -579,7 +579,6 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
timeBgH
.
constant
=
0
scvContentH
.
constant
=
680
calendarV
.
removeFromSuperview
()
}
else
{
timeBgH
.
constant
=
235
scvContentH
.
constant
=
915
...
...
@@ -592,8 +591,8 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
calendarV
.
setOldDate
(
beginD
:
BeginDate
!
,
endD
:
EndDate
!
)
}
}
}
//MARK:--日历代理
func
selectMoreDate
(
beginDate
:
Date
,
endginDate
:
Date
)
{
//bug
...
...
@@ -603,8 +602,8 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
timeTF
.
text
=
dayByDouble
(
sender
:
timeInterval
)
+
","
+
dayByDouble
(
sender
:
timeIntervalEnd
)
EndDate
=
endginDate
BeginDate
=
beginDate
}
//MARK: - 加载数据
var
start_time
=
0
var
end_time
=
0
...
...
@@ -703,6 +702,7 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
blackBtnView
.
addTarget
(
self
,
action
:
#selector(
removeBlackBtnView
)
,
for
:
.
touchUpInside
)
return
true
}
@objc
func
removeBlackBtnView
(){
if
blackBtnView
!=
nil
{
blackBtnView
.
removeFromSuperview
()
...
...
@@ -712,8 +712,7 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
//MARK:--搜索按钮代理
func
searchBarSearchButtonClicked
(
_
searchBar
:
UISearchBar
)
{
print
(
"点击搜索关键字进行--
\(
searchBar
.
text
)
"
)
searchBar
.
resignFirstResponder
()
if
blackBtnView
!=
nil
{
blackBtnView
.
removeFromSuperview
()
}
...
...
@@ -725,7 +724,8 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
//MARK:--清空搜索代理
func
clearSearchAction
()
{
}
}
//MARK:--编辑即将结束
func
searchBarTextDidEndEditing
(
_
searchBar
:
UISearchBar
)
{
print
(
"编辑即将结束了--"
)
...
...
@@ -742,14 +742,14 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
let
rowModel
=
datas
[
indexPath
.
row
]
if
rowModel
.
lc_name
==
"货拉拉"
{
if
rowModel
.
delivery_status
==
1
{
return
257
}
if
rowModel
.
delivery_status
==
4
&&
rowModel
.
pay_status
==
1
{
return
257
}
return
227
}
...
...
@@ -759,7 +759,6 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
}
if
((
rowModel
.
freight
)
!
>
0
)
&&
rowModel
.
pay_status
==
1
{
return
257
}
return
227
...
...
@@ -773,7 +772,6 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
cell
.
delegate
=
self
cell
.
tag
=
indexPath
.
row
cell
.
acButton
.
isHidden
=
true
let
rowModel
=
datas
[
indexPath
.
row
]
...
...
@@ -797,7 +795,7 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
cell
.
acButton
.
setTitle
(
"支付运费"
,
for
:
.
normal
)
}
}
cell
.
acButton
.
tag
=
indexPath
.
row
cell
.
title1
.
text
=
"运单号:"
+
rowModel
.
lwb_no
!
...
...
@@ -821,7 +819,7 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
if
rowModel
.
order_sn
?
.
count
==
0
{
cell
.
orderNumLbl
.
text
=
"订单号:-"
}
return
cell
}
...
...
@@ -830,7 +828,7 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
var
selectIndex
:
Int
?
func
YunDanLieBiaoCellAction
(
sender
:
UIButton
)
{
let
rowModel
=
datas
[
sender
.
tag
]
if
rowModel
.
lc_name
==
"货拉拉"
{
...
...
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