Merge branch 'develop/wap' into beta/wap

Conflicts:
	yohobuy/huodong.m.yohobuy.com/application/modules/Cuxiao/controllers/Yuanxiao.php

@@ -18,7 +18,7 @@
                 <div class="title">
                     生日
                 </div>
-                <input class="birthday-picker" type="text" name="birthday" value="{{birthday}}" min="1900-01-01" max="2016-02-29" readonly>
+                <input class="birthday-picker" type="text" name="birthday" value="{{birthday}}" data-number="{{birthdayNumber}}" readonly>
             </div>
             <div class="gender">
                 <div class="title">

@@ -9,9 +9,8 @@ use Plugin\Helpers;
  */
 class YuanxiaoController extends HuodongAction
 {
-
-    // const STATIC_FILE = 'http://localhost:2222/assets/1.0.8';
-    const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016yuanxiao/1.0.8';
+    // const STATIC_FILE = 'http://localhost:2222/assets/1.0.9';
+    const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016yuanxiao/1.0.9';
     const ENCRYPT_KEY = 'iamgtskkwhoareyou';
 
     /**
@@ -77,6 +76,7 @@ class YuanxiaoController extends HuodongAction
                         'info.js'
                     ),
                     'birthday' => $birthday,
+                    'birthdayNumber' => $FormatBirthday,
                     'gender' => $gender,
                     'isBoy' => $gender == 1, // 性别是否是女标志位
                     'message' => $result['message']
@@ -92,6 +92,7 @@ class YuanxiaoController extends HuodongAction
                     'info.js'
                 ),
                 'birthday' => date_format(date_create($userData['birthday']), 'Y年m月d日'),
+                'birthdayNumber' => $userData['birthday'],
                 'gender' => $userData['gender'],
                 'isBoy' => $userData['gender'] == 1 // 性别是否是女标志位
             ));