Authored by Rock Zhang

Merge branch 'feature/wap/yuanxiao' into develop/wap

... ... @@ -31,7 +31,7 @@ class YuanxiaoController extends HuodongAction
public function indexAction()
{
$this->_view->display('index', array(
'staticTitle' => '元宵抽签',
'staticTitle' => '2016潮流运势测试!',
'staticFile' => self::STATIC_FILE,
'staticJS' => array(
'home.js'
... ... @@ -70,7 +70,7 @@ class YuanxiaoController extends HuodongAction
$this->go(Helpers::url('/cuxiao/yuanxiao/wait'));
} else { // 不成功就显示返回的错误信息
$this->_view->display('info', array(
'staticTitle' => '元宵抽签',
'staticTitle' => '2016潮流运势测试!',
'staticFile' => self::STATIC_FILE,
'staticJS' => array(
'info.js'
... ... @@ -86,7 +86,7 @@ class YuanxiaoController extends HuodongAction
$userData = YuanxiaoModel::getUserProfileData($uid);
$this->_view->display('info', array(
'staticTitle' => '元宵抽签',
'staticTitle' => '2016潮流运势测试!',
'staticFile' => self::STATIC_FILE,
'staticJS' => array(
'info.js'
... ... @@ -108,7 +108,7 @@ class YuanxiaoController extends HuodongAction
$this->auditJumpLogin();
$this->_view->display('wait', array(
'staticTitle' => '元宵抽签',
'staticTitle' => '2016潮流运势测试!',
'staticFile' => self::STATIC_FILE,
'activityUrl' => Helpers::url('/cuxiao/yuanxiao/result'),
'staticJS' => array(
... ... @@ -137,7 +137,7 @@ class YuanxiaoController extends HuodongAction
));
$this->_view->display('result', array(
'staticTitle' => '元宵抽签',
'staticTitle' => '2016潮流运势测试!',
'needShare' => $this->checkNeedShare(), // 是否需要微信分享
'staticFile' => self::STATIC_FILE,
'result' => $result,
... ... @@ -168,7 +168,7 @@ class YuanxiaoController extends HuodongAction
$result = YuanxiaoModel::getChoujiangShareInfo($uid);
$this->_view->display('share', array(
'staticTitle' => '元宵抽签',
'staticTitle' => '2016潮流运势测试!',
'staticFile' => self::STATIC_FILE,
'result' => array(
'name' => $result['name'],
... ...