fe / YOHOBUYWAP · Commits

Go to a project

Authored by 梁志锋
Commit c0cb5313cab4ed18a16fecdc8962135035e1686c 2 parents aa69c998 a6f1254e

merge master

Inline Side-by-side
Showing 50 changed files with 425 additions and 227 deletions
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <link rel="dns-prefetch" href="//static.yohobuy.com"> 26 <link rel="dns-prefetch" href="//static.yohobuy.com">
27 <link rel="dns-prefetch" href="//img12.static.yhbimg.com"> 27 <link rel="dns-prefetch" href="//img12.static.yhbimg.com">
28 <link rel="dns-prefetch" href="//img13.static.yhbimg.com"> 28 <link rel="dns-prefetch" href="//img13.static.yhbimg.com">
29 -<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.13/index.css"> 29 +<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.16/index.css">
30 <link rel="apple-touch-icon-precomposed" href="//static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png"> 30 <link rel="apple-touch-icon-precomposed" href="//static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png">
31 <link rel="apple-touch-startup-image" sizes="640x920" href="//static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)"> 31 <link rel="apple-touch-startup-image" sizes="640x920" href="//static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">
32 <link rel="apple-touch-startup-image" sizes="320x460" href="//static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)"> 32 <link rel="apple-touch-startup-image" sizes="320x460" href="//static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">
@@ -44,11 +44,8 @@ @@ -44,11 +44,8 @@
44 </div> 44 </div>
45 </div> 45 </div>
46 46
47 -  
48 -  
49 -  
50 - <script src="//cdn.yoho.cn/myohobuy/1.3.13/lib.js"></script>  
51 -<script src="//cdn.yoho.cn/myohobuy/1.3.13/index.js"></script> 47 + <script src="//cdn.yoho.cn/myohobuy/1.3.16/lib.js"></script>
  48 +<script src="//cdn.yoho.cn/myohobuy/1.3.16/index.js"></script>
