Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
my-yaf-project
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenchuanwen
my-yaf-project
Commits
127c4564
Commit
127c4564
authored
Dec 18, 2018
by
christ
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ccw:master_dev
parent
6eb4cac7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
Shopkeeper.php
application/modules/Client/controllers/Shopkeeper.php
+1
-1
No files found.
application/modules/Client/controllers/Shopkeeper.php
View file @
127c4564
...
@@ -143,7 +143,7 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
...
@@ -143,7 +143,7 @@ class ShopkeeperController extends \Our\Controller_AbstractClient {
$pageSize
=
$this
->
getPageSize
();
$pageSize
=
$this
->
getPageSize
();
$orderState
=
isset
(
$this
->
req
[
'data'
][
'orderState'
])
?
$this
->
req
[
'data'
][
'orderState'
]
:
''
;
$orderState
=
isset
(
$this
->
req
[
'data'
][
'orderState'
])
?
$this
->
req
[
'data'
][
'orderState'
]
:
''
;
$keyword
=
isset
(
$this
->
req
[
'data'
][
'keyword'
])
?
$this
->
req
[
'data'
][
'keyword'
]
:
''
;
$keyword
=
isset
(
$this
->
req
[
'data'
][
'keyword'
])
?
$this
->
req
[
'data'
][
'keyword'
]
:
''
;
$result
=
$this
->
shopkeeperService
->
getOrders
(
$this
->
memberId
,
$pageIndex
,
$pageSize
,
$orderState
,
$keyword
);
$result
=
$this
->
shopkeeperService
->
getOrders
(
$this
->
storeId
,
$pageIndex
,
$pageSize
,
$orderState
,
$keyword
,
true
);
$this
->
success
(
$result
);
$this
->
success
(
$result
);
// if($result){
// if($result){
// $this->success(array(),\Our\DescribeConst::successMessage,\Our\DescribeConst::successMessage);
// $this->success(array(),\Our\DescribeConst::successMessage,\Our\DescribeConst::successMessage);
...
...
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