Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yoho-activity-platform
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
yyq
7 years ago
Commit
be90ac098c26d296d01a6612710ba447d0636967
1 parent
6b482492
fix pager
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
10 deletions
apps/admin/models/activity.js
apps/admin/views/action/activity/zero-buy-list.hbs
utils/pager.js
apps/admin/models/activity.js
View file @
be90ac0
...
...
@@ -477,7 +477,7 @@ class AdminModel extends global.yoho.BaseModel {
return
value
;
});
Object
.
assign
(
resData
,
pager
(
_
.
get
(
result
,
'[1].total'
,
1
),
params
));
Object
.
assign
(
resData
,
pager
(
_
.
get
(
result
,
'[1]
[0]
.total'
,
1
),
params
));
return
resData
;
});
...
...
apps/admin/views/action/activity/zero-buy-list.hbs
View file @
be90ac0
...
...
@@ -82,11 +82,11 @@
{{/if}}
</li>
{{/
pages
}}
{{#
next
Limit
}}
{{#
next
Page
}}
<li
class=
"page-item"
>
<a
class=
"page-link"
href=
"
{{
url
}}
"
>
下一页
</a>
</li>
{{/
next
Limit
}}
{{/
next
Page
}}
</ul>
</nav>
</div>
...
...
utils/pager.js
View file @
be90ac0
...
...
@@ -6,7 +6,7 @@ const _ = require('lodash');
* @param newParam 要拼接的 参数
* @returns {string}
*/
const
handleFilterUrl
=
(
originParam
,
newParam
,
delParam
)
=>
{
const
handleFilterUrl
=
(
baseUrl
,
originParam
,
newParam
,
delParam
)
=>
{
let
dest
=
'?'
;
let
tempOriginParam
=
{};
...
...
@@ -15,17 +15,17 @@ const handleFilterUrl = (originParam, newParam, delParam) => {
tempOriginParam
=
Object
.
assign
(
tempOriginParam
,
originParam
,
newParam
);
delete
tempOriginParam
.
uid
;
_
.
forEach
(
tempOriginParam
,
info
=>
{
if
(
!
delParam
[
info
.
key
]
&&
info
.
value
)
{
_
.
forEach
(
tempOriginParam
,
(
value
,
key
)
=>
{
if
(
!
delParam
[
key
]
&&
value
)
{
// NOTE: 这里会对 query 进行编码,因为 query 有可以能是中文
if
(
info
.
key
===
'query'
)
{
info
.
value
=
encodeURIComponent
(
info
.
value
);
if
(
key
===
'query'
)
{
value
=
encodeURIComponent
(
value
);
}
dest
+=
`
$
{
info
.
key
}
=
$
{
info
.
value
}
&
`
;
dest
+=
`
$
{
key
}
=
$
{
value
}
&
`
;
}
});
return
_
.
trim
(
dest
,
'&'
);
return
(
baseUrl
||
''
)
+
_
.
trim
(
dest
,
'&'
);
};
module
.
exports
=
(
total
,
params
=
{},
baseUrl
=
''
)
=>
{
...
...
@@ -92,6 +92,7 @@ module.exports = (total, params = {}, baseUrl = '') => {
});
offsetPage
++
;
}
if
(
nextLimit
>=
2
)
{
pages
=
_
.
concat
(
pages
,
{
num
:
'...'
...
...
Please
register
or
login
to post a comment