52 <script> 49 <script>
53 seajs.use('js/common'); 50 seajs.use('js/common');
54 </script> 51 </script>
@@ -67,26 +64,7 @@ @@ -67,26 +64,7 @@
67 j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= 64 j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
68 '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); 65 '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
69 })(window,document,'script','dataLayer','GTM-W958MG'); 66 })(window,document,'script','dataLayer','GTM-W958MG');
70 - (function() {  
71 - var hm = document.createElement("script");  
72 - hm.src = "//hm.baidu.com/hm.js?c6ee7218b8321cb65fb2e98f284d8311";  
73 - hm.async = 1;  
74 - var s = document.getElementsByTagName("script")[0];  
75 - s.parentNode.insertBefore(hm, s);  
76 - })();  
77 - (function() {  
78 - var hm = document.createElement("script");  
79 - hm.src = "//hm.baidu.com/hm.js?65dd99e0435a55177ffda862198ce841";  
80 - hm.async = 1;  
81 - var s = document.getElementsByTagName("script")[0];  
82 - s.parentNode.insertBefore(hm, s);  
83 - })();  
84 - (function() {  
85 - var hm = document.createElement("script");  
86 - hm.src = "//hm.baidu.com/hm.js?e5b83a487a4458aa5abca43f5779b764";  
87 - var s = document.getElementsByTagName("script")[0];  
88 - s.parentNode.insertBefore(hm, s);  
89 - })(); 67 +
90 (function() { 68 (function() {
91 var hm = document.createElement("script"); 69 var hm = document.createElement("script");
92 hm.src = "//static.yohobuy.com/js/analytics/analysis.js"; 70 hm.src = "//static.yohobuy.com/js/analytics/analysis.js";
@@ -111,5 +89,4 @@ @@ -111,5 +89,4 @@
111 var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h); 89 var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h);
112 }(document); 90 }(document);
113 </script> 91 </script>
114 -<script src="//static.yohobuy.com/m/v1/js/om_code.js" async="async"></script></body>  
115 </html> 92 </html>
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <html> 2 <html>
3 <head> 3 <head>
4 -<meta charset="utf-8">  
5 -<title>页面不存在 | Yoho!Buy有货 | 潮流购物逛不停</title>  
6 -<meta name="keywords" content="Yoho! 有货官网,潮流志,潮流男装,潮牌,美国潮牌,日本潮牌,香港潮牌,潮牌店,新品首发,欧美潮流,全球购,代购,时尚,流行,特卖,B2C,正品,购物网站,网上购物,货到付款">  
7 -<meta name="description" content="YOHO! 有货，年轻人潮流购物中心，中国最大的潮流商品购物网站。100%品牌正品保证，支持货到付款。作为YOHO!旗下的购物平台，汇集了全球潮流时尚商品和中国最流行的商品，也是国内最大的原创文化商品平台，也是香港，台湾地区流行商品的集中地。同时包含日本、韩国等众多国外潮流品牌，带给您全新潮流购物体验。">  
8 -<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">  
9 -<meta http-equiv="cleartype" content="on">  
10 -<meta name="apple-mobile-web-app-status-bar-style" content="black" />  
11 -<meta content="telephone=no" name="format-detection" />  
12 -<meta content="email=no" name="format-detection" />  
13 -<script type="text/javascript">  
14 - (function(doc, win) {  
15 - var docEl = doc.documentElement;  
16 - (function() {  
17 - var clientWidth = docEl.clientWidth;  
18 - if (!clientWidth) {  
19 - return;  
20 - }  
21 - docEl.style.fontSize = 20 * (clientWidth / 320) + 'px';  
22 - }());  
23 - })(document, window);  
24 -</script>  
25 -<link rel="dns-prefetch" href="//cdn.yoho.cn">  
26 -<link rel="dns-prefetch" href="//static.yohobuy.com">  
27 -<link rel="dns-prefetch" href="//img12.static.yhbimg.com">  
28 -<link rel="dns-prefetch" href="//img13.static.yhbimg.com">  
29 -<link rel="stylesheet" href="http://static.dev.yohobuy.com/css/index.css">  
30 -<link rel="apple-touch-icon-precomposed" href="http://static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png">  
31 -<link rel="apple-touch-startup-image" sizes="640x920" href="http://static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">  
32 -<link rel="apple-touch-startup-image" sizes="320x460" href="http://static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)"> 4 + <meta charset="utf-8">
  5 + <title>页面不存在 | Yoho!Buy有货 | 潮流购物逛不停</title>
  6 + <meta name="keywords" content="Yoho! 有货官网,潮流志,潮流男装,潮牌,美国潮牌,日本潮牌,香港潮牌,潮牌店,新品首发,欧美潮流,全球购,代购,时尚,流行,特卖,B2C,正品,购物网站,网上购物,货到付款">
  7 + <meta name="description" content="YOHO! 有货，年轻人潮流购物中心，中国最大的潮流商品购物网站。100%品牌正品保证，支持货到付款。作为YOHO!旗下的购物平台，汇集了全球潮流时尚商品和中国最流行的商品，也是国内最大的原创文化商品平台，也是香港，台湾地区流行商品的集中地。同时包含日本、韩国等众多国外潮流品牌，带给您全新潮流购物体验。">
  8 + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
  9 + <meta http-equiv="cleartype" content="on">
  10 + <meta name="apple-mobile-web-app-status-bar-style" content="black" />
  11 + <meta content="telephone=no" name="format-detection" />
  12 + <meta content="email=no" name="format-detection" />
  13 + <script type="text/javascript">
  14 + (function(doc, win) {
  15 + var docEl = doc.documentElement;
  16 + (function() {
  17 + var clientWidth = docEl.clientWidth;
  18 + if (!clientWidth) {
  19 + return;
  20 + }
  21 + docEl.style.fontSize = 20 * (clientWidth / 320) + 'px';
  22 + }());
  23 + })(document, window);
  24 + </script>
  25 + <link rel="dns-prefetch" href="//cdn.yoho.cn">
  26 + <link rel="dns-prefetch" href="//static.yohobuy.com">
  27 + <link rel="dns-prefetch" href="//img12.static.yhbimg.com">
  28 + <link rel="dns-prefetch" href="//img13.static.yhbimg.com">
  29 + <link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.16/index.css">
  30 + <link rel="apple-touch-icon-precomposed" href="http://static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png">
  31 + <link rel="apple-touch-startup-image" sizes="640x920" href="http://static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">
  32 + <link rel="apple-touch-startup-image" sizes="320x460" href="http://static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">
33 </head> 33 </head>
34 <body > 34 <body >
35 <header id="yoho-header" class="yoho-header boys"> 35 <header id="yoho-header" class="yoho-header boys">
@@ -95,10 +95,20 @@ @@ -95,10 +95,20 @@
95 </a> 95 </a>
96 </div> 96 </div>
97 97
  98 +<script src="http://cdn.yoho.cn/myohobuy/1.3.16/lib.js"></script>
  99 +<script src="http://cdn.yoho.cn/myohobuy/1.3.16/index.js"></script>
98 100
99 -  
100 - <script src="http://localhost:8000/static/js/sea.js?nowrap"></script>  
101 -<script>seajs.config({base: 'http://localhost:8000/'});</script> 101 +<script type="text/javascript">
  102 + (function(w,d,s,j,f){
  103 + w['YohoAcquisitionObject']=f;
  104 + w[f]=function(){w[f].p=arguments;};
  105 + var a=d.createElement(s);
  106 + var m=d.getElementsByTagName(s)[0];
  107 + a.async=1;
  108 + a.src=j;
  109 + m.parentNode.insertBefore(a,m);
  110 + })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.14/yas.js','_yas');
  111 +</script>
