Merge branch 'fix/beta' into 'beta'
1.修复有货币页面最后一条数据被遮挡的问题. 2.有货币页面不加载底部. 3有货币页面头部加入问号标志并能跳转到帮助中心。4.去掉明细页面多余的顶部。 code review by 张振 1.修复有货币页面最后一条数据被遮挡的问题. 2.有货币页面不加载底部. 3.有货币页面头部加入问号标志并能跳转到帮助中心。 4.去掉明细页面多余的顶部。 code review by 张振 See merge request !98
Showing
3 changed files
with
11 additions
and
3 deletions
@@ -91,7 +91,14 @@ module.exports = function(specificGender) { | @@ -91,7 +91,14 @@ module.exports = function(specificGender) { | ||
91 | if (data === ' ') { | 91 | if (data === ' ') { |
92 | searching = false; | 92 | searching = false; |
93 | loading.hideLoadingMask(); | 93 | loading.hideLoadingMask(); |
94 | - if (gender) { | 94 | + |
95 | + //修复有货币页面最后一条数据显示被遮挡的问题 | ||
96 | + if (specificGender) { | ||
97 | + window.rePosFooter(); | ||
98 | + } | ||
99 | + | ||
100 | + // 有货币页面不加载底部 | ||
101 | + if (gender && !specificGender) { | ||
95 | if (gender === '1,3') { | 102 | if (gender === '1,3') { |
96 | url = '/boys/bottomBanner'; | 103 | url = '/boys/bottomBanner'; |
97 | } else { | 104 | } else { |
1 | 1 | ||
2 | {{> layout/header}} | 2 | {{> layout/header}} |
3 | <div class="yoho-coin-detail-page yoho-page"> | 3 | <div class="yoho-coin-detail-page yoho-page"> |
4 | - <div class="money">你拥有的有货币:<span>{{ money}}</span></div> | ||
5 | - | ||
6 | <ul class="coin-detail"></ul> | 4 | <ul class="coin-detail"></ul> |
7 | </div> | 5 | </div> |
8 | {{> layout/footer}} | 6 | {{> layout/footer}} |
@@ -6,6 +6,9 @@ | @@ -6,6 +6,9 @@ | ||
6 | {{#navHome}} | 6 | {{#navHome}} |
7 | <a href="{{.}}" class="iconfont nav-home"></a> | 7 | <a href="{{.}}" class="iconfont nav-home"></a> |
8 | {{/navHome}} | 8 | {{/navHome}} |
9 | + {{#currencyPage}} | ||
10 | + <a href="/home/help" class="iconfont nav-home"></a> | ||
11 | + {{/currencyPage}} | ||
9 | {{#navPhone}} | 12 | {{#navPhone}} |
10 | <a href="{{.}}" class="iconfont nav-home"></a> | 13 | <a href="{{.}}" class="iconfont nav-home"></a> |
11 | {{/navPhone}} | 14 | {{/navPhone}} |
-
Please register or login to post a comment