chenchao / YOHOBUYPC · Commits

Go to a project

Authored by Rock Zhang
Commit 097a28ce3a782ae82fc27d3577400ecb489309a9 2 parents 6021afe3 30743601

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

Inline Side-by-side
Showing 3 changed files with 17 additions and 6 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}}">
@@ -9,7 +9,8 @@ use Plugin\Helpers; @@ -9,7 +9,8 @@ use Plugin\Helpers;
9 */ 9 */
10 class YuanxiaoController extends HuodongAction 10 class YuanxiaoController extends HuodongAction
11 { 11 {
12 - const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016yuanxiao/1.0.0'; 12 + // const STATIC_FILE = 'http://localhost:2222/assets/1.0.1';
  13 + const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016yuanxiao/1.0.1';
13 const ENCRYPT_KEY = 'iamgtskkwhoareyou'; 14 const ENCRYPT_KEY = 'iamgtskkwhoareyou';
14 15
15 /** 16 /**
@@ -35,6 +36,9 @@ class YuanxiaoController extends HuodongAction @@ -35,6 +36,9 @@ class YuanxiaoController extends HuodongAction
35 $this->_view->display('index', array( 36 $this->_view->display('index', array(
36 'staticTitle' => '元宵抽签', 37 'staticTitle' => '元宵抽签',
37 'staticFile' => self::STATIC_FILE, 38 'staticFile' => self::STATIC_FILE,
  39 + 'staticJS' => array(
  40 + 'home.js'
  41 + ),
38 'weixinShare' => $this->_isApp ? false : true, // 是否需要微信分享 42 'weixinShare' => $this->_isApp ? false : true, // 是否需要微信分享
39 'shareLink' => 'http://feature.yoho.cn/2016lishifeng/index.html', 43 'shareLink' => 'http://feature.yoho.cn/2016lishifeng/index.html',
40 'shareTitle' => 'YOHO!BUY有货新年寻宝大作战，千元利是等你赢！', 44 'shareTitle' => 'YOHO!BUY有货新年寻宝大作战，千元利是等你赢！',
@@ -102,7 +106,10 @@ class YuanxiaoController extends HuodongAction @@ -102,7 +106,10 @@ class YuanxiaoController extends HuodongAction
102 106
103 $this->_view->display('wait', array( 107 $this->_view->display('wait', array(
104 'staticTitle' => '元宵抽签', 108 'staticTitle' => '元宵抽签',
105 - 'staticFile' => self::STATIC_FILE 109 + 'staticFile' => self::STATIC_FILE,
  110 + 'staticJS' => array(
  111 + 'wait.js'
  112 + ),
106 )); 113 ));
107 } 114 }
108 115
@@ -128,6 +135,10 @@ class YuanxiaoController extends HuodongAction @@ -128,6 +135,10 @@ class YuanxiaoController extends HuodongAction
128 $this->_view->display('result', array( 135 $this->_view->display('result', array(
129 'staticTitle' => '元宵抽签', 136 'staticTitle' => '元宵抽签',
130 'staticFile' => self::STATIC_FILE, 137 'staticFile' => self::STATIC_FILE,
  138 + 'result' => array(
  139 + 'name' => '张大龙',
  140 + 'type' => 'M1'
  141 + ),
131 'result' => $result, 142 'result' => $result,
132 'shareUrl' => $shareUrl, 143 'shareUrl' => $shareUrl,
133 'staticJS' => array( 144 'staticJS' => array(