102 <script> 112 <script>
103 seajs.use('js/common'); 113 seajs.use('js/common');
104 </script> 114 </script>
@@ -106,56 +116,12 @@ @@ -106,56 +116,12 @@
106 <!-- Google Tag Manager --> 116 <!-- Google Tag Manager -->
107 <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript> 117 <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
108 <script> 118 <script>
109 - var _hmt = _hmt || [];  
110 - function async_load(){  
111 - (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':  
112 - new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],  
113 - j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=  
114 - '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);  
115 - })(window,document,'script','dataLayer','GTM-W958MG');  
116 - (function() {  
117 - var hm = document.createElement("script");  
118 - hm.src = "//hm.baidu.com/hm.js?c6ee7218b8321cb65fb2e98f284d8311";  
119 - hm.async = 1;  
120 - var s = document.getElementsByTagName("script")[0];  
121 - s.parentNode.insertBefore(hm, s);  
122 - })();  
123 - (function() {  
124 - var hm = document.createElement("script");  
125 - hm.src = "//hm.baidu.com/hm.js?65dd99e0435a55177ffda862198ce841";  
126 - hm.async = 1;  
127 - var s = document.getElementsByTagName("script")[0];  
128 - s.parentNode.insertBefore(hm, s);  
129 - })();  
130 - (function() {  
131 - var hm = document.createElement("script");  
132 - hm.src = "//hm.baidu.com/hm.js?e5b83a487a4458aa5abca43f5779b764";  
133 - var s = document.getElementsByTagName("script")[0];  
134 - s.parentNode.insertBefore(hm, s);  
135 - })();  
136 - (function() {  
137 - var hm = document.createElement("script");  
138 - hm.src = "http://static.yohobuy.com/js/analytics/analysis.js";  
139 - hm.async = 1;  
140 - var s = document.getElementsByTagName("script")[0];  
141 - s.parentNode.insertBefore(hm, s);  
142 - })();  
143 - }  
144 - window.addEventListener('load', async_load, false);  
145 -</script>  
146 -<script>  
147 - window._py = window._py||[];  
148 - window._py.push(['a', 'MC..o8vMMWxEXDCiqYckD81lUX']);  
149 - window._py.push(['domain','stats.ipinyou.com']);  
150 - window._py.push(['e','']);  
151 - if(typeof _goodsData!='undefined'){  
152 - window._py.push(['pi',_goodsData]);  
153 - }  
154 - -function(d){  
155 - var f = 'https:' == d.location.protocol;var c = d.createElement('script');c.type='text/javascript';c.async=1;  
156 - c.src=(f ? 'https' : 'http') + '://'+(f?'fm.ipinyou.com':'fm.p0y.cn')+'/j/t/adv.js';  
157 - var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h);  
158 - }(document); 119 + (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
  120 + new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
  121 + j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
  122 + '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
  123 + })(window,document,'script','dataLayer','GTM-W958MG');
159 </script> 124 </script>
160 -<script src="http://static.yohobuy.com/m/v1/js/om_code.js" async="async"></script></body> 125 +
  126 +<script src="http://static.yohobuy.com/js/analytics/analysis.js"></script>
161 </html> 127 </html>
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <link rel="dns-prefetch" href="//static.yohobuy.com"> 26 <link rel="dns-prefetch" href="//static.yohobuy.com">
27 <link rel="dns-prefetch" href="//img12.static.yhbimg.com"> 27 <link rel="dns-prefetch" href="//img12.static.yhbimg.com">
28 <link rel="dns-prefetch" href="//img13.static.yhbimg.com"> 28 <link rel="dns-prefetch" href="//img13.static.yhbimg.com">
29 -<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.13/index.css"> 29 +<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/1.3.16/index.css">
30 <link rel="apple-touch-icon-precomposed" href="//static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png"> 30 <link rel="apple-touch-icon-precomposed" href="//static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png">
31 <link rel="apple-touch-startup-image" sizes="640x920" href="//static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)"> 31 <link rel="apple-touch-startup-image" sizes="640x920" href="//static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">
32 <link rel="apple-touch-startup-image" sizes="320x460" href="//static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)"> 32 <link rel="apple-touch-startup-image" sizes="320x460" href="//static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">
@@ -62,11 +62,8 @@ @@ -62,11 +62,8 @@
62 </div> 62 </div>
63 </div> 63 </div>
64 64
65 -  
66 -  
67 -  
68 - <script src="//cdn.yoho.cn/myohobuy/1.3.13/lib.js"></script>  
69 -<script src="//cdn.yoho.cn/myohobuy/1.3.13/index.js"></script> 65 + <script src="//cdn.yoho.cn/myohobuy/1.3.16/lib.js"></script>
  66 +<script src="//cdn.yoho.cn/myohobuy/1.3.16/index.js"></script>
