Authored by yangyang

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

... ... @@ -20,7 +20,7 @@ class StarClassController extends AbstractAction
public function indexAction()
{
//获取uid
$uid = self::getLoggedUid();
$uid = $this->getLoggedUid();
$appVersion = array();
if (!$this->_isApp) {
//设置头部公共导航
... ... @@ -46,7 +46,7 @@ class StarClassController extends AbstractAction
public function specialAction()
{
//获取uid
$uid = self::getLoggedUid();
$uid = $this->getLoggedUid();
$appVersion = array();
if (!$this->_isApp) {
//设置头部公共导航
... ... @@ -73,7 +73,7 @@ class StarClassController extends AbstractAction
public function collocationAction()
{
//获取uid
$uid = self::getLoggedUid();
$uid = $this->getLoggedUid();
$appVersion = array();
if (!$this->_isApp) {
//设置头部公共导航
... ... @@ -125,7 +125,7 @@ class StarClassController extends AbstractAction
public function topAction()
{
//获取uid
$uid = self::getLoggedUid();
$uid = $this->getLoggedUid();
$appVersion = array();
//设置头部公共导航(此处返回键调转星潮教室首页)
if (!$this->_isApp) {
... ...