Authored by 梁志锋

Merge remote-tracking branch 'origin/master'

... ... @@ -26,7 +26,7 @@ function doPassportCallback(openId, nickname, sourceType, req, res) {
refer = `${config.siteUrl}/home`;
}
if (/sign|login/.test(refer)) {
if (/signin|login/.test(refer)) {
refer = `${config.siteUrl}/home`;
}
if (openId && nickname) {
... ... @@ -55,7 +55,7 @@ const wechat = {
if (!refer) {
refer = req.get('Referer');
}
refer && res.cookie('refer', encodeURI(refer), {
refer && !/signin|login/.test(refer) && res.cookie('refer', encodeURI(refer), {
domain: 'yohobuy.com'
});
next();
... ...
... ... @@ -41,13 +41,15 @@ class Auth {
let uidCookie = `${data.profile_name}::${data.uid}::${data.vip_info.title}::${token}`;
res.cookie('_UID', uidCookie, {
domain: 'yohobuy.com'
domain: 'yohobuy.com',
expires: new Date(Date.now() + 2592000000) // 有效期一年
});
}
req.session._TOKEN = token; // esline-disable-line
req.session._LOGIN_UID = uid; // esline-disable-line
res.cookie('_TOKEN', token, {
domain: 'yohobuy.com'
domain: 'yohobuy.com',
expires: new Date(Date.now() + 2592000000) // 有效期一年
}); // esline-disable-line
});
}
... ...
... ... @@ -5557,6 +5557,7 @@ a{
}
.star-page{
background: #333;
position: relative;
}
.star-page a{
text-decoration: none;
... ... @@ -5655,7 +5656,6 @@ a{
height: 4.5rem;
}
.star-page .star-main{
position: relative;
margin-top: 2.2rem;
}
.star-page .avatar-swiper{
... ... @@ -5671,10 +5671,8 @@ a{
margin-top: 0.9rem;
background: #000;
}
.star-page .avatar-swiper li span{
display: block;
width: 100%;
height: 100%;
.star-page .avatar-swiper li a{
border-radius: 0.125rem;
}
.star-page .avatar-swiper .swiper-slide-active{
width: 4.5rem;
... ... @@ -5908,15 +5906,6 @@ a{
top: 0;
z-index: -1;
}
.star-page .swiper-num1{
width: 2.75rem;
}
.star-page .swiper-num2{
width: 3.25rem;
}
.star-page .swiper-num3{
width: 4.5rem;
}
.star-index-bg{
background: #000;
overflow: hidden;
... ... @@ -5924,6 +5913,25 @@ a{
.star-index-bg .star-page{
background: #000;
}
@media screen and (max-width: 375px) and (min-width: 375px){
.star-page .avatar-wrap{
height: 105PX;
}
.star-page .avatar-swiper li{
width: 64PX;
height: 64PX;
margin-top: 20.5PX;
}
.star-page .avatar-swiper .swiper-slide-active{
width: 105PX;
height: 105PX;
}
.star-page .avatar-swiper .swiper-slide-prev, .star-page .avatar-swiper .swiper-slide-next{
width: 76PX;
height: 76PX;
margin-top: 14.5PX;
}
}
.star-page .special-list{
width: 100%;
height: auto;
... ... @@ -5937,7 +5945,7 @@ a{
}
.star-page .special-list li img{
width: 100%;
min-height: 7.75rem;
height: 7.75rem;
}
.star-page .special-list li p{
width: 100%;
... ...
This diff could not be displayed because it is too large.