70 <script> 67 <script>
71 seajs.use('js/common'); 68 seajs.use('js/common');
72 </script> 69 </script>
@@ -85,26 +82,7 @@ @@ -85,26 +82,7 @@
85 j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= 82 j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
86 '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); 83 '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
87 })(window,document,'script','dataLayer','GTM-W958MG'); 84 })(window,document,'script','dataLayer','GTM-W958MG');
88 - (function() {  
89 - var hm = document.createElement("script");  
90 - hm.src = "//hm.baidu.com/hm.js?c6ee7218b8321cb65fb2e98f284d8311";  
91 - hm.async = 1;  
92 - var s = document.getElementsByTagName("script")[0];  
93 - s.parentNode.insertBefore(hm, s);  
94 - })();  
95 - (function() {  
96 - var hm = document.createElement("script");  
97 - hm.src = "//hm.baidu.com/hm.js?65dd99e0435a55177ffda862198ce841";  
98 - hm.async = 1;  
99 - var s = document.getElementsByTagName("script")[0];  
100 - s.parentNode.insertBefore(hm, s);  
101 - })();  
102 - (function() {  
103 - var hm = document.createElement("script");  
104 - hm.src = "//hm.baidu.com/hm.js?e5b83a487a4458aa5abca43f5779b764";  
105 - var s = document.getElementsByTagName("script")[0];  
106 - s.parentNode.insertBefore(hm, s);  
107 - })(); 85 +
108 (function() { 86 (function() {
109 var hm = document.createElement("script"); 87 var hm = document.createElement("script");
110 hm.src = "//static.yohobuy.com/js/analytics/analysis.js"; 88 hm.src = "//static.yohobuy.com/js/analytics/analysis.js";
@@ -129,5 +107,4 @@ @@ -129,5 +107,4 @@
129 var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h); 107 var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h);
130 }(document); 108 }(document);
131 </script> 109 </script>
132 -<script src="//static.yohobuy.com/m/v1/js/om_code.js" async="async"></script></body>  
133 </html> 110 </html>
@@ -77,56 +77,48 @@ @@ -77,56 +77,48 @@
77 </div> 77 </div>
78 </div> 78 </div>
79 79
  80 + <script src="//cdn.yoho.cn/myohobuy/1.3.16/lib.js"></script>
  81 + <script src="//cdn.yoho.cn/myohobuy/1.3.16/index.js"></script>
  82 + <script>
  83 + seajs.use('js/common');
  84 + </script>
  85 + <script>
  86 + seajs.use('js/passport/login/login');
  87 + </script>
80 88
  89 + <!-- Google Tag Manager -->
  90 + <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
  91 + <script>
  92 + var _hmt = _hmt || [];
  93 + function async_load(){
  94 + (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
  95 + new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
  96 + j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
  97 + '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
  98 + })(window,document,'script','dataLayer','GTM-W958MG');
81 99
82 - <script src="http://localhost:8000/static/js/sea.js?nowrap"></script>  
83 -<script>seajs.config({base: 'http://localhost:8000/'});</script>  
84 -<script type="text/javascript">  
85 - (function(w,d,s,j,f){  
86 - w['YohoAcquisitionObject']=f;  
87 - w[f]=function(){w[f].p=arguments;};  
88 - var a=d.createElement(s);  
89 - var m=d.getElementsByTagName(s)[0];  
90 - a.async=1;  
91 - a.src=j;  
92 - m.parentNode.insertBefore(a,m);  
93 - })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.8/yas.js','_yas');  
94 -</script>  
95 -<script>  
96 - seajs.use('js/common');  
97 -</script>  
98 -<script>  
99 - seajs.use('js/passport/login/login');  
100 -</script>  
101 -<!-- Google Tag Manager -->  
102 -<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>  
103 -<script>  
104 - (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':  
105 - new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],  
106 - j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=  
107 - '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);  
108 - })(window,document,'script','dataLayer','GTM-W958MG');  
109 -</script>  
110 -<!-- End Google Tag Manager -->  
111 -<script type="text/javascript">  
112 - var _hmt = _hmt || [];  
113 - (function() {  
114 - var hm = document.createElement("script");  
115 - hm.src = "//hm.baidu.com/hm.js?c6ee7218b8321cb65fb2e98f284d8311";  
116 - var s = document.getElementsByTagName("script")[0];  
117 - s.parentNode.insertBefore(hm, s);  
118 - })();  
119 -</script>  
120 -<script>  
121 - var _hmt = _hmt || [];  
122 - (function() {  
123 - var hm = document.createElement("script");  
124 - hm.src = "//hm.baidu.com/hm.js?65dd99e0435a55177ffda862198ce841";  
125 - var s = document.getElementsByTagName("script")[0];  
126 - s.parentNode.insertBefore(hm, s);  
127 - })();  
128 -</script>  
129 -<script src="http://static.yohobuy.com/js/analytics/analysis.js"></script>  
130 -<script src="http://static.yohobuy.com/m/v1/js/om_code.js"></script>  
131 -</body> 100 + (function() {
  101 + var hm = document.createElement("script");
  102 + hm.src = "//static.yohobuy.com/js/analytics/analysis.js";
  103 + hm.async = 1;
  104 + var s = document.getElementsByTagName("script")[0];
  105 + s.parentNode.insertBefore(hm, s);
  106 + })();
  107 + }
  108 + window.addEventListener('load', async_load, false);
  109 + </script>
  110 + <script>
  111 + window._py = window._py||[];
  112 + window._py.push(['a', 'MC..o8vMMWxEXDCiqYckD81lUX']);
  113 + window._py.push(['domain','stats.ipinyou.com']);
  114 + window._py.push(['e','']);
  115 + if(typeof _goodsData!='undefined'){
  116 + window._py.push(['pi',_goodsData]);
  117 + }
  118 + -function(d){
  119 + var f = 'https:' == d.location.protocol;var c = d.createElement('script');c.type='text/javascript';c.async=1;
  120 + c.src=(f ? 'https' : 'http') + '://'+(f?'fm.ipinyou.com':'fm.p0y.cn')+'/j/t/adv.js';
  121 + var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h);
  122 + }(document);
  123 + </script>
