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
c2eb1c6a
authored
Nov 27, 2018
by
朱继来
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
自营对账隐藏流水号
parent
ac39c42f
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
23 deletions
app/Http/Controllers/OrderController.php
public/js/order.js
resources/views/detail/selfCheckPay.blade.php
app/Http/Controllers/OrderController.php
View file @
c2eb1c6a
...
@@ -1387,13 +1387,13 @@ Class OrderController extends Controller
...
@@ -1387,13 +1387,13 @@ Class OrderController extends Controller
{
{
if
(
$request
->
isMethod
(
'post'
))
{
if
(
$request
->
isMethod
(
'post'
))
{
$order_id
=
$request
->
input
(
'order_id'
,
''
);
$order_id
=
$request
->
input
(
'order_id'
,
''
);
$serial_number
=
$request
->
input
(
'serial_number'
,
''
);
//
$serial_number = $request->input('serial_number', '');
$operator_id
=
$request
->
user
->
userId
;
$operator_id
=
$request
->
user
->
userId
;
$url
=
Config
(
'website.api_domain'
)
.
'order/selfcheckpay'
;
$url
=
Config
(
'website.api_domain'
)
.
'order/selfcheckpay'
;
$data
[
'order_id'
]
=
$order_id
;
$data
[
'order_id'
]
=
$order_id
;
$data
[
'serial_number'
]
=
$serial_number
;
//
$data['serial_number'] = $serial_number;
$data
[
'operator_id'
]
=
$operator_id
;
$data
[
'operator_id'
]
=
$operator_id
;
$data
[
'k1'
]
=
time
();
$data
[
'k1'
]
=
time
();
...
@@ -1410,6 +1410,11 @@ Class OrderController extends Controller
...
@@ -1410,6 +1410,11 @@ Class OrderController extends Controller
}
}
$info
=
$this
->
orderDetail
(
$request
,
$id
);
$info
=
$this
->
orderDetail
(
$request
,
$id
);
if
(
!
$request
->
input
(
'tags'
)
&&
$request
->
input
(
'tags'
)
!=
'self'
)
{
// 自营订单页面
return
redirect
(
'/self_order'
);
}
$this
->
pageHeader
(
$request
,
$info
,
'自营对账'
,
[
"title"
=>
'自营对账'
,
"href"
=>
'#'
]);
$this
->
pageHeader
(
$request
,
$info
,
'自营对账'
,
[
"title"
=>
'自营对账'
,
"href"
=>
'#'
]);
$this
->
selfOtherData
(
$info
,
$id
);
$this
->
selfOtherData
(
$info
,
$id
);
...
...
public/js/order.js
View file @
c2eb1c6a
...
@@ -1668,12 +1668,12 @@
...
@@ -1668,12 +1668,12 @@
// 自营对账
// 自营对账
$
(
'.self-sure-pay'
).
click
(
function
(){
$
(
'.self-sure-pay'
).
click
(
function
(){
var
order_id
=
$
(
'#order_id'
).
val
();
var
order_id
=
$
(
'#order_id'
).
val
();
var
serial_number
=
$
(
'input[name="serial_number"]'
).
val
();
//
var serial_number = $('input[name="serial_number"]').val();
if
(
serial_number
.
length
==
0
)
{
//
if (serial_number.length == 0) {
layer
.
alert
(
'请输入流水号'
);
//
layer.alert('请输入流水号');
return
false
;
//
return false;
}
//
}
layer
.
open
({
layer
.
open
({
title
:
'收款确认'
,
title
:
'收款确认'
,
...
@@ -1682,7 +1682,8 @@
...
@@ -1682,7 +1682,8 @@
btn1
:
function
(){
btn1
:
function
(){
$
.
ajax
({
$
.
ajax
({
url
:
'/self_check_pay/'
+
order_id
,
url
:
'/self_check_pay/'
+
order_id
,
data
:
{
order_id
:
order_id
,
serial_number
:
serial_number
},
// data: {order_id : order_id, serial_number : serial_number},
data
:
{
order_id
:
order_id
},
type
:
'post'
,
type
:
'post'
,
dataType
:
'json'
,
dataType
:
'json'
,
success
:
function
(
resp
){
success
:
function
(
resp
){
...
...
resources/views/detail/selfCheckPay.blade.php
View file @
c2eb1c6a
<p
style=
"margin-left: 5px;"
>
对账操作
</p>
<p
style=
"margin-left: 5px;"
>
对账操作
</p>
<div
class=
"tabs-box"
>
<div
class=
"tabs-box"
>
<!-- 判断订单类型 1.全款,2.预付款 -->
<!-- 判断订单类型 1.全款,2.预付款 -->
<?php
@if ($order_info['status'] == 4)
if
(
$order_info
[
'status'
]
==
4
)
{
<p>
订单对账正常
</p>
echo
'<p>订单对账正常</p>
<p
class=
"error"
>
订单总金额:{{ $order_info['order_amount'] }}
</p>
<p class="error">订单总金额:'
.
$order_info
[
'order_amount'
]
.
'</p>
<!-- <p>流水号:{{ $order_pay_log[0]['serial_number'] }}</p> -->
<p>流水号:'
.
$order_pay_log
[
0
][
'serial_number'
]
.
'</p>'
;
@else
}
else
{
<p
class=
"error"
>
订单总金额:{{ $order_info['order_amount'] }}
</p>
$serial_number
=
isset
(
$order_pay_log
[
0
][
'serial_number'
])
?
$order_pay_log
[
0
][
'serial_number'
]
:
''
;
<!-- <p> 流水号:
<input style="width: 200px;" type="text" name="serial_number" value="{{ isset($order_pay_log[0]['serial_number']) ? $order_pay_log[0]['serial_number'] : '' }}">
echo
'<p class="error">订单总金额:'
.
$order_info
[
'order_amount'
]
.
'</p>
<p> 流水号:
<input style="width: 200px;" type="text" name="serial_number" value="'
.
$serial_number
.
'">
<span style="color:orange;">请录入流水号,流水号为英文、数字</span>
<span style="color:orange;">请录入流水号,流水号为英文、数字</span>
</p>
</p> -->
<p style="margin-top: 20px;"><a class="btn btn-default self-sure-pay">确认收款</a></p>'
;
<p
style=
"margin-top: 20px;"
><a
class=
"btn btn-default self-sure-pay"
>
确认收款
</a></p>
}
@endif
?>
</div>
</div>
<div
class=
"hide"
id=
"sure-pay"
>
<div
class=
"hide"
id=
"sure-pay"
>
...
...
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