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

@@ -33,11 +33,15 @@ class StarClassModel
         $res['starClassIndex'] = StarClassData::getResourceDataUrl($contentCode);
 
         //组装获得每日签到数据接口URL
+//        echo $uid;
         $res['rankInfo'] = StarClassData::rankInfoDataUrl($uid);
 //print_r($res['rankInfo']);exit;
+        //批量调接口
         $data = Yohobuy::getMulti($res);
+
 //        print_r($data['starClassIndex']);
 //        print_r($data);exit;
+
         //调用成功封装数据
         if (isset($data['starClassIndex']) && !empty($data['starClassIndex'])) {
             $starClassIndex = $data['starClassIndex'];
@@ -59,7 +63,25 @@ class StarClassModel
             $build = array();
 
         }
-//print_r($result);
+
+        if (isset($data['rankInfo'])) {
+            $rankInfo = array(
+                array(
+                    'portraitUrl' => isset($data['rankInfo']['avatar']) ? Helpers::getOriginalImg($data['rankInfo']['avatar']) : '',
+                    'username' => isset($data['rankInfo']['username']) ? $data['rankInfo']['username'] : '',
+                    'rank' => isset($data['rankInfo']['userNum']) ? $data['rankInfo']['userNum'] : '0',
+                    'intimacy' => isset($data['rankInfo']['userRank']) ? $data['rankInfo']['userRank'] : '0',
+                    'week' => array(
+                        'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fn', 'Sat'
+                    ),
+                    'homeSign' => true
+                )
+            );
+        }
+
+        //将签到数据插入资源位第二位置
+        array_splice($result['resources'], 1, 0 ,$rankInfo);
+
         return $result;
     }
 
@@ -98,7 +120,7 @@ class StarClassModel
 
 
     /**
-     * 星搭配
+     * 星搭配页面
      */
     public static function getCollocation()
     {
@@ -110,7 +132,7 @@ class StarClassModel
     }
 
     /**
-     * 星搭配
+     * 星搭配文章请求
      */
     public static function ajaxCollocation($page)
     {
@@ -139,11 +161,12 @@ class StarClassModel
     //签到操作
     public static function sign($uid)
     {
+
         $data = StarClassData::sign($uid);
 //print_r($data);
         $result = array();
         if (isset($data['code']) && $data['code'] == 200) {
-            $result['signDay'];
+            $result['signDay'] = $data['data'][];
             foreach ($data['data']['logs'] as $key => $value) {
                 $result['signDay'] .= date('N', $value['createTime']) . ',';
             }
@@ -157,7 +180,7 @@ class StarClassModel
             }
 
         }
-
+print_r($result);
         return $result;
     }
 

@@ -14,7 +14,6 @@ class StarClassController extends AbstractAction
     public function indexAction()
     {
         //判断登录
-//        $this->auditJumpLogin();
         $uid = $this->getUid();
 
         $data = StarClassModel::getStarClass($uid);
@@ -52,9 +51,9 @@ class StarClassController extends AbstractAction
     //星潮教室-星搭配文章请求
     public function ajaxCollocationAction()
     {
-//        if (!$this->isAjax()) {
-//            return;
-//        }
+        if (!$this->isAjax()) {
+            return;
+        }
         $page = $this->get('page',1);
         $data = StarClassModel::ajaxCollocation($page);
 

@@ -60,10 +60,10 @@ class TrendClassroom2Controller extends AbstractAction
                 'username' => 'LIFE KK',
                 'rank' => 169,
                 'intimacy' => 2589,
-
                 'week' => array(
                     'Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fn', 'Sat'
                 ),
+
                 'signDay' => '1,2,3,4',
                 'intimacyNum' => '15',
                 'url' => '/star/classroom/check-in',