Merge branch 'feature/wap/yuanxiao' of git.dev.yoho.cn:web/yohobuy into feature/wap/yuanxiao

@@ -24,7 +24,7 @@
 <script type="text/tmpl" id="M1">
     <div class="bg-majia"></div>
     <div class="bg-yifei animated slideInUp"></div>
-    <div class="flyman animated infinite "></div>
+    <div class="flyman flyIn "></div>
 </script>
 <script type="text/tmpl" id="M2">
     <div class="bg-bamei animated slideInRight"></div>

@@ -9,8 +9,8 @@ use Plugin\Helpers;
  */
 class YuanxiaoController extends HuodongAction
 {
-    // const STATIC_FILE = 'http://localhost:2222/assets/1.0.1';
-    const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016yuanxiao/1.0.1';
+    // const STATIC_FILE = 'http://localhost:2222/assets/1.0.2';
+    const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016yuanxiao/1.0.2';
     const ENCRYPT_KEY = 'iamgtskkwhoareyou';
 
     /**
@@ -127,9 +127,9 @@ class YuanxiaoController extends HuodongAction
         $this->auditJumpLogin();
 
         $result = $this->getCookie('yuanxiaochouqian', null);
-        if (empty($result)) { // 未取到信息就重新测试
-            $this->go(Helpers::url('/cuxiao/yuanxiao/info'));
-        }
+        // if (empty($result)) { // 未取到信息就重新测试
+        //     $this->go(Helpers::url('/cuxiao/yuanxiao/info'));
+        // }
         // cookie中存的结果
         $result = json_decode($result, true);
         $shareUrl = Helpers::url('/cuxiao/yuanxiao/share', array(