Merge branch 'feature/userBirth' into release/0627

@@ -291,10 +291,6 @@ module.exports = class extends global.yoho.BaseModel {
                 let gender,
                 let gender,
                     genderArr,
                     genderArr,
                     birthday,
                     birthday,
-                    birthdayJson,
-                    yearArr,
-                    monthArr,
-                    dayArr,
                     profession,
                     profession,
                     professionArr,
                     professionArr,
                     income,
                     income,
@@ -333,11 +329,6 @@ module.exports = class extends global.yoho.BaseModel {
                     }
                     }
                 }
                 }
 
 
-                birthdayJson = that.getBirthday(birthday);
-                yearArr = birthdayJson.yearArr;
-                monthArr = birthdayJson.monthArr;
-                dayArr = birthdayJson.dayArr;
-
                 finalResult.userPersonalInfo = {
                 finalResult.userPersonalInfo = {
                     subTitle: '会员信息',
                     subTitle: '会员信息',
                     certified: parseInt(userInfo.vip_info.is_student, 10) === 1,
                     certified: parseInt(userInfo.vip_info.is_student, 10) === 1,
@@ -372,24 +363,8 @@ module.exports = class extends global.yoho.BaseModel {
                     birthday: {
                     birthday: {
                         labelText: '生日：',
                         labelText: '生日：',
                         key: 'birthday',
                         key: 'birthday',
-                        tips: '',
-                        selects: [
-                            {
-                                key: 'year',
-                                options: yearArr,
-                                unit: '年'
-                            },
-                            {
-                                key: 'month',
-                                options: monthArr,
-                                unit: '月'
-                            },
-                            {
-                                key: 'day',
-                                options: dayArr,
-                                unit: '日'
-                            }
-                        ]
+                        tips: '生日信息仅可修改一次,如需修改，请至最新版app进行修改。',
+                        value: birthday
                     },
                     },
                     profession: {
                     profession: {
                         labelText: '职业：',
                         labelText: '职业：',
@@ -613,12 +588,11 @@ module.exports = class extends global.yoho.BaseModel {
                 nickname: _.trim(req.body.nickname),
                 nickname: _.trim(req.body.nickname),
                 username: _.trim(req.body.username),
                 username: _.trim(req.body.username),
                 gender: req.body.gender || 3,
                 gender: req.body.gender || 3,
-                birthday: req.body.year === '' ? '' : that.formatDate(req.body.year, req.body.month, req.body.day),
                 profession: req.body.profession || 0,
                 profession: req.body.profession || 0,
                 income: req.body.income || 0
                 income: req.body.income || 0
             };
             };
 
 
-        if (!userInfo.nickname || !userInfo.username || userInfo.birthday === '') {
+        if (!userInfo.nickname || !userInfo.username) {
             respData = Promise.resolve({
             respData = Promise.resolve({
                 code: 400,
                 code: 400,
                 message: '缺失必填项',
                 message: '缺失必填项',

@@ -34,13 +34,7 @@
             {{# birthday}}
             {{# birthday}}
             <div class="form-group">
             <div class="form-group">
                 <label>{{labelText}}</label>
                 <label>{{labelText}}</label>
-                {{#each selects}}
-                <select name="{{key}}" id="{{key}}" >
-                    {{#each options}}
-                    <option value="{{value}}" {{#isChecked}}selected{{/isChecked}}>{{text}}</option>
-                    {{/each}}
-                </select>{{unit}}
-                {{/each}}
+                <span class="plain">{{value}}</span>
                 <span class="tips-p" id="{{key}}-tip">{{tips}}</span>
                 <span class="tips-p" id="{{key}}-tip">{{tips}}</span>
             </div>
             </div>
             {{/birthday}}
             {{/birthday}}