fe / YOHOBUYWAP · Commits

Go to a project

Authored by 毕凯
Commit 41f5f7dd45a9cb6729af97ac358229f2540dea39 2 parents 4a19d289 23064a65

Merge branch 'hotfix/newuser6'

Inline Side-by-side
Showing 36 changed files with 302 additions and 3 deletions
@@ -208,9 +208,7 @@ function getNamedCoupon(activityId, couponId, isApp, userIsLogged) @@ -208,9 +208,7 @@ function getNamedCoupon(activityId, couponId, isApp, userIsLogged)
208 expires: -2, 208 expires: -2,
209 domain: '.m.yohobuy.com' 209 domain: '.m.yohobuy.com'
210 }); 210 });
211 - if (isApp && !userIsLogged) {  
212 - return;  
213 - } 211 +
214 if (data.code == 200) { 212 if (data.code == 200) {
215 showTip('恭喜您成功领取优惠券！<br><br>稍后即会到账，请耐心等待。'); 213 showTip('恭喜您成功领取优惠券！<br><br>稍后即会到账，请耐心等待。');
216 } 214 }
@@ -224,6 +222,13 @@ function getNamedCoupon(activityId, couponId, isApp, userIsLogged) @@ -224,6 +222,13 @@ function getNamedCoupon(activityId, couponId, isApp, userIsLogged)
224 }); 222 });
225 if (isApp) { 223 if (isApp) {
226 //showTip('请先登录！'); 224 //showTip('请先登录！');
  225 + //跳app登陆页面
  226 + if ($('.go-login').length <= 0) {
  227 + var loginUrl = location.href + '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' + location.href + '","param":{}},"priority":"Y"}}';
  228 + console.log(loginUrl);
  229 + $('body').append('<a href=\'' + loginUrl + '\' ><span class="go-login"></span></a>');
  230 + }
  231 + $('.go-login').click();
227 } else { 232 } else {
228 location.href = decodeURIComponent(data.data); 233 location.href = decodeURIComponent(data.data);
229 } 234 }
  1 +<!DOCTYPE html>
  2 +<html>
  3 +<head>
  4 + <meta charset="UTF-8">
  5 + <title>{{staticTitle}}</title>
  6 + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
  7 + <style>
  8 + *{margin: 0;padding: 0;}
  9 + #coupon-container {width: 100%;}
  10 + #coupon-container img {width: 100%; height: auto; display: block;overflow: hidden;}
  11 + .img-box {width: 100%;position: relative;}
  12 + .img-box .href {width: 50%; height: 100%;position: absolute;top: 0;}
  13 + .img-box .href-left {left: 0}
  14 + .img-box .href-right {right: 0}
  15 + .img-box .href-center {width: 90%;height: 100%;position: absolute;top: 0;left: 5%;}
  16 + .show-more {height: 100%;width: 25%;position: absolute;top: 0;right: 10%;}
  17 + .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;}
  18 + </style>
  19 + <link rel="dns-prefetch" href="//cdn.yoho.cn">
  20 + <link rel="dns-prefetch" href="//static.yohobuy.com">
  21 +</head>
  22 +<body>
  23 +<div id="coupon-container" param="{{activityId}}" isLogged="{{isLogged}}">
  24 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/01.jpg">
  25 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/02.jpg">
  26 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/03.jpg">
  27 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
  28 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/04.jpg">
  29 + <div class="img-box">
  30 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/05.jpg">
  31 + </div>
  32 + <div class="img-box">
  33 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/06.jpg">
  34 + <a class="href href-center" href="{{url_mycoupon}}"></a>
  35 + </div>
  36 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-2.jpg">
  37 +
  38 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/07.jpg">
  39 + <div class="img-box">
  40 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/08.jpg">
  41 + <a class="href href-left" href="{{url_more}}"></a>
  42 + <a class="href href-right" href="{{url_more}}"></a>
  43 + </div>
  44 + <div class="img-box">
  45 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/09.jpg">
  46 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12345"></span>
  47 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12346"></span>
  48 + </div>
  49 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
  50 + <div class="img-box">
  51 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/10.jpg">
  52 + <a class="href href-left" href="{{url_more}}"></a>
  53 + <a class="href href-right" href="{{url_more}}"></a>
  54 + </div>
  55 + <div class="img-box">
  56 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/11.jpg">
  57 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12347"></span>
  58 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12348"></span>
  59 + </div>
  60 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
  61 + <div class="img-box">
  62 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/12.jpg">
  63 + <a class="href href-left" href="{{url_1}}"></a>
  64 + <a class="href href-right" href="{{url_2}}"></a>
  65 + </div>
  66 + <div class="img-box">
  67 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/13.jpg">
  68 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12349"></span>
  69 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12350"></span>
  70 + </div>
  71 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
  72 + <div class="img-box">
  73 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/14.jpg">
  74 + <a class="href href-left" href="{{url_3}}"></a>
  75 + <a class="href href-right" href="{{url_4}}"></a>
  76 + </div>
  77 + <div class="img-box">
  78 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/15.jpg">
  79 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12351"></span>
  80 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12352"></span>
  81 + </div>
  82 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
  83 + <div class="img-box">
  84 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/16.jpg">
  85 + <a class="href href-left" href="{{url_5}}"></a>
  86 + <a class="href href-right" href="{{url_6}}"></a>
  87 + </div>
  88 + <div class="img-box">
  89 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/17.jpg">
  90 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12353"></span>
  91 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12354"></span>
  92 + </div>
  93 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
  94 + <div class="img-box">
  95 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/add1.jpg">
  96 + <a class="href href-left" href="{{url_7}}"></a>
  97 + </div>
  98 + <div class="img-box">
  99 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/add2.jpg">
  100 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12355"></span>
  101 + </div>
  102 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
  103 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
  104 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-2.jpg">
  105 +
  106 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/24-1.jpg">
  107 + <div class="img-box">
  108 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/24-2.jpg">
  109 + <a class="show-more" href="{{url_help}}"></a>
  110 + </div>
  111 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/24-3.jpg">
  112 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-2.jpg">
  113 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/25-1.jpg">
  114 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/25-2.jpg">
  115 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/25-3.jpg">
  116 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/26.jpg">
  117 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/27.jpg">
  118 +</div>
  119 +<script type="text/javascript" src="{{jsUrl}}/cuxiao/js/jquery.min.js"></script>
  120 +<script type="text/javascript" src="{{jsUrl}}/cuxiao/js/newuser/coupon2.js"></script>
  121 +</body>
  122 +</html>
  1 +<!DOCTYPE html>
  2 +<html>
  3 +<head>
  4 + <meta charset="UTF-8">
  5 + <title>{{staticTitle}}</title>
  6 + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
  7 + <style>
  8 + *{margin: 0;padding: 0;}
  9 + #coupon-container {width: 100%;}
  10 + #coupon-container img {width: 100%; height: auto; display: block;overflow: hidden;}
  11 + .img-box {width: 100%;position: relative;}
  12 + .img-box .href {width: 50%; height: 100%;position: absolute;top: 0;}
  13 + .img-box .href-left {left: 0}
  14 + .img-box .href-right {right: 0}
  15 + .img-box .href-center {width: 90%;height: 100%;position: absolute;top: 0;left: 5%;}
  16 + .show-more {height: 100%;width: 25%;position: absolute;top: 0;right: 10%;}
  17 + .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;}
  18 + </style>
  19 + <link rel="dns-prefetch" href="//cdn.yoho.cn">
  20 + <link rel="dns-prefetch" href="//static.yohobuy.com">
  21 +</head>
  22 +<body>
  23 + <div id="coupon-container" param="{{activityId}}" isLogged="{{isLogged}}">
  24 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/01.jpg">
  25 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/02.jpg">
  26 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/03.jpg">
  27 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
  28 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/04.jpg">
  29 + <div class="img-box">
  30 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/05.jpg">
  31 + </div>
  32 + <div class="img-box">
  33 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/06.jpg">
  34 + <a class="href href-center" href="{{url_mycoupon}}"></a>
  35 + </div>
  36 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-2.jpg">
  37 +
  38 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/07.jpg">
  39 + <div class="img-box">
  40 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/08.jpg">
  41 + <a class="href href-left" href="{{url_more}}"></a>
  42 + <a class="href href-right" href="{{url_more}}"></a>
  43 + </div>
  44 + <div class="img-box">
  45 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/09.jpg">
  46 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="22546"></span>
  47 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="22542"></span>
  48 + </div>
  49 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
  50 + <div class="img-box">
  51 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/10.jpg">
  52 + <a class="href href-left" href="{{url_more}}"></a>
  53 + <a class="href href-right" href="{{url_more}}"></a>
  54 + </div>
  55 + <div class="img-box">
  56 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/11.jpg">
  57 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="22544"></span>
  58 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="22548"></span>
  59 + </div>
  60 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
  61 + <div class="img-box">
  62 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/12.jpg">
  63 + <a class="href href-left" href="{{url_1}}"></a>
  64 + <a class="href href-right" href="{{url_2}}"></a>
  65 + </div>
  66 + <div class="img-box">
  67 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/13.jpg">
  68 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="22550"></span>
  69 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="22552"></span>
  70 + </div>
  71 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
  72 + <div class="img-box">
  73 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/14.jpg">
  74 + <a class="href href-left" href="{{url_3}}"></a>
  75 + <a class="href href-right" href="{{url_4}}"></a>
  76 + </div>
  77 + <div class="img-box">
  78 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/15.jpg">
  79 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="22554"></span>
  80 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="22556"></span>
  81 + </div>
  82 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
  83 + <div class="img-box">
  84 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/16.jpg">
  85 + <a class="href href-left" href="{{url_5}}"></a>
  86 + <a class="href href-right" href="{{url_6}}"></a>
  87 + </div>
  88 + <div class="img-box">
  89 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/17.jpg">
  90 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="22558"></span>
  91 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="22560"></span>
  92 + </div>
  93 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
  94 + <div class="img-box">
  95 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/add1.jpg">
  96 + <a class="href href-left" href="{{url_7}}"></a>
  97 + </div>
  98 + <div class="img-box">
  99 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/add2.jpg">
  100 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="22562"></span>
  101 + </div>
  102 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
  103 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
  104 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-2.jpg">
  105 +
  106 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/24-1.jpg">
  107 + <div class="img-box">
  108 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/24-2.jpg">
  109 + <a class="show-more" href="{{url_help}}"></a>
  110 + </div>
  111 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/24-3.jpg">
  112 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-2.jpg">
  113 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/25-1.jpg">
  114 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/25-2.jpg">
  115 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/25-3.jpg">
  116 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/26.jpg">
  117 + <img src="{{jsUrl}}/cuxiao/img/newuser/160512/27.jpg">
  118 + </div>
  119 + <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/jquery.min.js"></script>
  120 + <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/newuser/coupon2.js"></script>
  121 +</body>
  122 +</html>
