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
b7e110d7
authored
Sep 17, 2020
by
朱继来
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge branch 'zjl_merge_20200821'
parents
202f41b1
7fb57c7a
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
7 deletions
public/js/add_order.js
resources/views/changeInvoice.blade.php
resources/views/changeShipping.blade.php
resources/views/changeShipping/content.blade.php
public/js/add_order.js
View file @
b7e110d7
...
...
@@ -356,7 +356,7 @@
}
}
var
joint_goods_type
=
[
'1'
,
'2'
];
// 商品联营类型
var
joint_goods_type
=
[
1
,
2
];
// 商品联营类型
if
(
joint_goods_type
.
indexOf
(
data
.
goods_type
)
!=
-
1
)
{
html
+=
'<th>USD价格</th>'
;
...
...
@@ -502,12 +502,13 @@
}
if
(
num
<
min_buy
)
{
num
=
min_buy
;
self
.
val
(
min_buy
)
;
layer
.
msg
(
'购买数量低于最小起订量,默认调整为最小起订量'
);
return
}
var
curr_goods_type
=
$
(
this
).
parents
(
'tr'
).
data
(
'goods_type'
);
var
joint_goods_type
=
[
'1'
,
'2'
];
// 商品联营类型
var
joint_goods_type
=
[
1
,
2
];
// 商品联营类型
// if (goods_type == 1) { // 联营需要选择交货地
if
(
joint_goods_type
.
indexOf
(
curr_goods_type
)
!=
-
1
)
{
...
...
resources/views/changeInvoice.blade.php
View file @
b7e110d7
...
...
@@ -7,8 +7,8 @@
<title>
订单管理后台 | 更改发票
</title>
<script>
document
.
domain
=
"{{ Config::get('website.domain') }}"
;
</script>
@include('
orderlist.css')
@include('
orderlist.js')
@include('
detail.css')
@include('
detail.js')
</head>
<body
class=
""
>
...
...
resources/views/changeShipping.blade.php
View file @
b7e110d7
...
...
@@ -7,8 +7,8 @@
<title>
订单管理后台 | 更改收货地址
</title>
<script>
document
.
domain
=
"{{ Config::get('website.domain') }}"
;
</script>
@include('
orderlist.css')
@include('
orderlist.js')
@include('
detail.css')
@include('
detail.js')
</head>
<body
class=
""
>
...
...
resources/views/changeShipping/content.blade.php
View file @
b7e110d7
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