Authored by 梁志锋

线上问题:逛的活动页面https的问题

@@ -88,9 +88,14 @@ class Helpers @@ -88,9 +88,14 @@ class Helpers
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') 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') && strrpos($url, 'feature.yoho.cn') && !strrpos($url, '/home/orders/pay')) { 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://' => '//')); 92 $url = strtr($url, array('http://' => '//'));
93 } 93 }
  94 +
  95 + if (strrpos($url, 'feature.yoho.cn')) {
  96 + $url = self::transHttpsUrl($url);
  97 + }
  98 +
94 $filter = strstr($url, 'openby:yohobuy=', true); 99 $filter = strstr($url, 'openby:yohobuy=', true);
95 if ($filter) { 100 if ($filter) {
96 return rtrim(rtrim($filter, '?'), '&'); 101 return rtrim(rtrim($filter, '?'), '&');
@@ -349,6 +354,11 @@ class Helpers @@ -349,6 +354,11 @@ class Helpers
349 $result['showTags'] = $showTag; 354 $result['showTags'] = $showTag;
350 $result['img'] = isset($articleData['src']) ? self::getImageUrl($articleData['src'], 640, 640) : ''; 355 $result['img'] = isset($articleData['src']) ? self::getImageUrl($articleData['src'], 640, 640) : '';
351 $result['url'] = $articleData['url']; //$isApp ? $articleData['url'] : self::url('/info/index', array('id' => $articleData['id']), 'guang'); 356 $result['url'] = $articleData['url']; //$isApp ? $articleData['url'] : self::url('/info/index', array('id' => $articleData['id']), 'guang');
  357 +
  358 + if (strrpos($result['url'], 'feature.yoho.cn') || strrpos($result['url'], 'cdn.yoho.cn')) {
  359 + $result['url'] = self::transHttpsUrl($result['url']);
  360 + }
  361 +
352 $result['title'] = $articleData['title']; 362 $result['title'] = $articleData['title'];
353 $result['text'] = $articleData['intro']; 363 $result['text'] = $articleData['intro'];
354 $result['publishTime'] = $articleData['publish_time']; 364 $result['publishTime'] = $articleData['publish_time'];