fe / YOHOBUYWAP · Commits

Go to a project

Authored by yyq
Commit 71a34fdfbfc10b9fdda72ecc38f67c8692afa2ce 2 parents ed4997a9 2a4ba825

merge master

Inline Side-by-side
Showing 15 changed files with 203 additions and 25 deletions
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 *{margin: 0;padding: 0;} 8 *{margin: 0;padding: 0;}
9 #coupon-container {width: 100%;} 9 #coupon-container {width: 100%;}
10 #coupon-container img {width: 100%; height: auto; display: block;overflow: hidden;} 10 #coupon-container img {width: 100%; height: auto; display: block;overflow: hidden;}
11 - .img-box {width: 100%;position: relative;} 11 + .img-box {width: 100%;position: relative;}
12 .img-box .href {width: 50%; height: 100%;position: absolute;top: 0;} 12 .img-box .href {width: 50%; height: 100%;position: absolute;top: 0;}
13 .img-box .href-left {left: 0} 13 .img-box .href-left {left: 0}
14 .img-box .href-right {right: 0} 14 .img-box .href-right {right: 0}
@@ -43,10 +43,8 @@ @@ -43,10 +43,8 @@
43 </div> 43 </div>
44 <div class="img-box"> 44 <div class="img-box">
45 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/09.jpg"> 45 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/09.jpg">
46 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="23714  
47 -"></span>  
48 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="23716  
49 -"></span> 46 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="23714"></span>
  47 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="23716"></span>
50 </div> 48 </div>
51 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg"> 49 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
52 <div class="img-box"> 50 <div class="img-box">
@@ -56,10 +54,8 @@ @@ -56,10 +54,8 @@
56 </div> 54 </div>
57 <div class="img-box"> 55 <div class="img-box">
58 <img src="{{jsUrl}}/cuxiao/img/newuser/160603/11.jpg"> 56 <img src="{{jsUrl}}/cuxiao/img/newuser/160603/11.jpg">
59 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="23718  
60 -"></span>  
61 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="23720  
62 -"></span> 57 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="23718"></span>
  58 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="23720"></span>
63 </div> 59 </div>
64 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg"> 60 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
65 <div class="img-box"> 61 <div class="img-box">
@@ -69,10 +65,8 @@ @@ -69,10 +65,8 @@
69 </div> 65 </div>
70 <div class="img-box"> 66 <div class="img-box">
71 <img src="{{jsUrl}}/cuxiao/img/newuser/160603/13.jpg"> 67 <img src="{{jsUrl}}/cuxiao/img/newuser/160603/13.jpg">
72 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="23734  
73 -"></span>  
74 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="23742  
75 -"></span> 68 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="23734"></span>
  69 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="23742"></span>
76 </div> 70 </div>
77 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg"> 71 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
78 <div class="img-box"> 72 <div class="img-box">
@@ -82,10 +76,8 @@ @@ -82,10 +76,8 @@
82 </div> 76 </div>
83 <div class="img-box"> 77 <div class="img-box">
84 <img src="{{jsUrl}}/cuxiao/img/newuser/160603/15.jpg"> 78 <img src="{{jsUrl}}/cuxiao/img/newuser/160603/15.jpg">
85 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="23744  
86 -"></span>  
87 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="23746  
88 -"></span> 79 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="23744"></span>
  80 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="23746"></span>
89 </div> 81 </div>
90 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg"> 82 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
91 <div class="img-box"> 83 <div class="img-box">
@@ -95,10 +87,8 @@ @@ -95,10 +87,8 @@
95 </div> 87 </div>
96 <div class="img-box"> 88 <div class="img-box">
97 <img src="{{jsUrl}}/cuxiao/img/newuser/160603/17.jpg"> 89 <img src="{{jsUrl}}/cuxiao/img/newuser/160603/17.jpg">
98 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="23748  
99 -"></span>  
100 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="23750  
101 -"></span> 90 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="23748"></span>
  91 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="23750"></span>