132 </html> 124 </html>
@@ -604,4 +604,28 @@ class WebAction extends Controller_Abstract @@ -604,4 +604,28 @@ class WebAction extends Controller_Abstract
604 return $apiDomain; 604 return $apiDomain;
605 } 605 }
606 606
  607 + /**
  608 + * JS 跳转并提示
  609 + *
  610 + * @param String $message 提示信息
  611 + * @param String $expression 附加的JS
  612 + * @return void
  613 + */
  614 + protected function helpJsRedirect($message = '', $expression = "history.back()")
  615 + {
  616 + header("content-type: text/html; charset=utf-8");
  617 +
  618 + if ($message != '') {
  619 + $message = strtr(addslashes($message), array('\n' => '\\n'));
  620 + echo "<script language=\"javascript\">";
  621 + echo "alert(\"{$message}\");";
  622 + echo "</script>";
  623 + }
  624 + if ($expression != '') {
  625 + echo "<script language=\"javascript\">\n";
  626 + echo $expression . "\n";
  627 + echo "</script>";
  628 + }
  629 + exit();
  630 + }
607 } 631 }
@@ -33,7 +33,7 @@ class Cache @@ -33,7 +33,7 @@ class Cache
33 * @param int $expire 缓存有效期(单位秒, 0表示永久) 33 * @param int $expire 缓存有效期(单位秒, 0表示永久)
34 * @return void 34 * @return void
35 */ 35 */
36 - public static function set($key, $value, $expire = 3600) 36 + public static function set($key, $value, $expire = 300)
37 { 37 {
38 try { 38 try {
39 // WINDOWS 39 // WINDOWS
@@ -269,8 +269,8 @@ class FloorProcess @@ -269,8 +269,8 @@ class FloorProcess
269 269
270 foreach ($data as $key => &$value) { 270 foreach ($data as $key => &$value) {
271 if ($key == 'title') { 271 if ($key == 'title') {
272 - $urlParam = array('id' => 4);  
273 - //isset(self::$channel[$type]) && $urlParam['gender'] = self::$channel[$type]; 272 + $urlParam = array('id' => 4);
  273 + //isset(self::$channel[$type]) && $urlParam['gender'] = self::$channel[$type];
274 $value['more_url'] = Helpers::url('', $urlParam, 'guang'); 274 $value['more_url'] = Helpers::url('', $urlParam, 'guang');
275 } 275 }
276 if ($key == 'list' && is_array($value)) { 276 if ($key == 'list' && is_array($value)) {
@@ -480,5 +480,4 @@ class FloorProcess @@ -480,5 +480,4 @@ class FloorProcess
480 } 480 }
481 return array('freshOnly'=>$result); 481 return array('freshOnly'=>$result);
482 } 482 }
483 -  
484 } 483 }
@@ -712,7 +712,7 @@ class Helpers @@ -712,7 +712,7 @@ class Helpers
712 $oneGoods['name'] = $single['product_name']; 712 $oneGoods['name'] = $single['product_name'];
713 $oneGoods['thumb'] = !empty($single['goods_images']) ? Images::getImageUrl($single['goods_images'], 120, 160) : ''; 713 $oneGoods['thumb'] = !empty($single['goods_images']) ? Images::getImageUrl($single['goods_images'], 120, 160) : '';
714 $oneGoods['price'] = self::transPrice($single['last_price']); 714 $oneGoods['price'] = self::transPrice($single['last_price']);
715 - $oneGoods['marketPrice'] = self::transPrice($single['market_price']); 715 + $oneGoods['marketPrice'] = $isGift ? '0.00' : self::transPrice($single['market_price']);
716 $oneGoods['count'] = $single['storage_number']; 716 $oneGoods['count'] = $single['storage_number'];
717 717
718 $gift['goods'][] = $oneGoods; 718 $gift['goods'][] = $oneGoods;
1 { 1 {
2 "name": "yohobuy", 2 "name": "yohobuy",
3 - "version": "1.3.17", 3 + "version": "1.3.19",
4 "description": "yohobuy statics", 4 "description": "yohobuy statics",
5 "keywords": [], 5 "keywords": [],
6 "homepage": "", 6 "homepage": "",
@@ -54,9 +54,10 @@ @@ -54,9 +54,10 @@
54 "postcss-position": "^0.4.0", 54 "postcss-position": "^0.4.0",
55 "postcss-pxtorem": "^3.3.1", 55 "postcss-pxtorem": "^3.3.1",
56 "postcss-short": "^1.4.0", 56 "postcss-short": "^1.4.0",
57 - "postcss-sprites": "^3.1.2", 57 + "postcss-sprites": "^3.1.0",
58 "postcss-use": "^2.0.2", 58 "postcss-use": "^2.0.2",
59 - "precss": "^1.4.0" 59 + "precss": "^1.4.0",
  60 + "spm": "3.4"
60 }, 61 },
61 "scripts": { 62 "scripts": {
62 "test": "spm test", 63 "test": "spm test",
  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/160428/01.jpg">
  25 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/02.jpg">
  26 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/03.jpg">
  27 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/line-1.jpg">
  28 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/04.jpg">
  29 + <div class="img-box">
  30 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/05.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/160428/06.jpg">
  35 + <a class="href href-center" href="{{url_mycoupon}}"></a>
  36 + </div>
  37 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/line-2.jpg">
  38 +
  39 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/07.jpg">
  40 + <div class="img-box">
  41 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/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/160428/09.jpg">
  47 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12345"></span>
  48 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12346"></span>
  49 + </div>
  50 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/line-1.jpg">
  51 + <div class="img-box">
  52 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/10.jpg">
  53 + <a class="href href-left" href="{{url_more}}"></a>
  54 + <a class="href href-right" href="{{url_more}}"></a>
  55 + </div>
  56 + <div class="img-box">
  57 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/11.jpg">
  58 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12347"></span>
  59 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12348"></span>
  60 + </div>
  61 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/line-1.jpg">
  62 + <div class="img-box">
  63 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/12.jpg">
  64 + <a class="href href-left" href="{{url_1}}"></a>
  65 + <a class="href href-right" href="{{url_2}}"></a>
  66 + </div>
  67 + <div class="img-box">
  68 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/13.jpg">
  69 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12349"></span>
  70 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12350"></span>
  71 + </div>
  72 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/line-1.jpg">
  73 + <div class="img-box">
  74 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/14.jpg">
  75 + <a class="href href-left" href="{{url_3}}"></a>
  76 + <a class="href href-right" href="{{url_4}}"></a>
  77 + </div>
  78 + <div class="img-box">
  79 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/15.jpg">
  80 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12351"></span>
  81 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12352"></span>
  82 + </div>
  83 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/line-1.jpg">
  84 + <div class="img-box">
  85 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/16.jpg">
  86 + <a class="href href-left" href="{{url_5}}"></a>
  87 + <a class="href href-right" href="{{url_6}}"></a>
  88 + </div>
  89 + <div class="img-box">
  90 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/17.jpg">
  91 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="12353"></span>
  92 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="12354"></span>
  93 + </div>
  94 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/line-1.jpg">
  95 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/line-1.jpg">
  96 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/line-1.jpg">
  97 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/line-2.jpg">
  98 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/24-1.jpg">
  99 + <div class="img-box">
  100 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/24-2.jpg">
  101 + <a class="show-more" href="{{url_help}}"></a>
  102 + </div>
  103 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/24-3.jpg">
  104 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/line-2.jpg">
  105 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/25-1.jpg">
  106 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/25-2.jpg">
  107 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/25-3.jpg">
  108 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/26.jpg">
  109 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/27.jpg">
  110 + </div>
  111 + <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/jquery.min.js"></script>
  112 + <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/newuser/coupon2.js"></script>
  113 +</body>
  114 +</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/160428/01.jpg">
  25 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/02.jpg">
  26 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/03.jpg">
  27 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/line-1.jpg">
  28 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/04.jpg">
  29 + <div class="img-box">
  30 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/05.jpg">
  31 + <a class="href href-right"></a>
  32 + </div>
  33 + <div class="img-box">
  34 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/06.jpg">
  35 + <a class="href href-center" href="{{url_mycoupon}}"></a>
  36 + </div>
  37 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/line-2.jpg">
  38 +
  39 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/07.jpg">
  40 + <div class="img-box">
  41 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/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/160428/09.jpg">
  47 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="21649"></span>
  48 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="21651"></span>
  49 + </div>
  50 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/line-1.jpg">
  51 + <div class="img-box">
  52 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/10.jpg">
  53 + <a class="href href-left" href="{{url_more}}"></a>
  54 + <a class="href href-right" href="{{url_more}}"></a>
  55 + </div>
  56 + <div class="img-box">
  57 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/11.jpg">
  58 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="21655"></span>
  59 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="21657"></span>
  60 + </div>
  61 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/line-1.jpg">
  62 + <div class="img-box">
  63 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/12.jpg">
  64 + <a class="href href-left" href="{{url_1}}"></a>
  65 + <a class="href href-right" href="{{url_2}}"></a>
  66 + </div>
  67 + <div class="img-box">
  68 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/13.jpg">
  69 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="21659"></span>
  70 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="21661"></span>
  71 + </div>
  72 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/line-1.jpg">
  73 + <div class="img-box">
  74 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/14.jpg">
  75 + <a class="href href-left" href="{{url_3}}"></a>
  76 + <a class="href href-right" href="{{url_4}}"></a>
  77 + </div>
  78 + <div class="img-box">
  79 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/15.jpg">
  80 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="21663"></span>
  81 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="21665"></span>
  82 + </div>
  83 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/line-1.jpg">
  84 + <div class="img-box">
  85 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/16.jpg">
  86 + <a class="href href-left" href="{{url_5}}"></a>
  87 + <a class="href href-right" href="{{url_6}}"></a>
  88 + </div>
  89 + <div class="img-box">
  90 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/17.jpg">
  91 + <span class="href href-left get-coupon" href="{{jumpUrl}}" param="21669"></span>
  92 + <span class="href href-right get-coupon" href="{{jumpUrl}}" param="21667"></span>
  93 + </div>
  94 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/line-1.jpg">
  95 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/line-1.jpg">
  96 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/line-1.jpg">
  97 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/line-2.jpg">
  98 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/24-1.jpg">
  99 + <div class="img-box">
  100 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/24-2.jpg">
  101 + <a class="show-more" href="{{url_help}}"></a>
  102 + </div>
  103 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/24-3.jpg">
  104 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/line-2.jpg">
  105 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/25-1.jpg">
  106 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/25-2.jpg">
  107 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/25-3.jpg">
  108 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/26.jpg">
  109 + <img src="{{jsUrl}}/cuxiao/img/newuser/160428/27.jpg">
  110 + </div>
  111 + <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/jquery.min.js"></script>
  112 + <script type="text/javascript" src="{{jsUrl}}/cuxiao/js/newuser/coupon2.js"></script>
  113 +</body>
  114 +</html>
@@ -8,26 +8,7 @@ @@ -8,26 +8,7 @@
8 j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src= 8 j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
9 '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f); 9 '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
10 })(window,document,'script','dataLayer','GTM-W958MG'); 10 })(window,document,'script','dataLayer','GTM-W958MG');
11 - (function() {  
12 - var hm = document.createElement("script");  
13 - hm.src = "//hm.baidu.com/hm.js?c6ee7218b8321cb65fb2e98f284d8311";  
14 - hm.async = 1;  
15 - var s = document.getElementsByTagName("script")[0];  
16 - s.parentNode.insertBefore(hm, s);  
17 - })();  
18 - (function() {  
19 - var hm = document.createElement("script");  
20 - hm.src = "//hm.baidu.com/hm.js?65dd99e0435a55177ffda862198ce841";  
21 - hm.async = 1;  
22 - var s = document.getElementsByTagName("script")[0];  
23 - s.parentNode.insertBefore(hm, s);  
24 - })();  
25 - (function() {  
26 - var hm = document.createElement("script");  
27 - hm.src = "//hm.baidu.com/hm.js?e5b83a487a4458aa5abca43f5779b764";  
28 - var s = document.getElementsByTagName("script")[0];  
29 - s.parentNode.insertBefore(hm, s);  
30 - })(); 11 +
31 (function() { 12 (function() {
32 var hm = document.createElement("script"); 13 var hm = document.createElement("script");
33 hm.src = "http://static.yohobuy.com/js/analytics/analysis.js"; 14 hm.src = "http://static.yohobuy.com/js/analytics/analysis.js";
@@ -51,5 +32,4 @@ @@ -51,5 +32,4 @@
51 c.src=(f ? 'https' : 'http') + '://'+(f?'fm.ipinyou.com':'fm.p0y.cn')+'/j/t/adv.js'; 32 c.src=(f ? 'https' : 'http') + '://'+(f?'fm.ipinyou.com':'fm.p0y.cn')+'/j/t/adv.js';
52 var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h); 33 var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h);
53 }(document); 34 }(document);
54 -</script>  
55 -<script src="http://static.yohobuy.com/m/v1/js/om_code.js" async="async"></script>  
  35 +</script>
