fe / YOHOBUYPC · Commits

Go to a project

Authored by biao
Commit cff3a0fb2d6d3ad53a2c77785aa554b5fd2a0d45 2 parents 37264da1 67e8c0f8

Merge branch 'develop/wap' of http://git.dev.yoho.cn/web/yohobuy into develop/wap

Inline Side-by-side
Showing 2 changed files with 45 additions and 45 deletions
@@ -21,90 +21,90 @@ @@ -21,90 +21,90 @@
21 </head> 21 </head>
22 <body> 22 <body>
23 <div id="coupon-container" param="{{activityId}}" isLogged="{{isLogged}}"> 23 <div id="coupon-container" param="{{activityId}}" isLogged="{{isLogged}}">
24 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/01.jpg">  
25 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/02.jpg">  
26 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/03.jpg">  
27 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg">  
28 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/04.jpg"> 24 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/01.jpg">
  25 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/02.jpg">
  26 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/03.jpg">
  27 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
  28 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/04.jpg">
29 <div class="img-box"> 29 <div class="img-box">
30 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/05.jpg"> 30 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/05.jpg">
31 <a class="href href-right" href="{{url_yohope}}"></a> 31 <a class="href href-right" href="{{url_yohope}}"></a>
32 </div> 32 </div>
33 <div class="img-box"> 33 <div class="img-box">
34 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/06.jpg"> 34 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/06.jpg">
35 <a class="href href-center" href="{{url_mycoupon}}"></a> 35 <a class="href href-center" href="{{url_mycoupon}}"></a>
36 </div> 36 </div>
37 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-2.jpg"> 37 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-2.jpg">
38 38
39 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/07.jpg"> 39 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/07.jpg">
40 <div class="img-box"> 40 <div class="img-box">
41 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/08.jpg"> 41 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/08.jpg">
42 <a class="href href-left" href="{{url_more}}"></a> 42 <a class="href href-left" href="{{url_more}}"></a>
43 <a class="href href-right" href="{{url_more}}"></a> 43 <a class="href href-right" href="{{url_more}}"></a>
44 </div> 44 </div>
45 <div class="img-box"> 45 <div class="img-box">
46 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/09.jpg">  
47 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12258"></span>  
48 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12259"></span> 46 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/09.jpg">
  47 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12311"></span>
  48 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12312"></span>
49 </div> 49 </div>
50 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg"> 50 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
51 <div class="img-box"> 51 <div class="img-box">
52 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/10.jpg"> 52 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/10.jpg">
53 <a class="href href-left" href="{{url_more}}"></a> 53 <a class="href href-left" href="{{url_more}}"></a>
54 <a class="href href-right" href="{{url_1}}"></a> 54 <a class="href href-right" href="{{url_1}}"></a>
55 </div> 55 </div>
56 <div class="img-box"> 56 <div class="img-box">
57 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/11.jpg">  
58 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12260"></span>  
59 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12261"></span> 57 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/11.jpg">
  58 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12313"></span>
  59 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12314"></span>
60 </div> 60 </div>
61 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg"> 61 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
62 <div class="img-box"> 62 <div class="img-box">
63 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/12.jpg"> 63 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/12.jpg">
64 <a class="href href-left" href="{{url_1}}"></a> 64 <a class="href href-left" href="{{url_1}}"></a>
65 <a class="href href-right" href="{{url_2}}"></a> 65 <a class="href href-right" href="{{url_2}}"></a>
66 </div> 66 </div>
67 <div class="img-box"> 67 <div class="img-box">
68 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/13.jpg">  
69 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12262"></span>  
70 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12263"></span> 68 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/13.jpg">
  69 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12315"></span>
  70 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12316"></span>
71 </div> 71 </div>
72 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg"> 72 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
73 <div class="img-box"> 73 <div class="img-box">
74 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/14.jpg"> 74 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/14.jpg">
75 <a class="href href-left" href="{{url_3}}"></a> 75 <a class="href href-left" href="{{url_3}}"></a>
76 <a class="href href-right" href="{{url_4}}"></a> 76 <a class="href href-right" href="{{url_4}}"></a>
77 </div> 77 </div>
78 <div class="img-box"> 78 <div class="img-box">
79 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/15.jpg">  
80 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12264"></span>  
81 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12265"></span> 79 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/15.jpg">
  80 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12317"></span>
  81 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12318"></span>
82 </div> 82 </div>
83 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg"> 83 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
84 <div class="img-box"> 84 <div class="img-box">
85 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/16.jpg"> 85 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/16.jpg">
86 <a class="href href-left" href="{{url_5}}"></a> 86 <a class="href href-left" href="{{url_5}}"></a>
87 <a class="href href-right" href="{{url_6}}"></a> 87 <a class="href href-right" href="{{url_6}}"></a>
88 </div> 88 </div>
89 <div class="img-box"> 89 <div class="img-box">
90 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/17.jpg">  
91 - <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12266"></span>  
92 - <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12267"></span> 90 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/17.jpg">
  91 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12319"></span>
  92 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12320"></span>
93 </div> 93 </div>
94 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-1.jpg"> 94 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-1.jpg">
95 95
96 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/24-1.jpg"> 96 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/24-1.jpg">
97 <div class="img-box"> 97 <div class="img-box">
98 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/24-2.jpg"> 98 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/24-2.jpg">
99 <a class="show-more" href="{{url_help}}"></a> 99 <a class="show-more" href="{{url_help}}"></a>
100 </div> 100 </div>
101 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/24-3.jpg">  
102 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/line-2.jpg">  
103 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/25-1.jpg">  
104 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/25-2.jpg">  
105 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/25-3.jpg">  
106 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/26.jpg">  
107 - <img src="{{jsUrl}}/cuxiao/img/newuser/160219/27.jpg"> 101 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/24-3.jpg">
  102 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/line-2.jpg">
  103 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/25-1.jpg">
  104 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/25-2.jpg">
  105 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/25-3.jpg">
  106 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/26.jpg">
  107 + <img src="{{jsUrl}}/cuxiao/img/newuser/160301/27.jpg">
108 </div> 108 </div>
109 <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/jquery.min.js"></script> 109 <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/jquery.min.js"></script>
110 <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/newuser/coupon2.js"></script> 110 <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/newuser/coupon2.js"></script>
@@ -552,8 +552,8 @@ class CouponController extends HuodongAction @@ -552,8 +552,8 @@ class CouponController extends HuodongAction
552 } 552 }
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(  
556 - 'activityId' => 508, //498, //492, // 94活动ID 555 + $this->_view->display('newuser3-test', array(
  556 + 'activityId' => 489, //508, //498, //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', // 标识是否登录