Showing
5 changed files
with
99 additions
and
4 deletions
@@ -366,7 +366,6 @@ exports.getGrade = (uid, channel) => { | @@ -366,7 +366,6 @@ exports.getGrade = (uid, channel) => { | ||
366 | obj = _.assign(obj, { | 366 | obj = _.assign(obj, { |
367 | costOfThisYear: result[0].data.current_year_cost, | 367 | costOfThisYear: result[0].data.current_year_cost, |
368 | sumCost: result[0].data.current_total_cost, | 368 | sumCost: result[0].data.current_total_cost, |
369 | - allUrl: helpers.urlFormat('/me/privilege'), | ||
370 | costGap: upg | 369 | costGap: upg |
371 | }); | 370 | }); |
372 | 371 |
1 | <div class="vip-privilege-page yoho-page"> | 1 | <div class="vip-privilege-page yoho-page"> |
2 | + <div class="blk-header-wrap"> | ||
3 | + <div class="blk-header"> | ||
4 | + <div class="blk-header-left"> | ||
5 | + <i class="icon icon-back go-back-btn"></i> | ||
6 | + </div> | ||
7 | + <div class="blk-header-main"> | ||
8 | + <span class="blk-header-title">VIP特权</span> | ||
9 | + </div> | ||
10 | + </div> | ||
2 | <ul class="privilege-list"> | 11 | <ul class="privilege-list"> |
3 | {{#each privilege}} | 12 | {{#each privilege}} |
4 | <li> | 13 | <li> |
public/js/me/privilege.page.js
0 → 100644
1 | +.vip-grade-page, | ||
2 | +.vip-privilege-page { | ||
3 | + .blk-header { | ||
4 | + box-sizing: content-box; | ||
5 | + position: fixed; | ||
6 | + top: 0; | ||
7 | + right: 0; | ||
8 | + left: 0; | ||
9 | + z-index: 210; | ||
10 | + padding: 20px 34px; | ||
11 | + height: 70px; | ||
12 | + max-width: 750px; | ||
13 | + margin-left: auto; | ||
14 | + margin-right: auto; | ||
15 | + line-height: 70px; | ||
16 | + font-size: 48px; | ||
17 | + background-color: #fff; | ||
18 | + border-bottom: 1px solid #eee; | ||
19 | + color: #000; | ||
20 | + | ||
21 | + .icon, | ||
22 | + .blk-header-title { | ||
23 | + vertical-align: middle; | ||
24 | + } | ||
25 | + | ||
26 | + .blk-header-right { | ||
27 | + margin-right: -32px; | ||
28 | + } | ||
29 | + | ||
30 | + .icon { | ||
31 | + min-width: 110px; | ||
32 | + min-height: 110px; | ||
33 | + line-height: 110px; | ||
34 | + margin-top: -20px; | ||
35 | + margin-left: -32px; | ||
36 | + text-indent: 32px; | ||
37 | + display: inline-block; | ||
38 | + } | ||
39 | + | ||
40 | + .go-back-btn { | ||
41 | + &:hover { | ||
42 | + background: #ccc; | ||
43 | + opacity: 0.5; | ||
44 | + } | ||
45 | + } | ||
46 | + } | ||
47 | + | ||
48 | + .blk-header-left { | ||
49 | + float: left; | ||
50 | + font-size: 42px; | ||
51 | + } | ||
52 | + | ||
53 | + .blk-header-main { | ||
54 | + display: block; | ||
55 | + text-align: center; | ||
56 | + margin-left: auto; | ||
57 | + margin-right: auto; | ||
58 | + font-size: 42px; | ||
59 | + overflow: hidden; | ||
60 | + white-space: nowrap; | ||
61 | + text-overflow: ellipsis; | ||
62 | + position: absolute; | ||
63 | + left: 0; | ||
64 | + right: 0; | ||
65 | + z-index: -1; | ||
66 | + } | ||
67 | +} | ||
68 | + | ||
1 | .vip-grade-page { | 69 | .vip-grade-page { |
2 | background: #f0f0f0; | 70 | background: #f0f0f0; |
3 | padding-bottom: 30px; | 71 | padding-bottom: 30px; |
@@ -11,7 +79,7 @@ | @@ -11,7 +79,7 @@ | ||
11 | } | 79 | } |
12 | 80 | ||
13 | .basic-info { | 81 | .basic-info { |
14 | - padding-top: 30px; | 82 | + padding-top: 130px; |
15 | padding-bottom: 25px; | 83 | padding-bottom: 25px; |
16 | 84 | ||
17 | p { | 85 | p { |
@@ -180,7 +248,7 @@ | @@ -180,7 +248,7 @@ | ||
180 | } | 248 | } |
181 | 249 | ||
182 | .vip-privilege-page { | 250 | .vip-privilege-page { |
183 | - padding: 0 20px; | 251 | + padding: 120px 20px 0 20px; |
184 | } | 252 | } |
185 | 253 | ||
186 | .privilege-list { | 254 | .privilege-list { |
1 | <template> | 1 | <template> |
2 | + <div class="blk-header-wrap"> | ||
3 | + <div class="blk-header"> | ||
4 | + <div class="blk-header-left"> | ||
5 | + <i class="icon icon-back go-back-btn" @click="goBack"></i> | ||
6 | + </div> | ||
7 | + <div class="blk-header-main"> | ||
8 | + <span class="blk-header-title">会员等级</span> | ||
9 | + </div> | ||
10 | + </div> | ||
11 | + </div> | ||
2 | <div class="basic-info block" v-if="vipGrade.vip3"> | 12 | <div class="basic-info block" v-if="vipGrade.vip3"> |
3 | <p> | 13 | <p> |
4 | <span class="user-name">{{vipGrade.name}}</span> | 14 | <span class="user-name">{{vipGrade.name}}</span> |
@@ -108,7 +118,7 @@ | @@ -108,7 +118,7 @@ | ||
108 | </ul> | 118 | </ul> |
109 | </div> | 119 | </div> |
110 | 120 | ||
111 | - <a class="all-privilege block tap-hightlight" href="{{vipGrade.allUrl}}"> | 121 | + <a class="all-privilege block tap-hightlight" href="/me/privilege"> |
112 | 查看全部VIP特权 | 122 | 查看全部VIP特权 |
113 | <span class="icon icon-right"></span> | 123 | <span class="icon icon-right"></span> |
114 | </a> | 124 | </a> |
@@ -131,6 +141,9 @@ | @@ -131,6 +141,9 @@ | ||
131 | }).then(result => { | 141 | }).then(result => { |
132 | this.vipGrade = result || {}; | 142 | this.vipGrade = result || {}; |
133 | }); | 143 | }); |
144 | + }, | ||
145 | + goBack() { | ||
146 | + yoho.goBack({}, function() {}, function() {}); | ||
134 | } | 147 | } |
135 | }, | 148 | }, |
136 | ready() { | 149 | ready() { |
-
Please register or login to post a comment