wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by hf
Commit 45ee2b0f88037d7465989aa86640223b691ffa87 1 parent 971667fe

code review by fei.hong : modify to change newuser huodong coupon

Inline Side-by-side
Showing 4 changed files with 121 additions and 11 deletions
@@ -373,7 +373,7 @@ server @@ -373,7 +373,7 @@ server
373 } 373 }
374 374
375 ## since 2016/01/23 375 ## since 2016/01/23
376 - location ^~ /shopping/pay/alipay { 376 + location ^~ /shopping/pay/index {
377 proxy_redirect off; 377 proxy_redirect off;
378 proxy_pass http://yohobuy; 378 proxy_pass http://yohobuy;
379 proxy_set_header Host $host; 379 proxy_set_header Host $host;
  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/160107/01.jpg">
  25 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/02.jpg">
  26 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/03-a.jpg">
  27 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/line-1.jpg">
  28 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/04-a.jpg">
  29 + <div class="img-box">
  30 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/05-a.jpg">
  31 + <a class="href href-right" href="{{url_yohope}}"></a>
  32 + </div>
  33 + <div class="img-box">
  34 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/06.jpg">
  35 + <a class="href href-center" href="{{url_mycoupon}}"></a>
  36 + </div>
  37 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/line-2.jpg">
  38 +
  39 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/07.jpg">
  40 + <div class="img-box">
  41 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/08.jpg">
  42 + <a class="href href-left" href="{{url_more}}"></a>
  43 + <a class="href href-right" href="{{url_more}}"></a>
  44 + </div>
  45 + <div class="img-box">
  46 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/09.jpg">
  47 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="17443"></span>
  48 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="17445"></span>
  49 + </div>
  50 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/line-1.jpg">
  51 + <div class="img-box">
  52 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/10.jpg">
  53 + <a class="href href-left" href="{{url_more}}"></a>
  54 + <a class="href href-right" href="{{url_1}}"></a>
  55 + </div>
  56 + <div class="img-box">
  57 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/11.jpg">
  58 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="17463"></span>
  59 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="17451"></span>
  60 + </div>
  61 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/line-1.jpg">
  62 + <div class="img-box">
  63 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/12.jpg">
  64 + <a class="href href-left" href="{{url_2}}"></a>
  65 + <a class="href href-right" href="{{url_3}}"></a>
  66 + </div>
  67 + <div class="img-box">
  68 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/13.jpg">
  69 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="17461"></span>
  70 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="17459"></span>
  71 + </div>
  72 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/line-1.jpg">
  73 + <div class="img-box">
  74 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/14.jpg">
  75 + <a class="href href-left" href="{{url_4}}"></a>
  76 + <a class="href href-right" href="{{url_5}}"></a>
  77 + </div>
  78 + <div class="img-box">
  79 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/15.jpg">
  80 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="17453"></span>
  81 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="17455"></span>
  82 + </div>
  83 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/line-1.jpg">
  84 + <div class="img-box">
  85 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/16.jpg">
  86 + <a class="href href-left" href="{{url_6}}"></a>
  87 + </div>
  88 + <div class="img-box">
  89 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/17.jpg">
  90 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="17449"></span>
  91 + </div>
  92 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/line-1.jpg">
  93 +
  94 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/24-1.jpg">
  95 + <div class="img-box">
  96 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/24-2.jpg">
  97 + <a class="show-more" href="{{url_help}}"></a>
  98 + </div>
  99 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/24-3.jpg">
  100 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/line-2.jpg">
  101 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/25-1-a.jpg">
  102 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/25-2-a.jpg">
  103 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/25-3-a.jpg">
  104 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/26-a.jpg">
  105 + <img src="{{jsUrl}}/cuxiao/img/newuser/160107/27-a.jpg">
  106 + </div>
  107 + <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/jquery.min.js"></script>
  108 + <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/newuser/coupon2.js"></script>
  109 +</body>
  110 +</html>
@@ -44,8 +44,8 @@ @@ -44,8 +44,8 @@
44 </div> 44 </div>
45 <div class="img-box"> 45 <div class="img-box">
46 <img src="{{jsUrl}}/cuxiao/img/newuser/160107/09.jpg"> 46 <img src="{{jsUrl}}/cuxiao/img/newuser/160107/09.jpg">
47 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="17443"></span>  
48 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="17445"></span> 47 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="18281"></span>
  48 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="18283"></span>
49 </div> 49 </div>
50 <img src="{{jsUrl}}/cuxiao/img/newuser/160107/line-1.jpg"> 50 <img src="{{jsUrl}}/cuxiao/img/newuser/160107/line-1.jpg">
51 <div class="img-box"> 51 <div class="img-box">
@@ -55,8 +55,8 @@ @@ -55,8 +55,8 @@
55 </div> 55 </div>
56 <div class="img-box"> 56 <div class="img-box">
57 <img src="{{jsUrl}}/cuxiao/img/newuser/160107/11.jpg"> 57 <img src="{{jsUrl}}/cuxiao/img/newuser/160107/11.jpg">
58 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="17463"></span>  
59 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="17451"></span> 58 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="18289"></span>
  59 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="18293"></span>
60 </div> 60 </div>
61 <img src="{{jsUrl}}/cuxiao/img/newuser/160107/line-1.jpg"> 61 <img src="{{jsUrl}}/cuxiao/img/newuser/160107/line-1.jpg">
62 <div class="img-box"> 62 <div class="img-box">
@@ -66,8 +66,8 @@ @@ -66,8 +66,8 @@
66 </div> 66 </div>
67 <div class="img-box"> 67 <div class="img-box">
68 <img src="{{jsUrl}}/cuxiao/img/newuser/160107/13.jpg"> 68 <img src="{{jsUrl}}/cuxiao/img/newuser/160107/13.jpg">
69 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="17461"></span>  
70 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="17459"></span> 69 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="18295"></span>
  70 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="18291"></span>
71 </div> 71 </div>
72 <img src="{{jsUrl}}/cuxiao/img/newuser/160107/line-1.jpg"> 72 <img src="{{jsUrl}}/cuxiao/img/newuser/160107/line-1.jpg">
73 <div class="img-box"> 73 <div class="img-box">
@@ -77,8 +77,8 @@ @@ -77,8 +77,8 @@
77 </div> 77 </div>
78 <div class="img-box"> 78 <div class="img-box">
79 <img src="{{jsUrl}}/cuxiao/img/newuser/160107/15.jpg"> 79 <img src="{{jsUrl}}/cuxiao/img/newuser/160107/15.jpg">
80 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="17453"></span>  
81 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="17455"></span> 80 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="18297"></span>
  81 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="18299"></span>
82 </div> 82 </div>
83 <img src="{{jsUrl}}/cuxiao/img/newuser/160107/line-1.jpg"> 83 <img src="{{jsUrl}}/cuxiao/img/newuser/160107/line-1.jpg">
84 <div class="img-box"> 84 <div class="img-box">
@@ -87,7 +87,7 @@ @@ -87,7 +87,7 @@
87 </div> 87 </div>
88 <div class="img-box"> 88 <div class="img-box">
89 <img src="{{jsUrl}}/cuxiao/img/newuser/160107/17.jpg"> 89 <img src="{{jsUrl}}/cuxiao/img/newuser/160107/17.jpg">
90 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="17449"></span> 90 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="18301"></span>
91 </div> 91 </div>
92 <img src="{{jsUrl}}/cuxiao/img/newuser/160107/line-1.jpg"> 92 <img src="{{jsUrl}}/cuxiao/img/newuser/160107/line-1.jpg">
93 93
@@ -553,7 +553,7 @@ class CouponController extends HuodongAction @@ -553,7 +553,7 @@ class CouponController extends HuodongAction
553 $url = Helpers::url('/boys', array(), 'default') . '?openby:yohobuy={"action":"go.home","params":{"gender":"' . $gender . '","channel":"' . $channel . '"}}'; 553 $url = Helpers::url('/boys', array(), 'default') . '?openby:yohobuy={"action":"go.home","params":{"gender":"' . $gender . '","channel":"' . $channel . '"}}';
554 554
555 $this->_view->display('newuser3', array( 555 $this->_view->display('newuser3', array(
556 - 'activityId' => 472, // 94活动ID 556 + 'activityId' => 492, // 94活动ID
557 'staticTitle' => '新人潮这看，超值惊喜等你领', // 标题 557 'staticTitle' => '新人潮这看，超值惊喜等你领', // 标题
558 'jumpUrl' => $isAppLogged ? 'javascript:;' : $urlNewuser . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $urlEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}', 558 'jumpUrl' => $isAppLogged ? 'javascript:;' : $urlNewuser . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $urlEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}',
559 'isLogged' => $isLogged ? 'Y' : 'N', // 标识是否登录 559 'isLogged' => $isLogged ? 'Y' : 'N', // 标识是否登录