fe / YOHOBUYPC · Commits

Go to a project

Authored by hf
Commit 5e2a084cb108f737ba9460e83bb5e4346e3f3acc 2 parents 9f8ba552 3a47ca3c

Merge branch 'beta/wap' of http://git.dev.yoho.cn/web/yohobuy into beta/wap

Inline Side-by-side
Showing 1 changed file with 6 additions and 6 deletions
@@ -34,7 +34,7 @@ class YuanxiaoController extends HuodongAction @@ -34,7 +34,7 @@ class YuanxiaoController extends HuodongAction
34 $playUrlEncode = strtr($playUrl, array('/' => '\\/')); 34 $playUrlEncode = strtr($playUrl, array('/' => '\\/'));
35 35
36 $this->_view->display('index', array( 36 $this->_view->display('index', array(
37 - 'staticTitle' => '元宵抽签', 37 + 'staticTitle' => '2016潮流运势测试！',
38 'staticFile' => self::STATIC_FILE, 38 'staticFile' => self::STATIC_FILE,
39 'staticJS' => array( 39 'staticJS' => array(
40 'home.js' 40 'home.js'
@@ -75,7 +75,7 @@ class YuanxiaoController extends HuodongAction @@ -75,7 +75,7 @@ class YuanxiaoController extends HuodongAction
75 $this->go(Helpers::url('/cuxiao/yuanxiao/wait')); 75 $this->go(Helpers::url('/cuxiao/yuanxiao/wait'));
76 } else { // 不成功就显示返回的错误信息 76 } else { // 不成功就显示返回的错误信息
77 $this->_view->display('info', array( 77 $this->_view->display('info', array(
78 - 'staticTitle' => '元宵抽签', 78 + 'staticTitle' => '2016潮流运势测试！',
79 'staticFile' => self::STATIC_FILE, 79 'staticFile' => self::STATIC_FILE,
80 'staticJS' => array( 80 'staticJS' => array(
81 'info.js' 81 'info.js'
@@ -91,7 +91,7 @@ class YuanxiaoController extends HuodongAction @@ -91,7 +91,7 @@ class YuanxiaoController extends HuodongAction
91 $userData = YuanxiaoModel::getUserProfileData($uid); 91 $userData = YuanxiaoModel::getUserProfileData($uid);
92 92
93 $this->_view->display('info', array( 93 $this->_view->display('info', array(
94 - 'staticTitle' => '元宵抽签', 94 + 'staticTitle' => '2016潮流运势测试！',
95 'staticFile' => self::STATIC_FILE, 95 'staticFile' => self::STATIC_FILE,
96 'staticJS' => array( 96 'staticJS' => array(
97 'info.js' 97 'info.js'
@@ -113,7 +113,7 @@ class YuanxiaoController extends HuodongAction @@ -113,7 +113,7 @@ class YuanxiaoController extends HuodongAction
113 $this->auditJumpLogin(); 113 $this->auditJumpLogin();
114 114
115 $this->_view->display('wait', array( 115 $this->_view->display('wait', array(
116 - 'staticTitle' => '元宵抽签', 116 + 'staticTitle' => '2016潮流运势测试！',
117 'staticFile' => self::STATIC_FILE, 117 'staticFile' => self::STATIC_FILE,
118 'activityUrl' => Helpers::url('/cuxiao/yuanxiao/result'), 118 'activityUrl' => Helpers::url('/cuxiao/yuanxiao/result'),
119 'staticJS' => array( 119 'staticJS' => array(
@@ -143,7 +143,7 @@ class YuanxiaoController extends HuodongAction @@ -143,7 +143,7 @@ class YuanxiaoController extends HuodongAction
143 )); 143 ));
144 144
145 $this->_view->display('result', array( 145 $this->_view->display('result', array(
146 - 'staticTitle' => '元宵抽签', 146 + 'staticTitle' => '2016潮流运势测试！',
147 'needShare' => $this->checkNeedShare(), // 是否需要微信分享 147 'needShare' => $this->checkNeedShare(), // 是否需要微信分享
148 'staticFile' => self::STATIC_FILE, 148 'staticFile' => self::STATIC_FILE,
149 'result' => $result, 149 'result' => $result,
@@ -174,7 +174,7 @@ class YuanxiaoController extends HuodongAction @@ -174,7 +174,7 @@ class YuanxiaoController extends HuodongAction
174 $result = YuanxiaoModel::getChoujiangShareInfo($uid); 174 $result = YuanxiaoModel::getChoujiangShareInfo($uid);
175 175
176 $this->_view->display('share', array( 176 $this->_view->display('share', array(
177 - 'staticTitle' => '元宵抽签', 177 + 'staticTitle' => '2016潮流运势测试！',
178 'staticFile' => self::STATIC_FILE, 178 'staticFile' => self::STATIC_FILE,
179 'result' => array( 179 'result' => array(
180 'name' => $result['name'], 180 'name' => $result['name'],