Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
YOHOBUYWAP
·
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
郝肖肖
8 years ago
Commit
2404f4ad6eac4e38bd35d3545a0ed407d75307e5
1 parent
910b6282
代码回退
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
15 deletions
static/js/plugin/tip.js
static/js/product/shop_coupon.js
static/sass/index.css
static/sass/product/_shop-index-coupon.css
yohobuy/m.yohobuy.com/application/modules/Product/controllers/Index.php
static/js/plugin/tip.js
View file @
2404f4a
...
...
@@ -38,9 +38,7 @@ function show(con, dur) {
content
=
con
.
toString
();
duration
=
(
dur
&&
dur
>
0
)
?
dur
:
2000
;
$tip
.
text
(
content
).
css
({
left
:
(
$
(
window
).
width
()
-
$tip
.
width
()
-
30
)
/
2
}).
show
();
$tip
.
text
(
content
).
show
();
tipItime
=
setTimeout
(
function
()
{
if
(
$tip
.
css
(
'display'
)
===
'block'
)
{
...
...
static/js/product/shop_coupon.js
View file @
2404f4a
var
$
=
require
(
'jquery'
),
IScroll
=
require
(
'iscroll/iscroll-probe'
),
Swiper
=
require
(
'yoho.iswiper'
),
ellipsis
=
require
(
'yoho.mlellipsis'
),
tip
=
require
(
'../plugin/tip'
);
var
appVersion
=
$
(
'input[name="app_version"]'
).
val
();
ellipsis
.
init
();
$
(
".coupon-content .receive-btn"
).
closest
(
'.swiper-slide'
).
on
(
'click'
,
function
(
e
)
{
var
that
=
this
,
code
=
$
(
this
).
data
(
'id'
)
||
''
;
...
...
@@ -59,8 +56,4 @@ $(function() {
slidesPerView
:
'auto'
,
watchSlidesVisibility
:
true
});
$
(
'.coupon-content .coupon-left-name'
).
each
(
function
()
{
this
.
mlellipsis
(
2
);
});
})
...
...
static/sass/index.css
View file @
2404f4a
...
...
@@ -151,6 +151,8 @@ iframe[height="0"] {
z-index
:
4
;
border-radius
:
10
PX
;
margin
:
0
auto
;
left
:
50%
;
transform
:
translateX
(
-50%
);
}
.tap-hightlight
{
...
...
static/sass/product/_shop-index-coupon.css
View file @
2404f4a
...
...
@@ -87,9 +87,12 @@
width
:
150px
;
height
:
45px
;
line-height
:
24px
;
display
:
table-cell
;
vertical-align
:
middle
;
padding-top
:
2px
;
overflow
:
hidden
;
word-break
:
break-all
;
display
:
-webkit-box
;
-webkit-box-orient
:
vertical
;
-webkit-line-clamp
:
2
;
}
.coupon-right
{
...
...
yohobuy/m.yohobuy.com/application/modules/Product/controllers/Index.php
View file @
2404f4a
...
...
@@ -621,9 +621,9 @@ class IndexController extends AbstractAction
$data
[
'goodList'
][
'cartUrl'
]
=
Helpers
::
url
(
'/cart/index/index'
,
null
);
$data
[
'goodList'
]
+=
$condition
;
$data
[
'pageFooter'
]
=
true
;
$data
[
'shopCoupons'
]
=
ListModel
::
getShopCouponsList
(
$shop
[
'shops_id'
],
$uid
);
$data
[
'shopCouponsOne'
]
=
count
(
$data
[
'shopCoupons'
])
===
1
;
//基础模板,于水说APP没有,H5暂时不须要
// $data['shopCoupons'] = ListModel::getShopCouponsList($shop['shops_id'], $uid);
// $data['shopCouponsOne'] = count($data['shopCoupons']) === 1;
$this
->
setTitle
(
$title
);
$this
->
setNavHeader
(
$title
,
true
,
SITE_MAIN
);
...
...
Please
register
or
login
to post a comment