Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
T
token
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
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
wallet
token
Commits
61b4eb5c
Commit
61b4eb5c
authored
Nov 15, 2019
by
shajiaiming
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/explore' into 'master'
fix See merge request
!191
parents
aa3207c8
fca68d1a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
ExploreController.php
api/controllers/ExploreController.php
+1
-1
ExploreAppController.php
wallet/controllers/ExploreAppController.php
+2
-2
No files found.
api/controllers/ExploreController.php
View file @
61b4eb5c
...
@@ -28,7 +28,7 @@ class ExploreController extends BaseController
...
@@ -28,7 +28,7 @@ class ExploreController extends BaseController
$val
->
name
=
$val
->
name
[
$this
->
lang
];
$val
->
name
=
$val
->
name
[
$this
->
lang
];
$apps_model
=
ExploreApp
::
find
()
->
select
(
'id, name, icon, type, app_url, slogan'
)
$apps_model
=
ExploreApp
::
find
()
->
select
(
'id, name, icon, type, app_url, slogan'
)
->
where
([
'app_category_id'
=>
(
int
)
$val
->
id
])
->
where
([
'app_category_id'
=>
(
int
)
$val
->
id
])
->
orderBy
(
'sort'
)
->
orderBy
(
'sort
desc
'
)
->
limit
(
$val
->
limit
)
->
limit
(
$val
->
limit
)
->
all
();
->
all
();
foreach
(
$apps_model
as
&
$app
)
{
foreach
(
$apps_model
as
&
$app
)
{
...
...
wallet/controllers/ExploreAppController.php
View file @
61b4eb5c
...
@@ -54,7 +54,7 @@ class ExploreAppController extends BaseController
...
@@ -54,7 +54,7 @@ class ExploreAppController extends BaseController
if
(
Yii
::
$app
->
request
->
isGet
)
{
if
(
Yii
::
$app
->
request
->
isGet
)
{
$query
=
ExploreAppCategory
::
find
()
->
where
([
'platform_id'
=>
$platform_id
])
->
asArray
();
$query
=
ExploreAppCategory
::
find
()
->
where
([
'platform_id'
=>
$platform_id
])
->
asArray
();
$app_category_model
=
$query
->
offset
((
$page
-
1
)
*
$size
)
->
limit
(
$size
)
->
asArray
()
->
all
();
$app_category_model
=
$query
->
offset
((
$page
-
1
)
*
$size
)
->
orderBy
(
'sort desc'
)
->
limit
(
$size
)
->
asArray
()
->
all
();
foreach
(
$app_category_model
as
&
$val
)
{
foreach
(
$app_category_model
as
&
$val
)
{
$name
=
json_decode
(
$val
[
'name'
],
true
);
$name
=
json_decode
(
$val
[
'name'
],
true
);
$val
[
'name'
]
=
$name
;
$val
[
'name'
]
=
$name
;
...
@@ -189,7 +189,7 @@ class ExploreAppController extends BaseController
...
@@ -189,7 +189,7 @@ class ExploreAppController extends BaseController
$query
=
ExploreApp
::
find
()
$query
=
ExploreApp
::
find
()
->
where
([
'app_category_id'
=>
$category_id
])
->
where
([
'app_category_id'
=>
$category_id
])
->
asArray
();
->
asArray
();
$app_model
=
$query
->
offset
((
$page
-
1
)
*
$size
)
->
limit
(
$size
)
->
asArray
()
->
all
();
$app_model
=
$query
->
offset
((
$page
-
1
)
*
$size
)
->
orderBy
(
'sort desc'
)
->
limit
(
$size
)
->
asArray
()
->
all
();
foreach
(
$app_model
as
&
$val
)
{
foreach
(
$app_model
as
&
$val
)
{
$name
=
json_decode
(
$val
[
'name'
],
true
);
$name
=
json_decode
(
$val
[
'name'
],
true
);
$val
[
'name'
]
=
$name
;
$val
[
'name'
]
=
$name
;
...
...
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