@@ -676,6 +676,60 @@ class CouponController extends HuodongAction @@ -676,6 +676,60 @@ class CouponController extends HuodongAction
676 )); 676 ));
677 } 677 }
678 678
  679 +
  680 + /**
  681 + * 新客领券（第5波）2016年4月26号上线
  682 + */
  683 + public function newuser5Action()
  684 + {
  685 + // 判断是否是应用访问, 拼接APP需要的URL参数
  686 + $isApp = null !== $this->get('app_version');
  687 + $isAppLogged = true;
  688 + if ($isApp) {
  689 + $isLogged = $this->get('uid') !== null;
  690 + $isAppLogged = $this->checkIsLogin();
  691 + } else {
  692 + $isLogged = $this->getUid();
  693 + }
  694 + $urlNewuser = Helpers::url('/cuxiao/coupon/newuser5');
  695 + $urlYohope = Helpers::url('/cuxiao/coupon/yohope');
  696 + $urlHelp = Helpers::url('/cuxiao/coupon/help');
  697 + $urlMycoupon = Helpers::url('/home/coupons', null, 'default');
  698 + $urlEncode = strtr($urlNewuser, array('/' => '\\/'));
  699 + $channel = $this->get('yh_channel', '1');
  700 + switch (strval($channel)) {
  701 + case '1':
  702 + $gender = '1,3';
  703 + break;
  704 + case '2':
  705 + $gender = '2,3';
  706 + break;
  707 + default:
  708 + $gender = '1,2,3';
  709 + }
  710 + $url = Helpers::url('/boys', array(), 'default') . '?openby:yohobuy={"action":"go.home","params":{"gender":"' . $gender . '","channel":"' . $channel . '"}}';
  711 +
  712 + $this->_view->display('newuser5', array(
  713 + 'activityId' => 604, //活动ID 604
  714 + 'staticTitle' => '新人潮这看，超值惊喜等你领', // 标题
  715 + 'jumpUrl' => $isAppLogged ? 'javascript:;' : $urlNewuser . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $urlEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}',
  716 + 'isLogged' => $isLogged ? 'Y' : 'N', // 标识是否登录
  717 + 'url_mycoupon' => $urlMycoupon . '?openby:yohobuy={"action":"go.coupon"}',
  718 + 'url_yohope' => $urlYohope . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlYohope . '","param":{}}}',
  719 + 'url_help' => $urlHelp . '?yohobuy={"action":"go.h5","params":{"islogin":"Y","type":0,"url":"' . $urlHelp . '","param":{}}}',
  720 + 'url_more' => $url,
  721 +
  722 + '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":"外套"}}',
  723 + '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":"春装"}}',
  724 + '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":"裙装"}}',
  725 + '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":"裤装"}}',
  726 + 'url_5' => 'http://list.m.yohobuy.com/?msort=7,8&openby:yohobuy={"action":"go.list","params":{"msort":"7,8","title":"包配"}}',
  727 + 'url_6' => 'http://list.m.yohobuy.com/?msort=10&openby:yohobuy={"action":"go.list","params":{"msort":"10","title":"创意生活"}}'
  728 + ));
  729 + }
  730 +
  731 +
  732 +