@@ -728,7 +728,57 @@ class CouponController extends HuodongAction @@ -728,7 +728,57 @@ class CouponController extends HuodongAction
728 )); 728 ));
729 } 729 }
730 730
  731 + /**
  732 + * 新客领券（第6波）2016年5月13号上线
  733 + */
  734 + public function newuser6Action()
  735 + {
  736 + // 判断是否是应用访问, 拼接APP需要的URL参数
  737 + $isApp = null !== $this->get('app_version');
  738 + $isAppLogged = true;
  739 + if ($isApp) {
  740 + $isLogged = $this->get('uid') !== null;
  741 + $isAppLogged = $this->checkIsLogin();
  742 + } else {
  743 + $isLogged = $this->getUid();
  744 + }
  745 + $urlNewuser = Helpers::url('/cuxiao/coupon/newuser6');
  746 + $urlYohope = Helpers::url('/cuxiao/coupon/yohope');
  747 + $urlHelp = Helpers::url('/cuxiao/coupon/help');
  748 + $urlMycoupon = Helpers::url('/home/coupons', null, 'default');
  749 + $urlEncode = strtr($urlNewuser, array('/' => '\\/'));
  750 + $channel = $this->get('yh_channel', '1');
  751 + switch (strval($channel)) {
  752 + case '1':
  753 + $gender = '1,3';
  754 + break;
  755 + case '2':
  756 + $gender = '2,3';
  757 + break;
  758 + default:
  759 + $gender = '1,2,3';
  760 + }
  761 + $url = Helpers::url('/boys', array(), 'default') . '?openby:yohobuy={"action":"go.home","params":{"gender":"' . $gender . '","channel":"' . $channel . '"}}';
731 762
  763 + $this->_view->display('newuser6', array(
  764 + 'activityId' => 604,//627
  765 + 'staticTitle' => '新人潮这看，超值惊喜等你领', // 标题
  766 + 'jumpUrl' => $isAppLogged ? 'javascript:;' : $urlNewuser . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $urlEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}',
  767 + 'isLogged' => $isLogged ? 'Y' : 'N', // 标识是否登录
  768 + 'url_mycoupon' => $urlMycoupon . '?openby:yohobuy={"action":"go.coupon"}',
  769 + 'url_yohope' => $urlYohope . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlYohope . '","param":{}}}',
  770 + 'url_help' => $urlHelp . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlHelp . '","param":{}}}',
  771 + 'url_more' => $url,
  772 +
  773 + 'url_1' => 'http://list.m.yohobuy.com/?msort=1&misort=18,20,21,22,172,226&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"18,20,21,22,172,226","title":"外套"}}',
  774 + 'url_2' => 'http://list.m.yohobuy.com/?msort=1&misort=12,16,257&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"12,16,257","title":"春装"}}',
  775 + 'url_3' => '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":"裙装"}}',
  776 + 'url_4' => 'http://list.m.yohobuy.com/?msort=3&misort=26,27,28&openby:yohobuy={"action":"go.list","params":{"msort":"3","misort":"26,27,28","title":"裤装"}}',
  777 + 'url_5' => 'http://list.m.yohobuy.com/?msort=7,8&openby:yohobuy={"action":"go.list","params":{"msort":"7,8","title":"包配"}}',
  778 + 'url_6' => 'http://list.m.yohobuy.com/?msort=10&openby:yohobuy={"action":"go.list","params":{"msort":"10","title":"创意生活"}}',
  779 + 'url_7' => 'http://list.m.yohobuy.com/?msort=1&misort=12&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"12","title":"衬衫"}}',
  780 + ));
  781 + }
732 782
733 /** 783 /**
734 * 新客领券YOHOPE 784 * 新客领券YOHOPE