Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yohobuywap-node
·
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
Plain Diff
Browse Files
Authored by
QC-L
2019-03-13 13:53:44 +0800
Commit
56c923308416c4d55c14199fe4e6d8370888f05d
2 parents
5b628fad
a742441b
Merge branch 'feature/group-buy' of git.yoho.cn:fe/yohobuywap-node into feature/group-buy
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
14 deletions
apps/activity/models/group-service.js
public/js/activity/group/group-list.js
public/scss/activity/group/group-list.page.scss
utils/group-filter-process.js
apps/activity/models/group-service.js
View file @
56c9233
...
...
@@ -16,7 +16,7 @@ const contentCodes = {
result
:
'cea0efae77f4e04c935beb1e87181247'
,
detail
:
'3c3a94fd6c6e19508b6921acd7f6cbad'
}
}
[
isProd
?
'prod
'
:
'test'
];
}
[
isProd
?
'production
'
:
'test'
];
class
GroupService
extends
global
.
yoho
.
BaseModel
{
constructor
(
ctx
)
{
...
...
public/js/activity/group/group-list.js
View file @
56c9233
...
...
@@ -103,7 +103,6 @@ class ProductListLoader {
}
let
catchKey
=
this
.
url
+
'?'
+
$
.
param
(
this
.
defaultOpt
);
console
.
log
(
this
.
defaultOpt
);
if
(
!
this
.
isLoadMore
)
{
return
false
;
}
...
...
public/scss/activity/group/group-list.page.scss
View file @
56c9233
...
...
@@ -38,7 +38,6 @@ body {
display
:
block
;
width
:
100%
;
height
:
246px
;
border
:
1px
solid
yellowgreen
;
overflow
:
hidden
;
.img
{
...
...
@@ -136,7 +135,7 @@ body {
.price-view
{
position
:
absolute
;
bottom
:
44
%
;
bottom
:
32
%
;
width
:
470px
;
height
:
40px
;
margin-left
:
20px
;
...
...
utils/group-filter-process.js
View file @
56c9233
...
...
@@ -111,16 +111,6 @@ exports.processFilter = (list, options) => {
name
:
filtersType
[
key
].
name
});
// 测试数据
// let itemList = [];
// for (let i = 0; i < 12; i++) {
// itemList.push({
// itemId: '1,3',
// itemName: 'MEN'
// });
// }
let
itemList
=
item
.
allItemList
||
item
.
itemList
;
_
.
forEach
(
itemList
,
(
sub
)
=>
{
...
...
Please
register
or
login
to post a comment