save

@@ -99,16 +99,26 @@ class StarClassModel
     /**
      * 星搭配
      */
-    public static function getCollocation($page)
+    public static function getCollocation()
     {
         $result = array();
         $result['title'] = '星潮教室';
         $result['headTab'] = self::getHeadTab('collocation');
 
+
+        return $result;
+    }
+
+    /**
+     * 星搭配
+     */
+    public static function ajaxCollocation($page)
+    {
         $data = StarClassData::collocationData($page);
-//        print_r($data);
+
+        $result = array();
         $collocationList = array();
-        if (isset($data['code']) && $data['code'] == 200) {
+        if (isset($data['code']) && $data['code'] == 200 && !empty($data['data'])) {
             foreach ($data['data']['list']['artList'] as $key=>$value) {
                 $collocationList[$key]['img'] = Helpers::getImageUrl($value['src'], 640, 240);
                 $collocationList[$key]['url'] = $value['url'];
@@ -126,7 +136,6 @@ class StarClassModel
         return $result;
     }
 
-
     //签到操作
     public static function sign($uid)
     {

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