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
5c9efb5a
Commit
5c9efb5a
authored
Mar 01, 2021
by
lujunye
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
发货默认空数组。等UI
parent
64e422a2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
...erdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
+0
-0
GeliBusinessPlatform/ViewController/代客下单(货运)/下运单/XiaYunDanViewController.swift
...ViewController/代客下单(货运)/下运单/XiaYunDanViewController.swift
+5
-3
GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift
GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift
+1
-1
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
...ssPlatform/ViewController/订单详情/OrderDViewController.swift
+3
-1
No files found.
GeliBusinessPlatform.xcworkspace/xcuserdata/junyelu.xcuserdatad/UserInterfaceState.xcuserstate
View file @
5c9efb5a
No preview for this file type
GeliBusinessPlatform/ViewController/代客下单(货运)/下运单/XiaYunDanViewController.swift
View file @
5c9efb5a
...
...
@@ -670,8 +670,10 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
}
let
alertView
=
LogisticalSelectView
(
frame
:
self
.
view
.
window
!.
bounds
)
alertView
.
delegate
=
self
if
logPayPriceModel
?
.
price_jd
!=
nil
{
alertView
.
jdPriceLbl
.
text
=
"京东冷运(预估运费"
+
(
logPayPriceModel
?
.
price_jd
)
!
+
"元)"
if
logPayPriceModel
?
.
total_freight_jd
!=
nil
&&
logPayPriceModel
?
.
total_freight_jd
!=
0
{
alertView
.
jdPriceLbl
.
text
=
"京东冷运(预估运费
\(
logPayPriceModel
?
.
total_freight_jd
)
元)"
}
else
{
alertView
.
jdPriceLbl
.
text
=
"京东冷运(待上门评估)"
}
if
logPayPriceModel
?
.
price_sf
!=
nil
&&
logPayPriceModel
?
.
price_sf
!=
0
{
alertView
.
sfPriceLbl
.
text
=
"顺丰冷运(预估运费"
+
String
(
format
:
"%.2f"
,
(
logPayPriceModel
?
.
price_sf
)
!
)
+
"元)"
...
...
@@ -711,7 +713,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
weak_alertView
?
.
XYfuTitleArr
=
futitleArr
}
else
if
idx
==
0
{
let
str
=
"运费:¥
\(
logPayPriceModel
!.
total_freight
_jd
!
)
"
let
str
=
"运费:¥
\(
logPayPriceModel
!.
price
_jd
!
)
"
let
str1
=
"揽收费:¥
\(
logPayPriceModel
!.
collect_fees
!
)
"
let
str2
=
"派送费:¥
\(
logPayPriceModel
!.
delivery_fee
!
)
"
weak_alertView
?
.
JDfuTitleArr
=
[
str
,
str1
,
str2
]
...
...
GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift
View file @
5c9efb5a
...
...
@@ -606,7 +606,7 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
}
}
else
{
sendOut
([
"user_token"
:
UserToken
as
Any
,
"order_id"
:
sender
.
tag
as
Any
],
success
:
{
(
data
)
in
sendOut
([
"user_token"
:
UserToken
as
Any
,
"order_id"
:
sender
.
tag
as
Any
,
"goods_info"
:[]
as
Any
],
success
:
{
(
data
)
in
HUD
.
flash
(
.
labeledSubSuccess
(
subtitle
:
"提交成功"
),
delay
:
1.2
)
NotificationCenter
.
default
.
post
(
name
:
NSNotification
.
Name
(
rawValue
:
"orderChange"
),
object
:
nil
)
...
...
GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift
View file @
5c9efb5a
...
...
@@ -1719,7 +1719,9 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
}
}
else
{
sendOut
([
"user_token"
:
UserToken
as
Any
,
"order_id"
:
self
.
dataMdoel
?
.
order_res
?
.
order_id
as
Any
],
success
:
{
(
data
)
in
sendOut
([
"user_token"
:
UserToken
as
Any
,
"order_id"
:
self
.
dataMdoel
?
.
order_res
?
.
order_id
as
Any
,
"goods_info"
:[]
as
Any
],
success
:
{
(
data
)
in
HUD
.
flash
(
.
labeledSubSuccess
(
subtitle
:
"提交成功"
),
delay
:
1.2
)
NotificationCenter
.
default
.
post
(
name
:
NSNotification
.
Name
(
rawValue
:
"orderChange"
),
object
:
nil
)
self
.
delegate
?
.
refishingOrderDchange
()
...
...
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