fe / YOHOBUYPC · Commits

Go to a project

Authored by 梁志锋
Commit 5ec94a36da31ef1981e37ba2a77caa356d1fa1f2 2 parents 96ee5760 8e22d5f4

merge https 分支

Inline Side-by-side
Showing 48 changed files with 302 additions and 222 deletions
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <html> 2 <html>
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 -<title>找回密码-通过邮箱 | Yoho!Buy有货</title> 5 +<title>找回密码-通过邮箱 | Yoho!Buy有货 | 潮流购物逛不停</title>
6 <meta name="keywords" content="Yoho! 有货官网,潮流志,潮流男装,潮牌,美国潮牌,日本潮牌,香港潮牌,潮牌店,新品首发,欧美潮流,全球购,代购,时尚,流行,特卖,B2C,正品,购物网站,网上购物,货到付款"> 6 <meta name="keywords" content="Yoho! 有货官网,潮流志,潮流男装,潮牌,美国潮牌,日本潮牌,香港潮牌,潮牌店,新品首发,欧美潮流,全球购,代购,时尚,流行,特卖,B2C,正品,购物网站,网上购物,货到付款">
7 <meta name="description" content="YOHO! 有货，年轻人潮流购物中心，中国最大的潮流商品购物网站。100%品牌正品保证，支持货到付款。作为YOHO!旗下的购物平台，汇集了全球潮流时尚商品和中国最流行的商品，也是国内最大的原创文化商品平台，也是香港，台湾地区流行商品的集中地。同时包含日本、韩国等众多国外潮流品牌，带给您全新潮流购物体验。"> 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"> 8 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
@@ -22,69 +22,94 @@ @@ -22,69 +22,94 @@
22 }()); 22 }());
23 })(document, window); 23 })(document, window);
24 </script> 24 </script>
25 -<link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/1.1.2/index.css"> 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.13/index.css">
  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)">
  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)">
26 </head> 33 </head>
27 <body class=passport-body> 34 <body class=passport-body>
28 - <div class="back-email-page passport-page yoho-page"> 35 +<div class="back-email-page passport-page yoho-page">
29 <div class="header"> 36 <div class="header">
30 - <a class="go-back" href="/signin.html"></a>  
31 - <p class="title">找回密码</p>  
32 - </div>  
33 - <div class="content"> 37 + <a class="go-back" href="//m.yohobuy.com/signin.html"></a>
  38 + <p class="title">找回密码</p>
  39 + </div> <div class="content">
34 <div class="input-container row has-clear"> 40 <div class="input-container row has-clear">
35 <input id="email" class="input email" type="text" placeholder="请输入邮箱" autocomplete="off"> 41 <input id="email" class="input email" type="text" placeholder="请输入邮箱" autocomplete="off">
36 </div> 42 </div>
37 <span id="btn-sure" class="btn btn-sure disable row">确定</span> 43 <span id="btn-sure" class="btn btn-sure disable row">确定</span>
38 </div> 44 </div>
39 </div> 45 </div>
40 -<script src="http://cdn.yoho.cn/myohobuy/1.1.2/lib.js"></script>  
41 -<script src="http://cdn.yoho.cn/myohobuy/1.1.2/index.js"></script>  
42 46
43 -<script type="text/javascript">  
44 - (function(w,d,s,j,f){  
45 - w['YohoAcquisitionObject']=f;  
46 - w[f]=function(){w[f].p=arguments;};  
47 - var a=d.createElement(s);  
48 - var m=d.getElementsByTagName(s)[0];  
49 - a.async=1;  
50 - a.src=j;  
51 - m.parentNode.insertBefore(a,m);  
52 - })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.8/yas.js','_yas');  
53 -</script> 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>
54 <script> 52 <script>
55 seajs.use('js/common'); 53 seajs.use('js/common');
56 </script> 54 </script>
57 <script> 55 <script>
58 seajs.use('js/passport/back/email'); 56 seajs.use('js/passport/back/email');
59 </script> 57 </script>
60 - <!-- Google Tag Manager -->  
61 - <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>  
62 - <script>  
63 - (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':  
64 - new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],  
65 - j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=  
66 - '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);  
67 - })(window,document,'script','dataLayer','GTM-W958MG');  
68 - </script>  
69 - <!-- End Google Tag Manager -->  
70 -<script type="text/javascript">  
71 - var _hmt = _hmt || [];  
72 - (function() {  
73 - var hm = document.createElement("script");  
74 - hm.src = "//hm.baidu.com/hm.js?c6ee7218b8321cb65fb2e98f284d8311";  
75 - var s = document.getElementsByTagName("script")[0];  
76 - s.parentNode.insertBefore(hm, s);  
77 - })();  
78 -</script>  
79 58
  59 +
  60 +<!-- Google Tag Manager -->
  61 +<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
80 <script> 62 <script>
81 var _hmt = _hmt || []; 63 var _hmt = _hmt || [];
82 - (function() {  
83 - var hm = document.createElement("script");  
84 - hm.src = "//hm.baidu.com/hm.js?65dd99e0435a55177ffda862198ce841";  
85 - var s = document.getElementsByTagName("script")[0];  
86 - s.parentNode.insertBefore(hm, s);  
87 - })(); 64 + function async_load(){
  65 + (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
  66 + new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
  67 + 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);
  69 + })(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 + })();
  90 + (function() {
  91 + var hm = document.createElement("script");
  92 + hm.src = "//static.yohobuy.com/js/analytics/analysis.js";
  93 + hm.async = 1;
  94 + var s = document.getElementsByTagName("script")[0];
  95 + s.parentNode.insertBefore(hm, s);
  96 + })();
  97 + }
  98 + window.addEventListener('load', async_load, false);
  99 +</script>
  100 +<script>
  101 + window._py = window._py||[];
  102 + window._py.push(['a', 'MC..o8vMMWxEXDCiqYckD81lUX']);
  103 + window._py.push(['domain','stats.ipinyou.com']);
  104 + window._py.push(['e','']);
  105 + if(typeof _goodsData!='undefined'){
  106 + window._py.push(['pi',_goodsData]);
  107 + }
  108 + -function(d){
  109 + var f = 'https:' == d.location.protocol;var c = d.createElement('script');c.type='text/javascript';c.async=1;
  110 + c.src=(f ? 'https' : 'http') + '://'+(f?'fm.ipinyou.com':'fm.p0y.cn')+'/j/t/adv.js';
  111 + var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h);
  112 + }(document);
88 </script> 113 </script>
89 -</body> 114 +<script src="//static.yohobuy.com/m/v1/js/om_code.js" async="async"></script></body>
90 </html> 115 </html>
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <html> 2 <html>
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 -<title>找回密码-通过手机号 | Yoho!Buy有货</title> 5 +<title>找回密码-通过手机号 | Yoho!Buy有货 | 潮流购物逛不停</title>
6 <meta name="keywords" content="Yoho! 有货官网,潮流志,潮流男装,潮牌,美国潮牌,日本潮牌,香港潮牌,潮牌店,新品首发,欧美潮流,全球购,代购,时尚,流行,特卖,B2C,正品,购物网站,网上购物,货到付款"> 6 <meta name="keywords" content="Yoho! 有货官网,潮流志,潮流男装,潮牌,美国潮牌,日本潮牌,香港潮牌,潮牌店,新品首发,欧美潮流,全球购,代购,时尚,流行,特卖,B2C,正品,购物网站,网上购物,货到付款">
7 <meta name="description" content="YOHO! 有货，年轻人潮流购物中心，中国最大的潮流商品购物网站。100%品牌正品保证，支持货到付款。作为YOHO!旗下的购物平台，汇集了全球潮流时尚商品和中国最流行的商品，也是国内最大的原创文化商品平台，也是香港，台湾地区流行商品的集中地。同时包含日本、韩国等众多国外潮流品牌，带给您全新潮流购物体验。"> 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"> 8 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
@@ -22,13 +22,20 @@ @@ -22,13 +22,20 @@
22 }()); 22 }());
23 })(document, window); 23 })(document, window);
24 </script> 24 </script>
25 -<link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/1.1.2/index.css"> 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.13/index.css">
  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)">
  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)">
