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

@@ -5,9 +5,9 @@
 
         <div class="title">
             <p>
-                {{result.name}} 的
+                {{result.name}}
             </p>
-            2016年潮流运势是
+            2016年的潮流运势是
         </div>
 
         <div class="hr">

@@ -6,9 +6,9 @@
 
         <div class="title">
             <p>
-                {{result.name}} 的
+                {{result.name}}
             </p>
-            2016年潮流运势是
+            2016年的潮流运势是
         </div>
 
         <div class="type {{result.type}}" data-type="{{result.type}}">

@@ -9,7 +9,8 @@ use Plugin\Helpers;
  */
 class YuanxiaoController extends HuodongAction
 {
-    const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016yuanxiao/1.0.0';
+    // const STATIC_FILE = 'http://localhost:2222/assets/1.0.1';
+    const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016yuanxiao/1.0.1';
     const ENCRYPT_KEY = 'iamgtskkwhoareyou';
 
     /**
@@ -35,6 +36,9 @@ class YuanxiaoController extends HuodongAction
         $this->_view->display('index', array(
             'staticTitle' => '元宵抽签',
             'staticFile' => self::STATIC_FILE,
+            'staticJS' => array(
+                'home.js'
+            ),
             'weixinShare' => $this->_isApp ? false : true, // 是否需要微信分享
             'shareLink' => 'http://feature.yoho.cn/2016lishifeng/index.html',
             'shareTitle' => 'YOHO!BUY有货新年寻宝大作战，千元利是等你赢！',
@@ -102,7 +106,10 @@ class YuanxiaoController extends HuodongAction
 
         $this->_view->display('wait', array(
             'staticTitle' => '元宵抽签',
-            'staticFile' => self::STATIC_FILE
+            'staticFile' => self::STATIC_FILE,
+            'staticJS' => array(
+                'wait.js'
+            ),
         ));
     }
 
@@ -128,6 +135,10 @@ class YuanxiaoController extends HuodongAction
         $this->_view->display('result', array(
             'staticTitle' => '元宵抽签',
             'staticFile' => self::STATIC_FILE,
+            'result' => array(
+                'name' => '张大龙',
+                'type' => 'M1'
+            ),
             'result' => $result,
             'shareUrl' => $shareUrl,
             'staticJS' => array(