wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by Rock Zhang
Commit fb9f047720a4c4375d7e5d63cecadc78a32c21d3 2 parents c607980e 99183004

Merge branch 'develop/wap' into beta/wap 

Conflicts:
	yohobuy/huodong.m.yohobuy.com/application/modules/Cuxiao/controllers/Yuanxiao.php
Inline Side-by-side
Showing 2 changed files with 5 additions and 4 deletions
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <div class="title"> 18 <div class="title">
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}}" data-number="{{birthdayNumber}}" readonly>
22 </div> 22 </div>
23 <div class="gender"> 23 <div class="gender">
24 <div class="title"> 24 <div class="title">
@@ -9,9 +9,8 @@ use Plugin\Helpers; @@ -9,9 +9,8 @@ use Plugin\Helpers;
9 */ 9 */
10 class YuanxiaoController extends HuodongAction 10 class YuanxiaoController extends HuodongAction
11 { 11 {
12 -  
13 - // const STATIC_FILE = 'http://localhost:2222/assets/1.0.8';  
14 - const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016yuanxiao/1.0.8'; 12 + // const STATIC_FILE = 'http://localhost:2222/assets/1.0.9';
  13 + const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016yuanxiao/1.0.9';
15 const ENCRYPT_KEY = 'iamgtskkwhoareyou'; 14 const ENCRYPT_KEY = 'iamgtskkwhoareyou';
16 15
17 /** 16 /**
@@ -77,6 +76,7 @@ class YuanxiaoController extends HuodongAction @@ -77,6 +76,7 @@ class YuanxiaoController extends HuodongAction
77 'info.js' 76 'info.js'
78 ), 77 ),
79 'birthday' => $birthday, 78 'birthday' => $birthday,
  79 + 'birthdayNumber' => $FormatBirthday,
80 'gender' => $gender, 80 'gender' => $gender,
81 'isBoy' => $gender == 1, // 性别是否是女标志位 81 'isBoy' => $gender == 1, // 性别是否是女标志位
82 'message' => $result['message'] 82 'message' => $result['message']
@@ -92,6 +92,7 @@ class YuanxiaoController extends HuodongAction @@ -92,6 +92,7 @@ class YuanxiaoController extends HuodongAction
92 'info.js' 92 'info.js'
93 ), 93 ),
94 'birthday' => date_format(date_create($userData['birthday']), 'Y年m月d日'), 94 'birthday' => date_format(date_create($userData['birthday']), 'Y年m月d日'),
  95 + 'birthdayNumber' => $userData['birthday'],
95 'gender' => $userData['gender'], 96 'gender' => $userData['gender'],
96 'isBoy' => $userData['gender'] == 1 // 性别是否是女标志位 97 'isBoy' => $userData['gender'] == 1 // 性别是否是女标志位
97 )); 98 ));