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
cddf1b4d
authored
May 15, 2019
by
朱继来
Browse files
Options
_('Browse Files')
Download
Plain Diff
Merge branch 'zjl_erp_syn_20190514' into development
parents
c6578754
50a372a0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
41 additions
and
0 deletions
app/Http/routes.php
public/js/order.js
app/Http/routes.php
View file @
cddf1b4d
...
...
@@ -120,6 +120,8 @@ Route::group(['middleware' => 'web'], function () {
Route
::
get
(
'/refund_self_order'
,
'RefundController@selfRefundList'
);
Route
::
post
(
'/ajax/cancelSelfRefund'
,
'RefundController@cancelSelfRefund'
);
Route
::
get
(
'/refund_self_export'
,
'RefundController@refundSelfExport'
);
Route
::
post
(
'/ajax/offlinePaid'
,
'OrderController@offlinePaid'
);
});
// 不需要登陆态
...
...
public/js/order.js
View file @
cddf1b4d
...
...
@@ -770,6 +770,45 @@
$
(
this
).
parents
(
'tbody'
).
find
(
'.click-down'
).
show
();
})
// 线下转账
$
(
'.offline-paid'
).
click
(
function
()
{
var
order_id
=
$
(
this
).
data
(
'id'
);
var
order_sn
=
$
(
this
).
data
(
'sn'
);
var
content
=
'<div>确定要使用“线下转账”的付款方式吗?</div><div style="margin-top:5px; color:red;">选择“线下转账”,订单会立即同步至ERP,但必须由财务在“出库前”完成付款确认,否则无法出库。</div>'
;
layer
.
open
({
title
:
'提示信息'
,
content
:
content
,
btn
:[
'确认'
,
'取消'
],
//提交事件
btn1
:
function
(){
$
.
ajax
({
url
:
'/ajax/offlinePaid'
,
data
:
{
order_id
:
order_id
,
order_sn
:
order_sn
},
type
:
'post'
,
dataType
:
'json'
,
success
:
function
(
resp
){
if
(
resp
.
errcode
==
0
){
layer
.
msg
(
resp
.
errmsg
||
'操作成功'
);
setTimeout
(
function
(){
location
.
reload
();
},
1000
);
return
false
;
}
else
{
layer
.
alert
(
resp
.
errmsg
||
'网络异常'
);
}
},
error
:
function
(){
layer
.
alert
(
'网络异常'
);
}
});
},
btn2
:
function
(
index
){
layer
.
close
(
index
);
}
});
})
},
//物流信息
...
...
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