Authored by yyq

merge master

... ... @@ -8,7 +8,7 @@
*{margin: 0;padding: 0;}
#coupon-container {width: 100%;}
#coupon-container img {width: 100%; height: auto; display: block;overflow: hidden;}
.img-box {width: 100%;position: relative;}
.img-box {width: 100%;position: relative;}
.img-box .href {width: 50%; height: 100%;position: absolute;top: 0;}
.img-box .href-left {left: 0}
.img-box .href-right {right: 0}
... ... @@ -43,10 +43,8 @@
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/09.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23714
"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="23716
"></span>
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23714"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="23716"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
<div class="img-box">
... ... @@ -56,10 +54,8 @@
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/11.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23718
"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="23720
"></span>
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23718"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="23720"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
<div class="img-box">
... ... @@ -69,10 +65,8 @@
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/13.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23734
"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="23742
"></span>
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23734"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="23742"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
<div class="img-box">
... ... @@ -82,10 +76,8 @@
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/15.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23744
"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="23746
"></span>
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23744"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="23746"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
<div class="img-box">
... ... @@ -95,10 +87,8 @@
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/17.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23748
"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="23750
"></span>
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23748"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="23750"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
<div class="img-box">
... ... @@ -107,8 +97,7 @@
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/add2.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23752
"></span>
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23752"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
... ...
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>{{staticTitle}}</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
<style>
*{margin: 0;padding: 0;}
#coupon-container {width: 100%;}
#coupon-container img {width: 100%; height: auto; display: block;overflow: hidden;}
.img-box {width: 100%;position: relative;}
.img-box .href {width: 50%; height: 100%;position: absolute;top: 0;}
.img-box .href-left {left: 0}
.img-box .href-right {right: 0}
.img-box .href-center {width: 90%;height: 100%;position: absolute;top: 0;left: 5%;}
.show-more {height: 100%;width: 25%;position: absolute;top: 0;right: 10%;}
.yoho-tip {position: fixed;display: none;text-align: center;width: 70%;padding: 34px 0;top: 50%;left: 50%;margin-left: -35%;margin-top: -45px;background-color: #000;opacity: 0.9;color: #fff;font-size: 18px;border: none;border-radius: 10px;}
</style>
<link rel="dns-prefetch" href="//cdn.yoho.cn">
<link rel="dns-prefetch" href="//static.yohobuy.com">
</head>
<body>
<div id="coupon-container" param="{{activityId}}" isLogged="{{isLogged}}">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/01.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/02.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/03.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/04.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/05.jpg">
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/06.jpg">
<a class="href href-center" href="{{url_mycoupon}}"></a>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/07.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/08.jpg">
<a class="href href-left" href="{{url_more}}"></a>
<a class="href href-right" href="{{url_more}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/09.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23714"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="23716"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/10.jpg">
<a class="href href-left" href="{{url_more}}"></a>
<a class="href href-right" href="{{url_more}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/11.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23718"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="23720"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/12.jpg">
<a class="href href-left" href="{{url_1}}"></a>
<a class="href href-right" href="{{url_2}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/13.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23734"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="23742"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/14.jpg">
<a class="href href-left" href="{{url_3}}"></a>
<a class="href href-right" href="{{url_4}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/15.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23744"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="23746"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/16.jpg">
<a class="href href-left" href="{{url_5}}"></a>
<a class="href href-right" href="{{url_6}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/17.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23748"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="23750"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/add1.jpg">
<a class="href href-left" href="{{url_7}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160603/add2.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="23752"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/24-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/24-2.jpg">
<a class="show-more" href="{{url_help}}"></a>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/24-3.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/25-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/25-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/25-3.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/26.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160512/27.jpg">
</div>
<script type="text/javascript" src="{{jsUrl}}/cuxiao/js/jquery.min.js"></script>
<script type="text/javascript" src="{{jsUrl}}/cuxiao/js/newuser/coupon2.js"></script>
<!-- Google Tag Manager -->
<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
<script>
var _hmt = _hmt || [];
function async_load(){
(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
'//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
})(window,document,'script','dataLayer','GTM-W958MG');
}
window.addEventListener('load', async_load, false);
</script>
</body>
</html>
\ No newline at end of file
... ...
... ... @@ -782,6 +782,58 @@ class CouponController extends HuodongAction
}
/**
* 新客领券(第6波)2016年5月13号上线
*/
public function newuser7Action()
{
// 判断是否是应用访问, 拼接APP需要的URL参数
$isApp = null !== $this->get('app_version');
$isAppLogged = true;
if ($isApp) {
$isLogged = $this->get('uid') !== null;
$isAppLogged = $this->checkIsLogin();
} else {
$isLogged = $this->getUid();
}
$urlNewuser = Helpers::url('/cuxiao/coupon/newuser5');
$urlYohope = Helpers::url('/cuxiao/coupon/yohope');
$urlHelp = Helpers::url('/cuxiao/coupon/help');
$urlMycoupon = Helpers::url('/home/coupons', null, 'default');
$urlEncode = strtr($urlNewuser, array('/' => '\\/'));
$channel = $this->get('yh_channel', '1');
switch (strval($channel)) {
case '1':
$gender = '1,3';
break;
case '2':
$gender = '2,3';
break;
default:
$gender = '1,2,3';
}
$url = Helpers::url('/boys', array(), 'default') . '?openby:yohobuy={"action":"go.home","params":{"gender":"' . $gender . '","channel":"' . $channel . '"}}';
$this->_view->display('newuser7', array(
'activityId' => 604,//627
'staticTitle' => '新人潮这看,超值惊喜等你领', // 标题
'jumpUrl' => $isAppLogged ? 'javascript:;' : $urlNewuser . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $urlEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}',
'isLogged' => $isLogged ? 'Y' : 'N', // 标识是否登录
'url_mycoupon' => $urlMycoupon . '?openby:yohobuy={"action":"go.coupon"}',
'url_yohope' => $urlYohope . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlYohope . '","param":{}}}',
'url_help' => $urlHelp . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlHelp . '","param":{}}}',
'url_more' => $url,
'url_1' => 'http://list.m.yohobuy.com/?msort=1,3,6&misort=11,12,28,46&openby:yohobuy={"action":"go.list","params":{"msort":"1,3,6","misort":"11,12,28,46","title":"夏装"}}',
'url_2' => 'http://list.m.yohobuy.com/?msort=1&misort=21,16,257&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"21,16,257","title":"春装"}}',
'url_3' => 'http://list.m.yohobuy.com/?msort=3&misort=26,27,28&openby:yohobuy={"action":"go.list","params":{"msort":"3","misort":"26,27,28","title":"裤装"}}',
'url_4' => 'http://list.m.yohobuy.com/?msort=7,8&openby:yohobuy={"action":"go.list","params":{"msort":"7,8","title":"包配"}}',
'url_5' => 'http://list.m.yohobuy.com/?gender=2,3&msort=4&misort=31,32&openby:yohobuy={"action":"go.list","params":{"msort":"4","misort":"31,32","gender":"2,3","title":"裙装"}}',
'url_6' => 'http://list.m.yohobuy.com/?msort=10&openby:yohobuy={"action":"go.list","params":{"msort":"10","title":"创意生活"}}',
'url_7' => 'http://list.m.yohobuy.com/?msort=1&misort=12,13,14&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"12,13,14","title":"衬衫"}}',
));
}
/**
* 新客领券YOHOPE
*
* 上线时间2015/12/2
... ...
... ... @@ -128,8 +128,8 @@ class InfoController extends AbstractAction
continue;
}
// 单个商品
elseif ($i === 0 && isset($good[0])) {
$build['relatedReco'] = $good[0];
elseif ($i === 0 && isset($reco[0])) {
$build['relatedReco'] = $reco[0];
}
// 多个商品
else {
... ...