26 </head> 33 </head>
27 <body class=passport-body> 34 <body class=passport-body>
28 - <div class="back-mobile-page passport-page yoho-page"> 35 +<div class="back-mobile-page passport-page yoho-page">
29 <div class="header"> 36 <div class="header">
30 - <a class="go-back" href=/signin.html></a>  
31 - <p class="title">找回密码</p> 37 + <a class="go-back" href="//m.yohobuy.com/signin.html"></a>
  38 + <p class="title">找回密码</p>
32 </div> <div class="content"> 39 </div> <div class="content">
33 <div class="select-container row"> 40 <div class="select-container row">
34 <span class="select-title">国家和地区</span> 41 <span class="select-title">国家和地区</span>
@@ -48,27 +55,18 @@ @@ -48,27 +55,18 @@
48 </select> 55 </select>
49 <div class="arrow-right"></div> 56 <div class="arrow-right"></div>
50 </div> <div class="input-container phone-container row has-clear"> 57 </div> <div class="input-container phone-container row has-clear">
51 - <span id="area-code" class="area-code"></span> 58 + <span id="area-code" class="area-code">+86</span>
52 <input id="phone-num" class="input phone-num" type="text" placeholder="手机号"> 59 <input id="phone-num" class="input phone-num" type="text" placeholder="手机号">
53 </div> 60 </div>
54 <span id="btn-next" class="btn btn-next disable row">下一步</span> 61 <span id="btn-next" class="btn btn-next disable row">下一步</span>
55 </div> 62 </div>
56 </div> 63 </div>
57 64
58 -<script src="http://cdn.yoho.cn/myohobuy/1.1.2/lib.js"></script>  
59 -<script src="http://cdn.yoho.cn/myohobuy/1.1.2/index.js"></script>  
60 65
61 -<script type="text/javascript">  
62 - (function(w,d,s,j,f){  
63 - w['YohoAcquisitionObject']=f;  
64 - w[f]=function(){w[f].p=arguments;};  
65 - var a=d.createElement(s);  
66 - var m=d.getElementsByTagName(s)[0];  
67 - a.async=1;  
68 - a.src=j;  
69 - m.parentNode.insertBefore(a,m);  
70 - })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.8/yas.js','_yas');  
71 -</script> 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>
72 <script> 70 <script>
73 seajs.use('js/common'); 71 seajs.use('js/common');
74 </script> 72 </script>
@@ -76,35 +74,60 @@ @@ -76,35 +74,60 @@
76 seajs.use('js/passport/back/mobile'); 74 seajs.use('js/passport/back/mobile');
77 </script> 75 </script>
78 76
79 - <!-- Google Tag Manager -->  
80 - <noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>  
81 - <script>  
82 - (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':  
83 - new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],  
84 - j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=  
85 - '//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);  
86 - })(window,document,'script','dataLayer','GTM-W958MG');  
87 - </script>  
88 - <!-- End Google Tag Manager -->  
89 77
90 -<script type="text/javascript"> 78 +<!-- Google Tag Manager -->
  79 +<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-W958MG" height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
  80 +<script>
91 var _hmt = _hmt || []; 81 var _hmt = _hmt || [];
92 - (function() {  
93 - var hm = document.createElement("script");  
94 - hm.src = "//hm.baidu.com/hm.js?c6ee7218b8321cb65fb2e98f284d8311";  
95 - var s = document.getElementsByTagName("script")[0];  
96 - s.parentNode.insertBefore(hm, s);  
97 - })(); 82 + function async_load(){
  83 + (function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
  84 + new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
  85 + 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);
  87 + })(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 + })();
  108 + (function() {
  109 + var hm = document.createElement("script");
  110 + hm.src = "//static.yohobuy.com/js/analytics/analysis.js";
  111 + hm.async = 1;
  112 + var s = document.getElementsByTagName("script")[0];
  113 + s.parentNode.insertBefore(hm, s);
  114 + })();
  115 + }
  116 + window.addEventListener('load', async_load, false);
98 </script> 117 </script>
99 -  
100 <script> 118 <script>
101 - var _hmt = _hmt || [];  
102 - (function() {  
103 - var hm = document.createElement("script");  
104 - hm.src = "//hm.baidu.com/hm.js?65dd99e0435a55177ffda862198ce841";  
105 - var s = document.getElementsByTagName("script")[0];  
106 - s.parentNode.insertBefore(hm, s);  
107 - })(); 119 + window._py = window._py||[];
  120 + window._py.push(['a', 'MC..o8vMMWxEXDCiqYckD81lUX']);
  121 + window._py.push(['domain','stats.ipinyou.com']);
  122 + window._py.push(['e','']);
  123 + if(typeof _goodsData!='undefined'){
  124 + window._py.push(['pi',_goodsData]);
  125 + }
  126 + -function(d){
  127 + var f = 'https:' == d.location.protocol;var c = d.createElement('script');c.type='text/javascript';c.async=1;
  128 + c.src=(f ? 'https' : 'http') + '://'+(f?'fm.ipinyou.com':'fm.p0y.cn')+'/j/t/adv.js';
  129 + var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h);
  130 + }(document);
108 </script> 131 </script>
109 -</body> 132 +<script src="//static.yohobuy.com/m/v1/js/om_code.js" async="async"></script></body>
110 </html> 133 </html>
@@ -96,7 +96,11 @@ class BrandData @@ -96,7 +96,11 @@ class BrandData
96 // 构建必传参数 96 // 构建必传参数
97 $param = Yohobuy::param(); 97 $param = Yohobuy::param();
98 $param['brand_id'] = $brandId; 98 $param['brand_id'] = $brandId;
99 - $param['uid'] = $uid; 99 +
  100 + if (!empty($uid)) {
  101 + $param['uid'] = $uid;
  102 + }
  103 +
100 $param['method'] = 'app.brand.getBrandIntro'; 104 $param['method'] = 'app.brand.getBrandIntro';
101 $param['client_secret'] = Sign::getSign($param); 105 $param['client_secret'] = Sign::getSign($param);
102 106
@@ -198,12 +198,18 @@ class PlusstarData @@ -198,12 +198,18 @@ class PlusstarData
198 $result['getArticleByBrand'] = empty($article['data']) ? array() : $article['data']; 198 $result['getArticleByBrand'] = empty($article['data']) ? array() : $article['data'];
199 // file_put_contents('../../../../../../Desktop/app/n/getArticleByBrand.txt', var_export($result['getArticleByBrand'], true)); 199 // file_put_contents('../../../../../../Desktop/app/n/getArticleByBrand.txt', var_export($result['getArticleByBrand'], true));
200 200
201 -// // 是否收藏店铺  
202 -// if ($isUidOk) {  
203 -// Yohobuy::yarConcurrentCall(Yohobuy::SERVICE_URL . self::URI_BRANDINFO_FAVORITE, 'getUidBrandFav', array($uid, $brandInfo['data']['brand_id']), function($retval) use(&$result) {  
204 -// $result['getUidBrandFav'] = (isset($retval['message']) && $retval['message'] == 'favorite') ? true : false;  
205 -// });  
206 -// } 201 + // 是否收藏店铺
  202 + $param = Yohobuy::param();
  203 + $param['uid'] = $uid;
  204 + $param['brandId'] = $brandInfo['data']['brand_id'];
  205 + $param['client_type'] = $clientType;
  206 + $param['private_key'] = Yohobuy::$privateKeyList[$clientType];
  207 + $param['client_secret'] = Sign::getSign($param);
  208 + $uidBrandFavRes = Yohobuy::get(Yohobuy::SERVICE_URL . self::URI_BRANDINFO_FAVORITE . 'getUidBrandFav', $param);
  209 +
  210 + if (isset($uidBrandFavRes['code']) && $uidBrandFavRes['code'] == 200) {
  211 + $result['getUidBrandFav'] = true;
  212 + }
