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
cd3233ec
authored
Mar 12, 2019
by
朱继来
Browse files
Options
_('Browse Files')
Download
Plain Diff
fix
parents
4d4de6ce
c4128182
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
app/Model/OrderModel.php
config/params.php
public/js/add_order.js
app/Model/OrderModel.php
View file @
cd3233ec
...
...
@@ -347,12 +347,12 @@ class OrderModel extends Model
$sales
=
DB
::
table
(
'user_info'
)
->
where
([
'userId'
=>
$order
[
$i
][
'sale_id'
]])
->
select
(
'name'
)
->
first
();
}
$tmp
[
$i
][
'order_id'
]
=
$order
[
$i
][
'order_id'
];
$tmp
[
$i
][
'order_sn'
]
=
"
\t
"
.
$order
[
$i
][
'order_sn'
]
.
"
\t
"
;
$tmp
[
$i
][
'order_id'
]
=
$order
[
$i
][
'order_id'
];
$tmp
[
$i
][
'order_sn'
]
=
"
\t
"
.
$order
[
$i
][
'order_sn'
]
.
"
\t
"
;
if
(
$order
[
$i
][
'order_goods_type'
]
==
2
)
{
$tmp
[
$i
][
'sale_type'
]
=
$order
[
$i
][
'sale_type'
]
==
1
?
'现卖'
:
'预售'
;
$tmp
[
$i
][
'business_type'
]
=
Config
(
'params.business_type'
)[
$order
[
$i
][
'business_type'
]]
;
// 自营其他业务类型
$tmp
[
$i
][
'business_type'
]
=
$order
[
$i
][
'business_type'
]
?
Config
(
'params.business_type'
)[
$order
[
$i
][
'business_type'
]]
:
'正常订单'
;
// 自营其他业务类型
}
$tmp
[
$i
][
'user_account'
]
=
$order
[
$i
][
'mobile'
]
?
$order
[
$i
][
'mobile'
]
:
$order
[
$i
][
'email'
];
...
...
config/params.php
View file @
cd3233ec
...
...
@@ -61,7 +61,6 @@
// 特殊业务类型
'business_type'
=>
[
0
=>
'正常订单'
,
1
=>
'样品销售'
,
2
=>
'仓库损耗'
,
],
...
...
public/js/add_order.js
View file @
cd3233ec
...
...
@@ -38,9 +38,9 @@
// 自营其他订单类型---仓库损耗
if
(
mobile
==
'15022222222'
)
{
$
(
'#business_type'
).
val
(
2
);
$
(
'#business_type'
).
val
(
2
)
.
attr
(
'disabled'
,
true
)
;
}
else
{
$
(
'#business_type'
).
val
(
1
);
$
(
'#business_type'
).
val
(
1
)
.
attr
(
'disabled'
,
false
)
;
}
$
.
ajax
({
...
...
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