fe / YOHOBUYPC · Commits

Go to a project

Authored by 毕凯
Commit 4093000b241a5b7f799cb5ba873e885e413819b2 1 parent 8a7112cf

元宵抽签活动完善

Inline Side-by-side
Showing 3 changed files with 16 additions and 9 deletions
@@ -5,9 +5,9 @@ @@ -5,9 +5,9 @@
5 5
6 <div class="title"> 6 <div class="title">
7 <p> 7 <p>
8 - {{result.name}} 的 8 + {{result.name}}
9 </p> 9 </p>
10 - 2016年潮流运势是 10 + 2016年的潮流运势是
11 </div> 11 </div>
12 12
13 <div class="hr"> 13 <div class="hr">
@@ -6,9 +6,9 @@ @@ -6,9 +6,9 @@
6 6
7 <div class="title"> 7 <div class="title">
8 <p> 8 <p>
9 - {{result.name}} 的 9 + {{result.name}}
10 </p> 10 </p>
11 - 2016年潮流运势是 11 + 2016年的潮流运势是
12 </div> 12 </div>
13 13
14 <div class="type {{result.type}}" data-type="{{result.type}}"> 14 <div class="type {{result.type}}" data-type="{{result.type}}">
@@ -10,7 +10,8 @@ use Api\Yohobuy; @@ -10,7 +10,8 @@ use Api\Yohobuy;
10 */ 10 */
11 class YuanxiaoController extends HuodongAction 11 class YuanxiaoController extends HuodongAction
12 { 12 {
13 - const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016yuanxiao/1.0.0'; 13 + const STATIC_FILE = 'http://localhost:2222/assets/1.0.0';
  14 + // const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016yuanxiao/1.0.0';
14 /** 15 /**
15 * 元宵抽签 16 * 元宵抽签
16 */ 17 */
@@ -18,7 +19,10 @@ class YuanxiaoController extends HuodongAction @@ -18,7 +19,10 @@ class YuanxiaoController extends HuodongAction
18 { 19 {
19 $this->_view->display('index', array( 20 $this->_view->display('index', array(
20 'staticTitle' => '元宵抽签', 21 'staticTitle' => '元宵抽签',
21 - 'staticFile' => self::STATIC_FILE 22 + 'staticFile' => self::STATIC_FILE,
  23 + 'staticJS' => array(
  24 + 'home.js'
  25 + ),
22 )); 26 ));
23 } 27 }
24 28
@@ -44,7 +48,10 @@ class YuanxiaoController extends HuodongAction @@ -44,7 +48,10 @@ class YuanxiaoController extends HuodongAction
44 { 48 {
45 $this->_view->display('wait', array( 49 $this->_view->display('wait', array(
46 'staticTitle' => '元宵抽签', 50 'staticTitle' => '元宵抽签',
47 - 'staticFile' => self::STATIC_FILE 51 + 'staticFile' => self::STATIC_FILE,
  52 + 'staticJS' => array(
  53 + 'wait.js'
  54 + ),
48 )); 55 ));
49 } 56 }
50 57
@@ -58,7 +65,7 @@ class YuanxiaoController extends HuodongAction @@ -58,7 +65,7 @@ class YuanxiaoController extends HuodongAction
58 'staticFile' => self::STATIC_FILE, 65 'staticFile' => self::STATIC_FILE,
59 'result' => array( 66 'result' => array(
60 'name' => '张大龙', 67 'name' => '张大龙',
61 - 'type' => 'F4' 68 + 'type' => 'M1'
62 ), 69 ),
63 'staticJS' => array( 70 'staticJS' => array(
64 'result.js' 71 'result.js'
@@ -76,7 +83,7 @@ class YuanxiaoController extends HuodongAction @@ -76,7 +83,7 @@ class YuanxiaoController extends HuodongAction
76 'staticFile' => self::STATIC_FILE, 83 'staticFile' => self::STATIC_FILE,
77 'result' => array( 84 'result' => array(
78 'name' => '张大龙', 85 'name' => '张大龙',
79 - 'type' => 'P1' 86 + 'type' => 'F4'
80 ), 87 ),
81 'count' => '78999', // 过万转换成 “16万” 这种形式 88 'count' => '78999', // 过万转换成 “16万” 这种形式
82 'staticJS' => array( 89 'staticJS' => array(