Authored by 郝肖肖

Merge branch 'release/5.2' of git.yoho.cn:fe/yohobuywap-node into release/5.2

... ... @@ -628,7 +628,10 @@ const bankCard = (req, res) => {
// 银行卡详情
const cardDetail = (req, res) => {
installmentModel.getCardDetail(req.cookies.installmentUid, req.query.cardIdNo).then(result => {
let uid = req.cookies.installmentUid;
let cardIdNo = req.query.cardIdNo;
installmentModel.getCardDetail(uid, cardIdNo).then(result => {
res.render('installment/card-detail', {
module: 'home',
page: 'card-detail',
... ...
... ... @@ -492,8 +492,7 @@ const getCardDetail = (uid, cardIdNo) => {
uid: uid,
cardIdNo: cardIdNo
}, {
timeout: API_TIMEOUT,
cache: true
timeout: API_TIMEOUT
}).then((result) => {
if (result && result.code === 200) {
return _processCardDetail(result.data);
... ...
... ... @@ -28,7 +28,7 @@ var cardDetail = {
errorText: '解除失败',
successAction: function() {
tip.show('解除成功!');
window.location.href = '/home/installment/bank-card';
window.location.href = '/home/installment/bank-card?openby:yohobuy={"action":"go.relieveCardSuccess"}';
}
});
});
... ...
... ... @@ -6,6 +6,7 @@
var $ = require('yoho-jquery'),
ellipsis = require('yoho-mlellipsis'),
cookie = require('yoho-cookie'),
ListData = require('./installment-goods'),
bp = require('./burying-point'),
PullRefresh = require('../plugin/pull-refresh'),
... ... @@ -41,7 +42,7 @@ var installment = {
uuid: self.uuidVal
});
if (self.cookieTab && window.queryString.refresh) {
if (self.cookieTab) {
self.$tab.eq(self.cookieTab).addClass('on').siblings().removeClass('on');
self.$installmentCont.hide().eq(self.cookieTab).fadeIn();
} else {
... ... @@ -49,6 +50,8 @@ var installment = {
self.$installmentCont.hide().eq(0).fadeIn();
}
cookie.remove('installmentTab');
// 已开通tab 切换
self.$tab.on('click', function() {
self.tabChangeAction(this);
... ... @@ -129,7 +132,7 @@ var installment = {
var starIScroll = new PullRefresh('.installment-main', {
pullDown: function() {
window.setCookie('installmentTab', $('.detail-tab .on').index());
location.href = '/home/installment/index?uid=' + window.queryString.uid + '&refresh=1';
location.reload();
}
});
... ...
... ... @@ -91,15 +91,27 @@
}
.girls-wrap .home-header {
background: #ff88ae;
background: rgb(255,136,174);
&.iswechat {
background: rgba(255,136,174, 0.6);
}
}
.kids-wrap .home-header {
background: #7ad9f9;
background: rgb(122,217,249);
&.iswechat {
background: rgba(122,217,249,0.6);
}
}
.lifestyle-wrap .home-header {
background: #4f4138;
background: rgb(79,65,56);
&.iswechat {
background: rgba(79,65,56,0.6);
}
}
.kids-wrap .logo {
... ...