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
635bfdd5
authored
Oct 15, 2019
by
朱继来
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
新增新客价
parent
be0c9b96
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
public/js/order.js
resources/views/detail/changeOrder.blade.php
public/js/order.js
View file @
635bfdd5
...
@@ -1907,11 +1907,16 @@
...
@@ -1907,11 +1907,16 @@
var
content
=
'<div class="submit-check">'
+
var
content
=
'<div class="submit-check">'
+
'<p class="error">请核对订单金额,谨慎操作!</p>'
+
'<p class="error">请核对订单金额,谨慎操作!</p>'
+
'<p><label>商品总金额:</label>'
+
currencySign
+
goods_amount
+
'</p>'
+
'<p><label>商品总金额:</label>'
+
currencySign
+
goods_amount
+
'</p>'
;
'<p><label>优惠金额:</label>'
+
discount_amount
+
'</p>'
+
'<p><label>附加费金额:</label>'
+
extra_fee
+
'</p>'
+
if
(
new_client_price
)
{
'<p><label>运费金额:</label>'
+
freight_fee
+
'</p>'
+
content
+=
'<p><label>新客价金额:</label>'
+
new_client_price
+
'</p>'
;
'<p><label>订单总金额:</label><span class="error">'
+
currencySign
+
order_amount
+
'</span></p>'
;
}
content
+=
'<p><label>优惠金额:</label>'
+
discount_amount
+
'</p>'
+
'<p><label>附加费金额:</label>'
+
extra_fee
+
'</p>'
+
'<p><label>运费金额:</label>'
+
freight_fee
+
'</p>'
+
'<p><label>订单总金额:</label><span class="error">'
+
currencySign
+
order_amount
+
'</span></p>'
;
if
(
order_goods_type
==
1
)
{
if
(
order_goods_type
==
1
)
{
content
+=
'</div>'
;
content
+=
'</div>'
;
...
...
resources/views/detail/changeOrder.blade.php
View file @
635bfdd5
...
@@ -506,6 +506,7 @@
...
@@ -506,6 +506,7 @@
var
order_pay_type
=
"{{$order_info['order_pay_type']}}"
;
// 付款类型
var
order_pay_type
=
"{{$order_info['order_pay_type']}}"
;
// 付款类型
var
discount_amount
=
"{{ $order_price_info['discount_amount'] ? $order_price_info['discount_amount'] : 0 }}"
;
// 优惠券金额
var
discount_amount
=
"{{ $order_price_info['discount_amount'] ? $order_price_info['discount_amount'] : 0 }}"
;
// 优惠券金额
var
pay_preferential
=
"{{ $order_price_info['pay_preferential'] ? $order_price_info['pay_preferential'] : 0 }}"
;
// 支付优惠(钱包)
var
pay_preferential
=
"{{ $order_price_info['pay_preferential'] ? $order_price_info['pay_preferential'] : 0 }}"
;
// 支付优惠(钱包)
var
new_client_price
=
"{{ $order_price_info['new_client_price'] }}"
;
var
rest_time
=
"{{$order_info['pay_time'] ? $order_info['pay_time'] - time() : NULL}}"
;
var
rest_time
=
"{{$order_info['pay_time'] ? $order_info['pay_time'] - time() : NULL}}"
;
...
...
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