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
Email Patches
Plain Diff
Browse Files
Authored by
QC-L
6 years ago
Commit
d48b11f91e1d195bd2ee068a445d1f0a8d0985de
1 parent
d85b340d
修改样式
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
68 additions
and
38 deletions
apps/activity/models/group-service.js
apps/activity/views/partial/group/resources/guess-like.hbs
apps/activity/views/partial/group/resources/new-index-filter-list-item.hbs
public/hbs/activity/group/group-list-product.hbs
public/js/activity/group.page.js
public/scss/activity/group/floor/collage-buy-list.scss
public/scss/activity/group/floor/guess-like.scss
public/scss/activity/group/new-filter-list.scss
apps/activity/models/group-service.js
View file @
d48b11f
...
...
@@ -20,10 +20,16 @@ const contentCodes = {
const
newContentCodes
=
{
test
:
{
home
:
'd9101626ba774147080596e482e5f697'
home
:
'd9101626ba774147080596e482e5f697'
,
ready
:
'89141506b9926010f28915a82b3db61d'
,
result
:
'3c3a94fd6c6e19508b6921acd7f6cbad'
,
detail
:
'cea0efae77f4e04c935beb1e87181247'
},
production
:
{
home
:
'd9101626ba774147080596e482e5f697'
home
:
'd9101626ba774147080596e482e5f697'
,
ready
:
'89141506b9926010f28915a82b3db61d'
,
result
:
'3c3a94fd6c6e19508b6921acd7f6cbad'
,
detail
:
'cea0efae77f4e04c935beb1e87181247'
}
}
[
isProd
?
'production'
:
'test'
];
...
...
apps/activity/views/partial/group/resources/guess-like.hbs
View file @
d48b11f
...
...
@@ -3,7 +3,8 @@
<div
class=
"guess-scroll"
>
{{#
each
data
}}
<div
class=
"guess-tab"
data-query=
"
{{
queryString
}}
"
>
<img
src=
"
{{
image2
src
w
=
160
h
=
80
q
=
60
mode
=
3
}}
"
/>
<img
class=
"guess-img"
src=
"
{{
image2
src
w
=
160
h
=
80
q
=
60
mode
=
3
}}
"
/>
<div></div>
</div>
{{/
each
}}
</div>
...
...
apps/activity/views/partial/group/resources/new-index-filter-list-item.hbs
View file @
d48b11f
...
...
@@ -19,14 +19,16 @@
<div
class=
"new-group-number forcefontsize10"
>
已拼
{{
joinPeopleNum
}}
件
</div>
</div>
<div
class=
"new-group-prict-bg"
>
<div
class=
"new-group-number-price"
>
<span
class=
"new-group-people-numer"
>
{{
people_num
}}
人团
</span>
<span
class=
"new-group-price-collage"
>
{{
collage_price_str
}}
</span>
</div>
<div
class=
"new-market-button"
>
<span
class=
"new-group-price-market"
>
单人价
{{
market_price_str
}}
</span>
<div
class=
"go-group-product"
></div>
<div
class=
"new-group-prict-bg-column"
>
<div
class=
"new-group-number-price"
>
<span
class=
"new-group-people-numer"
>
{{
people_num
}}
人团
</span>
<span
class=
"new-group-price-collage"
>
{{
collage_price_str
}}
</span>
</div>
<div
class=
""
>
<span
class=
"new-group-price-market"
>
单人价
{{
market_price_str
}}
</span>
</div>
</div>
<div
class=
"go-group-product"
></div>
</div>
</div>
</div>
...
...
public/hbs/activity/group/group-list-product.hbs
View file @
d48b11f
...
...
@@ -19,14 +19,16 @@
<div
class=
"new-group-number forcefontsize10"
>
已拼
{{
joinPeopleNum
}}
件
</div>
</div>
<div
class=
"new-group-prict-bg"
>
<div
class=
"new-group-number-price"
>
<span
class=
"new-group-people-numer"
>
{{
people_num
}}
人团
</span>
<span
class=
"new-group-price-collage"
>
{{
collage_price_str
}}
</span>
</div>
<div
class=
"new-market-button"
>
<span
class=
"new-group-price-market"
>
单人价
{{
market_price_str
}}
</span>
<div
class=
"go-group-product"
></div>
<div
class=
"new-group-prict-bg-column"
>
<div
class=
"new-group-number-price"
>
<span
class=
"new-group-people-numer"
>
{{
people_num
}}
人团
</span>
<span
class=
"new-group-price-collage"
>
{{
collage_price_str
}}
</span>
</div>
<div
class=
""
>
<span
class=
"new-group-price-market"
>
单人价
{{
market_price_str
}}
</span>
</div>
</div>
<div
class=
"go-group-product"
></div>
</div>
</div>
</div>
...
...
public/js/activity/group.page.js
View file @
d48b11f
...
...
@@ -201,7 +201,6 @@ class Group extends Page {
query
.
forEach
(
item
=>
{
queryObject
=
Object
.
assign
(
queryObject
,
item
);
});
console
.
log
(
queryObject
);
$
.
ajax
({
type
:
'GET'
,
url
:
'/activity/group/goods-tab'
,
...
...
@@ -210,8 +209,8 @@ class Group extends Page {
// $('.filter-mask').remove();
// $('.group').append(data);
// $('.guess-scroll').find('')
$
(
'.guess-scroll'
).
children
(
'div'
).
removeClass
(
'active'
);
$this
.
addClass
(
'active'
);
$
(
'.guess-tab'
).
children
(
'div'
).
removeClass
(
'guess-tab-active'
);
$this
.
children
(
'div'
).
addClass
(
'guess-tab-active'
);
this
.
renderMoreData
(
data
.
filterList
||
[]);
}
});
...
...
@@ -506,7 +505,7 @@ class Group extends Page {
// 筛选初始化
filterInit
()
{
$
(
'.guess-scroll'
).
find
(
'div:first-child'
).
addClass
(
'
active'
);
$
(
'.guess-scroll'
).
find
(
'div:first-child'
).
children
(
'div'
).
addClass
(
'guess-tab-
active'
);
let
selectedChannel
=
this
.
selectedChannel
;
let
requestParams
=
{
...
this
.
filterTab
[
selectedChannel
]
...
...
public/scss/activity/group/floor/collage-buy-list.scss
View file @
d48b11f
...
...
@@ -11,13 +11,13 @@
font-size
:
32px
;
color
:
#444
;
padding-top
:
20px
;
padding-left
:
2
0px
;
padding-left
:
4
0px
;
padding-bottom
:
20px
;
}
.swiper-container
{
margin-left
:
20px
;
margin-right
:
20px
;
margin-left
:
40px
;
margin-right
:
40px
;
padding-bottom
:
60px
;
}
...
...
@@ -53,7 +53,7 @@
.product-price
{
letter-spacing
:
0
;
font-weight
:
500
;
font-weight
:
bold
;
font-family
:
BrownStd-Bold
,
sans-serif
;
font-size
:
30px
;
color
:
#d0021b
;
...
...
public/scss/activity/group/floor/guess-like.scss
View file @
d48b11f
...
...
@@ -15,17 +15,26 @@
min-width
:
100%
;
.guess-tab
{
margin-left
:
20px
;
margin-right
:
20px
;
min-width
:
140px
;
height
:
78px
;
display
:
flex
;
flex-direction
:
column
;
align-items
:
center
;
}
}
}
.active
{
box-sizing
:
border-box
;
border-bottom
:
2px
solid
#222
;
.guess-tab-inactive
{
height
:
2px
;
width
:
80%
;
background-color
:
#222
;
display
:
none
;
}
.guess-tab-active
{
height
:
2px
;
width
:
70%
;
background-color
:
#222
;
}
.
wapper
:
:-
webkit-scrollbar
{
width
:
0
!
important
;
}
...
...
public/scss/activity/group/new-filter-list.scss
View file @
d48b11f
...
...
@@ -22,7 +22,7 @@
.new-group-product-image
{
margin
:
20px
;
width
:
162px
;
height
:
2
2
0px
;
height
:
2
0
0px
;
}
.new-group-product-info-bg
{
...
...
@@ -56,7 +56,7 @@
height
:
38px
;
background
:
url("img/activity/group/group/new-free-post@3x.png")
no-repeat
;
background-size
:
contain
;
margin-right
:
2
0px
;
margin-right
:
1
0px
;
}
.new-market-button
{
...
...
@@ -86,8 +86,8 @@
box-sizing
:
border-box
;
height
:
30px
;
line-height
:
30px
;
padding-left
:
20px
;
padding-right
:
20px
;
padding-left
:
10px
;
padding-right
:
10px
;
border-radius
:
15px
;
border
:
0
.5px
#222
solid
;
color
:
#222
;
...
...
@@ -100,8 +100,11 @@
.new-group-prict-bg
{
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
row
;
font-size
:
22px
;
flex-grow
:
1
;
justify-content
:
space-between
;
align-items
:
flex-end
;
}
.new-group-price
{
...
...
@@ -114,12 +117,20 @@
.new-group-number-price
{
color
:
#d0021b
;
top
:
20
px
;
margin-bottom
:
4
px
;
}
.new-group-price-collage
{
margin-left
:
20px
;
font-size
:
36px
;
margin-left
:
10px
;
font-size
:
30px
;
font-weight
:
bold
;
font-family
:
BrownStd-Bold
,
sans-serif
;
}
.new-group-prict-bg-column
{
display
:
flex
;
flex-direction
:
column
;
justify-content
:
flex-end
;
}
.new-group-price-market
{
...
...
Please
register
or
login
to post a comment