Authored by hf

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

{{> cuxiao/yuanxiao/header}}
<div class="main-wrap home">
<div class="header"></div>
<div class="people">
<div class="flower flower-l"></div>
<div class="flower flower-r"></div>
</div>
<a class="start" href="{{playUrl}}"></a>
<div class="footer">
<a class="arrow animated infinite pulse" href="{{playUrl}}"></a>
<div class="yohobuy"></div>
</div>
<a href="{{playUrl}}">
<div class="people">
<div class="flower flower-l"></div>
<div class="flower flower-r"></div>
</div>
<div class="start"></div>
<div class="footer">
<div class="arrow animated infinite pulse"></div>
<div class="yohobuy"></div>
</div>
</a>
</div>
{{> cuxiao/yuanxiao/footer}}
... ...
... ... @@ -9,8 +9,8 @@ use Plugin\Helpers;
*/
class YuanxiaoController extends HuodongAction
{
// const STATIC_FILE = 'http://localhost:2222/assets/1.1.3';
const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016yuanxiao/1.1.5';
// const STATIC_FILE = 'http://localhost:2222/assets/1.1.6';
const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016yuanxiao/1.1.6';
const ENCRYPT_KEY = 'iamgtskkwhoareyou';
/**
... ... @@ -254,7 +254,7 @@ class YuanxiaoController extends HuodongAction
*/
private function checkNeedShare()
{
// Android
// Android
if ($this->_isApp) {
return true;
}
... ... @@ -269,7 +269,7 @@ class YuanxiaoController extends HuodongAction
return false;
}
/**
* 判断是否是微信访问
*/
... ...