Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
朱继来
/
后台订单管理
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
c623b85c
authored
Jul 31, 2018
by
朱继来
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
调整导出变量
parent
4c23c690
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
app/Http/Controllers/OrderController.php
app/Http/Controllers/OrderController.php
View file @
c623b85c
...
...
@@ -793,8 +793,8 @@ Class OrderController extends Controller
$tmp
[
$i
][
'coupon'
]
=
$this
->
getOrderPrice
(
$order
[
$i
]
->
order_id
,
-
4
);
$tmp
[
$i
][
'order_amount'
]
=
$order
[
$i
]
->
order_amount
;
$tmp
[
$i
][
'currency'
]
=
$order
[
$i
]
->
currency
==
1
?
'RMB'
:
'USD'
;
$tmp
[
$i
][
'order_type'
]
=
$order_type
[
$order
[
$i
]
->
order_pay_type
]
;
$tmp
[
$i
][
'order_status'
]
=
$order_status
[
$order
[
$i
]
->
status
]
;
$tmp
[
$i
][
'order_type'
]
=
!
empty
(
$order
[
$i
]
->
order_pay_type
)
?
$order_type
[
$order
[
$i
]
->
order_pay_type
]
:
'未知'
;
$tmp
[
$i
][
'order_status'
]
=
!
empty
(
$order
[
$i
]
->
status
)
?
$order_status
[
$order
[
$i
]
->
status
]
:
'未知'
;
$tmp
[
$i
][
'shipping_status'
]
=
!
empty
(
$order
[
$i
]
->
shipping_status
)
?
$shipping_status
[
$order
[
$i
]
->
shipping_status
]
:
'无发货信息'
;
// 发货状态
$tmp
[
$i
][
'invoice_status'
]
=
!
empty
(
$order
[
$i
]
->
invoice_status
)
?
$invoice_status
[
$order
[
$i
]
->
invoice_status
]
:
'无发票信息'
;
// 发票状态
$tmp
[
$i
][
'company_name'
]
=
$order
[
$i
]
->
supplier_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