Merge branch 'feature/xingchao' into feature/wap4.3

@@ -19,10 +19,13 @@ class StarClassController extends AbstractAction
      */
      */
     public function indexAction()
     public function indexAction()
     {
     {
-        //设置头部公共导航
-        $this->setNavHeader('星潮教室', true, false);
         //获取uid
         //获取uid
-        $uid = $this->getLoggedUid();
+        $uid = self::getLoggedUid();
+        if (!$this->_isApp) {
+            //设置头部公共导航
+            $this->setNavHeader('星潮教室', true, false);
+        }
+        $this->setTitle('星潮教室');
         //调用模型获得星潮教室首页数据
         //调用模型获得星潮教室首页数据
         $data = StarClassModel::getStarClass($uid);
         $data = StarClassModel::getStarClass($uid);
         //渲染模板
         //渲染模板
@@ -39,8 +42,13 @@ class StarClassController extends AbstractAction
      */
      */
     public function specialAction()
     public function specialAction()
     {
     {
-        //设置头部公共导航
-        $this->setNavHeader('星潮教室', true, false);
+        //获取uid
+        $uid = self::getLoggedUid();
+        if (!$this->_isApp) {
+            //设置头部公共导航
+            $this->setNavHeader('星潮教室', true, false);
+        }
+        $this->setTitle('星潮教室');
 
 
         //调用模型获得星专题数据
         //调用模型获得星专题数据
         $data = StarClassModel::getspecial();
         $data = StarClassModel::getspecial();
@@ -58,8 +66,13 @@ class StarClassController extends AbstractAction
      */
      */
     public function collocationAction()
     public function collocationAction()
     {
     {
-        //设置头部公共导航
-        $this->setNavHeader('星潮教室', true, false);
+        //获取uid
+        $uid = self::getLoggedUid();
+        if (!$this->_isApp) {
+            //设置头部公共导航
+            $this->setNavHeader('星潮教室', true, false);
+        }
+        $this->setTitle('星潮教室');
 
 
         //调用模板获得星搭配数据
         //调用模板获得星搭配数据
         $data = StarClassModel::getCollocation();
         $data = StarClassModel::getCollocation();
@@ -104,7 +117,11 @@ class StarClassController extends AbstractAction
     {
     {
         //设置头部公共导航（此处返回键调转星潮教室首页）
         //设置头部公共导航（此处返回键调转星潮教室首页）
         $url = Helpers::url('/guang/starclass/index');
         $url = Helpers::url('/guang/starclass/index');
-        $this->setNavHeader('星潮粉丝榜', $url, false);
+        if (!$this->_isApp) {
+            //设置头部公共导航
+            $this->setNavHeader('星潮粉丝榜', $url, false);
+        }
+        $this->setTitle('星潮粉丝榜');
 
 
         //根据客户端类型，进行未登录跳转
         //根据客户端类型，进行未登录跳转
         $uid = $this->getLoggedUid();
         $uid = $this->getLoggedUid();