207 // 相关资讯列表 (3篇) 213 // 相关资讯列表 (3篇)
208 // $result['getArticleByBrand'] = array(); 214 // $result['getArticleByBrand'] = array();
209 // Yohobuy::yarConcurrentCall(Yohobuy::PRD_SERVICE_URL . self::URI_BRANDINFO_ARTICLE, 'getArticleByBrand', array($brandInfo['data']['brand_id'], 3, $udid), function($retval) use(&$result) { 215 // Yohobuy::yarConcurrentCall(Yohobuy::PRD_SERVICE_URL . self::URI_BRANDINFO_ARTICLE, 'getArticleByBrand', array($brandInfo['data']['brand_id'], 3, $udid), function($retval) use(&$result) {
@@ -24,16 +24,16 @@ class Helpers @@ -24,16 +24,16 @@ class Helpers
24 24
25 switch ($module) { 25 switch ($module) {
26 case 'default': 26 case 'default':
27 - $url = 'http://m.yohobuy.com'; 27 + $url = '//m.yohobuy.com';
28 break; 28 break;
29 case 'guang': // 逛 29 case 'guang': // 逛
30 - $url = 'http://guang' . SUB_DOMAIN; 30 + $url = '//guang' . SUB_DOMAIN;
31 break; 31 break;
32 case 'list': // 商品列表 32 case 'list': // 商品列表
33 - $url = 'http://list' . SUB_DOMAIN; 33 + $url = '//list' . SUB_DOMAIN;
34 break; 34 break;
35 case 'search': // 搜索 35 case 'search': // 搜索
36 - $url = 'http://search' . SUB_DOMAIN; 36 + $url = '//search' . SUB_DOMAIN;
37 break; 37 break;
38 case 'index': // 默认 38 case 'index': // 默认
39 $url = SITE_MAIN; 39 $url = SITE_MAIN;
@@ -41,7 +41,7 @@ class Helpers @@ -41,7 +41,7 @@ class Helpers
41 case '': // 相对地址 41 case '': // 相对地址
42 break; 42 break;
43 default: // 其它子域名 43 default: // 其它子域名
44 - $url = 'http://' . $module . SUB_DOMAIN; 44 + $url = '//' . $module . SUB_DOMAIN;
45 } 45 }
46 $url .= $uri; 46 $url .= $uri;
47 if (!empty($param)) { 47 if (!empty($param)) {
@@ -62,7 +62,7 @@ class Helpers @@ -62,7 +62,7 @@ class Helpers
62 */ 62 */
63 public static function getImageUrl($url, $width, $height, $mode = 2) 63 public static function getImageUrl($url, $width, $height, $mode = 2)
64 { 64 {
65 - return strtr($url, array('{width}' => $width, '{height}' => $height, '{mode}' => $mode)); 65 + return strtr($url, array('{width}' => $width, '{height}' => $height, '{mode}' => $mode, 'http://' => '//'));
66 } 66 }
67 67
68 /** 68 /**
@@ -74,6 +74,7 @@ class Helpers @@ -74,6 +74,7 @@ class Helpers
74 public static function getFilterUrl($url) 74 public static function getFilterUrl($url)
75 { 75 {
76 $url = strtr($url, array('.m.yohobuy.com' => SUB_DOMAIN, OLD_MAIN => SITE_MAIN, 'www.yohobuy.com' => SITE_MAIN)); 76 $url = strtr($url, array('.m.yohobuy.com' => SUB_DOMAIN, OLD_MAIN => SITE_MAIN, 'www.yohobuy.com' => SITE_MAIN));
  77 + //$url = strtr($url, array('http://' => '//'));
77 $filter = strstr($url, 'openby:yohobuy=', true); 78 $filter = strstr($url, 'openby:yohobuy=', true);
78 if ($filter) { 79 if ($filter) {
79 return rtrim(rtrim($filter, '?'), '&'); 80 return rtrim(rtrim($filter, '?'), '&');
@@ -353,6 +354,10 @@ class Helpers @@ -353,6 +354,10 @@ class Helpers
353 $articleData['author']['url'] = Helpers::getFilterUrl($articleData['author']['url']); 354 $articleData['author']['url'] = Helpers::getFilterUrl($articleData['author']['url']);
354 } 355 }
355 $result['author'] = $articleData['author']; 356 $result['author'] = $articleData['author'];
  357 +
  358 + if (isset($result['author']['avatar'])) {
  359 + $result['author']['avatar'] = strtr($result['author']['avatar'], array('http://' => '//'));
  360 + }
356 } 361 }
357 362
358 // 模板中需要的标签标识 363 // 模板中需要的标签标识
@@ -809,10 +814,10 @@ class Helpers @@ -809,10 +814,10 @@ class Helpers
809 $url = 'https://login.m.yohobuy.com'; 814 $url = 'https://login.m.yohobuy.com';
810 break; 815 break;
811 case 'testing': 816 case 'testing':
812 - $url = 'http://m1.yohobuy.com'; 817 + $url = 'https://login.m.yohobuy.com'; //http://m1.yohobuy.com 没有https时
813 break; 818 break;
814 default: 819 default:
815 - $url = 'http://m1.yohobuy.com'; 820 + $url = 'https://login.m.yohobuy.com';
816 break; 821 break;
817 } 822 }
818 $url .= '/Passport/session/index?callback=' . $callback . '&sign=' . md5(md5($uid . 'Js8Yn0!EwPM45-ws')) . '&uid=' . $uid . '&go=' . $refer; 823 $url .= '/Passport/session/index?callback=' . $callback . '&sign=' . md5(md5($uid . 'Js8Yn0!EwPM45-ws')) . '&uid=' . $uid . '&go=' . $refer;
@@ -51,7 +51,7 @@ class Images @@ -51,7 +51,7 @@ class Images
51 return $fileName; 51 return $fileName;
52 } 52 }
53 $domain = self::getDomain($bucket, $fileName); 53 $domain = self::getDomain($bucket, $fileName);
54 - return 'http://' . $domain . '/' . $bucket . $fileName; 54 + return '//' . $domain . '/' . $bucket . $fileName;
55 } 55 }
56 56
57 /** 57 /**
@@ -71,7 +71,7 @@ class Images @@ -71,7 +71,7 @@ class Images
71 if (stripos($fileName, 'http://') !== 0) { 71 if (stripos($fileName, 'http://') !== 0) {
72 $fileName = self::template($fileName, $bucket, $mode); 72 $fileName = self::template($fileName, $bucket, $mode);
73 } 73 }
74 - return strtr($fileName, array('{width}' => $width, '{height}' => $height, '{mode}' => $mode)); 74 + return strtr($fileName, array('{width}' => $width, '{height}' => $height, '{mode}' => $mode, 'http://' => '//'));
75 } 75 }
76 76
77 /** 77 /**
@@ -5,7 +5,7 @@ defined('SITE_MAIN') || define('SITE_MAIN', $_SERVER['HTTP_HOST']); @@ -5,7 +5,7 @@ defined('SITE_MAIN') || define('SITE_MAIN', $_SERVER['HTTP_HOST']);
5 return array( 5 return array(
6 'appid' => '100229394', 6 'appid' => '100229394',
7 'appkey' => 'c0af9c29e0900813028c2ccb42021792', 7 'appkey' => 'c0af9c29e0900813028c2ccb42021792',
8 - 'callback' => SITE_MAIN . '/passport/login/qqcallback', 8 + 'callback' => strtr(SITE_MAIN, array('//' => 'http://')) . '/passport/login/qqcallback',
9 'scope' => 'get_user_info,add_share,upload_pic,get_idollist,get_fanslist', 9 'scope' => 'get_user_info,add_share,upload_pic,get_idollist,get_fanslist',
10 'errorReport' => true, 10 'errorReport' => true,
11 ); 11 );
@@ -5,5 +5,5 @@ defined('SITE_MAIN') || define('SITE_MAIN', $_SERVER['HTTP_HOST']); @@ -5,5 +5,5 @@ defined('SITE_MAIN') || define('SITE_MAIN', $_SERVER['HTTP_HOST']);
5 return array( 5 return array(
6 'appId' => '3739328910', 6 'appId' => '3739328910',
7 'appKey' => '9d44cded26d048e23089e5e975c93df1', 7 'appKey' => '9d44cded26d048e23089e5e975c93df1',
8 - 'appCallbackUrl' => SITE_MAIN . '/passport/login/sinacallback', 8 + 'appCallbackUrl' => strtr(SITE_MAIN, array('//' => 'http://')) . '/passport/login/sinacallback',
9 ); 9 );
@@ -34,7 +34,7 @@ server @@ -34,7 +34,7 @@ server
34 location ^~ /dist/ { 34 location ^~ /dist/ {
35 proxy_redirect off; 35 proxy_redirect off;
36 proxy_set_header X-Real-IP $remote_addr; 36 proxy_set_header X-Real-IP $remote_addr;
37 - proxy_pass http://cdn.yoho.cn/; 37 + proxy_pass https://cdn.yoho.cn/;
38 } 38 }
39 39
40 location = /Passport/session/index { 40 location = /Passport/session/index {
@@ -3,7 +3,6 @@ @@ -3,7 +3,6 @@
3 * @author: xuqi<qi.xu@yoho.cn> 3 * @author: xuqi<qi.xu@yoho.cn>
4 * @date: 2015/10/20 4 * @date: 2015/10/20
5 */ 5 */
6 -  
7 var $ = require('jquery'), 6 var $ = require('jquery'),
8 ellipsis = require('mlellipsis'), 7 ellipsis = require('mlellipsis'),
9 Hammer = require('yoho.hammer'); 8 Hammer = require('yoho.hammer');
@@ -216,7 +215,7 @@ $('.btn-balance').on('touchend', function() { @@ -216,7 +215,7 @@ $('.btn-balance').on('touchend', function() {
216 } 215 }
217 }); 216 });
218 217
219 -$('.off-shell-goods').on('touchstart touchend', function() { 218 +$('.off-shell-goods').on('touchstart touchend', function(e) {
220 var $this = $(e.target).closest('span'); 219 var $this = $(e.target).closest('span');
221 220
222 if ($this.hasClass('icon-del')) { 221 if ($this.hasClass('icon-del')) {
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 * @date: 2015/10/21 5 * @date: 2015/10/21
6 */ 6 */
7 7
  8 +
8 // bikai 9 // bikai
9 // 增加init函数，异步请求的接口需要重新初始化一下选择列表 10 // 增加init函数，异步请求的接口需要重新初始化一下选择列表
10 // 异步渲染的模板统一插入 #chose-panel ,兼容页面多个选择框 11 // 异步渲染的模板统一插入 #chose-panel ,兼容页面多个选择框
@@ -152,17 +152,17 @@ function reMarginFooter(fixedElement) { @@ -152,17 +152,17 @@ function reMarginFooter(fixedElement) {
152 152
153 //未登录 153 //未登录
154 $op.prepend( 154 $op.prepend(
155 - '<a href="http://m.yohobuy.com/signin.html?refer=' + location.href + '">登录</a>' + 155 + '<a href="//m.yohobuy.com/signin.html?refer=' + location.href + '">登录</a>' +
156 '<span class="sep-line">|</span>' + 156 '<span class="sep-line">|</span>' +
157 - '<a href="http://m.yohobuy.com/reg.html">注册</a>' 157 + '<a href="//m.yohobuy.com/reg.html">注册</a>'
158 ); 158 );
159 } else { 159 } else {
160 160
161 //已登录 161 //已登录
162 $op.prepend( 162 $op.prepend(
163 '<span>Hi,</span>' + 163 '<span>Hi,</span>' +
164 - '<a class="user-name" href="http://m.yohobuy.com/home?tmp=' + Math.random() + '">' + user[0] + '</a>' +  
165 - '<a href="http://m.yohobuy.com/passport/signout/index?token=' + user[3] + '">退出</a>' 164 + '<a class="user-name" href="//m.yohobuy.com/home?tmp=' + Math.random() + '">' + user[0] + '</a>' +
  165 + '<a href="//m.yohobuy.com/passport/signout/index?token=' + user[3] + '">退出</a>'
166 ); 166 );
167 } 167 }
168 168
@@ -191,7 +191,7 @@ function reMarginFooter(fixedElement) { @@ -191,7 +191,7 @@ function reMarginFooter(fixedElement) {
191 a.async = 1; 191 a.async = 1;
192 a.src = j; 192 a.src = j;
193 m.parentNode.insertBefore(a, m); 193 m.parentNode.insertBefore(a, m);
194 -})(window, document, 'script', 'http://cdn.yoho.cn/yas-jssdk/1.0.14/yas.js', '_yas'); 194 +})(window, document, 'script', '//cdn.yoho.cn/yas-jssdk/1.0.14/yas.js', '_yas');
195 195
196 (function() { 196 (function() {
197 var uid = getUid(); 197 var uid = getUid();
@@ -44,7 +44,7 @@ $('.nav-btn').on('touchstart', function() { @@ -44,7 +44,7 @@ $('.nav-btn').on('touchstart', function() {
44 return false; 44 return false;
45 }); 45 });
46 46
47 -function hideSideBar() { 47 +function hideSideBar(){
48 openSideNav = false; 48 openSideNav = false;
49 if ($mobileWrap.hasClass('menu-open')) { 49 if ($mobileWrap.hasClass('menu-open')) {
50 $mobileWrap.removeClass('menu-open'); 50 $mobileWrap.removeClass('menu-open');
@@ -9,7 +9,6 @@ @@ -9,7 +9,6 @@
9 background: rgba(0,0,0,.3); 9 background: rgba(0,0,0,.3);
10 z-index:3; 10 z-index:3;
11 11
12 -  
13 .main { 12 .main {
14 position: absolute; 13 position: absolute;
15 height: pxToRem(610px); 14 height: pxToRem(610px);
@@ -169,6 +168,7 @@ @@ -169,6 +168,7 @@
169 margin-left: -1px; 168 margin-left: -1px;
170 } 169 }
171 170
  171 +
172 .btn-wrap { 172 .btn-wrap {
173 position: relative; 173 position: relative;
174 height: 120rem / $pxConvertRem; 174 height: 120rem / $pxConvertRem;
@@ -124,7 +124,7 @@ $border_color_light: #eee; @@ -124,7 +124,7 @@ $border_color_light: #eee;
124 a { 124 a {
125 img { 125 img {
126 width: 100%; 126 width: 100%;
127 - height: 100%; 127 + height: auto;
128 } 128 }
129 } 129 }
130 } 130 }
@@ -23,71 +23,71 @@ @@ -23,71 +23,71 @@
23 </head> 23 </head>
24 <body> 24 <body>
25 <div id="wrapper"> 25 <div id="wrapper">
26 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/01.jpg">  
27 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/02.jpg">  
28 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/03.jpg"> 26 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/01.jpg">
  27 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/02.jpg">
  28 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/03.jpg">
29 <div class="img-box"> 29 <div class="img-box">
30 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/04.jpg"> 30 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/04.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 - <a href="{{url_mycoupon}}"><img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/05.jpg"></a>  
34 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/06.jpg">  
35 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/07.jpg"> 33 + <a href="{{url_mycoupon}}"><img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/05.jpg"></a>
  34 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/06.jpg">
  35 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/07.jpg">
36 <div class="img-box"> 36 <div class="img-box">
37 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/08.jpg"> 37 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/08.jpg">
38 <a class="href href-left" href="{{url_60}}"></a> 38 <a class="href href-left" href="{{url_60}}"></a>
39 <a class="href href-right" href="{{url_710}}"></a> 39 <a class="href href-right" href="{{url_710}}"></a>
40 </div> 40 </div>
41 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg"> 41 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
42 <div class="img-box"> 42 <div class="img-box">
43 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/09.jpg"> 43 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/09.jpg">
44 <a class="href href-left" href="{{url_138}}"></a> 44 <a class="href href-left" href="{{url_138}}"></a>
45 <a class="href href-right" href="{{url_495}}"></a> 45 <a class="href href-right" href="{{url_495}}"></a>
46 </div> 46 </div>
47 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg"> 47 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
48 <div class="img-box"> 48 <div class="img-box">
49 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/10.jpg"> 49 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/10.jpg">
50 <a class="href href-left" href="{{url_419}}"></a> 50 <a class="href href-left" href="{{url_419}}"></a>
51 <a class="href href-right" href="{{url_868}}"></a> 51 <a class="href href-right" href="{{url_868}}"></a>
52 </div> 52 </div>
53 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg"> 53 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
54 <div class="img-box"> 54 <div class="img-box">
55 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/11.jpg"> 55 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/11.jpg">
56 <a class="href href-left" href="{{url_1026}}"></a> 56 <a class="href href-left" href="{{url_1026}}"></a>
57 <a class="href href-right" href="{{url_1027}}"></a> 57 <a class="href href-right" href="{{url_1027}}"></a>
58 </div> 58 </div>
59 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg"> 59 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
60 <div class="img-box"> 60 <div class="img-box">
61 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/12.jpg"> 61 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/12.jpg">
62 <a class="href href-left" href="{{url_324}}"></a> 62 <a class="href href-left" href="{{url_324}}"></a>
63 <a class="href href-right" href="{{url_649}}"></a> 63 <a class="href href-right" href="{{url_649}}"></a>
64 </div> 64 </div>
65 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg"> 65 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
66 <div class="img-box"> 66 <div class="img-box">
67 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/13.jpg"> 67 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/13.jpg">
68 <a class="href href-left" href="{{url_more}}"></a> 68 <a class="href href-left" href="{{url_more}}"></a>
69 </div> 69 </div>
70 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">  
71 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/14.jpg">  
72 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg"> 70 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
  71 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/14.jpg">
  72 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
73 <div class="img-box"> 73 <div class="img-box">
74 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/15.jpg"> 74 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/15.jpg">
75 <a class="href-click" id="get-all-coupon" href="{{jumpUrl}}"></a> 75 <a class="href-click" id="get-all-coupon" href="{{jumpUrl}}"></a>
76 </div> 76 </div>
77 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">  
78 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/16.jpg">  
79 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/17.jpg">  
80 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/18.jpg"> 77 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
  78 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/16.jpg">
  79 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/17.jpg">
  80 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/18.jpg">
81 <div class="img-box"> 81 <div class="img-box">
82 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/19.jpg"> 82 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/19.jpg">
83 <a href="{{url_help}}" class="show-more"></a> 83 <a href="{{url_help}}" class="show-more"></a>
84 </div> 84 </div>
85 - <img class="lazy" data-original="http://static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg"> 85 + <img class="lazy" data-original="//static.buy.test.yoho.cn/img/cuxiao/newuser/00.jpg">
86 </div> 86 </div>
87 <div id="coupon-container" param="{{activityId}}"></div> 87 <div id="coupon-container" param="{{activityId}}"></div>
88 - <script src="http://static.buy.test.yoho.cn/js/cuxiao/jquery.min.js"></script>  
89 - <script src="http://static.buy.test.yoho.cn/js/cuxiao/jquery.lazyload.js"></script>  
90 - <script src="http://static.buy.test.yoho.cn/js/cuxiao/151201/coupon.mobile.js"></script> 88 + <script src="//static.buy.test.yoho.cn/js/cuxiao/jquery.min.js"></script>
  89 + <script src="//static.buy.test.yoho.cn/js/cuxiao/jquery.lazyload.js"></script>
  90 + <script src="//static.buy.test.yoho.cn/js/cuxiao/151201/coupon.mobile.js"></script>
91 <script> 91 <script>
92 $(function() { 92 $(function() {
93 $("img.lazy").lazyload({ 93 $("img.lazy").lazyload({
@@ -42,7 +42,7 @@ @@ -42,7 +42,7 @@
42 </a> 42 </a>
43 {{/notice.list}} 43 {{/notice.list}}
44 </div> 44 </div>
45 - {{/if}} --> 45 + {{/if}}-->
46 <div class="my-order"> 46 <div class="my-order">
47 <a class="order-title" href="/home/orders"> 47 <a class="order-title" href="/home/orders">
48 我的订单 48 我的订单
@@ -2,9 +2,8 @@ @@ -2,9 +2,8 @@
2 <div class="logistic-page yoho-page"> 2 <div class="logistic-page yoho-page">
3 <div class="overview"> 3 <div class="overview">
4 <div class="left" > 4 <div class="left" >
5 - <a href="{{logisticUrl}}"><div class="icon" style='background-image:url("{{logisticImg}}")'></div></a> 5 + <a href="{{logisticUrl}}"><img class="icon" src="{{logisticImg}}" /></a>
6 </div> 6 </div>
7 -  
8 <div class="right"> 7 <div class="right">
9 <div> 8 <div>
10 <span class='info'>物流公司:</span> 9 <span class='info'>物流公司:</span>
@@ -112,7 +112,7 @@ @@ -112,7 +112,7 @@
112 {{/ orderDetail}} 112 {{/ orderDetail}}
113 </div> 113 </div>
114 <script>_ozprm = "orderid={{orderCode}}&ordertotal={{orderTotal}}";</script> 114 <script>_ozprm = "orderid={{orderCode}}&ordertotal={{orderTotal}}";</script>
115 -<script type="text/javascript" src="http://static.yohobuy.com/m/v1/js/AG_Tracking.js"></script> 115 +<script type="text/javascript" src="//static.yohobuy.com/m/v1/js/AG_Tracking.js"></script>
116 <script type="text/javascript"> 116 <script type="text/javascript">
117 var _agq = _agq || []; 117 var _agq = _agq || [];
118 _agq.push(['_cid', '415']); //生成value 118 _agq.push(['_cid', '415']); //生成value
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 </div> 33 </div>
34 </div> 34 </div>
35 <script>_ozprm="orderid={{orderCode}}&ordertotal={{orderTotal}}";</script> 35 <script>_ozprm="orderid={{orderCode}}&ordertotal={{orderTotal}}";</script>
36 -<script type="text/javascript" src ="http://static.yohobuy.com/m/v1/js/AG_Tracking.js"></script> 36 +<script type="text/javascript" src ="//static.yohobuy.com/m/v1/js/AG_Tracking.js"></script>
37 <script type="text/javascript"> 37 <script type="text/javascript">
38 var _agq = _agq || []; 38 var _agq = _agq || [];
39 _agq.push(['_cid', '415']); //生成value 39 _agq.push(['_cid', '415']); //生成value
1 -{{> layout/header_passport}} 1 +{{> layout/header}}
2 <div class="back-email-success-page passport-page yoho-page"> 2 <div class="back-email-success-page passport-page yoho-page">
3 {{> passport/header}} 3 {{> passport/header}}
4 <div class="content"> 4 <div class="content">
@@ -8,4 +8,4 @@ @@ -8,4 +8,4 @@
8 <a id="resend" class="resend" data-url={{resendUrl}}>重新发送邮件</a> 8 <a id="resend" class="resend" data-url={{resendUrl}}>重新发送邮件</a>
9 </div> 9 </div>
10 </div> 10 </div>
11 -{{> layout/footer_passport}}  
  11 +{{> layout/footer}}
1 -{{> layout/header_passport}} 1 +{{> layout/header}}
2 <div class="back-email-page passport-page yoho-page"> 2 <div class="back-email-page passport-page yoho-page">
3 {{> passport/header}} 3 {{> passport/header}}
4 <div class="content"> 4 <div class="content">
@@ -8,4 +8,4 @@ @@ -8,4 +8,4 @@
8 <span id="btn-sure" class="btn btn-sure disable row">确定</span> 8 <span id="btn-sure" class="btn btn-sure disable row">确定</span>
9 </div> 9 </div>
10 </div> 10 </div>
11 -{{> layout/footer_passport}}  
  11 +{{> layout/footer}}
1 -{{> layout/header_passport}} 1 +{{> layout/header}}
2 <div class="back-code-page passport-page yoho-page"> 2 <div class="back-code-page passport-page yoho-page">
3 {{> passport/code}} 3 {{> passport/code}}
4 </div> 4 </div>
5 -{{> layout/footer_passport}}  
  5 +{{> layout/footer}}
1 -{{> layout/header_passport}} 1 +{{> layout/header}}
2 <div class="back-mobile-page passport-page yoho-page"> 2 <div class="back-mobile-page passport-page yoho-page">
3 {{> passport/header}} 3 {{> passport/header}}
4 <div class="content"> 4 <div class="content">
@@ -10,4 +10,4 @@ @@ -10,4 +10,4 @@
10 <span id="btn-next" class="btn btn-next disable row">下一步</span> 10 <span id="btn-next" class="btn btn-next disable row">下一步</span>
11 </div> 11 </div>
12 </div> 12 </div>
13 -{{> layout/footer_passport}}  
  13 +{{> layout/footer}}
1 -{{> layout/header_passport}} 1 +{{> layout/header}}
2 <div class="back-new-password-page passport-page yoho-page"> 2 <div class="back-new-password-page passport-page yoho-page">
3 {{> passport/header}} 3 {{> passport/header}}
4 <div class="content"> 4 <div class="content">
@@ -17,4 +17,4 @@ @@ -17,4 +17,4 @@
17 <input id="email-code" type="hidden" value={{.}}> 17 <input id="email-code" type="hidden" value={{.}}>
18 {{/ code}} 18 {{/ code}}
19 </div> 19 </div>
20 -{{> layout/footer_passport}}  
  20 +{{> layout/footer}}
1 -{{> layout/header_passport}} 1 +{{> layout/header}}
2 <div class="reg-code-page passport-page yoho-page"> 2 <div class="reg-code-page passport-page yoho-page">
3 <input type="hidden" id="isReg" value="{{isReg}}"> 3 <input type="hidden" id="isReg" value="{{isReg}}">
4 <input type="hidden" id="openId" value="{{openId}}"> 4 <input type="hidden" id="openId" value="{{openId}}">
@@ -6,4 +6,4 @@ @@ -6,4 +6,4 @@
6 <input type="hidden" id="nickname" value="{{nickname}}"> 6 <input type="hidden" id="nickname" value="{{nickname}}">
7 {{> passport/code}} 7 {{> passport/code}}
8 </div> 8 </div>
9 -{{> layout/footer_passport}} 9 +{{> layout/footer}}
1 -{{> layout/header_passport}} 1 +{{> layout/header}}
2 <div class="bind-page passport-page yoho-page"> 2 <div class="bind-page passport-page yoho-page">
3 <input type="hidden" id="openId" value="{{openId}}"> 3 <input type="hidden" id="openId" value="{{openId}}">
4 <input type="hidden" id="sourceType" value="{{sourceType}}"> 4 <input type="hidden" id="sourceType" value="{{sourceType}}">
@@ -14,4 +14,4 @@ @@ -14,4 +14,4 @@
14 <p class="bind-tip">绑定手机号码后，可选择{{platform}}和手机号登录此帐号</p> 14 <p class="bind-tip">绑定手机号码后，可选择{{platform}}和手机号登录此帐号</p>
15 </div> 15 </div>
16 </div> 16 </div>
17 -{{> layout/footer_passport}} 17 +{{> layout/footer}}
1 -{{> layout/header_passport}} 1 +{{> layout/header}}
2 <div class="bind-password-page passport-page yoho-page"> 2 <div class="bind-password-page passport-page yoho-page">
3 <input type="hidden" id="openId" value="{{openId}}"> 3 <input type="hidden" id="openId" value="{{openId}}">
4 <input type="hidden" id="sourceType" value="{{sourceType}}"> 4 <input type="hidden" id="sourceType" value="{{sourceType}}">
@@ -14,4 +14,4 @@ @@ -14,4 +14,4 @@
14 <input id="area-code" type="hidden" value={{areaCode}}> 14 <input id="area-code" type="hidden" value={{areaCode}}>
15 <input id="token" type="hidden" value={{token}}> 15 <input id="token" type="hidden" value={{token}}>
16 </div> 16 </div>
17 -{{> layout/footer_passport}} 17 +{{> layout/footer}}
1 -{{> layout/header_passport}} 1 +{{> layout/header}}
2 <div class="login-page passport-page yoho-page"> 2 <div class="login-page passport-page yoho-page">
3 {{> passport/header}} 3 {{> passport/header}}
4 <div class="content"> 4 <div class="content">
@@ -41,4 +41,4 @@ @@ -41,4 +41,4 @@
41 </ul> 41 </ul>
42 </div> 42 </div>
43 </div> 43 </div>
44 -{{> layout/footer_passport}}  
  44 +{{> layout/footer}}
1 -{{> layout/header_passport}} 1 +{{> layout/header}}
2 <div class="login-international-page passport-page yoho-page"> 2 <div class="login-international-page passport-page yoho-page">
3 {{> passport/header}} 3 {{> passport/header}}
4 <div class="content"> 4 <div class="content">
@@ -13,4 +13,4 @@ @@ -13,4 +13,4 @@
13 <span id="btn-login" class="btn btn-login disble row">登录</span> 13 <span id="btn-login" class="btn btn-login disble row">登录</span>
14 </div> 14 </div>
15 </div> 15 </div>
16 -{{> layout/footer_passport}}  
  16 +{{> layout/footer}}
1 -{{> layout/header_passport}} 1 +{{> layout/header}}
2 <div class="reg-code-page passport-page yoho-page"> 2 <div class="reg-code-page passport-page yoho-page">
3 {{> passport/code}} 3 {{> passport/code}}
4 </div> 4 </div>
5 -{{> layout/footer_passport}}  
  5 +{{> layout/footer}}
1 -{{> layout/header_passport}} 1 +{{> layout/header}}
2 <div class="reg-page passport-page yoho-page"> 2 <div class="reg-page passport-page yoho-page">
3 {{> passport/header}} 3 {{> passport/header}}
4 <div class="content"> 4 <div class="content">
@@ -11,4 +11,4 @@ @@ -11,4 +11,4 @@
11 <p class="register-tip">YOHO!Family账号可登录Yoho!Buy有货、YOHO!Boys、YOHO!Girls及SHOW</p> 11 <p class="register-tip">YOHO!Family账号可登录Yoho!Buy有货、YOHO!Boys、YOHO!Girls及SHOW</p>
12 </div> 12 </div>
13 </div> 13 </div>
14 -{{> layout/footer_passport}}  
  14 +{{> layout/footer}}
1 -{{> layout/header_passport}} 1 +{{> layout/header}}
2 <div class="reg-password-page passport-page yoho-page"> 2 <div class="reg-password-page passport-page yoho-page">
3 {{> passport/header}} 3 {{> passport/header}}
4 <div class="content"> 4 <div class="content">
@@ -20,4 +20,4 @@ var r=b.getElementsByTagName('script')[0];r.parentNode.insertBefore(s,r); @@ -20,4 +20,4 @@ var r=b.getElementsByTagName('script')[0];r.parentNode.insertBefore(s,r);
20 _agtjs('init','AG_052186_PHCW','yohobuy.com'); 20 _agtjs('init','AG_052186_PHCW','yohobuy.com');
21 _agtjs('loadEvent',{atsev:101,'atsrmv':""}); 21 _agtjs('loadEvent',{atsev:101,'atsrmv':""});
22 </script> 22 </script>
23 -{{> layout/footer_passport}}  
  23 +{{> layout/footer}}
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 })(); 30 })();
31 (function() { 31 (function() {
32 var hm = document.createElement("script"); 32 var hm = document.createElement("script");
33 - hm.src = "http://static.yohobuy.com/js/analytics/analysis.js"; 33 + hm.src = "//static.yohobuy.com/js/analytics/analysis.js";
34 hm.async = 1; 34 hm.async = 1;
35 var s = document.getElementsByTagName("script")[0]; 35 var s = document.getElementsByTagName("script")[0];
36 s.parentNode.insertBefore(hm, s); 36 s.parentNode.insertBefore(hm, s);
@@ -52,4 +52,4 @@ @@ -52,4 +52,4 @@
52 var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h); 52 var h = d.getElementsByTagName("script")[0];h.parentNode.insertBefore(c, h);
53 }(document); 53 }(document);
54 </script> 54 </script>
55 -<script src="http://static.yohobuy.com/m/v1/js/om_code.js" async="async"></script>  
  55 +<script src="//static.yohobuy.com/m/v1/js/om_code.js" async="async"></script>
1 {{> layout/page_footer}} 1 {{> layout/page_footer}}
2 {{> layout/download_app}} 2 {{> layout/download_app}}
3 {{#if hasWxShare}} 3 {{#if hasWxShare}}
4 -<script type="text/javascript" charset="utf-8" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script> 4 +<script type="text/javascript" charset="utf-8" src="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
5 {{/if}} 5 {{/if}}
6 {{#if rlsEnv}} 6 {{#if rlsEnv}}
7 -<script src="http://cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>  
8 -<script src="http://cdn.yoho.cn/myohobuy/{{version}}/index.js"></script> 7 +<script src="//cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>
  8 +<script src="//cdn.yoho.cn/myohobuy/{{version}}/index.js"></script>
9 {{/if}} 9 {{/if}}
10 {{#if preEnv}} 10 {{#if preEnv}}
11 -<script src="http://cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>  
12 -<script src="http://cdn.yoho.cn/myohobuy/{{version}}/index.js"></script> 11 +<script src="//cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>
  12 +<script src="//cdn.yoho.cn/myohobuy/{{version}}/index.js"></script>
13 {{/if}} 13 {{/if}}
14 {{#if testEnv}} 14 {{#if testEnv}}
15 -<script src="http://cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>  
16 -<script src="http://cdn.yoho.cn/myohobuy/{{version}}/index-debug.js"></script> 15 +<script src="//cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>
  16 +<script src="//cdn.yoho.cn/myohobuy/{{version}}/index-debug.js"></script>
17 {{/if}} 17 {{/if}}
18 {{#if devEnv}} 18 {{#if devEnv}}
19 -<script src="http://localhost:8000/static/js/sea.js?nowrap"></script>  
20 -<script>seajs.config({base: 'http://localhost:8000/'});</script> 19 +<script src="//localhost:8000/static/js/sea.js?nowrap"></script>
  20 +<script>seajs.config({base: '//localhost:8000/'});</script>
21 {{/if}} 21 {{/if}}
22 {{> layout/use}} 22 {{> layout/use}}
23 {{> layout/analysis}} 23 {{> layout/analysis}}
@@ -16,8 +16,8 @@ @@ -16,8 +16,8 @@
16 <script src="/dist/myohobuy/{{version}}/index-debug.js"></script> 16 <script src="/dist/myohobuy/{{version}}/index-debug.js"></script>
17 {{/if}} 17 {{/if}}
18 {{#if devEnv}} 18 {{#if devEnv}}
19 -<script src="http://localhost:8000/static/js/sea.js?nowrap"></script>  
20 -<script>seajs.config({base: 'http://localhost:8000/'});</script> 19 +<script src="//localhost:8000/static/js/sea.js?nowrap"></script>
  20 +<script>seajs.config({base: '//localhost:8000/'});</script>
21 {{/if}} 21 {{/if}}
22 {{> layout/use}} 22 {{> layout/use}}
23 {{> layout/analysis_passport}} 23 {{> layout/analysis_passport}}
@@ -27,20 +27,20 @@ @@ -27,20 +27,20 @@
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 {{#if rlsEnv}} 29 {{#if rlsEnv}}
30 -<link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/{{version}}/index.css"> 30 +<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/{{version}}/index.css">
31 {{/if}} 31 {{/if}}
32 {{#if preEnv}} 32 {{#if preEnv}}
33 -<link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/{{version}}/index.css"> 33 +<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/{{version}}/index.css">
34 {{/if}} 34 {{/if}}
35 {{#if testEnv}} 35 {{#if testEnv}}
36 -<link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/{{version}}/index.css"> 36 +<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/{{version}}/index.css">
37 {{/if}} 37 {{/if}}
38 {{#if devEnv}} 38 {{#if devEnv}}
39 -<link rel="stylesheet" href="http://static.dev.yohobuy.com/css/index.css"> 39 +<link rel="stylesheet" href="//static.dev.yohobuy.com/css/index.css">
40 {{/if}} 40 {{/if}}
41 -<link rel="apple-touch-icon-precomposed" href="http://static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png">  
42 -<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)">  
43 -<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)"> 41 +<link rel="apple-touch-icon-precomposed" href="//static.yohobuy.com/m/v1/img/touch/apple-touch-icon-144x144-precomposed-new.png">
  42 +<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)">
  43 +<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 </head> 44 </head>
45 <body {{#if isPassportPage}}class=passport-body{{/if}}> 45 <body {{#if isPassportPage}}class=passport-body{{/if}}>
46 {{#if systemUpdate}} 46 {{#if systemUpdate}}
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 <link rel="stylesheet" href="/dist/myohobuy/{{version}}/index.css"> 36 <link rel="stylesheet" href="/dist/myohobuy/{{version}}/index.css">
37 {{/if}} 37 {{/if}}
38 {{#if devEnv}} 38 {{#if devEnv}}
39 -<link rel="stylesheet" href="http://static.dev.yohobuy.com/css/index.css"> 39 +<link rel="stylesheet" href="//static.dev.yohobuy.com/css/index.css">
40 {{/if}} 40 {{/if}}
41 </head> 41 </head>
42 <body {{#if isPassportPage}}class=passport-body{{/if}}> 42 <body {{#if isPassportPage}}class=passport-body{{/if}}>
@@ -66,9 +66,15 @@ class GradeModel @@ -66,9 +66,15 @@ class GradeModel
66 //username 调用获取用户基本信息数据，获得nikename昵称; 66 //username 调用获取用户基本信息数据，获得nikename昵称;
67 $result['vipGrade']['name'] = !empty($data['userProfile']) ? $data['userProfile']['nickname'] : ''; 67 $result['vipGrade']['name'] = !empty($data['userProfile']) ? $data['userProfile']['nickname'] : '';
68 //跳转url(会员特权详情) 68 //跳转url(会员特权详情)
69 - $result['vipGrade']['allUrl'] = Helpers::url('/home/preferential', null); 69 + $allUrl = Helpers::url('/home/preferential', null);
  70 + $result['vipGrade']['allUrl'] = strtr($allUrl, array('http://' => '//'));
70 //当前vip等级享受的特权 71 //当前vip等级享受的特权
  72 + foreach ($data['grade']['enjoy_preferential'] as &$value) {
  73 + $value['pic'] = strtr($value['pic'], array('http://' => '//'));
  74 + }
  75 +
71 $result['vipGrade']['privilege'] = $data['grade']['enjoy_preferential']; 76 $result['vipGrade']['privilege'] = $data['grade']['enjoy_preferential'];
  77 +
72 } 78 }
73 79
74 if (USE_CACHE) { 80 if (USE_CACHE) {
@@ -105,6 +111,9 @@ class GradeModel @@ -105,6 +111,9 @@ class GradeModel
105 //调取接口获得数据 111 //调取接口获得数据
106 $data = GradeData::getPreferentialData($channel, $uid); 112 $data = GradeData::getPreferentialData($channel, $uid);
107 if (isset($data['code']) && $data['code'] == 200) { 113 if (isset($data['code']) && $data['code'] == 200) {
  114 + foreach ($data['data'] as &$value) {
  115 + $value['pic'] = strtr($value['pic'], array('http://' => '//'));
  116 + }
108 $result['vipGrade']['privilege'] = $data['data']; 117 $result['vipGrade']['privilege'] = $data['data'];
109 } 118 }
110 119
@@ -122,9 +122,8 @@ class OrderModel @@ -122,9 +122,8 @@ class OrderModel
122 if (empty($logistics['data'])) { 122 if (empty($logistics['data'])) {
123 break; 123 break;
124 } 124 }
125 -  
126 $result['logisticUrl'] = $logistics['data']['url']; 125 $result['logisticUrl'] = $logistics['data']['url'];
127 - $result['logisticImg'] = $logistics['data']['logo']; 126 + $result['logisticImg'] = strtr($logistics['data']['logo'], array('http://' => '//'));
128 $result['logisticCompany'] = $logistics['data']['caption']; 127 $result['logisticCompany'] = $logistics['data']['caption'];
129 $result['logisticNumber'] = $logistics['data']['express_number']; 128 $result['logisticNumber'] = $logistics['data']['express_number'];
130 129
@@ -473,6 +473,8 @@ class DetailModel @@ -473,6 +473,8 @@ class DetailModel
473 473
474 // 测量方式 474 // 测量方式
475 if (!empty($sizeInfo['sizeImage'])) { 475 if (!empty($sizeInfo['sizeImage'])) {
  476 + $sizeInfo['sizeImage'] = strtr($sizeInfo['sizeImage'], array('http://' => '//'));
  477 +
476 $result['measurementMethod'] = array( 478 $result['measurementMethod'] = array(
477 'title' => '测量方式', 479 'title' => '测量方式',
478 'enTitle' => 'MEASUREMENT METHOD', 480 'enTitle' => 'MEASUREMENT METHOD',
@@ -501,7 +503,7 @@ class DetailModel @@ -501,7 +503,7 @@ class DetailModel
501 $result['reference']['detail']['list'][6]['params'] = array(0 => array('param' => '试穿描述')); // 试穿描述 503 $result['reference']['detail']['list'][6]['params'] = array(0 => array('param' => '试穿描述')); // 试穿描述
502 504
503 foreach ($sizeInfo['modelBos'] as $value) { 505 foreach ($sizeInfo['modelBos'] as $value) {
504 - $result['reference']['detail']['list'][0]['params'][] = array('param' => $value['avatar']); 506 + $result['reference']['detail']['list'][0]['params'][] = array('param' => strtr($value['avatar'], array('http://' => '//')));
505 $result['reference']['detail']['list'][1]['params'][] = array('param' => $value['modelName']); 507 $result['reference']['detail']['list'][1]['params'][] = array('param' => $value['modelName']);
506 $result['reference']['detail']['list'][2]['params'][] = array('param' => $value['height']); 508 $result['reference']['detail']['list'][2]['params'][] = array('param' => $value['height']);
507 $result['reference']['detail']['list'][3]['params'][] = array('param' => $value['weight']); 509 $result['reference']['detail']['list'][3]['params'][] = array('param' => $value['weight']);
@@ -531,7 +533,7 @@ class DetailModel @@ -531,7 +533,7 @@ class DetailModel
531 ); 533 );
532 foreach ($sizeInfo['productMaterialList'] as $value) { 534 foreach ($sizeInfo['productMaterialList'] as $value) {
533 $result['materials']['list'][] = array( 535 $result['materials']['list'][] = array(
534 - 'img' => $value['imageUrl'], 536 + 'img' => strtr($value['imageUrl'], array('http://' => '//')),
535 'desc' => $value['remark'], 537 'desc' => $value['remark'],
536 ); 538 );
537 } 539 }
@@ -541,7 +543,11 @@ class DetailModel @@ -541,7 +543,11 @@ class DetailModel
541 if (!empty($sizeInfo['washTipsBoList'])) { 543 if (!empty($sizeInfo['washTipsBoList'])) {
542 $result['washTips']['list'] = array(); 544 $result['washTips']['list'] = array();
543 foreach ($sizeInfo['washTipsBoList'] as $value) { 545 foreach ($sizeInfo['washTipsBoList'] as $value) {
544 - $result['washTips']['list'][] = $value; 546 + //$result['washTips']['list'][] = $value;
  547 + $result['washTips']['list'][] = array(
  548 + 'img' => strtr($value['img'], array('http://' => '//')),
  549 + 'caption' => $value['caption'],
  550 + );
545 } 551 }
546 } 552 }
547 553
@@ -557,6 +563,7 @@ class DetailModel @@ -557,6 +563,7 @@ class DetailModel
557 'title' => '商品详情', 563 'title' => '商品详情',
558 'enTitle' => 'DETAILS', 564 'enTitle' => 'DETAILS',
559 'desc' => strtr($productIntro, array( 565 'desc' => strtr($productIntro, array(
  566 + 'http://' => '//',
560 '\r\n\t' => '', 567 '\r\n\t' => '',
561 '</p>' => '', 568 '</p>' => '',
562 '<img src=' => "<img class=\"lazy\" src=\"data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==\" data-original=", 569 '<img src=' => "<img class=\"lazy\" src=\"data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==\" data-original=",
@@ -55,7 +55,7 @@ class InfoController extends AbstractAction @@ -55,7 +55,7 @@ class InfoController extends AbstractAction
55 // 作者信息数据 55 // 作者信息数据
56 if (isset($detail['getAuthor']['name'])) { 56 if (isset($detail['getAuthor']['name'])) {
57 $data['guang']['author'] = array(); 57 $data['guang']['author'] = array();
58 - $data['guang']['author']['avatar'] = $detail['getAuthor']['avatar']; 58 + $data['guang']['author']['avatar'] = strtr($detail['getAuthor']['avatar'], array('http://' => '//'));
59 $data['guang']['author']['name'] = $detail['getAuthor']['name']; 59 $data['guang']['author']['name'] = $detail['getAuthor']['name'];
60 $data['guang']['author']['intro'] = $detail['getAuthor']['author_desc']; 60 $data['guang']['author']['intro'] = $detail['getAuthor']['author_desc'];
61 $data['guang']['author']['url'] = $isApp ? $detail['getAuthor']['url'] : Helpers::url('/author/index', array('id' => $detail['getArticle']['author_id']), 'guang'); 61 $data['guang']['author']['url'] = $isApp ? $detail['getAuthor']['url'] : Helpers::url('/author/index', array('id' => $detail['getArticle']['author_id']), 'guang');
@@ -158,6 +158,9 @@ class InfoController extends AbstractAction @@ -158,6 +158,9 @@ class InfoController extends AbstractAction
158 // 相关品牌 158 // 相关品牌
159 if (!empty($detail['getBrand'])) { 159 if (!empty($detail['getBrand'])) {
160 $data['relatedBrand'] = $detail['getBrand']; 160 $data['relatedBrand'] = $detail['getBrand'];
  161 + foreach ($data['relatedBrand'] as &$value) {
  162 + $value['thumb'] = strtr($value['thumb'], array('http://' => '//'));
  163 + }
161 } 164 }
162 165
163 // 相关标签 166 // 相关标签
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 2
3 use Yaf\Application; 3 use Yaf\Application;
4 4
5 -define('SITE_MAIN', 'http://m.dev.yohobuy.com'); // 网站主域名  
6 -define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名 5 +define('SITE_MAIN', '//m.dev.yohobuy.com'); // 网站主域名
  6 +define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名
7 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域 7 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
8 define('SUB_DOMAIN', '.dev.yohobuy.com'); // 子域名后缀 8 define('SUB_DOMAIN', '.dev.yohobuy.com'); // 子域名后缀
9 define('USE_CACHE', false); // 缓存的开关 9 define('USE_CACHE', false); // 缓存的开关
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 2
3 use Yaf\Application; 3 use Yaf\Application;
4 4
5 -define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名  
6 -define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名 5 +define('SITE_MAIN', '//m.yohobuy.com'); // 网站主域名
  6 +define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名
7 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域 7 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
8 define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀 8 define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀
9 define('USE_CACHE', true); // 缓存的开关 9 define('USE_CACHE', true); // 缓存的开关
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 2
3 use Yaf\Application; 3 use Yaf\Application;
4 4
5 -define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名  
6 -define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名 5 +define('SITE_MAIN', '//m.yohobuy.com'); // 网站主域名
  6 +define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名
7 define('COOKIE_DOMAIN', '.m.yohobuy.com'); // COOKIE作用域 7 define('COOKIE_DOMAIN', '.m.yohobuy.com'); // COOKIE作用域
8 define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀 8 define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀
9 define('USE_CACHE', false); // 缓存的开关 9 define('USE_CACHE', false); // 缓存的开关
@@ -2,11 +2,11 @@ @@ -2,11 +2,11 @@
2 2
3 use Yaf\Application; 3 use Yaf\Application;
4 4
5 -define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名  
6 -define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名 5 +define('SITE_MAIN', '//m.yohobuy.com'); // 网站主域名
  6 +define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名
7 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域 7 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
8 define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀 8 define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀
9 -define('USE_CACHE', true); // 缓存的开关 9 +define('USE_CACHE', false); // 缓存的开关
10 define('APPLICATION_PATH', dirname(__DIR__)); // 应用目录 10 define('APPLICATION_PATH', dirname(__DIR__)); // 应用目录
11 define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录 11 define('ROOT_PATH', dirname(dirname(APPLICATION_PATH))); // 根目录
12 defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'testing'); 12 defined('APPLICATION_ENV') || define('APPLICATION_ENV', 'testing');
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 2
3 use Yaf\Application; 3 use Yaf\Application;
4 4
5 -define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名  
6 -define('OLD_MAIN', 'http://m.yohobuy.com'); // 网站旧域名 5 +define('SITE_MAIN', '//m.yohobuy.com'); // 网站主域名
  6 +define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名
7 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域 7 define('COOKIE_DOMAIN', '.yohobuy.com'); // COOKIE作用域
8 define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀 8 define('SUB_DOMAIN', '.m.yohobuy.com'); // 子域名后缀
9 define('USE_CACHE', true); // 缓存的开关 9 define('USE_CACHE', true); // 缓存的开关