Authored by hf

Merge branch 'develop/wap' into beta/wap

Showing 34 changed files with 284 additions and 8 deletions
<!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/160310/01.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/02.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/03.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/04.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/05.jpg">
<a class="href href-right" href="{{url_yohope}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/06.jpg">
<a class="href href-center" href="{{url_mycoupon}}"></a>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/line-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/07.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/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/160310/09.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="12345"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="12346"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/10.jpg">
<a class="href href-left" href="{{url_more}}"></a>
<a class="href href-right" href="{{url_1}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/11.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="12347"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="12348"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/12.jpg">
<a class="href href-left" href="{{url_2}}"></a>
<a class="href href-right" href="{{url_3}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/13.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="12349"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="12350"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/14.jpg">
<a class="href href-left" href="{{url_4}}"></a>
<a class="href href-right" href="{{url_5}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/15.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="12351"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="12352"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/16.jpg">
<a class="href href-left" href="{{url_6}}"></a>
<a class="href href-right" href="{{url_7}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/17.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="12353"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="12354"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/24-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/24-2.jpg">
<a class="show-more" href="{{url_help}}"></a>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/24-3.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/line-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/25-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/25-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/25-3.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/26.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/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>
</body>
</html>
\ No newline at end of file
... ...
<!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/160310/01.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/02.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/03.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/04.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/05.jpg">
<a class="href href-right" href="{{url_yohope}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/06.jpg">
<a class="href href-center" href="{{url_mycoupon}}"></a>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/line-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/07.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/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/160310/09.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="19239"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="19241"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/10.jpg">
<a class="href href-left" href="{{url_more}}"></a>
<a class="href href-right" href="{{url_1}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/11.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="19243"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="19245"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/12.jpg">
<a class="href href-left" href="{{url_2}}"></a>
<a class="href href-right" href="{{url_3}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/13.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="19253"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="19257"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/14.jpg">
<a class="href href-left" href="{{url_4}}"></a>
<a class="href href-right" href="{{url_5}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/15.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="19247"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="19249"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/line-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/16.jpg">
<a class="href href-left" href="{{url_6}}"></a>
<a class="href href-right" href="{{url_7}}"></a>
</div>
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/17.jpg">
<span class="href href-left get-coupon" href="{{jumpUrl}}" param="19251"></span>
<span class="href href-right get-coupon" href="{{jumpUrl}}" param="19259"></span>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/line-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/24-1.jpg">
<div class="img-box">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/24-2.jpg">
<a class="show-more" href="{{url_help}}"></a>
</div>
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/24-3.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/line-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/25-1.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/25-2.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/25-3.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/26.jpg">
<img src="{{jsUrl}}/cuxiao/img/newuser/160310/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>
</body>
</html>
\ No newline at end of file
... ...
... ... @@ -520,7 +520,7 @@ class CouponController extends HuodongAction
));
}
/**
/**
* 新客领券(第三波)2016年1月7号上线
*/
public function newuser3Action()
... ... @@ -577,6 +577,58 @@ class CouponController extends HuodongAction
'url_7' => 'http://list.m.yohobuy.com/?msort=1,3,6&misort=11,28,12,46&title=夏装&openby:yohobuy={"action":"go.list","params":{"msort":"1,3,6","misort":"11,28,12,46","title":"夏装"}}',
));
}
/**
* 新客领券(第4波)2016年3月14号上线
*/
public function newuser4Action()
{
// 判断是否是应用访问, 拼接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/newuser4');
$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('newuser4', array(
'activityId' => 536, //495, // 536活动ID
'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&misort=18,20,21,22&title=冬装&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"18,20,21,22","title":"冬装"}}',
'url_2' => 'http://list.m.yohobuy.com/?msort=1&misort=21,22,226&title=春装外套&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"18,20,21,22","title":"春装外套"}}',
'url_3' => 'http://list.m.yohobuy.com/?msort=1&misort=16,257&title=春装&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"16,257","title":"春装"}}',
'url_4' => 'http://list.m.yohobuy.com/?msort=6&misort=48&title=时装鞋&openby:yohobuy={"action":"go.list","params":{"msort":"6","misort":"48","title":"时装鞋"}}',
'url_5' => 'http://list.m.yohobuy.com/?msort=7,8&title=包配&openby:yohobuy={"action":"go.list","params":{"msort":"7,8","title":"包配"}}',
'url_6' => 'http://list.m.yohobuy.com/?msort=3,4&title=下装&openby:yohobuy={"action":"go.list","params":{"msort":"3,4","title":"下装"}}',
'url_7' => 'http://list.m.yohobuy.com/?msort=1,3,6&misort=11,28,12,46&title=夏装&openby:yohobuy={"action":"go.list","params":{"msort":"1,3,6","misort":"11,28,12,46","title":"夏装"}}',
));
}
/**
* 新客领券YOHOPE
... ... @@ -760,8 +812,8 @@ class CouponController extends HuodongAction
}
/* 判断用户是否登录 */
$uid = $this->getSession(self::SESSION_UID);
if (!$uid) {
// $uid = $this->getSession(self::SESSION_UID);
// if (!$uid) {
$uid = $this->getUid();
if (!$uid) {
$result['code'] = 400;
... ... @@ -769,7 +821,7 @@ class CouponController extends HuodongAction
$result['data'] = Helpers::url('/signin.html', array('refer' => $this->server('HTTP_REFERER', '/')), 'default');
break;
}
}
// }
/* 领取指定的优惠券操作 */
$result = ActivityData::getCouponNamed($uid, $activityId, $couponId);
... ...
... ... @@ -15,8 +15,8 @@ use Plugin\Helpers;
class GirldayController extends HuodongAction
{
// const STATIC_VERSION = 'http://localhost:2222/1.0.2';
const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili-2/1.0.2';
// const STATIC_FILE = 'http://localhost:2222/1.0.3';
const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016xinshili-2/1.0.3';
/**
* 检测登录状态
... ... @@ -70,7 +70,7 @@ class GirldayController extends HuodongAction
'isApp' => $this->_isApp,
'getCouponUrl' => Helpers::url('/cuxiao/girlday/sendCoupon', array('uid' => $this->getLoggedUid())),
'banner' => array(
'img' => '',
'img' => 'http://img02.yohoboys.com/staticimg/2016/03/10/10/02b9827b20adc91409b5301f2232dc9144.jpg',
'url' => 'http://feature.yoho.cn/0310/0310APPHOME/index.html?openby:yohobuy={"action":"go.h5","params":{"title":"YOHO!BUY有货【春潮新势力】", "url":"http://feature.yoho.cn/0310/0310APPHOME/index.html?","share":"\/operations\/api\/v5\/webshare\/getShare","shareparam":{"share_id":"382"},"param":{"share_id":"382"}}}'
),
'selectUrl' => 'http://m.yohobuy.com/home/coupons?openby:yohobuy={"action":"go.coupon"}',
... ... @@ -78,7 +78,7 @@ class GirldayController extends HuodongAction
'appUrl' => 'http://www.yohoshow.com/about/index/yohobuyqr', // APP 下载地址
'shareTitle' => 'YOHO!BUY有货【春潮新势力】火力全开!320元优惠券限时派送中!',
'shareDesc' => '换我做主,用新陪伴!白色情人节限时2件7折!',
'shareImg' => '',
'shareImg' => 'http://img02.yohoboys.com/staticimg/2016/03/10/10/0298ef8fbbb543144af487fbcd6718041b.png',
'shareLink' => 'http://feature.yoho.cn/0310/0310APPHOME/index.html'
));
}
... ...