Merge branch 'release/4.5' of git.yoho.cn:fe/YOHOBUYWAP into release/4.5

@@ -344,12 +344,12 @@ class Helpers
         if (!isset($articleData['id'])) {
             return false;
         }
-
         $result = array();
         $result['id'] = $articleData['id'];
         $result['showTags'] = $showTag;
         $result['img'] = isset($articleData['src']) ? self::getImageUrl($articleData['src'], 640, 640) : '';
-        $result['url'] = $articleData['url']; //$isApp ? $articleData['url'] : self::url('/info/index', array('id' => $articleData['id']), 'guang');
+        //逛详情页app跳转url处理 20160601
+        $result['url'] = $articleData['url'] . '&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $articleData['id'] . '"},"shareparam":{"id":"' . $articleData['id'] . '"},"share":"/guang/api/v1/share/guang","id":' . $articleData['id'] . ',"type":1,"url":"' . self::url('/info/index', array(), 'guang') . '","islogin":"N"}}';
         $result['title'] = $articleData['title'];
         $result['text'] = $articleData['intro'];
         $result['publishTime'] = $articleData['publish_time'];
@@ -376,6 +376,8 @@ class Helpers
             if (!$isApp) {
                 $articleData['author']['url'] = Helpers::getFilterUrl($articleData['author']['url']);
             }
+            //编辑人员 app跳转url处理 20160601
+            $articleData['author']['url'].='&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $articleData['author']['author_id'] . '"},"share":"","id":' . $articleData['author']['author_id'] . ',"type":0,"islogin":"N","url":"' . self::url('/author/index', array(), 'guang') . '"}}';
             $result['author'] = $articleData['author'];
             if (isset($result['author']['avatar'])) {
                 $result['author']['avatar'] = strtr($result['author']['avatar'], array('http://' => '//'));

@@ -245,6 +245,8 @@ class NewsaleModel
         $result = array();
 
         $data = NewsaleData::getTopProducts($gender, $channel, $sort, $tab_id, $limit, $page);
+        echo '热销排行数据：';
+        print_r($data);
 
         if (isset($data['code']) && $data['code'] === 200 && isset($data['data']['product_list'])) {
             $result = NewSaleProcess::topData($data['data'], $notab, $limit, $page);

@@ -58,7 +58,10 @@ class InfoController extends AbstractAction
             $data['guang']['author']['avatar'] = strtr($detail['getAuthor']['avatar'], array('http://' => '//'));
             $data['guang']['author']['name'] = $detail['getAuthor']['name'];
             $data['guang']['author']['intro'] = $detail['getAuthor']['author_desc'];
-            $data['guang']['author']['url'] = $isApp ? $detail['getAuthor']['url'] : Helpers::url('/author/index', array('id' => $detail['getArticle']['author_id']), 'guang');
+            //guang双头部的问题 20160601
+            $authorTmp = explode("?id=", $detail['getAuthor']['url']);
+            $authorId=$authorTmp[1];
+            $data['guang']['author']['url'] = $detail['getAuthor']['url'] .'&openby:yohobuy={"action":"go.h5","params":{"param":{"id":"' . $authorId . '"},"share":"","id":' .$authorId . ',"type":0,"islogin":"N","url":"' . Helpers::url('/author/index', array(), 'guang') . '"}}';
         }
 
         $data['detail'] = array();