102 </div> 92 </div>
103 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg"> 93 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
104 <div class="img-box"> 94 <div class="img-box">
@@ -107,8 +97,7 @@ @@ -107,8 +97,7 @@
107 </div> 97 </div>
108 <div class="img-box"> 98 <div class="img-box">
109 <img src="{{jsUrl}}/cuxiao/img/newuser/160603/add2.jpg"> 99 <img src="{{jsUrl}}/cuxiao/img/newuser/160603/add2.jpg">
110 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="23752  
111 -"></span> 100 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="23752"></span>
112 </div> 101 </div>
113 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg"> 102 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
114 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg"> 103 <img src="{{jsUrl}}/cuxiao/img/newuser/160512/line-1.jpg">
  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/160603/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="23714"></span>
  47 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="23716"></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/160603/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/160603/11.jpg">
  57 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="23718"></span>
  58 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="23720"></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/160603/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/160603/13.jpg">
  68 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="23734"></span>
  69 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="23742"></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/160603/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/160603/15.jpg">
  79 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="23744"></span>
  80 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="23746"></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/160603/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/160603/17.jpg">
  90 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="23748"></span>
  91 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="23750"></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/160603/add2.jpg">
  100 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="23752"></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 +
  122 + <!-- Google Tag Manager -->
  123 + <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
  124 + <script>
  125 + var _hmt = _hmt || [];
  126 + function async_load(){
  127 + (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
  128 + new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
  129 + j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
  130 + '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
  131 + })(window,document,'script','dataLayer','GTM-W958MG');
  132 + }
  133 + window.addEventListener('load', async_load, false);
  134 + </script>
  135 +
  136 +</body>
  137 +</html>
@@ -782,6 +782,58 @@ class CouponController extends HuodongAction @@ -782,6 +782,58 @@ class CouponController extends HuodongAction
782 } 782 }
783 783
784 /** 784 /**
  785 + * 新客领券（第6波）2016年5月13号上线
  786 + */
  787 + public function newuser7Action()
  788 + {
  789 + // 判断是否是应用访问, 拼接APP需要的URL参数
  790 + $isApp = null !== $this->get('app_version');
  791 + $isAppLogged = true;
  792 + if ($isApp) {
  793 + $isLogged = $this->get('uid') !== null;
  794 + $isAppLogged = $this->checkIsLogin();
  795 + } else {
  796 + $isLogged = $this->getUid();
  797 + }
  798 + $urlNewuser = Helpers::url('/cuxiao/coupon/newuser5');
  799 + $urlYohope = Helpers::url('/cuxiao/coupon/yohope');
  800 + $urlHelp = Helpers::url('/cuxiao/coupon/help');
  801 + $urlMycoupon = Helpers::url('/home/coupons', null, 'default');
  802 + $urlEncode = strtr($urlNewuser, array('/' => '\\/'));
  803 + $channel = $this->get('yh_channel', '1');
  804 + switch (strval($channel)) {
  805 + case '1':
  806 + $gender = '1,3';
  807 + break;
  808 + case '2':
  809 + $gender = '2,3';
  810 + break;
  811 + default:
  812 + $gender = '1,2,3';
  813 + }
  814 + $url = Helpers::url('/boys', array(), 'default') . '?openby:yohobuy={"action":"go.home","params":{"gender":"' . $gender . '","channel":"' . $channel . '"}}';
  815 +
  816 + $this->_view->display('newuser7', array(
  817 + 'activityId' => 604,//627
  818 + 'staticTitle' => '新人潮这看，超值惊喜等你领', // 标题
  819 + 'jumpUrl' => $isAppLogged ? 'javascript:;' : $urlNewuser . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $urlEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}',
  820 + 'isLogged' => $isLogged ? 'Y' : 'N', // 标识是否登录
  821 + 'url_mycoupon' => $urlMycoupon . '?openby:yohobuy={"action":"go.coupon"}',
  822 + 'url_yohope' => $urlYohope . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlYohope . '","param":{}}}',
  823 + 'url_help' => $urlHelp . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlHelp . '","param":{}}}',
  824 + 'url_more' => $url,
  825 +
  826 + '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":"夏装"}}',
  827 + '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":"春装"}}',
  828 + '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":"裤装"}}',
  829 + 'url_4' => 'http://list.m.yohobuy.com/?msort=7,8&openby:yohobuy={"action":"go.list","params":{"msort":"7,8","title":"包配"}}',
  830 + '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":"裙装"}}',
  831 + 'url_6' => 'http://list.m.yohobuy.com/?msort=10&openby:yohobuy={"action":"go.list","params":{"msort":"10","title":"创意生活"}}',
  832 + '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":"衬衫"}}',
  833 + ));
  834 + }
  835 +
  836 + /**
785 * 新客领券YOHOPE 837 * 新客领券YOHOPE
786 * 838 *
787 * 上线时间2015/12/2 839 * 上线时间2015/12/2
@@ -128,8 +128,8 @@ class InfoController extends AbstractAction @@ -128,8 +128,8 @@ class InfoController extends AbstractAction
128 continue; 128 continue;
129 } 129 }
130 // 单个商品 130 // 单个商品
131 - elseif ($i === 0 && isset($good[0])) {  
132 - $build['relatedReco'] = $good[0]; 131 + elseif ($i === 0 && isset($reco[0])) {
  132 + $build['relatedReco'] = $reco[0];
133 } 133 }
134 // 多个商品 134 // 多个商品
135 else { 135 else {