Authored by ccbikai(👎🏻🍜)

Merge branch 'release/5.0.0'

... ... @@ -201,7 +201,7 @@ exports.index = (req, res, next) => {
}
return userAcquireStatus(uid, couponids.join(',')).then((cous) => {
coupons.data = (coupons.data || []).map((item)=>{
coupons.data = _.get(coupons, 'data', []).map((item)=>{
item.status = 1;
(cous.data || []).forEach((it) => {
... ...
... ... @@ -239,8 +239,9 @@ let getChannelSwitchData = () => {
*/
let getChannelData = (params) => {
var channelData = {};
let navGender = _.cloneDeep(params.gender);
return Promise.all([_getChannelResource(params), _getLeftNav(params.gender)]).then((data) => {
return Promise.all([_getChannelResource(params), _getLeftNav(navGender)]).then((data) => {
channelData.content = data[0]; // 资源位数据
channelData.sideNav = data[1]; // 侧边栏数据
... ...
... ... @@ -639,7 +639,7 @@ const _detailDataPkg = (origin, uid, vipLevel, ua) => {
vipList.push({
level: levelList[value.caption],
text: value.price,
currentLevel: (value.vipLevel === vipLevel)
currentLevel: (levelList[value.caption] === parseInt(vipLevel, 10))
});
});
... ...
... ... @@ -101,10 +101,6 @@ function search() {
searching = false;
end = true;
loading.hideLoadingMask();
if ($('#productDesc').hasClass('limit')) {
$('#productDesc').find('.service').removeClass('service').addClass('limit-service');
}
},
error: function() {
tip.show('网络断开连接了~');
... ...
... ... @@ -14,12 +14,6 @@
}
}
.limit-service {
height: 28px;
background: resolve('product/limit.png') no-repeat;
background-size: cover;
}
.detail {
margin-bottom: 1px;
}
... ...