Authored by Rock Zhang

修复android登录问题

@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 </div> 17 </div>
18 <script type="text/javascript"> 18 <script type="text/javascript">
19 setTimeout(function (){ 19 setTimeout(function (){
20 - location.href = '{{activityUrl}}'; 20 + location.href = '{{{activityUrl}}}';
21 21
22 // location.href = '{{activityUrl}}?openby:yohobuy={"action":"go.h5","params":{"title":"元宵抽签","url":"{{activityUrl}}","share":"\/operations\/api\/v5\/webshare\/getShare","shareparam":{"share_id":"1"},"param":{"share_id":"1"}}}'; 22 // location.href = '{{activityUrl}}?openby:yohobuy={"action":"go.h5","params":{"title":"元宵抽签","url":"{{activityUrl}}","share":"\/operations\/api\/v5\/webshare\/getShare","shareparam":{"share_id":"1"},"param":{"share_id":"1"}}}';
23 }, 2000); 23 }, 2000);
@@ -135,7 +135,7 @@ class YuanxiaoController extends HuodongAction @@ -135,7 +135,7 @@ class YuanxiaoController extends HuodongAction
135 $this->_view->display('wait', array( 135 $this->_view->display('wait', array(
136 'staticTitle' => '2016潮流运势测试', 136 'staticTitle' => '2016潮流运势测试',
137 'staticFile' => self::STATIC_FILE, 137 'staticFile' => self::STATIC_FILE,
138 - 'activityUrl' => !$this->isWeixin() ? $activityUrl . '?openby:yohobuy={"action":"go.h5","params":{"url":"' . $activityUrl . '","islogin":"N"}}' : $activityUrl, 138 + 'activityUrl' => !$this->isWeixin() ? $activityUrl . '?openby:yohobuy={"action":"go.h5","params":{"url":"' . $activityUrl . '","islogin":"N","param":{"from":"app"},"share":"'.$activityUrl.'","shareparam":{"share_id":"1"}}}' : $activityUrl,
139 'staticJS' => array( 139 'staticJS' => array(
140 'wait.js' 140 'wait.js'
141 ), 141 ),