679 /** 733 /**
680 * 新客领券YOHOPE 734 * 新客领券YOHOPE
681 * 735 *
@@ -191,7 +191,7 @@ class IndexModel @@ -191,7 +191,7 @@ class IndexModel
191 $result = Cache::get($key, 'master'); 191 $result = Cache::get($key, 'master');
192 if (empty($result)) { 192 if (empty($result)) {
193 // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存 193 // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
194 - Cache::set($key, $data, 3600); 194 + Cache::set($key, $data, 300);
195 } 195 }
196 } 196 }
197 } 197 }
@@ -299,7 +299,7 @@ class IndexModel @@ -299,7 +299,7 @@ class IndexModel
299 $result = Cache::get($key, 'master'); 299 $result = Cache::get($key, 'master');
300 if (empty($result)) { 300 if (empty($result)) {
301 // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存 301 // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
302 - Cache::set($key, $article, 3600); 302 + Cache::set($key, $article, 300);
303 } 303 }
304 } 304 }
305 } 305 }
@@ -57,7 +57,7 @@ class ListModel @@ -57,7 +57,7 @@ class ListModel
57 } 57 }
58 // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存 58 // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
59 else { 59 else {
60 - Cache::set($key, $result, 1800); // 缓存30分钟 60 + Cache::set($key, $result, 300); // 缓存5分钟
61 } 61 }
62 } 62 }
63 63
@@ -140,7 +140,7 @@ class ListModel @@ -140,7 +140,7 @@ class ListModel
140 } 140 }
141 // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存 141 // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
142 else { 142 else {
143 - Cache::set($key, $result, 1800); // 缓存30分钟 143 + Cache::set($key, $result, 300); // 缓存5分钟
144 } 144 }
145 } 145 }
146 146
@@ -58,7 +58,7 @@ class SearchModel @@ -58,7 +58,7 @@ class SearchModel
58 } 58 }
59 // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存 59 // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
60 else { 60 else {
61 - Cache::set($key, $result, 1800); // 缓存30分钟 61 + Cache::set($key, $result, 300); // 缓存5分钟
62 } 62 }
63 } 63 }
64 64
@@ -116,7 +116,7 @@ class SearchModel @@ -116,7 +116,7 @@ class SearchModel
116 } 116 }
117 // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存 117 // 接口调用正常,数据封装完成, 则设置一级(master)和二级(slave)数据缓存
118 else { 118 else {
119 - Cache::set($key, $result, 1800); // 缓存30分钟 119 + Cache::set($key, $result, 300); // 缓存5分钟
120 } 120 }
121 } 121 }
122 122
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "1.3.17" 53 +application.version = "1.3.19"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "1.3.17" 53 +application.version = "1.3.19"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "1.3.17" 53 +application.version = "1.3.19"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"
@@ -50,7 +50,7 @@ application.template.ext = ".phtml" @@ -50,7 +50,7 @@ application.template.ext = ".phtml"
50 application.assets.path = ROOT_PATH "/assets" 50 application.assets.path = ROOT_PATH "/assets"
51 51
52 ; 应用的版本号 52 ; 应用的版本号
53 -application.version = "1.3.17" 53 +application.version = "1.3.19"
54 54
55 ; 网站SEO信息 55 ; 网站SEO信息
56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停" 56 application.seo.title = "Yoho!Buy有货 | 潮流购物逛不停"