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
bfa31ca8
authored
Nov 02, 2018
by
朱继来
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge branch 'zjl_export_20181030' into development
parents
397fdc81
96dc5278
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
1 deletions
app/Model/OrderModel.php
app/Model/OrderModel.php
View file @
bfa31ca8
...
...
@@ -280,7 +280,7 @@ class OrderModel extends Model
$tmp
[
$i
][
'order_id'
]
=
$order
[
$i
][
'order_id'
];
$tmp
[
$i
][
'order_sn'
]
=
"
\t
"
.
$order
[
$i
][
'order_sn'
]
.
"
\t
"
;
$tmp
[
$i
][
'user_account'
]
=
$order
[
$i
][
'mobile'
]
?
$order
[
$i
][
'mobile'
]
:
$order
[
$i
][
'email'
];
$tmp
[
$i
][
'is_new'
]
=
$order
[
$i
][
'is_new'
]
!=
''
?
$user_tags
[
$order
[
$i
][
'is_new'
]]
:
''
;
$tmp
[
$i
][
'is_new'
]
=
isset
(
$order
[
$i
][
'is_new'
])
?
$user_tags
[
$order
[
$i
][
'is_new'
]]
:
''
;
$tmp
[
$i
][
'consignee'
]
=
isset
(
$order
[
$i
][
'consignee'
])
?
$order
[
$i
][
'consignee'
]
:
''
;
$tmp
[
$i
][
'create_time_date'
]
=
date
(
'Y-m-d'
,
$order
[
$i
][
'create_time'
]);
$tmp
[
$i
][
'create_time_sec'
]
=
date
(
'H:i:s'
,
$order
[
$i
][
'create_time'
]);
...
...
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