Merge branch 'feature/youhuiquan' into develop
Showing
57 changed files
with
171 additions
and
2 deletions
static/huodong/cuxiao/img/newuser2/01.jpg
0 → 100644
51 KB
static/huodong/cuxiao/img/newuser2/02.jpg
0 → 100644
13.3 KB
static/huodong/cuxiao/img/newuser2/03.jpg
0 → 100644
32.5 KB
static/huodong/cuxiao/img/newuser2/04.jpg
0 → 100644
33.1 KB
static/huodong/cuxiao/img/newuser2/05.jpg
0 → 100644
7.66 KB
static/huodong/cuxiao/img/newuser2/06.jpg
0 → 100644
8.39 KB
static/huodong/cuxiao/img/newuser2/07.jpg
0 → 100644
8 KB
static/huodong/cuxiao/img/newuser2/08.jpg
0 → 100644
68.5 KB
static/huodong/cuxiao/img/newuser2/09.jpg
0 → 100644
42.5 KB
static/huodong/cuxiao/img/newuser2/10.jpg
0 → 100644
56.9 KB
static/huodong/cuxiao/img/newuser2/11.jpg
0 → 100644
43.1 KB
static/huodong/cuxiao/img/newuser2/12.jpg
0 → 100644
55.7 KB
static/huodong/cuxiao/img/newuser2/13.jpg
0 → 100644
47.5 KB
static/huodong/cuxiao/img/newuser2/14.jpg
0 → 100644
53.5 KB
static/huodong/cuxiao/img/newuser2/15.jpg
0 → 100644
46.8 KB
static/huodong/cuxiao/img/newuser2/16.jpg
0 → 100644
62.8 KB
static/huodong/cuxiao/img/newuser2/17.jpg
0 → 100644
47.6 KB
static/huodong/cuxiao/img/newuser2/24-1.jpg
0 → 100644
32.3 KB
static/huodong/cuxiao/img/newuser2/24-2.jpg
0 → 100644
9.23 KB
static/huodong/cuxiao/img/newuser2/24-3.jpg
0 → 100644
1.6 KB
static/huodong/cuxiao/img/newuser2/25.jpg
0 → 100644
54.8 KB
static/huodong/cuxiao/img/newuser2/26.jpg
0 → 100644
69.7 KB
static/huodong/cuxiao/img/newuser2/27.jpg
0 → 100644
42.9 KB
43.2 KB
3.72 KB
3.59 KB
5.08 KB
6.42 KB
4.97 KB
5.11 KB
6.31 KB
3.96 KB
4.99 KB
4.65 KB
4.82 KB
4.43 KB
6.06 KB
7.69 KB
4.04 KB
4.78 KB
4.57 KB
5.28 KB
4.2 KB
4.14 KB
3.24 KB
8.69 KB
4.67 KB
3.8 KB
6.22 KB
5.76 KB
1.37 KB
2.36 KB
1.48 KB
static/huodong/cuxiao/img/newuser2/two.jpg
0 → 100644
5.16 KB
@@ -212,10 +212,10 @@ function getNamedCoupon(activityId, couponId, isApp, userIsLogged) | @@ -212,10 +212,10 @@ function getNamedCoupon(activityId, couponId, isApp, userIsLogged) | ||
212 | return; | 212 | return; |
213 | } | 213 | } |
214 | if (data.code == 200) { | 214 | if (data.code == 200) { |
215 | - showTip('恭喜你成功领取优惠券!<br><br>稍后即会到账,请耐心等待。'); | 215 | + showTip('恭喜您成功领取优惠券!<br><br>稍后即会到账,请耐心等待。'); |
216 | } | 216 | } |
217 | else if (data.code == 201) { | 217 | else if (data.code == 201) { |
218 | - showTip('你已领取过品牌优惠券<br><br>快去选购心仪的商品吧!'); | 218 | + showTip('您已领取过品牌优惠券<br><br>快去选购心仪的商品吧!'); |
219 | } | 219 | } |
220 | else if (data.code == 400) { | 220 | else if (data.code == 400) { |
221 | setCookie('_Coupon' + activityId, couponId, { | 221 | setCookie('_Coupon' + activityId, couponId, { |
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 { | ||
18 | + position: fixed; | ||
19 | + display: none; | ||
20 | + text-align: center; | ||
21 | + width: 70%; | ||
22 | + padding: 34px 0; | ||
23 | + top: 50%; | ||
24 | + left: 50%; | ||
25 | + margin-left: -35%; | ||
26 | + margin-top: -45px; | ||
27 | + background-color: #000; | ||
28 | + opacity: 0.9; | ||
29 | + color: #fff; | ||
30 | + font-size: 18px; | ||
31 | + border: none; | ||
32 | + border-radius: 10px; | ||
33 | + } | ||
34 | + </style> | ||
35 | + <link rel="dns-prefetch" href="//cdn.yoho.cn"> | ||
36 | + <link rel="dns-prefetch" href="//static.yohobuy.com"> | ||
37 | + </head> | ||
38 | + <body> | ||
39 | + <div class="coupon-container" id="coupon-container" param="{{activityId}}" isLogged="{{isLogged}}"> | ||
40 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/01.jpg"> | ||
41 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/02.jpg"> | ||
42 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/03.jpg"> | ||
43 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/line-1.jpg"> | ||
44 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/04.jpg"> | ||
45 | + <div class="img-box"> | ||
46 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/05.jpg"> | ||
47 | + <a class="href href-right" href="{{url_yohope}}"></a> | ||
48 | + </div> | ||
49 | + <div class="img-box"> | ||
50 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/06.jpg"> | ||
51 | + <a class="href href-center" href="{{url_mycoupon}}"></a> | ||
52 | + </div> | ||
53 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/line-2.jpg"> | ||
54 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/07.jpg"> | ||
55 | + <div class="img-box"> | ||
56 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/08.jpg"> | ||
57 | + <a class="href href-left" href="{{url_more}}"></a> | ||
58 | + <a class="href href-right" href="{{url_more}}"></a> | ||
59 | + </div> | ||
60 | + <div class="img-box"> | ||
61 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/09.jpg"> | ||
62 | + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12042"></span> | ||
63 | + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12043"></span> | ||
64 | + </div> | ||
65 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/line-1.jpg"> | ||
66 | + <div class="img-box"> | ||
67 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/10.jpg"> | ||
68 | + <a class="href href-left" href="{{url_4}}"></a> | ||
69 | + <a class="href href-right" href="{{url_343}}"></a> | ||
70 | + </div> | ||
71 | + <div class="img-box"> | ||
72 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/11.jpg"> | ||
73 | + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12044"></span> | ||
74 | + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12045"></span> | ||
75 | + </div> | ||
76 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/line-1.jpg"> | ||
77 | + <div class="img-box"> | ||
78 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/12.jpg"> | ||
79 | + <a class="href href-left" href="{{url_230}}"></a> | ||
80 | + <a class="href href-right" href="{{url_536}}"></a> | ||
81 | + </div> | ||
82 | + <div class="img-box"> | ||
83 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/13.jpg"> | ||
84 | + <span class="href href-left get-coupon" onclick="" href="{{jumpUrl}}" param="12046"></span> | ||
85 | + <span class="href href-right get-coupon" onclick="" href="{{jumpUrl}}" param="12047"></span> | ||
86 | + </div> | ||
87 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/line-1.jpg"> | ||
88 | + <div class="img-box"> | ||
89 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/14.jpg"> | ||
90 | + <a class="href href-left" href="{{url_847}}"></a> | ||
91 | + <a class="href href-right" href="{{url_900}}"></a> | ||
92 | + </div> | ||
93 | + <div class="img-box"> | ||
94 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/15.jpg"> | ||
95 | + <span class="href href-left get-coupon" onclick="" href="{{jumpUrl}}" param="12048"></span> | ||
96 | + <span class="href href-right get-coupon" onclick="" href="{{jumpUrl}}" param="12049"></span> | ||
97 | + </div> | ||
98 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/line-1.jpg"> | ||
99 | + <div class="img-box"> | ||
100 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/16.jpg"> | ||
101 | + <a class="href href-left" href="{{url_868}}"></a> | ||
102 | + <a class="href href-right" href="{{url_1026}}"></a> | ||
103 | + </div> | ||
104 | + <div class="img-box"> | ||
105 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/17.jpg"> | ||
106 | + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12050"></span> | ||
107 | + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12051"></span> | ||
108 | + </div> | ||
109 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/line-1.jpg"> | ||
110 | + <div class="img-box"> | ||
111 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/24-2.jpg"> | ||
112 | + <a class="show-more" href="{{url_help}}"></a> | ||
113 | + </div> | ||
114 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/24-3.jpg"> | ||
115 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/line-2.jpg"> | ||
116 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/25.jpg"> | ||
117 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/26.jpg"> | ||
118 | + <img src="{{jsUrl}}/cuxiao/img/newuser2/27.jpg"> | ||
119 | + </div> | ||
120 | + <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/jquery.min.js"></script> | ||
121 | + <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/newuser/coupon.js"></script> | ||
122 | + </body> | ||
123 | +</html> |
@@ -503,6 +503,52 @@ class CouponController extends HuodongAction | @@ -503,6 +503,52 @@ class CouponController extends HuodongAction | ||
503 | } | 503 | } |
504 | 504 | ||
505 | /** | 505 | /** |
506 | + * 新客领券2 | ||
507 | + * | ||
508 | + * | ||
509 | + */ | ||
510 | + public function newuser2Action() | ||
511 | + { | ||
512 | + // 判断是否是应用访问, 拼接APP需要的URL参数 | ||
513 | + $isApp = null !== $this->get('app_version'); | ||
514 | + $isAppLogged = true; | ||
515 | + if ($isApp) { | ||
516 | + $isLogged = $this->get('uid') !== null; | ||
517 | + $isAppLogged = $this->checkIsLogin(); | ||
518 | + } else { | ||
519 | + $isLogged = $this->getUid(); | ||
520 | + } | ||
521 | + $urlNewuser = Helpers::url('/cuxiao/coupon/newuser'); | ||
522 | + $urlYohope = Helpers::url('/cuxiao/coupon/yohope'); | ||
523 | + $urlHelp = Helpers::url('/cuxiao/coupon/help'); | ||
524 | + $urlMycoupon = Helpers::url('/home/coupons', null, 'default'); | ||
525 | + $urlEncode = strtr($urlNewuser, array('/' => '\\/')); | ||
526 | + $gender = $this->get('gender', '1,3'); | ||
527 | + $channel = $this -> get('yh_channel','1'); | ||
528 | + $url = Helpers::url('/boys') . '?openbuy:yohobuy={"action":"go.home","params":{"gender":"' . $gender . '","channel":"' . $channel . '"}}'; | ||
529 | + | ||
530 | + $this->_view->display('newuser2', array( | ||
531 | + 'activityId' => 87, // 活动ID | ||
532 | + 'staticTitle' => '新人潮这看,超值惊喜等你领', // 标题 | ||
533 | + 'jumpUrl' => $isAppLogged ? 'javascript:;' : $urlNewuser . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $urlEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}', | ||
534 | + 'isLogged' => $isLogged ? 'Y' : 'N', // 标识是否登录 | ||
535 | + 'url_mycoupon' => $urlMycoupon . '?openby:yohobuy={"action":"go.coupon"}', | ||
536 | + 'url_yohope' => $urlYohope . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlYohope . '","param":{}}}', | ||
537 | + 'url_help' => $urlHelp . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlHelp . '","param":{}}}', | ||
538 | + 'url_more' => $url, | ||
539 | + 'url_4' => 'http://list.m.yohobuy.com/?msort=365&openby:yohobuy={"action":"go.list","params":{"msort":"365","title":"童装"}}', | ||
540 | + 'url_343' => 'http://list.m.yohobuy.com/?msort=10&openby:yohobuy={"action":"go.list","params":{"misort":"10","title":"创意生活"}}', | ||
541 | + 'url_230' => 'http://list.m.yohobuy.com/?msort=1&misort=18,20,21,22,226&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"18,20,21,22,226","title":"冬装"}}', | ||
542 | + 'url_536' => 'http://list.m.yohobuy.com/?msort=3&misort=26,27,345&openby:yohobuy={"action":"go.list","params":{"msort":"3","misort":"26,27,345","title":"裤装"}}', | ||
543 | + 'url_847' => 'http://list.m.yohobuy.com/?msort=7,8&openby:yohobuy={"action":"go.list","params":{"msort":"7,8","title":"包配"}}', | ||
544 | + 'url_900' => 'http://list.m.yohobuy.com/?msort=4&openby:yohobuy={"action":"go.list","params":{"msort":"4","title":"裙装"}}', | ||
545 | + 'url_868' => 'http://list.m.yohobuy.com/?msort=1&misort=11,12,257,16&openby:yohobuy={"action":"go.list","params":{"msort":"1","misort":"11,12,257,16","title":"内搭"}}', | ||
546 | + 'url_1026' =>'http://list.m.yohobuy.com/?msort=6&misort=45&openby:yohobuy={"action":"go.list","params":{"msort":"6","misort":"45","title":"冬靴"}}' | ||
547 | + )); | ||
548 | + } | ||
549 | + | ||
550 | + | ||
551 | + /** | ||
506 | * 新客领券YOHOPE | 552 | * 新客领券YOHOPE |
507 | * | 553 | * |
508 | * 上线时间2015/12/2 | 554 | * 上线时间2015/12/2 |
-
Please register or login to post a comment