Toggle navigation
Toggle navigation
This project
Loading...
Sign in
chenchao
/
YOHOBUYPC
·
Commits
Go to a project
GitLab
Go to dashboard
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
biao
2016-03-03 20:11:02 +0800
Commit
4250ac414c60ec9d0cc3436913f278db92054b69
2 parents
8eb0bc5d
0ed9ad37
Merge branch 'develop/wap' of
http://git.dev.yoho.cn/web/yohobuy
into develop/wap
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
2 deletions
static/js/home/fresh-list.js
static/sass/home/_fresh-only.css
template/huodong.m.yohobuy.com/actions/cuxiao/xinshili/index.phtml
template/m.yohobuy.com/partials/layout/use.phtml
yohobuy/huodong.m.yohobuy.com/application/modules/Cuxiao/controllers/Xinshili.php
static/js/home/fresh-list.js
0 → 100644
View file @
4250ac4
/**
* 新人专享
* @author: wsl<shuiling.wang@yoho.cn>
* @date: 2016/3/3
*/
var
$
=
require
(
'jquery'
),
lazyLoad
=
require
(
'yoho.lazyload'
);
lazyLoad
(
$
(
'img.lazy'
));
\ No newline at end of file
...
...
static/sass/home/_fresh-only.css
View file @
4250ac4
...
...
@@ -109,3 +109,9 @@
}
}
}
.fresh-list
{
position
:
relative
;
min-height
:
440px
;
padding-left
:
14px
;
}
\ No newline at end of file
...
...
template/huodong.m.yohobuy.com/actions/cuxiao/xinshili/index.phtml
View file @
4250ac4
...
...
@@ -29,6 +29,7 @@
微信分享至朋友圈
</p>
</div>
<div
class=
"tip-wrap hide"
>
<div
class=
"tip hide fail"
>
<div
class=
"title"
>
领取失败<br>
...
...
@@ -42,6 +43,9 @@
刷新
</a>
</div>
</div>
<div
class=
"tip-wrap hide"
>
<div
class=
"tip hide geted"
>
<div
class=
"title"
>
你已领取过优惠券
...
...
@@ -54,6 +58,8 @@
返回
</a>
</div>
</div>
{
{#if
isApp
}
}
<input
type=
"hidden"
value=
"{{getCouponUrl}}"
id=
"getCouponUrl"
>
{
{/if
}
}
...
...
template/m.yohobuy.com/partials/layout/use.phtml
View file @
4250ac4
...
...
@@ -340,3 +340,10 @@
seajs.use('js/me/currency-new');
</script>
{{/if}}
{{#if freshListPage}}
<script>
seajs.use('js/home/fresh-list');
</script>
{{/if}}
...
...
yohobuy/huodong.m.yohobuy.com/application/modules/Cuxiao/controllers/Xinshili.php
View file @
4250ac4
...
...
@@ -9,8 +9,8 @@ use Plugin\Helpers;
*/
class
XinshiliController
extends
HuodongAction
{
// const STATIC_FILE = 'http://localhost:2222/1.0.4';
const
STATIC_FILE
=
'http://cdn.yoho.cn/huodong/2016xinshili/1.0.4'
;
// const STATIC_FILE = 'http://localhost:2222/1.0.5';
const
STATIC_FILE
=
'http://cdn.yoho.cn/huodong/2016xinshili/1.0.5'
;
/**
* 检测登录状态
...
...
Please
register
or
login
to post a comment