save

@@ -35,7 +35,7 @@ class StarClassModel
         $res['rankInfo'] = StarClassData::rankInfoDataUrl($uid);
 //print_r($res['rankInfo']);exit;
         $data = Yohobuy::getMulti($res);
-//        print_r($data['starClassIndex']);
+        print_r($data['starClassIndex']);
 //        print_r($data);exit;
         //调用成功封装数据
         if (isset($data['starClassIndex']) && !empty($data['starClassIndex'])) {
@@ -53,7 +53,7 @@ class StarClassModel
                 if (empty($build)) {
                     continue;
                 }
-                $result[] = $build;
+                $result['resources'][] = $build;
             }
             $build = array();
 

@@ -39,34 +39,31 @@ class StarClassController extends AbstractAction
 
 
     //星潮教室-星搭配
-    public function CollocationAction()
+    public function collocationAction()
     {
         $data = StarClassModel::getCollocation();
 
-        $this->_view->display('collocation', array(
+        $this->_view->display('collocation-list', array(
+            'trendClassCollocationPage' => true,
             'trendClassCollocation' => $data
         ));
-
-
     }
 
-    //星潮教室-星搭配
+    //星潮教室-星搭配文章请求
     public function ajaxCollocationAction()
     {
-//        if (!$this->isAjax()) {
-//            return;
-//        }
+        if (!$this->isAjax()) {
+            return;
+        }
         $page = $this->get('page',2);
         $data = StarClassModel::ajaxCollocation($page);
         if (isset($data) && !empty($data)) {
-            $this->_view->display('collocation', array(
+            $this->_view->display('collocation-list', array(
                 'trendClassCollocation' => $data
             ));
         }else{
             echo ' ';
         }
-
-
     }
 
     //签到