Merge branch 'feature/xingchao' of http://git.dev.yoho.cn/web/yohobuy into feature/xingchao

@@ -163,12 +163,18 @@ class StarClassModel
 
 
         $result = array();
         $result = array();
         if (isset($data['code']) && $data['code'] == 200) {
         if (isset($data['code']) && $data['code'] == 200) {
-            foreach ($data['data'] as $key=>$value) {
+            foreach ($data['data']['top'] as $key=>$value) {
                 $result['rankingList'][$key]['num'] = intval($key) + 1;
                 $result['rankingList'][$key]['num'] = intval($key) + 1;
                 $result['rankingList'][$key]['img'] = Helpers::getImageUrl($value['avatar'], 640, 240);
                 $result['rankingList'][$key]['img'] = Helpers::getImageUrl($value['avatar'], 640, 240);
                 $result['rankingList'][$key]['name'] = $value['username'];
                 $result['rankingList'][$key]['name'] = $value['username'];
                 $result['rankingList'][$key]['intimacyNum'] = $value['num'];
                 $result['rankingList'][$key]['intimacyNum'] = $value['num'];
             }
             }
+
+            $result['userImg'] = $data['data']['userStarInfo']['userImg'] = Helpers::getOriginalImg($value['avatar']);
+            $result['userName'] = $data['data']['userStarInfo']['username'];
+            $result['rankNum'] = $data['data']['userStarInfo']['userRank'];
+            $result['intimacy'] = $data['data']['userStarInfo']['userNum'];
+
         }
         }
 
 
         return $result;
         return $result;

@@ -59,7 +59,6 @@ class StarClassController extends AbstractAction
     }
     }
 
 
 
 
-
     //星潮教室-星搭配文章请求
     //星潮教室-星搭配文章请求
     public function ajaxCollocationAction()
     public function ajaxCollocationAction()
     {
     {
@@ -88,10 +87,10 @@ class StarClassController extends AbstractAction
         if (!$uid) {
         if (!$uid) {
             $refer = $this->server('HTTP_REFERER', SITE_MAIN);
             $refer = $this->server('HTTP_REFERER', SITE_MAIN);
             if (!$this->_isApp) {
             if (!$this->_isApp) {
-                $this->echoJson(array('code'=>201,'data'=>Helpers::url('/signin.html', array('refer' => $refer))));
+                $this->go(Helpers::url('/signin.html', array('refer' => $refer)));
             } else {
             } else {
                 $referEncode = strtr($refer, array('/' => '\\/'));
                 $referEncode = strtr($refer, array('/' => '\\/'));
-                $this->echoJson(array('code'=>201,'data'=>$refer . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $referEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}'));
+                $this->go($refer . '?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":"' . $referEncode . '","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"N"}}');
             }
             }
             return;
             return;
         }
         }

@@ -568,7 +568,7 @@ class TrendClassroom2Controller extends AbstractAction
     public function checkInAction()
     public function checkInAction()
     {
     {
         $data = array(
         $data = array(
-            'title' => '星潮教室',
+            //'title' => '星潮教室',
             'userImg' => 'http://img11.static.yhbimg.com/yhb-img01/2016/04/01/05/010cb10578a55206faff271bceb0f22aaf.jpg?imageView/2/w/640/h/240',
             'userImg' => 'http://img11.static.yhbimg.com/yhb-img01/2016/04/01/05/010cb10578a55206faff271bceb0f22aaf.jpg?imageView/2/w/640/h/240',
             'userName' => 'LIFE KK',
             'userName' => 'LIFE KK',
             'rankNum' => '169',
             'rankNum' => '169',