fe / YOHOBUYWAP · Commits

Go to a project

Authored by 梁志锋
Commit ae87f0605d9cab348c26ccefee1700ff51ff93f0 2 parents f099c842 e83b5a32

Merge branch 'master' of http://git.dev.yoho.cn/web/yohobuywap

Inline Side-by-side
Showing 29 changed files with 73 additions and 101 deletions
@@ -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 = '//m.yohobuy.com'; 27 + $url = 'http://m.yohobuy.com';
28 break; 28 break;
29 case 'guang': // 逛 29 case 'guang': // 逛
30 - $url = '//guang' . SUB_DOMAIN; 30 + $url = 'http://guang' . SUB_DOMAIN;
31 break; 31 break;
32 case 'list': // 商品列表 32 case 'list': // 商品列表
33 - $url = '//list' . SUB_DOMAIN; 33 + $url = 'http://list' . SUB_DOMAIN;
34 break; 34 break;
35 case 'search': // 搜索 35 case 'search': // 搜索
36 - $url = '//search' . SUB_DOMAIN; 36 + $url = 'http://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 = '//' . $module . SUB_DOMAIN; 44 + $url = 'http://' . $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, 'http://' => '//')); 65 + return strtr($url, array('{width}' => $width, '{height}' => $height, '{mode}' => $mode));
66 } 66 }
67 67
68 /** 68 /**
@@ -87,10 +87,6 @@ class Helpers @@ -87,10 +87,6 @@ class Helpers
87 public static function getFilterUrl($url) 87 public static function getFilterUrl($url)
88 { 88 {
89 $url = strtr($url, array('.m.yohobuy.com' => SUB_DOMAIN, OLD_MAIN => SITE_MAIN, 'www.yohobuy.com' => SITE_MAIN)); 89 $url = strtr($url, array('.m.yohobuy.com' => SUB_DOMAIN, OLD_MAIN => SITE_MAIN, 'www.yohobuy.com' => SITE_MAIN));
90 - if (strrpos($url, 'm.yohobuy.com') && !strrpos($url, 'sale.m.yohobuy.com') && !strrpos($url, 'cuxiao.m.yohobuy.com')  
91 - && !strrpos($url, 'activity.m.yohobuy.com') && !strrpos($url, 'huodong.m.yohobuy.com') && strrpos($url, 'cdn.yoho.cn/myohobuy') && !strrpos($url, '/home/orders/pay')) {  
92 - $url = strtr($url, array('http://' => '//'));  
93 - }  
94 $filter = strstr($url, 'openby:yohobuy=', true); 90 $filter = strstr($url, 'openby:yohobuy=', true);
95 if ($filter) { 91 if ($filter) {
96 return rtrim(rtrim($filter, '?'), '&'); 92 return rtrim(rtrim($filter, '?'), '&');
@@ -264,11 +260,9 @@ class Helpers @@ -264,11 +260,9 @@ class Helpers
264 $result['salePrice'] && $result['salePrice'] .= '.00'; 260 $result['salePrice'] && $result['salePrice'] .= '.00';
265 } 261 }
266 $result['is_soon_sold_out'] = ($productData['is_soon_sold_out'] === 'Y'); 262 $result['is_soon_sold_out'] = ($productData['is_soon_sold_out'] === 'Y');
267 - $url = self::url('/product/pro_' . $productData['product_id'] . '_' 263 + $result['url'] = self::url('/product/pro_' . $productData['product_id'] . '_'
268 . $productData['goods_list'][0]['goods_id'] 264 . $productData['goods_list'][0]['goods_id']
269 . '/' . $productData['cn_alphabet'] . '.html'); 265 . '/' . $productData['cn_alphabet'] . '.html');
270 - $result['url'] = strtr($url, array('http://' => '//'));  
271 -  
272 // APP访问需要加附加的参数 266 // APP访问需要加附加的参数
273 // 备注：如果以后APP的接口太多，可以把这边参数提取出来，变成一个公共的方法来生成，便于以后管理维护 267 // 备注：如果以后APP的接口太多，可以把这边参数提取出来，变成一个公共的方法来生成，便于以后管理维护
274 if ($isApp) { 268 if ($isApp) {
@@ -373,9 +367,6 @@ class Helpers @@ -373,9 +367,6 @@ class Helpers
373 $articleData['author']['url'] = Helpers::getFilterUrl($articleData['author']['url']); 367 $articleData['author']['url'] = Helpers::getFilterUrl($articleData['author']['url']);
374 } 368 }
375 $result['author'] = $articleData['author']; 369 $result['author'] = $articleData['author'];
376 - if (isset($result['author']['avatar'])) {  
377 - $result['author']['avatar'] = strtr($result['author']['avatar'], array('http://' => '//'));  
378 - }  
379 } 370 }
380 371
381 // 模板中需要的标签标识 372 // 模板中需要的标签标识
@@ -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 '//' . $domain . '/' . $bucket . $fileName; 54 + return 'http://' . $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, 'http://' => '//')); 74 + return strtr($fileName, array('{width}' => $width, '{height}' => $height, '{mode}' => $mode));
75 } 75 }
76 76
77 /** 77 /**
@@ -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="//m.yohobuy.com/signin.html?refer=' + location.href + '">登录</a>' + 155 + '<a href="http://m.yohobuy.com/signin.html?refer=' + location.href + '">登录</a>' +
156 '<span class="sep-line">|</span>' + 156 '<span class="sep-line">|</span>' +
157 - '<a href="//m.yohobuy.com/reg.html">注册</a>' 157 + '<a href="http://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="//m.yohobuy.com/home?tmp=' + Math.random() + '">' + user[0] + '</a>' +  
165 - '<a href="//m.yohobuy.com/passport/signout/index?token=' + user[3] + '">退出</a>' 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">退出</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', ('https:' == document.location.protocol ? 'https' : 'http') + '://' + 'cdn.yoho.cn/yas-jssdk/1.0.14/yas.js', '_yas'); 194 +})(window, document, 'script', 'http://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();
1 -{{> layout/header}} 1 +{{> layout/header_passport}}
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}}  
  11 +{{> layout/footer_passport}}
1 -{{> layout/header}} 1 +{{> layout/header_passport}}
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}}  
  11 +{{> layout/footer_passport}}
1 -{{> layout/header}} 1 +{{> layout/header_passport}}
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}}  
  5 +{{> layout/footer_passport}}
1 -{{> layout/header}} 1 +{{> layout/header_passport}}
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}}  
  13 +{{> layout/footer_passport}}
1 -{{> layout/header}} 1 +{{> layout/header_passport}}
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}}  
  20 +{{> layout/footer_passport}}
1 -{{> layout/header}} 1 +{{> layout/header_passport}}
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}} 9 +{{> layout/footer_passport}}
1 -{{> layout/header}} 1 +{{> layout/header_passport}}
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}} 17 +{{> layout/footer_passport}}
1 -{{> layout/header}} 1 +{{> layout/header_passport}}
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}}">
@@ -15,4 +15,4 @@ @@ -15,4 +15,4 @@
15 <input id="token" type="hidden" value={{token}}> 15 <input id="token" type="hidden" value={{token}}>
16 <input id="code" type="hidden" value={{code}}> 16 <input id="code" type="hidden" value={{code}}>
17 </div> 17 </div>
18 -{{> layout/footer}} 18 +{{> layout/footer_passport}}
1 -{{> layout/header}} 1 +{{> layout/header_passport}}
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}}  
  44 +{{> layout/footer_passport}}
1 -{{> layout/header}} 1 +{{> layout/header_passport}}
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}}  
  16 +{{> layout/footer_passport}}
1 -{{> layout/header}} 1 +{{> layout/header_passport}}
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}}  
  5 +{{> layout/footer_passport}}
1 -{{> layout/header}} 1 +{{> layout/header_passport}}
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}}  
  14 +{{> layout/footer_passport}}
1 -{{> layout/header}} 1 +{{> layout/header_passport}}
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}}  
  23 +{{> layout/footer_passport}}
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 11
12 (function() { 12 (function() {
13 var hm = document.createElement("script"); 13 var hm = document.createElement("script");
14 - hm.src = "//static.yohobuy.com/js/analytics/analysis.js"; 14 + hm.src = "http://static.yohobuy.com/js/analytics/analysis.js";
15 hm.async = 1; 15 hm.async = 1;
16 var s = document.getElementsByTagName("script")[0]; 16 var s = document.getElementsByTagName("script")[0];
17 s.parentNode.insertBefore(hm, s); 17 s.parentNode.insertBefore(hm, s);
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="//res.wx.qq.com/open/js/jweixin-1.0.0.js"></script> 4 +<script type="text/javascript" charset="utf-8" src="http://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="//cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>  
8 -<script src="//cdn.yoho.cn/myohobuy/{{version}}/index.js"></script> 7 +<script src="http://cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>
  8 +<script src="http://cdn.yoho.cn/myohobuy/{{version}}/index.js"></script>
9 {{/if}} 9 {{/if}}
10 {{#if preEnv}} 10 {{#if preEnv}}
11 -<script src="//cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>  
12 -<script src="//cdn.yoho.cn/myohobuy/{{version}}/index.js"></script> 11 +<script src="http://cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>
  12 +<script src="http://cdn.yoho.cn/myohobuy/{{version}}/index.js"></script>
13 {{/if}} 13 {{/if}}
14 {{#if testEnv}} 14 {{#if testEnv}}
15 -<script src="//cdn.yoho.cn/myohobuy/{{version}}/lib.js"></script>  
16 -<script src="//cdn.yoho.cn/myohobuy/{{version}}/index-debug.js"></script> 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>
17 {{/if}} 17 {{/if}}
18 {{#if devEnv}} 18 {{#if devEnv}}
19 -<script src="//localhost:8000/static/js/sea.js?nowrap"></script>  
20 -<script>seajs.config({base: '//localhost:8000/'});</script> 19 +<script src="http://localhost:8000/static/js/sea.js?nowrap"></script>
  20 +<script>seajs.config({base: 'http://localhost:8000/'});</script>
21 {{/if}} 21 {{/if}}
22 {{> layout/use}} 22 {{> layout/use}}
23 {{> layout/analysis}} 23 {{> layout/analysis}}
@@ -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="//cdn.yoho.cn/myohobuy/{{version}}/index.css"> 30 +<link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/{{version}}/index.css">
31 {{/if}} 31 {{/if}}
32 {{#if preEnv}} 32 {{#if preEnv}}
33 -<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/{{version}}/index.css"> 33 +<link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/{{version}}/index.css">
34 {{/if}} 34 {{/if}}
35 {{#if testEnv}} 35 {{#if testEnv}}
36 -<link rel="stylesheet" href="//cdn.yoho.cn/myohobuy/{{version}}/index.css"> 36 +<link rel="stylesheet" href="http://cdn.yoho.cn/myohobuy/{{version}}/index.css">
37 {{/if}} 37 {{/if}}
38 {{#if devEnv}} 38 {{#if devEnv}}
39 -<link rel="stylesheet" href="//static.dev.yohobuy.com/css/index.css"> 39 +<link rel="stylesheet" href="http://static.dev.yohobuy.com/css/index.css">
40 {{/if}} 40 {{/if}}
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)"> 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)">
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="//static.dev.yohobuy.com/css/index.css"> 39 +<link rel="stylesheet" href="http://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,13 +66,8 @@ class GradeModel @@ -66,13 +66,8 @@ 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 - $allUrl = Helpers::url('/home/preferential', null);  
70 - $result['vipGrade']['allUrl'] = strtr($allUrl, array('http://' => '//')); 69 + $result['vipGrade']['allUrl'] = Helpers::url('/home/preferential', null);
71 //当前vip等级享受的特权 70 //当前vip等级享受的特权
72 - foreach ($data['grade']['enjoy_preferential'] as &$value) {  
73 - $value['pic'] = strtr($value['pic'], array('http://' => '//'));  
74 - }  
75 -  
76 $result['vipGrade']['privilege'] = $data['grade']['enjoy_preferential']; 71 $result['vipGrade']['privilege'] = $data['grade']['enjoy_preferential'];
77 72
78 } 73 }
@@ -111,9 +106,6 @@ class GradeModel @@ -111,9 +106,6 @@ class GradeModel
111 //调取接口获得数据 106 //调取接口获得数据
112 $data = GradeData::getPreferentialData($channel, $uid); 107 $data = GradeData::getPreferentialData($channel, $uid);
113 if (isset($data['code']) && $data['code'] == 200) { 108 if (isset($data['code']) && $data['code'] == 200) {
114 - foreach ($data['data'] as &$value) {  
115 - $value['pic'] = strtr($value['pic'], array('http://' => '//'));  
116 - }  
117 $result['vipGrade']['privilege'] = $data['data']; 109 $result['vipGrade']['privilege'] = $data['data'];
118 } 110 }
119 111
@@ -123,7 +123,7 @@ class OrderModel @@ -123,7 +123,7 @@ class OrderModel
123 break; 123 break;
124 } 124 }
125 $result['logisticUrl'] = $logistics['data']['url']; 125 $result['logisticUrl'] = $logistics['data']['url'];
126 - $result['logisticImg'] = strtr($logistics['data']['logo'], array('http://' => '//')); 126 + $result['logisticImg'] = $logistics['data']['logo'];
127 $result['logisticCompany'] = $logistics['data']['caption']; 127 $result['logisticCompany'] = $logistics['data']['caption'];
128 $result['logisticNumber'] = $logistics['data']['express_number']; 128 $result['logisticNumber'] = $logistics['data']['express_number'];
129 129
@@ -58,8 +58,7 @@ class CartModel @@ -58,8 +58,7 @@ class CartModel
58 58
59 // 用户是否登录 59 // 用户是否登录
60 if (empty($uid)) { 60 if (empty($uid)) {
61 - $signurl = Helpers::url('/signin.html', array('refer' => Helpers::url('/cart/index/index')));  
62 - $result['signurl'] = strtr($signurl, array('http://' => '//')); 61 + $result['signurl'] = Helpers::url('/signin.html', array('refer' => Helpers::url('/cart/index/index')));
63 $result['showLoginInfo'] = true; 62 $result['showLoginInfo'] = true;
64 } 63 }
65 64
@@ -473,8 +473,6 @@ class DetailModel @@ -473,8 +473,6 @@ 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 -  
478 $result['measurementMethod'] = array( 476 $result['measurementMethod'] = array(
479 'title' => '测量方式', 477 'title' => '测量方式',
480 'enTitle' => 'MEASUREMENT METHOD', 478 'enTitle' => 'MEASUREMENT METHOD',
@@ -503,7 +501,7 @@ class DetailModel @@ -503,7 +501,7 @@ class DetailModel
503 $result['reference']['detail']['list'][6]['params'] = array(0 => array('param' => '试穿描述')); // 试穿描述 501 $result['reference']['detail']['list'][6]['params'] = array(0 => array('param' => '试穿描述')); // 试穿描述
504 502
505 foreach ($sizeInfo['modelBos'] as $value) { 503 foreach ($sizeInfo['modelBos'] as $value) {
506 - $result['reference']['detail']['list'][0]['params'][] = array('param' => strtr($value['avatar'], array('http://' => '//'))); 504 + $result['reference']['detail']['list'][0]['params'][] = array('param' => $value['avatar']);
507 $result['reference']['detail']['list'][1]['params'][] = array('param' => $value['modelName']); 505 $result['reference']['detail']['list'][1]['params'][] = array('param' => $value['modelName']);
508 $result['reference']['detail']['list'][2]['params'][] = array('param' => $value['height']); 506 $result['reference']['detail']['list'][2]['params'][] = array('param' => $value['height']);
509 $result['reference']['detail']['list'][3]['params'][] = array('param' => $value['weight']); 507 $result['reference']['detail']['list'][3]['params'][] = array('param' => $value['weight']);
@@ -533,7 +531,7 @@ class DetailModel @@ -533,7 +531,7 @@ class DetailModel
533 ); 531 );
534 foreach ($sizeInfo['productMaterialList'] as $value) { 532 foreach ($sizeInfo['productMaterialList'] as $value) {
535 $result['materials']['list'][] = array( 533 $result['materials']['list'][] = array(
536 - 'img' => strtr($value['imageUrl'], array('http://' => '//')), 534 + 'img' => $value['imageUrl'],
537 'desc' => $value['remark'], 535 'desc' => $value['remark'],
538 ); 536 );
539 } 537 }
@@ -543,11 +541,7 @@ class DetailModel @@ -543,11 +541,7 @@ class DetailModel
543 if (!empty($sizeInfo['washTipsBoList'])) { 541 if (!empty($sizeInfo['washTipsBoList'])) {
544 $result['washTips']['list'] = array(); 542 $result['washTips']['list'] = array();
545 foreach ($sizeInfo['washTipsBoList'] as $value) { 543 foreach ($sizeInfo['washTipsBoList'] as $value) {
546 - //$result['washTips']['list'][] = $value;  
547 - $result['washTips']['list'][] = array(  
548 - 'img' => strtr($value['img'], array('http://' => '//')),  
549 - 'caption' => $value['caption'],  
550 - ); 544 + $result['washTips']['list'][] = $value;
551 } 545 }
552 } 546 }
553 547
@@ -563,7 +557,6 @@ class DetailModel @@ -563,7 +557,6 @@ class DetailModel
563 'title' => '商品详情', 557 'title' => '商品详情',
564 'enTitle' => 'DETAILS', 558 'enTitle' => 'DETAILS',
565 'desc' => strtr($productIntro, array( 559 'desc' => strtr($productIntro, array(
566 - 'http://' => '//',  
567 '\r\n\t' => '', 560 '\r\n\t' => '',
568 '</p>' => '', 561 '</p>' => '',
569 '<img src=' => "<img class=\"lazy\" src=\"data:image/gif;base64,R0lGODlhAQABAJEAAAAAAP///93d3f///yH5BAEAAAMALAAAAAABAAEAAAICVAEAOw==\" data-original=", 562 '<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'] = strtr($detail['getAuthor']['avatar'], array('http://' => '//')); 58 + $data['guang']['author']['avatar'] = $detail['getAuthor']['avatar'];
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,9 +158,6 @@ class InfoController extends AbstractAction @@ -158,9 +158,6 @@ 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 - }  
164 } 161 }
165 162
166 // 相关标签 163 // 相关标签
@@ -2,8 +2,8 @@ @@ -2,8 +2,8 @@
2 2
3 use Yaf\Application; 3 use Yaf\Application;
4 4
5 -define('SITE_MAIN', '//m.dev.yohobuy.com'); // 网站主域名  
6 -define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名 5 +define('SITE_MAIN', 'http://m.dev.yohobuy.com'); // 网站主域名
  6 +define('OLD_MAIN', 'http://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', '//m.yohobuy.com'); // 网站主域名  
6 -define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名 5 +define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名
  6 +define('OLD_MAIN', 'http://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,8 +2,8 @@ @@ -2,8 +2,8 @@
2 2
3 use Yaf\Application; 3 use Yaf\Application;
4 4
5 -define('SITE_MAIN', '//m.yohobuy.com'); // 网站主域名  
6 -define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名 5 +define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名
  6 +define('OLD_MAIN', 'http://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', 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', '//m.yohobuy.com'); // 网站主域名  
6 -define('OLD_MAIN', '//m.yohobuy.com'); // 网站旧域名 5 +define('SITE_MAIN', 'http://m.yohobuy.com'); // 网站主域名
  6 +define('OLD_MAIN', 'http://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); // 缓存的开关