Showing
5 changed files
with
25 additions
and
19 deletions
@@ -46,8 +46,8 @@ const _getInfoNumData = (uid) => { | @@ -46,8 +46,8 @@ const _getInfoNumData = (uid) => { | ||
46 | 46 | ||
47 | if (data[0].data) { | 47 | if (data[0].data) { |
48 | for (let k in data[0].data) { | 48 | for (let k in data[0].data) { |
49 | - if (res[k] !== undefined) { | ||
50 | - res[k] = data[0].data[k] ? data[0].data[k] : ""; | 49 | + if (res[k] !== null) { |
50 | + res[k] = data[0].data[k] ? data[0].data[k] : ''; | ||
51 | if (k !== 'yoho_coin_num' && res[k] > 99) { | 51 | if (k !== 'yoho_coin_num' && res[k] > 99) { |
52 | res[k] = '99+'; | 52 | res[k] = '99+'; |
53 | } | 53 | } |
@@ -56,11 +56,11 @@ const _getInfoNumData = (uid) => { | @@ -56,11 +56,11 @@ const _getInfoNumData = (uid) => { | ||
56 | } | 56 | } |
57 | if (data[1].data) { | 57 | if (data[1].data) { |
58 | res = _.merge(res, { | 58 | res = _.merge(res, { |
59 | - address_num: data[1].data.length ? data[1].data.length : "" | 59 | + address_num: data[1].data.length ? data[1].data.length : '' |
60 | }); | 60 | }); |
61 | } | 61 | } |
62 | return res; | 62 | return res; |
63 | - }) | 63 | + }); |
64 | }; | 64 | }; |
65 | 65 | ||
66 | 66 | ||
@@ -87,8 +87,8 @@ exports.getHelpInfo = (data) => { | @@ -87,8 +87,8 @@ exports.getHelpInfo = (data) => { | ||
87 | infoData = Object.assign(defaultParam, data); | 87 | infoData = Object.assign(defaultParam, data); |
88 | 88 | ||
89 | return api.get('', infoData).then(result => { | 89 | return api.get('', infoData).then(result => { |
90 | - const helpData = result.data; | ||
91 | - const formatData = []; | 90 | + var helpData = result.data; |
91 | + var formatData = []; | ||
92 | 92 | ||
93 | helpData = helpData || []; | 93 | helpData = helpData || []; |
94 | _.forEach(helpData, (item) => { | 94 | _.forEach(helpData, (item) => { |
@@ -136,4 +136,4 @@ exports.saveFeedback = (data) => { | @@ -136,4 +136,4 @@ exports.saveFeedback = (data) => { | ||
136 | 136 | ||
137 | // 参考接口数据 | 137 | // 参考接口数据 |
138 | }); | 138 | }); |
139 | -}; | ||
139 | +}; |
@@ -21,7 +21,7 @@ router.get('/mycurrency', home.coin); // yoho币 | @@ -21,7 +21,7 @@ router.get('/mycurrency', home.coin); // yoho币 | ||
21 | router.get('/orderDetail', home.orderDetail); // yoho币 | 21 | router.get('/orderDetail', home.orderDetail); // yoho币 |
22 | 22 | ||
23 | router.get('/help', home.help); // 帮助中心列表页 | 23 | router.get('/help', home.help); // 帮助中心列表页 |
24 | -router.get('/helpDetail', home.helpDetail); // 帮助中心详情页 | 24 | +router.get('/help-detail', home.helpDetail); // 帮助中心详情页 |
25 | router.get('/feedback', home.feedback); // 个人中心-意见反馈 | 25 | router.get('/feedback', home.feedback); // 个人中心-意见反馈 |
26 | router.post('/save-feedback', home.saveFeedback); // 个人中心-提交意见反馈 | 26 | router.post('/save-feedback', home.saveFeedback); // 个人中心-提交意见反馈 |
27 | 27 | ||
@@ -37,4 +37,4 @@ router.get('/refund/logistics', refund.logistics); // 退换货 - 商品寄回 | @@ -37,4 +37,4 @@ router.get('/refund/logistics', refund.logistics); // 退换货 - 商品寄回 | ||
37 | router.get('/about-us', home.aboutUs); // 个人中心 - 关于我们 | 37 | router.get('/about-us', home.aboutUs); // 个人中心 - 关于我们 |
38 | 38 | ||
39 | 39 | ||
40 | -module.exports = router; | ||
40 | +module.exports = router; |
1 | <div class="about-us"> | 1 | <div class="about-us"> |
2 | <div class="description"> | 2 | <div class="description"> |
3 | - <p>From yoho! 2015 high-end store </p> | ||
4 | - <p>i fancy, you like.</p> | ||
5 | </div> | 3 | </div> |
6 | <div class="icon-container"> | 4 | <div class="icon-container"> |
7 | <div class="blk-icon"></div> | 5 | <div class="blk-icon"></div> |
@@ -2,17 +2,23 @@ | @@ -2,17 +2,23 @@ | ||
2 | width: 100%; | 2 | width: 100%; |
3 | height: 100%; | 3 | height: 100%; |
4 | background: #fff; | 4 | background: #fff; |
5 | - position: relative; | ||
6 | 5 | ||
7 | .description { | 6 | .description { |
8 | - position:absolute; | 7 | + position: absolute; |
9 | top: 30%; | 8 | top: 30%; |
10 | - width: 100%; | 9 | + width: 411px; |
10 | + height: 75px; | ||
11 | + background: resolve("home/about-us-tip.png") no-repeat; | ||
12 | + background-size: 100%; | ||
13 | + left: 0; | ||
14 | + right: 0; | ||
15 | + margin-left: auto; | ||
16 | + margin-right: auto; | ||
11 | } | 17 | } |
12 | - | 18 | + |
13 | .icon-container { | 19 | .icon-container { |
14 | position: absolute; | 20 | position: absolute; |
15 | - top: 45%; | 21 | + top: 43%; |
16 | left: 0; | 22 | left: 0; |
17 | right: 0; | 23 | right: 0; |
18 | margin-left: auto; | 24 | margin-left: auto; |
@@ -21,8 +27,8 @@ | @@ -21,8 +27,8 @@ | ||
21 | 27 | ||
22 | .blk-icon { | 28 | .blk-icon { |
23 | background: resolve("home/app-icon.png") no-repeat; | 29 | background: resolve("home/app-icon.png") no-repeat; |
24 | - width: 160px; | ||
25 | - height: 160px; | 30 | + width: 180px; |
31 | + height: 180px; | ||
26 | left: 0; | 32 | left: 0; |
27 | right: 0; | 33 | right: 0; |
28 | margin-left: auto; | 34 | margin-left: auto; |
@@ -31,6 +37,7 @@ | @@ -31,6 +37,7 @@ | ||
31 | } | 37 | } |
32 | 38 | ||
33 | .icon-label { | 39 | .icon-label { |
40 | + margin-top: 10px; | ||
34 | font-size: 30px; | 41 | font-size: 30px; |
35 | left: 0; | 42 | left: 0; |
36 | right: 0; | 43 | right: 0; |
@@ -41,5 +48,6 @@ | @@ -41,5 +48,6 @@ | ||
41 | p { | 48 | p { |
42 | text-align: center; | 49 | text-align: center; |
43 | font-size: 24px; | 50 | font-size: 24px; |
51 | + font-family: BrownStd Regular; | ||
44 | } | 52 | } |
45 | -} | ||
53 | +} |
-
Please register or login to post a comment