Authored by 毕凯

元宵抽签 动画完善

@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 <script type="text/tmpl" id="M1"> 24 <script type="text/tmpl" id="M1">
25 <div class="bg-majia"></div> 25 <div class="bg-majia"></div>
26 <div class="bg-yifei animated slideInUp"></div> 26 <div class="bg-yifei animated slideInUp"></div>
27 - <div class="flyman animated infinite "></div> 27 + <div class="flyman flyIn "></div>
28 </script> 28 </script>
29 <script type="text/tmpl" id="M2"> 29 <script type="text/tmpl" id="M2">
30 <div class="bg-bamei animated slideInRight"></div> 30 <div class="bg-bamei animated slideInRight"></div>
@@ -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.0.1';  
13 - const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016yuanxiao/1.0.1'; 12 + const STATIC_FILE = 'http://localhost:2222/assets/1.0.1';
  13 + // const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016yuanxiao/1.0.1';
14 const ENCRYPT_KEY = 'iamgtskkwhoareyou'; 14 const ENCRYPT_KEY = 'iamgtskkwhoareyou';
15 15
16 /** 16 /**
@@ -128,9 +128,9 @@ class YuanxiaoController extends HuodongAction @@ -128,9 +128,9 @@ class YuanxiaoController extends HuodongAction
128 $this->auditJumpLogin(); 128 $this->auditJumpLogin();
129 129
130 $result = $this->getCookie('yuanxiaochouqian', null); 130 $result = $this->getCookie('yuanxiaochouqian', null);
131 - if (empty($result)) { // 未取到信息就重新测试  
132 - $this->go(Helpers::url('/cuxiao/yuanxiao/info'));  
133 - } 131 + // if (empty($result)) { // 未取到信息就重新测试
  132 + // $this->go(Helpers::url('/cuxiao/yuanxiao/info'));
  133 + // }
134 // cookie中存的结果 134 // cookie中存的结果
135 $result = json_decode($result, true); 135 $result = json_decode($result, true);
136 $shareUrl = Helpers::url('/cuxiao/yuanxiao/share', array( 136 $shareUrl = Helpers::url('/cuxiao/yuanxiao/share', array(
@@ -141,11 +141,11 @@ class YuanxiaoController extends HuodongAction @@ -141,11 +141,11 @@ class YuanxiaoController extends HuodongAction
141 $this->_view->display('result', array( 141 $this->_view->display('result', array(
142 'staticTitle' => '元宵抽签', 142 'staticTitle' => '元宵抽签',
143 'staticFile' => self::STATIC_FILE, 143 'staticFile' => self::STATIC_FILE,
  144 + 'result' => $result,
144 'result' => array( 145 'result' => array(
145 'name' => '张大龙', 146 'name' => '张大龙',
146 'type' => 'M1' 147 'type' => 'M1'
147 ), 148 ),
148 - 'result' => $result,  
149 'shareUrl' => $shareUrl, 149 'shareUrl' => $shareUrl,
150 'staticJS' => array( 150 'staticJS' => array(
151 'result.js' 151 'result.js'