Authored by 郭成尧

Merge remote-tracking branches 'remotes/origin/hotfix/home' and 'remotes/origin/hotfix/usercenter'

... ... @@ -59,6 +59,14 @@ const currencyDetail = (uid, page, limit) => {
if (result && result.code === 200) {
let total = parseInt(result.data.page_total, 10) + 1;
_.forEach(_.get(result, 'data.coinlist', []), perCoin => {
if (perCoin.num > 0) {
perCoin.num = '+' + perCoin.num;
} else if (perCoin.num < 0) {
perCoin.num = '-' + perCoin.num;
}
});
if (page && page <= total) {
return yohoCoin(uid).then(list => {
... ...
... ... @@ -4,7 +4,7 @@
<p class="title">{{message}}</p>
<p class="time">{{date}}</p>
<div class="count">
+{{num}}
{{num}}
</div>
</div>
</li>
... ...
... ... @@ -128,11 +128,9 @@ module.exports = function(specificGender) {
var PRDID = [];
if (data === ' ' || data === '') {
searching = false;
searching = true;
loading.hideLoadingMask();
$('.maybe-like').hide();
// 有货币页面不加载底部
if (gender && !specificGender) {
gender = gender.substr(0, 3);
... ...
... ... @@ -13,3 +13,7 @@ function getGender() {
}
require('../channel/maybe-like')(getGender());
if ($('#goods-list').length === 0) {
$('.maybe-like').hide();
}
... ...