Authored by hf

Merge branch 'beta/wap' of http://git.dev.yoho.cn/web/yohobuy into beta/wap

@@ -19,10 +19,6 @@ @@ -19,10 +19,6 @@
19 生日 19 生日
20 </div> 20 </div>
21 <input class="birthday-picker" type="text" name="birthday" value="{{birthday}}" min="1900-01-01" max="2016-02-29" readonly> 21 <input class="birthday-picker" type="text" name="birthday" value="{{birthday}}" min="1900-01-01" max="2016-02-29" readonly>
22 - <!-- <div class="birthday-div">  
23 - <span>{{birthday}}</span>  
24 - <input class="birthday-input" type="date" name="birthday" value="{{birthday}}" min="1900-01-01" max="2016-02-29">  
25 - </div> -->  
26 </div> 22 </div>
27 <div class="gender"> 23 <div class="gender">
28 <div class="title"> 24 <div class="title">
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 </div> 17 </div>
18 <script type="text/javascript"> 18 <script type="text/javascript">
19 setTimeout(function (){ 19 setTimeout(function (){
20 - location.href = "/cuxiao/yuanxiao/result?share_id=1"; 20 + location.href = '{{activityUrl}}?openby:yohobuy={"action":"go.h5","params":{"title":"元宵抽签","url":"{{activityUrl}}","share":"\/operations\/api\/v5\/webshare\/getShare","shareparam":{"share_id":"1"},"param":{"share_id":"1"}}}';
21 }, 2000); 21 }, 2000);
22 </script> 22 </script>
23 {{> cuxiao/yuanxiao/footer}} 23 {{> cuxiao/yuanxiao/footer}}
@@ -109,6 +109,7 @@ class YuanxiaoController extends HuodongAction @@ -109,6 +109,7 @@ class YuanxiaoController extends HuodongAction
109 $this->_view->display('wait', array( 109 $this->_view->display('wait', array(
110 'staticTitle' => '元宵抽签', 110 'staticTitle' => '元宵抽签',
111 'staticFile' => self::STATIC_FILE, 111 'staticFile' => self::STATIC_FILE,
  112 + 'activityUrl' => Helpers::url('/cuxiao/yuanxiao/result'),
112 'staticJS' => array( 113 'staticJS' => array(
113 'wait.js' 114 'wait.js'
114 ), 115 ),