Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yoho-blk
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
1
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Email Patches
Plain Diff
Browse Files
Authored by
姜枫
9 years ago
Commit
80dfb503999c49ee77b9ed02dbdfaf6df6176bbe
1 parent
11e4849b
master
...
develop
feature/catch
feature/docker
feature/login-msg
feature/login-ua-ip
feature/removCamel
feature/safe-bug
feature/sessionKey
feature/setting
feature/vip
feature/webpack2
feature/wsl5.3
gray
release/2.0
release/fontBack2.0
fix bugs
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
62 additions
and
23 deletions
apps/product/views/action/newList.hbs
apps/product/views/partial/list/filter.hbs
apps/product/views/partial/list/goods-box.hbs
apps/shopping/controllers/pay.js
public/js/product/list/list-search.js
public/scss/plugin/_nanoscroller.css
public/scss/product/_list.css
public/scss/product/_order-area.css
apps/product/views/action/newList.hbs
View file @
80dfb50
...
...
@@ -18,7 +18,11 @@
{{!-- 新品banner --}}
{{#if
banner
.
src
}}
<div
class=
"banner-img"
style=
"height: 200px;margin-bottom:30px; background:url(
{{
image
banner
.
src
850
200
2
}}
) no-repeat top center;"
></div>
style=
"height: 200px;margin-bottom:30px;"
>
<a
href=
"
{{
banner
.
url
}}
"
target=
"_blank"
>
<img
src=
"
{{
image
banner
.
src
850
200
1
}}
"
alt=
"
{{
banner
.
alt
}}
"
width=
"850"
height=
"200"
>
</a>
</div>
{{/if}}
{{!-- 已选中条件 --}}
{{#
filter
}}
...
...
apps/product/views/partial/list/filter.hbs
View file @
80dfb50
...
...
@@ -88,7 +88,7 @@
</div>
<div
class=
"brand-btns"
>
<span
class=
"btn disable large confirm"
>
确定
</span>
<span
class=
"btn large cancel"
>
取消
</span>
<span
class=
"btn
white
large cancel"
>
取消
</span>
</div>
</div>
</div>
...
...
@@ -180,7 +180,7 @@
</div>
<div
class=
"style-btns"
>
<span
class=
"btn disable large confirm"
>
确定
</span>
<span
class=
"btn large cancel"
>
取消
</span>
<span
class=
"btn
white
large cancel"
>
取消
</span>
</div>
</div>
{{/if}}
...
...
apps/product/views/partial/list/goods-box.hbs
View file @
80dfb50
...
...
@@ -3,7 +3,7 @@
<div
class=
"goods"
data-id=
"
{{
productId
}}
"
data-url=
"
{{
url
}}
"
>
<div
class=
"goods-img"
>
<a
href=
"
{{
url
}}
"
target=
"_blank"
>
<img
class=
"lazy"
data-original=
"
{{
image
defaultImages
26
3
344
}}
"
width=
"263"
height=
"34
4"
alt=
""
>
<img
class=
"lazy"
data-original=
"
{{
image
defaultImages
26
7
354
}}
"
width=
"267"
height=
"35
4"
alt=
""
>
</a>
</div>
{{#if
showBrand
}}
...
...
@@ -22,7 +22,7 @@
</div>
<div
class=
"goods-list hide"
>
{{#
each
goodsList
}}
<i
data-url=
"
{{
url
}}
"
>
{{
image
imagesUrl
2
56
343
}}
</i>
<i
data-url=
"
{{
url
}}
"
>
{{
image
imagesUrl
2
67
354
}}
</i>
{{/
each
}}
</div>
</div>
...
...
apps/shopping/controllers/pay.js
View file @
80dfb50
...
...
@@ -32,7 +32,7 @@ const online = (req, res, next) => {
_
.
forEach
(
promotion
,
p
=>
{
if
(
p
.
promotion
===
'YOHO币'
)
{
coin
=
parseInt
(
parseFloat
(
p
.
promotionAmount
.
substring
(
2
,
p
.
promotionAmount
.
length
))
*
100
);
coin
=
parseInt
(
parseFloat
(
p
.
promotionAmount
.
substring
(
2
,
p
.
promotionAmount
.
length
))
*
100
,
10
);
}
});
...
...
@@ -111,7 +111,7 @@ const callback = (req, res) => {
_
.
forEach
(
promotion
,
p
=>
{
if
(
p
.
promotion
===
'YOHO币'
)
{
coin
=
_
.
toNumber
(
p
.
promotionAmount
.
substring
(
2
,
p
.
promotionAmount
.
length
))
*
100
;
coin
=
parseInt
(
parseFloat
(
p
.
promotionAmount
.
substring
(
2
,
p
.
promotionAmount
.
length
))
*
100
,
10
)
;
}
});
...
...
public/js/product/list/list-search.js
View file @
80dfb50
...
...
@@ -324,7 +324,7 @@ var YohoListPage = {
},
openStyleMulit
:
function
()
{
$
(
'.style-btns'
,
this
.
rootDoc
).
removeClass
(
'hide'
);
$
(
'.style-btns'
,
this
.
rootDoc
).
show
(
);
$
(
'.style-body .input-radio'
,
this
.
rootDoc
).
check
({
type
:
'checkbox'
});
...
...
@@ -333,7 +333,7 @@ var YohoListPage = {
},
closeStyleMulit
:
function
()
{
$
(
'.style-btns'
,
this
.
rootDoc
).
addClass
(
'hide'
);
$
(
'.style-btns'
,
this
.
rootDoc
).
hide
(
);
$
(
'.style-body .input-radio'
,
this
.
rootDoc
).
check
(
'unCheckAll'
);
$
(
'.style-body .input-radio'
,
this
.
rootDoc
).
check
({
type
:
'radio'
...
...
public/scss/plugin/_nanoscroller.css
View file @
80dfb50
...
...
@@ -31,7 +31,7 @@
.nano
>
.nano-pane
{
background
:
#eee
;
position
:
absolute
;
width
:
5
px
;
width
:
3
px
;
right
:
0
;
top
:
0
;
bottom
:
0
;
...
...
public/scss/product/_list.css
View file @
80dfb50
.yoho-product-list
{
@import
"order-area";
font-size
:
14px
;
.btn
{
...
...
@@ -10,10 +11,12 @@
.left
{
width
:
250px
;
}
.right
{
width
:
850px
;
}
}
.input-radio
{
padding
:
10px
1px
;
cursor
:
pointer
;
...
...
@@ -35,14 +38,16 @@
}
}
}
.input-radio
span
{
margin-left
:
0
;
font-size
:
14px
;
display
:
inline-block
;
}
.input-radio
label
{
font-size
:
14px
;
font-weight
:
700
;
font-weight
:
normal
;
margin-left
:
10px
;
cursor
:
pointer
;
}
...
...
@@ -50,9 +55,11 @@
.input-radio
label
.round-color
{
margin-left
:
0
;
}
.blank-div
{
height
:
70px
;
}
.title
{
font-size
:
14px
;
font-weight
:
700
;
...
...
@@ -69,6 +76,7 @@
max-height
:
240px
;
overflow-y
:
auto
;
}
.style-body
{
max-height
:
240px
;
overflow-y
:
auto
;
...
...
@@ -90,8 +98,10 @@
color
:
#111
;
}
}
.brand-body
{
margin
:
5px
0
;
.brand-search
{
border
:
0
;
background-color
:
#eae9e9
;
...
...
@@ -102,10 +112,12 @@
font-weight
:
700
;
}
}
.brand-letter-items
{
margin
:
15px
0
;
font-size
:
12px
;
font-weight
:
bolder
;
span
{
padding
:
5px
0
;
margin
:
5px
11px
5px
0
;
...
...
@@ -123,26 +135,36 @@
cursor
:
pointer
;
}
}
.brand-btns
,
.style-btns
{
text-align
:
center
;
margin-top
:
10px
;
display
:
none
;
height
:
38px
;
.btn
{
margin
:
0
10px
;
width
:
auto
;
padding
:
0
42px
;
float
:
left
;
}
.btn.cancel
{
float
:
right
;
}
}
.btn
{
display
:
inline-block
;
}
.btn.large
{
height
:
38px
;
line-height
:
38px
;
font-size
:
14px
;
}
.price-btns
{
.price-btns
{
.price-input
{
background-color
:
#eee
;
width
:
72px
;
...
...
@@ -175,6 +197,7 @@
margin-left
:
4px
;
}
}
.yoho-ui-accordion
{
h3
{
font-size
:
14px
;
...
...
@@ -185,12 +208,14 @@
display
:
block
;
cursor
:
pointer
;
position
:
relative
;
.ui-accordion-header-icon
{
position
:
absolute
;
right
:
0.5em
;
top
:
50%
;
margin-top
:
-20px
;
}
.ui-accordion-header-icon
:after
{
font-family
:
"iconfont"
!important
;
display
:
inline-block
;
...
...
@@ -205,6 +230,7 @@
content
:
"\e617"
;
}
}
>
.body
{
padding
:
10px
0
;
border-bottom
:
1px
solid
#eee
;
...
...
@@ -224,7 +250,7 @@
label
.cancel
{
float
:
right
;
color
:
#878787
;
margin
:
2
2
px
20px
0
0
;
margin
:
2
7
px
20px
0
0
;
cursor
:
pointer
;
}
...
...
@@ -270,12 +296,11 @@
}
.goods-area
{
margin
:
0
-12px
;
position
:
relative
;
.goods
{
margin
:
10px
0
;
margin
:
10px
0
26px
;
padding
:
10px
;
float
:
left
;
text-align
:
center
;
...
...
@@ -294,8 +319,8 @@
.goods-img
{
position
:
relative
;
overflow
:
hidden
;
width
:
265px
;
height
:
344px
;
width
:
267px
;
height
:
354px
;
img
{
margin
:
0
;
...
...
@@ -312,8 +337,9 @@
color
:
#fff
;
}
}
.goods-name
{
padding
:
10px
;
padding
:
4px
10px
10px
;
width
:
265px
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
...
...
@@ -350,7 +376,7 @@
}
.goods-img-list
{
margin
:
2px
1
3
px
;
margin
:
2px
1
0
px
;
float
:
left
;
.goods-img-col
{
...
...
@@ -363,7 +389,6 @@
margin
:
8px
0
;
cursor
:
pointer
;
}
}
}
}
...
...
@@ -386,7 +411,6 @@
}
.yoho-list-empty
{
height
:
800px
;
.tip-search
{
...
...
public/scss/product/_order-area.css
View file @
80dfb50
...
...
@@ -38,6 +38,7 @@
.iconfont.up
{
top
:
-2px
;
}
.iconfont.down
{
top
:
8px
;
}
...
...
@@ -50,9 +51,11 @@
.order-page
{
height
:
24px
;
line-height
:
24px
;
margin-top
:
1
2
px
;
margin-top
:
1
4
px
;
float
:
right
;
label
{
line-height
:
24px
;
color
:
#1b1b1b
;
font-weight
:
700
;
display
:
inline-block
;
...
...
@@ -80,5 +83,13 @@
color
:
#878787
;
border
:
2px
solid
#878787
;
}
.page.page-next
{
line-height
:
20px
;
}
.page.page-pre
{
line-height
:
20px
;
}
}
}
...
...
Please
register
or
login
to post a comment