Showing
27 changed files
with
87 additions
and
66 deletions
@@ -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 | /** |
@@ -354,6 +354,9 @@ class Helpers | @@ -354,6 +354,9 @@ class Helpers | ||
354 | $articleData['author']['url'] = Helpers::getFilterUrl($articleData['author']['url']); | 354 | $articleData['author']['url'] = Helpers::getFilterUrl($articleData['author']['url']); |
355 | } | 355 | } |
356 | $result['author'] = $articleData['author']; | 356 | $result['author'] = $articleData['author']; |
357 | + if (isset($result['author']['avatar'])) { | ||
358 | + $result['author']['avatar'] = strtr($result['author']['avatar'], array('http://' => '//')); | ||
359 | + } | ||
357 | } | 360 | } |
358 | 361 | ||
359 | // 模板中需要的标签标识 | 362 | // 模板中需要的标签标识 |
@@ -811,10 +814,10 @@ class Helpers | @@ -811,10 +814,10 @@ class Helpers | ||
811 | $url = 'https://login.m.yohobuy.com'; | 814 | $url = 'https://login.m.yohobuy.com'; |
812 | break; | 815 | break; |
813 | case 'testing': | 816 | case 'testing': |
814 | - $url = 'http://m1.yohobuy.com'; | 817 | + $url = 'https://login.m.yohobuy.com'; //http://m1.yohobuy.com 没有https时 |
815 | break; | 818 | break; |
816 | default: | 819 | default: |
817 | - $url = 'http://m1.yohobuy.com'; | 820 | + $url = 'https://login.m.yohobuy.com'; |
818 | break; | 821 | break; |
819 | } | 822 | } |
820 | $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; |
@@ -864,7 +867,7 @@ class Helpers | @@ -864,7 +867,7 @@ class Helpers | ||
864 | if (empty($cn_alphabet)) { | 867 | if (empty($cn_alphabet)) { |
865 | $cn_alphabet = 'goods.html'; | 868 | $cn_alphabet = 'goods.html'; |
866 | } | 869 | } |
867 | - return 'http://item.yohobuy.com/product/pro_' . $product_id . '_' . $goods_id . '/' . $cn_alphabet. '.html'; | 870 | + return '//item.yohobuy.com/product/pro_' . $product_id . '_' . $goods_id . '/' . $cn_alphabet. '.html'; |
868 | } | 871 | } |
869 | 872 | ||
870 | /** | 873 | /** |
@@ -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 | /** |
@@ -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(); |
@@ -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-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-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,8 +66,13 @@ class GradeModel | @@ -66,8 +66,13 @@ 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']; |
72 | 77 | ||
73 | } | 78 | } |
@@ -106,6 +111,9 @@ class GradeModel | @@ -106,6 +111,9 @@ class GradeModel | ||
106 | //调取接口获得数据 | 111 | //调取接口获得数据 |
107 | $data = GradeData::getPreferentialData($channel, $uid); | 112 | $data = GradeData::getPreferentialData($channel, $uid); |
108 | 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 | + } | ||
109 | $result['vipGrade']['privilege'] = $data['data']; | 117 | $result['vipGrade']['privilege'] = $data['data']; |
110 | } | 118 | } |
111 | 119 |
@@ -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'] = $logistics['data']['logo']; | 126 | + $result['logisticImg'] = strtr($logistics['data']['logo'], array('http://' => '//')); |
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 |
@@ -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 | // 相关标签 |
-
Please register or login to post a comment