Authored by hf

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

1 {{> cuxiao/yuanxiao/header}} 1 {{> cuxiao/yuanxiao/header}}
2 <div class="main-wrap home"> 2 <div class="main-wrap home">
3 <div class="header"></div> 3 <div class="header"></div>
4 - <div class="people">  
5 - <div class="flower flower-l"></div>  
6 - <div class="flower flower-r"></div>  
7 - </div>  
8 - <a class="start" href="{{playUrl}}"></a>  
9 - <div class="footer">  
10 - <a class="arrow animated infinite pulse" href="{{playUrl}}"></a>  
11 - <div class="yohobuy"></div>  
12 - </div> 4 + <a href="{{playUrl}}">
  5 + <div class="people">
  6 + <div class="flower flower-l"></div>
  7 + <div class="flower flower-r"></div>
  8 + </div>
  9 + <div class="start"></div>
  10 + <div class="footer">
  11 + <div class="arrow animated infinite pulse"></div>
  12 + <div class="yohobuy"></div>
  13 + </div>
  14 + </a>
13 </div> 15 </div>
14 {{> cuxiao/yuanxiao/footer}} 16 {{> cuxiao/yuanxiao/footer}}
@@ -9,8 +9,8 @@ use Plugin\Helpers; @@ -9,8 +9,8 @@ use Plugin\Helpers;
9 */ 9 */
10 class YuanxiaoController extends HuodongAction 10 class YuanxiaoController extends HuodongAction
11 { 11 {
12 - // const STATIC_FILE = 'http://localhost:2222/assets/1.1.3';  
13 - const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016yuanxiao/1.1.5'; 12 + // const STATIC_FILE = 'http://localhost:2222/assets/1.1.6';
  13 + const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016yuanxiao/1.1.6';
14 const ENCRYPT_KEY = 'iamgtskkwhoareyou'; 14 const ENCRYPT_KEY = 'iamgtskkwhoareyou';
15 15
16 /** 16 /**
@@ -254,7 +254,7 @@ class YuanxiaoController extends HuodongAction @@ -254,7 +254,7 @@ class YuanxiaoController extends HuodongAction
254 */ 254 */
255 private function checkNeedShare() 255 private function checkNeedShare()
256 { 256 {
257 - // Android 257 + // Android
258 if ($this->_isApp) { 258 if ($this->_isApp) {
259 return true; 259 return true;
260 } 260 }
@@ -269,7 +269,7 @@ class YuanxiaoController extends HuodongAction @@ -269,7 +269,7 @@ class YuanxiaoController extends HuodongAction
269 269
270 return false; 270 return false;
271 } 271 }
272 - 272 +
273 /** 273 /**
274 * 判断是否是微信访问 274 * 判断是否是微信访问
275 */ 275 */