首页资源位 潮流口令滚动
Showing
11 changed files
with
170 additions
and
62 deletions
@@ -84,7 +84,9 @@ exports.modify = (req, res, next) => { | @@ -84,7 +84,9 @@ exports.modify = (req, res, next) => { | ||
84 | uid: req.user.uid, | 84 | uid: req.user.uid, |
85 | nickName: req.query.nickName, | 85 | nickName: req.query.nickName, |
86 | gender: req.query.gender, | 86 | gender: req.query.gender, |
87 | - birthday: req.query.birthday | 87 | + birthday: req.query.birthday, |
88 | + height: req.query.height, | ||
89 | + weight: req.query.weight | ||
88 | }; | 90 | }; |
89 | 91 | ||
90 | req.ctx(family).modify(params).then((result) => { | 92 | req.ctx(family).modify(params).then((result) => { |
@@ -5,7 +5,9 @@ const moment = require('moment'); | @@ -5,7 +5,9 @@ const moment = require('moment'); | ||
5 | const camelCase = global.yoho.camelCase; | 5 | const camelCase = global.yoho.camelCase; |
6 | const api = global.yoho.API; | 6 | const api = global.yoho.API; |
7 | const service = global.yoho.ServiceAPI; | 7 | const service = global.yoho.ServiceAPI; |
8 | -const resourcesProcess = require(`${utils}/resources-process`); | 8 | +const resourcesProcess = require(`${global.utils}/resources-process`); |
9 | +const helpers = global.yoho.helpers; | ||
10 | +const crypto = global.yoho.crypto; | ||
9 | 11 | ||
10 | class familyModel extends global.yoho.BaseModel { | 12 | class familyModel extends global.yoho.BaseModel { |
11 | constructor(ctx) { | 13 | constructor(ctx) { |
@@ -454,32 +456,37 @@ class familyModel extends global.yoho.BaseModel { | @@ -454,32 +456,37 @@ class familyModel extends global.yoho.BaseModel { | ||
454 | } | 456 | } |
455 | 457 | ||
456 | userInfo(params) { | 458 | userInfo(params) { |
457 | - let options = { | ||
458 | - data: { | ||
459 | - method: 'app.passport.profile', | ||
460 | - uid: params.uid | ||
461 | - }, | ||
462 | - param: { | ||
463 | - code: 200 | ||
464 | - } | ||
465 | - }; | ||
466 | - | ||
467 | - return this.get(options).then(result => { | 459 | + return Promise.all([ |
460 | + this._userData(params.uid), | ||
461 | + this._getCode(params.uid) | ||
462 | + ]).then(result => { | ||
468 | let resu = {}; | 463 | let resu = {}; |
469 | 464 | ||
470 | - if (_.get(result, 'data')) { | ||
471 | - let thisGender = result.data.gender; | 465 | + if (_.get(result, '[0].data')) { |
466 | + let thisGender = result[0].data.gender; | ||
472 | 467 | ||
473 | - result.data.gender = (thisGender === '1' ? '男' : '女'); | ||
474 | - result.data.otherGender = (thisGender === '1' ? '女' : '男'); | ||
475 | - if (result.data.gender === '男') { | ||
476 | - result.data.genderId = 1; | ||
477 | - result.data.otherGenderId = 2; | 468 | + result[0].data.gender = (thisGender === '1' ? '男' : '女'); |
469 | + result[0].data.otherGender = (thisGender === '1' ? '女' : '男'); | ||
470 | + if (result[0].data.gender === '男') { | ||
471 | + result[0].data.genderId = 1; | ||
472 | + result[0].data.otherGenderId = 2; | ||
478 | } else { | 473 | } else { |
479 | - result.data.genderId = 2; | ||
480 | - result.data.otherGenderId = 1; | 474 | + result[0].data.genderId = 2; |
475 | + result[0].data.otherGenderId = 1; | ||
481 | } | 476 | } |
482 | - resu = camelCase(result.data); | 477 | + result[0].data.qrcodeLink = helpers.urlFormat('/home/user/qrcode', { |
478 | + token: _.get(result[0], 'data.uid', null) ? | ||
479 | + crypto.encryption('yoho9646yoho9646', _.get(result, 'data.uid', null) + '') : '', | ||
480 | + icon: _.get(result[0], 'data.head_ico', ''), | ||
481 | + uname: _.get(result[0], 'data.nickname', ''), | ||
482 | + vip: _.get(result[0], 'data.vip_info.cur_level') | ||
483 | + }); | ||
484 | + resu = camelCase(result[0].data); | ||
485 | + } | ||
486 | + if (_.get(result, '[1].data')) { | ||
487 | + Object.assign(resu, { | ||
488 | + trendWord: result[1].data.trendWord | ||
489 | + }); | ||
483 | } | 490 | } |
484 | return resu; | 491 | return resu; |
485 | }); | 492 | }); |
@@ -492,7 +499,9 @@ class familyModel extends global.yoho.BaseModel { | @@ -492,7 +499,9 @@ class familyModel extends global.yoho.BaseModel { | ||
492 | uid: params.uid, | 499 | uid: params.uid, |
493 | nick_name: params.nickName, | 500 | nick_name: params.nickName, |
494 | gender: params.gender, | 501 | gender: params.gender, |
495 | - birthday: params.birthday | 502 | + birthday: params.birthday, |
503 | + height: params.height, | ||
504 | + weight: params.weight | ||
496 | }, | 505 | }, |
497 | param: { | 506 | param: { |
498 | code: 200 | 507 | code: 200 |
@@ -500,6 +509,7 @@ class familyModel extends global.yoho.BaseModel { | @@ -500,6 +509,7 @@ class familyModel extends global.yoho.BaseModel { | ||
500 | }; | 509 | }; |
501 | 510 | ||
502 | return this.get(options).then(result => { | 511 | return this.get(options).then(result => { |
512 | + console.log(result); | ||
503 | return result; | 513 | return result; |
504 | }); | 514 | }); |
505 | } | 515 | } |
@@ -181,6 +181,6 @@ router.get('/family', auth, family.familyIndex); // family首页 | @@ -181,6 +181,6 @@ router.get('/family', auth, family.familyIndex); // family首页 | ||
181 | router.get('/family/vipDetailData', auth, family.familyVip); // 获取VIP信息 | 181 | router.get('/family/vipDetailData', auth, family.familyVip); // 获取VIP信息 |
182 | router.get('/family/coinDetail', auth, family.coinDetail); // 积分详情页 | 182 | router.get('/family/coinDetail', auth, family.coinDetail); // 积分详情页 |
183 | router.get('/family/coinDetail/getCoinData', auth, family.getCoinData); // 筛选积分详情 | 183 | router.get('/family/coinDetail/getCoinData', auth, family.getCoinData); // 筛选积分详情 |
184 | -router.get('/family/userInfo', auth, family.userInfo); // family个人信息页 | 184 | +router.get('/family/userInfo', auth, disableBFCache, family.userInfo); // family个人信息页 |
185 | router.get('/family/modify', auth, family.modify); // family修改个人信息页 | 185 | router.get('/family/modify', auth, family.modify); // family修改个人信息页 |
186 | module.exports = router; | 186 | module.exports = router; |
1 | <div class="yoho-family-page yoho-page"> | 1 | <div class="yoho-family-page yoho-page"> |
2 | <div class="score-detail-c"> | 2 | <div class="score-detail-c"> |
3 | <div class="tab"> | 3 | <div class="tab"> |
4 | - <div id="source" class="tab-item">版块 | 4 | + <div id="source" class="tab-item"> |
5 | + <span class="name">版块</span> | ||
5 | <span class="iconfont down"></span> | 6 | <span class="iconfont down"></span> |
6 | <span class="iconfont up"></span> | 7 | <span class="iconfont up"></span> |
7 | <ul class="list"> | 8 | <ul class="list"> |
8 | - <li data-source="0"> | ||
9 | - 全部 | 9 | + <li data-source="-1"> |
10 | + <span class="title">全部</span> | ||
10 | <span class="tick"></span> | 11 | <span class="tick"></span> |
11 | </li> | 12 | </li> |
12 | <li data-source="1"> | 13 | <li data-source="1"> |
13 | - Yoho!Buy | 14 | + <span class="title">Yoho!Buy</span> |
14 | <span class="tick"></span> | 15 | <span class="tick"></span> |
15 | </li> | 16 | </li> |
16 | <li data-source="3"> | 17 | <li data-source="3"> |
17 | - Yoho!Now | 18 | + <span class="title">Yoho!Now</span> |
18 | <span class="tick"></span> | 19 | <span class="tick"></span> |
19 | </li> | 20 | </li> |
20 | <li data-source="2"> | 21 | <li data-source="2"> |
21 | - Mars | 22 | + <span class="title">Mars</span> |
22 | <span class="tick"></span> | 23 | <span class="tick"></span> |
23 | </li> | 24 | </li> |
24 | <li data-source="6"> | 25 | <li data-source="6"> |
25 | - Yo!Coffee | 26 | + <span class="title">Yo!Coffee</span> |
26 | <span class="tick"></span> | 27 | <span class="tick"></span> |
27 | </li> | 28 | </li> |
28 | <li data-source="5"> | 29 | <li data-source="5"> |
29 | - Yo!Green | 30 | + <span class="title">Yo!Green</span> |
30 | <span class="tick"></span> | 31 | <span class="tick"></span> |
31 | </li> | 32 | </li> |
32 | <li data-source="7"> | 33 | <li data-source="7"> |
33 | - Yo!Little | 34 | + <span class="title">Yo!Little</span> |
34 | <span class="tick"></span> | 35 | <span class="tick"></span> |
35 | </li> | 36 | </li> |
36 | </ul> | 37 | </ul> |
37 | </div> | 38 | </div> |
38 | - <div id="queryType" class="tab-item">积分明细 | 39 | + <div id="queryType" class="tab-item"> |
40 | + <span class="name">积分明细</span> | ||
39 | <span class="iconfont down"></span> | 41 | <span class="iconfont down"></span> |
40 | <span class="iconfont up"></span> | 42 | <span class="iconfont up"></span> |
41 | <ul class="list"> | 43 | <ul class="list"> |
42 | <li data-type="0"> | 44 | <li data-type="0"> |
43 | - 全部 | 45 | + <span class="title">全部</span> |
44 | <span class="tick"></span> | 46 | <span class="tick"></span> |
45 | </li> | 47 | </li> |
46 | <li data-type="1"> | 48 | <li data-type="1"> |
47 | - 收入 | 49 | + <span class="title">收入</span> |
48 | <span class="tick"></span> | 50 | <span class="tick"></span> |
49 | </li> | 51 | </li> |
50 | <li data-type="2"> | 52 | <li data-type="2"> |
51 | - 支出 | 53 | + <span class="title">支出</span> |
52 | <span class="tick"></span> | 54 | <span class="tick"></span> |
53 | </li> | 55 | </li> |
54 | </ul> | 56 | </ul> |
55 | </div> | 57 | </div> |
56 | - <div id="time" class="tab-item">最近三月 | 58 | + <div id="time" class="tab-item"> |
59 | + <span class="name">最近一年</span> | ||
57 | <span class="iconfont down"></span> | 60 | <span class="iconfont down"></span> |
58 | <span class="iconfont up"></span> | 61 | <span class="iconfont up"></span> |
59 | <ul class="list"> | 62 | <ul class="list"> |
60 | <li data-begin="0"> | 63 | <li data-begin="0"> |
61 | - 全部 | 64 | + <span class="title">全部</span> |
62 | <span class="tick"></span></li> | 65 | <span class="tick"></span></li> |
63 | <li data-begin="7776000000"> | 66 | <li data-begin="7776000000"> |
64 | - 最近三月 | 67 | + <span class="title">最近三月</span> |
65 | <span class="tick"></span> | 68 | <span class="tick"></span> |
66 | </li> | 69 | </li> |
67 | <li data-begin="15552000000"> | 70 | <li data-begin="15552000000"> |
68 | - 最近六月 | 71 | + <span class="title">最近六月</span> |
69 | <span class="tick"></span> | 72 | <span class="tick"></span> |
70 | </li> | 73 | </li> |
71 | <li data-begin="31104000000"> | 74 | <li data-begin="31104000000"> |
72 | - 最近一年 | 75 | + <span class="title">最近一年</span> |
73 | <span class="tick"></span> | 76 | <span class="tick"></span> |
74 | </li> | 77 | </li> |
75 | </ul> | 78 | </ul> |
@@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
3 | <div class="list-item user-pic"> | 3 | <div class="list-item user-pic"> |
4 | <div class="title">头像</div> | 4 | <div class="title">头像</div> |
5 | <div class="main"> | 5 | <div class="main"> |
6 | - <img class="pic" src="http://img2.imgtn.bdimg.com/it/u=523024675,1399288021&fm=26&gp=0.jpg" /> | 6 | + <div class="pic user-avatar" data-avatar="{{image headIco 100 100}}"></div> |
7 | </div> | 7 | </div> |
8 | <div class="arr"> | 8 | <div class="arr"> |
9 | <span class="iconfont"></span> | 9 | <span class="iconfont"></span> |
@@ -50,30 +50,31 @@ | @@ -50,30 +50,31 @@ | ||
50 | <span class="iconfont"></span> | 50 | <span class="iconfont"></span> |
51 | </div> | 51 | </div> |
52 | </div> | 52 | </div> |
53 | - <div class="list-item"> | 53 | + <a class="list-item" href="//m.yohobuy.com/home/tide-command?hideTips=true"> |
54 | <div class="title">我的潮流口令</div> | 54 | <div class="title">我的潮流口令</div> |
55 | <div class="main"> | 55 | <div class="main"> |
56 | - <input class="inp" type="text" value="#谁比我更潮谁比我更潮!#" /> | 56 | + <span class="inp" type="text">#{{trendWord}}#</span> |
57 | </div> | 57 | </div> |
58 | <div class="arr"> | 58 | <div class="arr"> |
59 | <span class="iconfont"></span> | 59 | <span class="iconfont"></span> |
60 | </div> | 60 | </div> |
61 | - </div> | ||
62 | - <div class="list-item"> | 61 | + </a> |
62 | + <a class="list-item" href="{{qrcodeLink}}"> | ||
63 | <div class="title">我的二维码</div> | 63 | <div class="title">我的二维码</div> |
64 | <div class="main"> | 64 | <div class="main"> |
65 | - <input class="inp" type="text" value="177****4699" /> | 65 | + <div class="ewm"></div> |
66 | </div> | 66 | </div> |
67 | <div class="arr"> | 67 | <div class="arr"> |
68 | <span class="iconfont"></span> | 68 | <span class="iconfont"></span> |
69 | </div> | 69 | </div> |
70 | - </div> | 70 | + </a> |
71 | </div> | 71 | </div> |
72 | <div class="info-list"> | 72 | <div class="info-list"> |
73 | <div class="list-item"> | 73 | <div class="list-item"> |
74 | <div class="title">身高</div> | 74 | <div class="title">身高</div> |
75 | <div class="main"> | 75 | <div class="main"> |
76 | - <input class="inp" type="text" value="163cm" /> | 76 | + <label>cm</label> |
77 | + <input class="inp inp-2 height modify" type="number" value="{{height}}" /> | ||
77 | </div> | 78 | </div> |
78 | <div class="arr"> | 79 | <div class="arr"> |
79 | <span class="iconfont"></span> | 80 | <span class="iconfont"></span> |
@@ -82,14 +83,15 @@ | @@ -82,14 +83,15 @@ | ||
82 | <div class="list-item"> | 83 | <div class="list-item"> |
83 | <div class="title">体重</div> | 84 | <div class="title">体重</div> |
84 | <div class="main"> | 85 | <div class="main"> |
85 | - <input class="inp" type="text" value="体重" /> | 86 | + <label>kg</label> |
87 | + <input class="inp inp-2 weight modify" type="number" value="{{weight}}" /> | ||
86 | </div> | 88 | </div> |
87 | <div class="arr"> | 89 | <div class="arr"> |
88 | <span class="iconfont"></span> | 90 | <span class="iconfont"></span> |
89 | </div> | 91 | </div> |
90 | </div> | 92 | </div> |
91 | </div> | 93 | </div> |
92 | - <div class="info-list"> | 94 | + <div class="info-list hide"> |
93 | <div class="list-item"> | 95 | <div class="list-item"> |
94 | <div class="title">账号安全</div> | 96 | <div class="title">账号安全</div> |
95 | <div class="main"> | 97 | <div class="main"> |
@@ -100,6 +102,10 @@ | @@ -100,6 +102,10 @@ | ||
100 | </div> | 102 | </div> |
101 | </div> | 103 | </div> |
102 | </div> | 104 | </div> |
105 | + <div id="yoho-footer" class="foot-tip yoho-footer"> | ||
106 | + <div class="pic"></div> | ||
107 | + <p>如果你还使用了我们的其他产品(Yoho!Buy有货、Yoho!Now和 mars)修改个人信息时将同步。</p> | ||
108 | + </div> | ||
103 | <div class="city-swiper"> | 109 | <div class="city-swiper"> |
104 | <div class="swiper-header"> | 110 | <div class="swiper-header"> |
105 | <div class="cancel">取消</div> | 111 | <div class="cancel">取消</div> |
package-lock.json
0 → 100644
This diff could not be displayed because it is too large.
public/img/home/family/foot.png
0 → 100644

4.84 KB
public/img/home/family/person-ewm.png
0 → 100644

1.02 KB
@@ -14,17 +14,21 @@ class ScoreDetail extends Page { | @@ -14,17 +14,21 @@ class ScoreDetail extends Page { | ||
14 | $scoreDetailC: $('.score-detail-c'), | 14 | $scoreDetailC: $('.score-detail-c'), |
15 | $chosen: $('.tab-item .list').find('li'), | 15 | $chosen: $('.tab-item .list').find('li'), |
16 | $defaultChosen: $('.tab-item .list').find('li:first'), | 16 | $defaultChosen: $('.tab-item .list').find('li:first'), |
17 | - $result: $('.result') | 17 | + $defaultChosenTime: $('#time .list').find('li:last'), |
18 | + $result: $('.result'), | ||
19 | + $source: $('#source').find('.name'), | ||
20 | + $queryType: $('#queryType').find('.name'), | ||
21 | + $time: $('#time').find('.name') | ||
18 | }; | 22 | }; |
19 | 23 | ||
20 | this.view = { | 24 | this.view = { |
21 | resultRender | 25 | resultRender |
22 | }; | 26 | }; |
23 | 27 | ||
24 | - this.source = -1; | 28 | + this.source = window.queryString.plateType || -1; |
25 | this.queryType = 0; | 29 | this.queryType = 0; |
26 | - this.beginTime = ''; | ||
27 | - this.endTime = ''; | 30 | + this.endTime = Date.parse(new Date()); |
31 | + this.beginTime = parseInt(this.endTime, 10) - parseInt(31104000000, 10); // 默认显示一年内 | ||
28 | this.page = 1; | 32 | this.page = 1; |
29 | this.loading = false; | 33 | this.loading = false; |
30 | this.end = false; | 34 | this.end = false; |
@@ -33,10 +37,25 @@ class ScoreDetail extends Page { | @@ -33,10 +37,25 @@ class ScoreDetail extends Page { | ||
33 | } | 37 | } |
34 | 38 | ||
35 | init() { | 39 | init() { |
36 | - this.selector.$defaultChosen.addClass('chosen'); | ||
37 | this.setHeight(); | 40 | this.setHeight(); |
38 | this.bindEvents(); | 41 | this.bindEvents(); |
39 | this.chosenData(); | 42 | this.chosenData(); |
43 | + this.scroll(); | ||
44 | + this.defaultTab(); | ||
45 | + } | ||
46 | + | ||
47 | + defaultTab() { | ||
48 | + this.selector.$defaultChosen.addClass('chosen'); | ||
49 | + this.selector.$defaultChosenTime.addClass('chosen').siblings('li').removeClass('chosen'); | ||
50 | + if (window.queryString.plateType) { | ||
51 | + let $defaultSource = $('#source').find(`li[data-source=${window.queryString.plateType}]`); | ||
52 | + | ||
53 | + $defaultSource.addClass('chosen').siblings('li').removeClass('chosen'); | ||
54 | + this.selector.$source.text($defaultSource.find('.title').text()); | ||
55 | + } | ||
56 | + } | ||
57 | + | ||
58 | + scroll() { | ||
40 | $(window).scroll(() => { | 59 | $(window).scroll(() => { |
41 | window.requestAnimationFrame(this.scrollHandler.bind(this)); | 60 | window.requestAnimationFrame(this.scrollHandler.bind(this)); |
42 | }); | 61 | }); |
@@ -69,16 +88,22 @@ class ScoreDetail extends Page { | @@ -69,16 +88,22 @@ class ScoreDetail extends Page { | ||
69 | switch ($parensId) { | 88 | switch ($parensId) { |
70 | case 'source': | 89 | case 'source': |
71 | this.source = $this.data('source'); | 90 | this.source = $this.data('source'); |
91 | + this.selector.$source.text($this.find('.title').text()); | ||
72 | break; | 92 | break; |
73 | case 'queryType': | 93 | case 'queryType': |
74 | this.queryType = $this.data('type'); | 94 | this.queryType = $this.data('type'); |
95 | + this.selector.$queryType.text($this.find('.title').text()); | ||
75 | break; | 96 | break; |
76 | case 'time': | 97 | case 'time': |
77 | if ($this.data('begin')) { | 98 | if ($this.data('begin')) { |
78 | this.beginTime = $this.data('begin'); | 99 | this.beginTime = $this.data('begin'); |
79 | this.endTime = Date.parse(new Date()); | 100 | this.endTime = Date.parse(new Date()); |
80 | this.beginTime = parseInt(this.endTime, 10) - parseInt(this.beginTime, 10); | 101 | this.beginTime = parseInt(this.endTime, 10) - parseInt(this.beginTime, 10); |
102 | + } else { | ||
103 | + this.beginTime = ''; | ||
104 | + this.endTime = ''; | ||
81 | } | 105 | } |
106 | + this.selector.$time.text($this.find('.title').text()); | ||
82 | break; | 107 | break; |
83 | default: | 108 | default: |
84 | tip.show('请稍后再试~~'); | 109 | tip.show('请稍后再试~~'); |
@@ -131,11 +156,12 @@ class ScoreDetail extends Page { | @@ -131,11 +156,12 @@ class ScoreDetail extends Page { | ||
131 | if (result && result.coinList.length > 0) { | 156 | if (result && result.coinList.length > 0) { |
132 | this.selector.$result.append(this.view.resultRender(result)); | 157 | this.selector.$result.append(this.view.resultRender(result)); |
133 | this.loading = false; | 158 | this.loading = false; |
134 | - this.selector.$tabItem.removeClass('active'); | ||
135 | - this.selector.$scoreDetailC.removeClass('active'); | ||
136 | } else { | 159 | } else { |
137 | this.end = true; | 160 | this.end = true; |
161 | + tip.show('没有更多数据了~~~'); | ||
138 | } | 162 | } |
163 | + this.selector.$tabItem.removeClass('active'); | ||
164 | + this.selector.$scoreDetailC.removeClass('active'); | ||
139 | }).catch(error => { | 165 | }).catch(error => { |
140 | console.error(error); | 166 | console.error(error); |
141 | }); | 167 | }); |
@@ -16,6 +16,9 @@ class UserInfo extends Page { | @@ -16,6 +16,9 @@ class UserInfo extends Page { | ||
16 | $nickName: $('.inp.nick-name'), | 16 | $nickName: $('.inp.nick-name'), |
17 | $gender: $('.inp.gender'), | 17 | $gender: $('.inp.gender'), |
18 | $birthday: $('.inp.birthday'), | 18 | $birthday: $('.inp.birthday'), |
19 | + $height: $('.inp.height'), | ||
20 | + $weight: $('.inp.weight'), | ||
21 | + $userAvatar: $('.user-avatar') | ||
19 | }; | 22 | }; |
20 | 23 | ||
21 | this.init(); | 24 | this.init(); |
@@ -26,6 +29,7 @@ class UserInfo extends Page { | @@ -26,6 +29,7 @@ class UserInfo extends Page { | ||
26 | this.on('citySwiperCb', (event, data) => { // 返回选中的slide对象 | 29 | this.on('citySwiperCb', (event, data) => { // 返回选中的slide对象 |
27 | console.log(data); | 30 | console.log(data); |
28 | }); | 31 | }); |
32 | + this.defaultPic(); | ||
29 | } | 33 | } |
30 | 34 | ||
31 | bindEvents() { | 35 | bindEvents() { |
@@ -33,13 +37,26 @@ class UserInfo extends Page { | @@ -33,13 +37,26 @@ class UserInfo extends Page { | ||
33 | this.selector.$modifyInp.on('blur', this.modifyInp.bind(this)); | 37 | this.selector.$modifyInp.on('blur', this.modifyInp.bind(this)); |
34 | } | 38 | } |
35 | 39 | ||
40 | + defaultPic() { | ||
41 | + let myImage = new Image(), | ||
42 | + avatar; | ||
43 | + | ||
44 | + avatar = this.selector.$userAvatar.data('avatar'); | ||
45 | + myImage.src = avatar; | ||
46 | + myImage.onload = () => { | ||
47 | + this.selector.$userAvatar.css('background-image', 'url(' + avatar + ')'); | ||
48 | + }; | ||
49 | + } | ||
50 | + | ||
36 | modifyInp() { | 51 | modifyInp() { |
37 | this.ajax({ | 52 | this.ajax({ |
38 | url: '/home/family/modify', | 53 | url: '/home/family/modify', |
39 | data: { | 54 | data: { |
40 | nickName: this.selector.$nickName.val(), | 55 | nickName: this.selector.$nickName.val(), |
41 | gender: this.selector.$gender.val(), | 56 | gender: this.selector.$gender.val(), |
42 | - birthday: this.selector.$birthday.val() | 57 | + birthday: this.selector.$birthday.val(), |
58 | + height: this.selector.$height.val(), | ||
59 | + weight: this.selector.$weight.val() | ||
43 | }, | 60 | }, |
44 | }).then(result => { | 61 | }).then(result => { |
45 | if (result && result.code === 200) { | 62 | if (result && result.code === 200) { |
@@ -24,6 +24,7 @@ select { | @@ -24,6 +24,7 @@ select { | ||
24 | margin-bottom: 20px; | 24 | margin-bottom: 20px; |
25 | 25 | ||
26 | .list-item { | 26 | .list-item { |
27 | + display: block; | ||
27 | height: 90px; | 28 | height: 90px; |
28 | line-height: 90px; | 29 | line-height: 90px; |
29 | padding-right: 30px; | 30 | padding-right: 30px; |
@@ -42,6 +43,14 @@ select { | @@ -42,6 +43,14 @@ select { | ||
42 | padding: 10px 0; | 43 | padding: 10px 0; |
43 | padding-right: 20px; | 44 | padding-right: 20px; |
44 | position: relative; | 45 | position: relative; |
46 | + | ||
47 | + .ewm { | ||
48 | + width: 43px; | ||
49 | + height: 43px; | ||
50 | + background-image: url("/home/family/person-ewm.png"); | ||
51 | + float: right; | ||
52 | + margin-top: 12px; | ||
53 | + } | ||
45 | } | 54 | } |
46 | 55 | ||
47 | .arr { | 56 | .arr { |
@@ -56,7 +65,7 @@ select { | @@ -56,7 +65,7 @@ select { | ||
56 | } | 65 | } |
57 | 66 | ||
58 | .inp { | 67 | .inp { |
59 | - width: 100%; | 68 | + width: 430px; |
60 | height: 70px; | 69 | height: 70px; |
61 | line-height: 70px; | 70 | line-height: 70px; |
62 | font-size: 30px; | 71 | font-size: 30px; |
@@ -66,6 +75,20 @@ select { | @@ -66,6 +75,20 @@ select { | ||
66 | padding: 0; | 75 | padding: 0; |
67 | } | 76 | } |
68 | 77 | ||
78 | + .inp-2 { | ||
79 | + float: right; | ||
80 | + width: 400px; | ||
81 | + padding-right: 3%; | ||
82 | + } | ||
83 | + | ||
84 | + label { | ||
85 | + width: 30px; | ||
86 | + float: right; | ||
87 | + line-height: 70px; | ||
88 | + font-size: 30px; | ||
89 | + color: #b0b0b0; | ||
90 | + } | ||
91 | + | ||
69 | .date-c { | 92 | .date-c { |
70 | position: absolute; | 93 | position: absolute; |
71 | top: 10px; | 94 | top: 10px; |
@@ -81,6 +104,9 @@ select { | @@ -81,6 +104,9 @@ select { | ||
81 | height: 100px; | 104 | height: 100px; |
82 | border-radius: 50%; | 105 | border-radius: 50%; |
83 | overflow: hidden; | 106 | overflow: hidden; |
107 | + background-size: contain; | ||
108 | + background-position: center center; | ||
109 | + background-image: resolve("home/index/user-avatar.png"); | ||
84 | } | 110 | } |
85 | 111 | ||
86 | &.user-pic { | 112 | &.user-pic { |
@@ -98,4 +124,22 @@ select { | @@ -98,4 +124,22 @@ select { | ||
98 | border-bottom: 0; | 124 | border-bottom: 0; |
99 | } | 125 | } |
100 | } | 126 | } |
127 | + | ||
128 | + .foot-tip { | ||
129 | + background-color: #f0f0f0 !important; | ||
130 | + | ||
131 | + .pic { | ||
132 | + background-image: resolve("home/family/foot.png"); | ||
133 | + width: 140px; | ||
134 | + height: 80px; | ||
135 | + background-size: 100% 100%; | ||
136 | + margin: 0 auto 15px; | ||
137 | + } | ||
138 | + | ||
139 | + width: 750px; | ||
140 | + padding: 30px; | ||
141 | + font-size: 24px; | ||
142 | + color: #b0b0b0; | ||
143 | + line-height: 38px; | ||
144 | + } | ||
101 | } | 145 | } |
-
Please register or login to post a comment