fe / YOHOBUYPC · Commits

Go to a project

Authored by Rock Zhang
Commit 3a47ca3cf59ab1656f839cc89e0b4f244b64ac56 2 parents 112a53eb 764a3d53

Merge branch 'develop/wap' into beta/wap

Inline Side-by-side
Showing 1 changed file with 6 additions and 6 deletions
@@ -31,7 +31,7 @@ class YuanxiaoController extends HuodongAction @@ -31,7 +31,7 @@ class YuanxiaoController extends HuodongAction
31 public function indexAction() 31 public function indexAction()
32 { 32 {
33 $this->_view->display('index', array( 33 $this->_view->display('index', array(
34 - 'staticTitle' => '元宵抽签', 34 + 'staticTitle' => '2016潮流运势测试！',
35 'staticFile' => self::STATIC_FILE, 35 'staticFile' => self::STATIC_FILE,
36 'staticJS' => array( 36 'staticJS' => array(
37 'home.js' 37 'home.js'
@@ -70,7 +70,7 @@ class YuanxiaoController extends HuodongAction @@ -70,7 +70,7 @@ class YuanxiaoController extends HuodongAction
70 $this->go(Helpers::url('/cuxiao/yuanxiao/wait')); 70 $this->go(Helpers::url('/cuxiao/yuanxiao/wait'));
71 } else { // 不成功就显示返回的错误信息 71 } else { // 不成功就显示返回的错误信息
72 $this->_view->display('info', array( 72 $this->_view->display('info', array(
73 - 'staticTitle' => '元宵抽签', 73 + 'staticTitle' => '2016潮流运势测试！',
74 'staticFile' => self::STATIC_FILE, 74 'staticFile' => self::STATIC_FILE,
75 'staticJS' => array( 75 'staticJS' => array(
76 'info.js' 76 'info.js'
@@ -86,7 +86,7 @@ class YuanxiaoController extends HuodongAction @@ -86,7 +86,7 @@ class YuanxiaoController extends HuodongAction
86 $userData = YuanxiaoModel::getUserProfileData($uid); 86 $userData = YuanxiaoModel::getUserProfileData($uid);
87 87
88 $this->_view->display('info', array( 88 $this->_view->display('info', array(
89 - 'staticTitle' => '元宵抽签', 89 + 'staticTitle' => '2016潮流运势测试！',
90 'staticFile' => self::STATIC_FILE, 90 'staticFile' => self::STATIC_FILE,
91 'staticJS' => array( 91 'staticJS' => array(
92 'info.js' 92 'info.js'
@@ -108,7 +108,7 @@ class YuanxiaoController extends HuodongAction @@ -108,7 +108,7 @@ class YuanxiaoController extends HuodongAction
108 $this->auditJumpLogin(); 108 $this->auditJumpLogin();
109 109
110 $this->_view->display('wait', array( 110 $this->_view->display('wait', array(
111 - 'staticTitle' => '元宵抽签', 111 + 'staticTitle' => '2016潮流运势测试！',
112 'staticFile' => self::STATIC_FILE, 112 'staticFile' => self::STATIC_FILE,
113 'activityUrl' => Helpers::url('/cuxiao/yuanxiao/result'), 113 'activityUrl' => Helpers::url('/cuxiao/yuanxiao/result'),
114 'staticJS' => array( 114 'staticJS' => array(
@@ -138,7 +138,7 @@ class YuanxiaoController extends HuodongAction @@ -138,7 +138,7 @@ class YuanxiaoController extends HuodongAction
138 )); 138 ));
139 139
140 $this->_view->display('result', array( 140 $this->_view->display('result', array(
141 - 'staticTitle' => '元宵抽签', 141 + 'staticTitle' => '2016潮流运势测试！',
142 'needShare' => $this->checkNeedShare(), // 是否需要微信分享 142 'needShare' => $this->checkNeedShare(), // 是否需要微信分享
143 'staticFile' => self::STATIC_FILE, 143 'staticFile' => self::STATIC_FILE,
144 'result' => $result, 144 'result' => $result,
@@ -169,7 +169,7 @@ class YuanxiaoController extends HuodongAction @@ -169,7 +169,7 @@ class YuanxiaoController extends HuodongAction
169 $result = YuanxiaoModel::getChoujiangShareInfo($uid); 169 $result = YuanxiaoModel::getChoujiangShareInfo($uid);
170 170
171 $this->_view->display('share', array( 171 $this->_view->display('share', array(
172 - 'staticTitle' => '元宵抽签', 172 + 'staticTitle' => '2016潮流运势测试！',
173 'staticFile' => self::STATIC_FILE, 173 'staticFile' => self::STATIC_FILE,
174 'result' => array( 174 'result' => array(
175 'name' => $result['name'], 175 'name' => $result['name'],