fe / yohobuywap-node · Commits

Go to a project

Authored by ccbikai
Commit ea2478ade27af6ad0bce9522fc47b1d24ecbc5c3 2 parents 21505224 d891aacd

Merge branch 'hotfix/wechatShare'

Inline Side-by-side
Showing 9 changed files with 263 additions and 401 deletions
... ... @@ -21,9 +21,11 @@ const getPageInfo = (pageInfo) => {
dest.couponPic = pageInfo.data.couponPic;
dest.oldUserCouponPic = pageInfo.data.oldUserCouponPic;
dest.mobile = pageInfo.data.mobile;
//强制活动开始，活动上线产品要求这样设置
pageInfo.data.flag = 1;
if (pageInfo.data.flag === 1) {
dest.bgImg = pageInfo.data.activityNormalPic;
} else if (pageInfo.data.flag !== 1) {
} else {
dest.bgImg = pageInfo.data.activityEndPic;
dest.ended = true;
}
... ...
... ... @@ -13,10 +13,10 @@ const coupon = require(`${cRoot}/coupon`);
// routers
router.get('/index', coupon.index);
router.get('/coupon', coupon.index);
router.get('/phone', coupon.getCoupon);
router.get('/coupon/phone', coupon.getCoupon);
router.get('/verify', coupon.verify);
router.get('/coupon/verify', coupon.verify);
module.exports = router;
... ...
... ... @@ -14,5 +14,5 @@ module.exports = app => {
// 业务模块
app.use('/product', require('./apps/product'));
app.use('/passport', require('./apps/passport'));
app.use('/coupon', require('./apps/coupon'));
app.use('/activity', require('./apps/activity'));
};
... ...
... ... @@ -90,7 +90,7 @@ a{
.iconfont{
text-decoration: none;
font-style: normal;
font-size: 0.6rem;
font-size: 0.8rem;
font-family: "iconfont" !important;
-webkit-font-smoothing: antialiased;
-webkit-text-stroke-width: 0.4px;
... ... @@ -126,29 +126,29 @@ a{
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
background: rgba(0, 0, 0, 0.1);
@keyframes scale{
0%{
transform: scale(1);
opacity: 1;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
transform: scale(1);
}
45%{
transform: scale(0.1);
opacity: 0.7;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
transform: scale(0.1);
}
80%{
transform: scale(1);
opacity: 1;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
transform: scale(1);
}
}
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
background: rgba(0, 0, 0, 0.1);
}
.loading-mask .loading{
position: absolute;
... ... @@ -168,13 +168,13 @@ a{
background: #fff;
}
.loading-mask .loading > div:nth-child(1){
animation: scale 0.75s 0.12s infinite cubic-bezier(0.2, 0.68, 0.18, 1.08);
animation: scale 0.75s (1 + 1) * 0.12s infinite cubic-bezier(0.2, 0.68, 0.18, 1.08);
}
.loading-mask .loading > div:nth-child(2){
animation: scale 0.75s 0.24s infinite cubic-bezier(0.2, 0.68, 0.18, 1.08);
animation: scale 0.75s (2 + 1) * 0.12s infinite cubic-bezier(0.2, 0.68, 0.18, 1.08);
}
.loading-mask .loading > div:nth-child(3){
animation: scale 0.75s 0.36s infinite cubic-bezier(0.2, 0.68, 0.18, 1.08);
animation: scale 0.75s (3 + 1) * 0.12s infinite cubic-bezier(0.2, 0.68, 0.18, 1.08);
}
/* stylelint-disable */
/**
... ... @@ -730,7 +730,6 @@ a{
height: auto;
color: #fff;
line-height: 1rem;
font-size: 0.35rem;
}
.homebuttom.boys{
background-image: linear-gradient(#323232, #414141);
... ... @@ -2479,10 +2478,10 @@ a{
height: 100%;
}
.break-code-page .banner-swiper{
height: auto;
height: 5rem;
}
.break-code-page .banner-swiper ul{
height: auto;
height: 5rem;
}
.break-code-page .swiper-size{
display: none;
... ... @@ -2602,10 +2601,10 @@ a{
background-color: #fff;
}
.sale-page .banner-top .swiper-container{
height: auto;
height: 5rem;
}
.sale-page .banner-top .swiper-container ul{
height: auto;
height: 5rem;
}
.sale-page #thumb-row{
overflow: hidden;
... ... @@ -2636,10 +2635,10 @@ a{
white-space: nowrap;
}
.sale-vip-page .banner-swiper{
height: auto;
height: 5rem;
}
.sale-vip-page .banner-swiper ul{
height: auto;
height: 5rem;
}
.discount-page{
overflow: hidden;
... ... @@ -5136,447 +5135,308 @@ a{
color: #fff;
font-size: 0.8rem;
}
.star-page{
background: #333;
}
.star-page a{
text-decoration: none;
outline: none;
color: #000;
}
.star-page a:link, .star-page a:visited, .star-page a:hover, .star-page a:actived{
color: #000;
}
.star-page *:focus{
outline: none;
}
.star-page .font-bold{
font-weight: bold;
.receive-coupon-page *{
margin: 0;
padding: 0;
font-size: 0.35rem;
}
.star-page .head-tab{
position: relative;
.receive-coupon-page .bg-contain{
width: 100%;
height: 2.2rem;
background: #000;
z-index: 1;
transform-origin: top;
transform: scale(1, 1);
transition: transform 400ms;
}
.star-page .head-tab li{
width: 33.3%;
text-align: center;
float: left;
line-height: 2.2rem;
font-size: 0.75rem;
}
.star-page .head-tab li a{
color: #b0b0b0;
display: inline-block;
}
.star-page .head-tab li.cur a{
color: #fff;
}
.star-page .head-tab.hide-tab{
transform: scale(1, 0);
height: 100%;
position: absolute;
background: #c4211a;
}
.star-page .banner-top{
.receive-coupon-page .bg-contain img{
width: 100%;
height: auto;
position: relative;
}
.star-page .banner-top .banner-swiper{
.receive-coupon-page .page{
width: 100%;
height: auto;
padding-bottom: 1.5rem;
position: absolute;
top: 0;
bottom: 0;
}
.receive-coupon-page .coupon-centent, .receive-coupon-page .gain-coupon-centent{
margin-top: 10.7rem !important;
height: 13rem;
margin-left: 0.75rem;
margin-right: 0.75rem;
background: #9d1a15;
overflow: hidden;
position: relative;
border-radius: 0.3rem;
}
.star-page .banner-top .banner-swiper ul{
.receive-coupon-page .coupon-centent{
position: relative;
height: auto;
}
.star-page .banner-top .banner-swiper ul li{
float: left;
width: 100%;
height: auto;
}
.star-page .banner-top .banner-swiper ul img{
width: 100%;
height: 100%;
}
.star-page .banner-top .swiper-pagination{
.receive-coupon-page .coupon-centent .title{
position: absolute;
left: 0;
right: 0;
bottom: 0.5rem;
text-align: center;
z-index: 1;
}
.star-page .banner-top .swiper-pagination .pagination-inner{
display: inline-block;
}
.star-page .banner-top .swiper-pagination span{
display: inline-block;
width: 0.35rem;
height: 0.35rem;
background: #fff;
opacity: 0.5;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
margin: 0 0.25rem;
border-radius: 50%;
}
.star-page .banner-top .swiper-pagination .swiper-pagination-bullet-active{
background: #fff;
opacity: 1;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
}
.star-page .avatar-swiper{
overflow: hidden;
margin-top: 0.75rem;
}
.star-page .avatar-swiper li{
float: left;
width: auto;
width: 2.75rem;
height: 2.75rem;
margin-top: 0.85rem;
top: 1rem;
left: 50%;
margin-left: -5rem;
width: 10.025rem;
height: 1.425rem;
background-image: url(../img/sprite.img.png);
background-position: -4.25rem -5.45rem;
background-size: 14.5rem 9.65rem;
}
.star-page .avatar-swiper li img{
.receive-coupon-page .coupon-centent .under-title{
position: absolute;
top: 2.5rem;
width: 100%;
height: 100%;
border-radius: 0.1rem;
}
.star-page .avatar-swiper .swiper-slide-active{
width: 4.5rem;
height: 4.5rem;
margin-top: 0;
}
.star-page .avatar-swiper .swiper-slide-prev, .star-page .avatar-swiper .swiper-slide-next{
width: 3.25rem;
height: 3.25rem;
margin-top: 0.675rem;
}
.star-page .avatar-swiper.avatar-clone{
position: fixed;
left: 0;
top: 0;
margin-top: 2.15rem;
padding: 0.125rem 0;
background: #000;
z-index: 9;
height: 11.575rem;
}
.star-page .star-info{
margin-top: 0.75rem;
background: #000;
.receive-coupon-page .coupon-centent .input-content{
height: 5.15rem;
margin: 0.75rem 0.75rem 0;
position: relative;
}
.star-page .star-info li{
float: left;
.receive-coupon-page .coupon-centent .input-content input{
height: 2.2rem;
width: 100%;
margin-bottom: 0.75rem;
border: 1px solid #fff;
font-size: 0.7rem;
color: #fff;
background: #9d1a15;
border-radius: 0.3rem;
text-align: center;
outline: none;
}
.star-page .star-avatar{
width: 3.35rem;
padding-left: 0.75rem;
box-sizing: border-box;
float: left;
overflow: hidden;
}
.star-page .star-avatar .article-avatar-swiper{
width: 2.6rem;
overflow: hidden;
}
.star-page .star-avatar .rank-avatar{
width: 2.6rem;
height: 2.6rem;
border-radius: 50%;
float: left;
}
.star-page .star-avatar .name{
font-size: 0.6rem;
.receive-coupon-page .coupon-centent .input-content div{
height: 2.2rem;
width: 100%;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
color: #fff;
margin-top: 0.2rem;
float: left;
text-align: center;
font-size: 0.7rem;
border-radius: 0.3rem;
background: #b0b0b0;
color: #e0e0e0;
line-height: 2.2rem;
}
.star-page .star-article{
width: 11.8rem;
position: relative;
border-radius: 0.2rem;
background: #282828;
float: left;
padding: 0.5rem 0.75rem;
box-sizing: border-box;
margin-left: 0.45rem;
.receive-coupon-page .coupon-centent .input-content .verification-code, .receive-coupon-page .coupon-centent .input-content .get{
background: #fff;
color: #444;
}
.star-page .star-article .article-arrow{
position: absolute;
left: -0.325rem;
width: 0;
height: 0;
border-top: 0.25rem solid transparent;
border-bottom: 0.25rem solid transparent;
border-right: 0.325rem solid #282828;
.receive-coupon-page .coupon-centent .has-clear{
padding-right: 0.75rem;
}
.star-page .star-article .article-title{
.receive-coupon-page .coupon-centent .clear-input{
position: absolute;
padding: 0.25rem;
top: 0.4rem;
right: 1.25rem;
font-size: 0.7rem;
line-height: 0.95rem;
color: #fff;
}
.star-page .star-article .artice-cont{
margin-top: 0.25rem;
}
.star-page .star-article .artice-cont p{
font-size: 0.45rem;
line-height: 0.725rem;
color: #969696;
color: #666;
z-index: 1;
}
.star-page .star-article .artice-imgs-area{
.receive-coupon-page .coupon-centent .coupon-description{
width: 100%;
overflow: hidden;
}
.star-page .star-article .artice-imgs-area img{
width: 6.65rem;
float: left;
margin: 0.625rem 0;
}
.star-page .star-article .artice-imgs{
margin: 0.625rem 0 0;
width: 62.5rem;
float: left;
overflow: hidden;
}
.star-page .star-article .artice-imgs li{
display: inline-block;
margin-left: 0.15rem;
height: 3.4rem;
position: relative;
background-image: url(../img/sprite.img.png);
background-position: 0px 0px;
background-size: 14.5rem 9.65rem;
}
.star-page .star-article .artice-imgs li:first{
margin-left: 0;
}
.star-page .star-article .artice-imgs img{
width: 3.25rem;
border-radius: 0.1rem;
}
.star-page .star-article .artice-imgs .img-size{
width: 1.25rem;
height: 0.65rem;
line-height: 0.7rem;
border-radius: 0.325rem;
background-color: rgba(0, 0, 0, 0.4);
color: #fff;
.receive-coupon-page .coupon-centent .coupon-description span{
position: absolute;
right: 0.25rem;
bottom: 0.25rem;
font-size: 0.45rem;
}
.star-page .star-article .artice-imgs .pic-icon{
width: 0.475rem;
height: 0.375rem;
background-image: url(../img/sprite.guang.png);
background-position: 0px 0px;
background-size: 0.475rem 0.375rem;
display: inline-block;
margin: 0.15rem 0.1rem 0 0.2rem;
vertical-align: top;
bottom: 0;
left: 40%;
width: 20%;
height: 2rem;
}
.star-page .star-article .artice-o{
.receive-coupon-page .gain-coupon-centent p{
width: 100%;
float: left;
border-top: 1px solid #b0b0b0;
padding-top: 0.5rem;
}
.star-page .star-article .artice-o span{
font-size: 0.45rem;
color: #b0b0b0;
height: 0.55rem;
line-height: 0.55rem;
}
.star-page .star-article .artice-o span i{
display: inline-block;
margin-right: 0.125rem;
font-size: 0.55rem;
vertical-align: text-bottom;
}
.star-page .star-article .artice-o .time{
float: left;
}
.star-page .star-article .artice-o .see{
float: left;
margin-left: 0.75rem;
height: 1rem;
line-height: 1rem;
text-align: center;
color: #fff;
font-size: 0.425rem;
}
.star-page .star-article .artice-o .time-ico{
width: 0.6rem;
height: 0.6rem;
.receive-coupon-page .gain-coupon-centent p.phone{
margin-top: 0.25rem;
font-size: 0.75rem;
font-weight: bold;
}
.star-page .star-article .artice-o .see-ico{
width: 0.775rem;
height: 0.6rem;
.receive-coupon-page .gain-coupon-centent .coupon{
padding-top: 1.25rem;
width: 90%;
margin-left: 5%;
height: 5.5rem;
background: ##9d1a15;
}
.star-page .view-area{
height: 100%;
position: relative;
.receive-coupon-page .gain-coupon-centent .coupon img{
width: 100%;
height: auto;
}
.star-page .swiper-view{
height: 100%;
background: rgba(0, 0, 0, 0.5);
.receive-coupon-page .gain-coupon-centent .use-coupon-btn{
height: 2.2rem;
line-height: 2.2rem;
margin: 0.75rem 1.375rem;
background: #444;
color: #fff;
text-align: center;
border-radius: 0.1rem;
}
.star-page .view-img{
position: fixed;
left: 0;
right: 0;
top: 0;
bottom: 0;
display: none;
z-index: 9;
.receive-coupon-page .gain-coupon-centent span{
font-weight: bold;
display: inline-block;
width: 3.475rem;
height: 1.05rem;
align: center;
font-size: 0.6rem;
color: #fff;
margin: 0 40%;
background-image: url(../img/sprite.img.png);
background-position: -9.825rem -3.45rem;
background-size: 14.5rem 9.65rem;
}
.star-page .view-img li{
float: left;
.receive-coupon-page .gain-coupon-centent a{
color: #fff;
font-size: 0.7rem;
}
.star-page .view-img li img{
width: 90%;
transform: translate(-50%, -50%);
.receive-coupon-page .dialog{
width: 84%;
height: 10.25rem;
position: absolute;
top: 50%;
left: 50%;
}
.star-page .rank-avatar{
background-image: url('../img/guang/star/user-avatar.png');
background-repeat: no-repeat;
background-size: contain;
background: #fff;
border-radius: 0.6rem;
left: 8%;
top: 5.875rem;
z-index: 2;
}
.star-page .loading-tip{
display: none;
.receive-coupon-page .dialog .close{
width: 1rem;
height: 1rem;
overflow: hidden;
background-image: url(../img/sprite.img.png);
background-position: -13.35rem -3.45rem;
background-size: 14.5rem 9.65rem;
color: #f1f1f1;
position: absolute;
top: -0.5rem;
right: -0.5rem;
line-height: 1rem;
text-align: center;
color: #ccc;
font-size: 0.3rem;
margin: 0.75rem 0;
}
.star-index-bg{
background: #000;
.receive-coupon-page .hidden{
display: none;
}
.star-index-bg .star-page{
background: #000;
.receive-coupon-page .phone-error{
text-align: center;
line-height: 14rem;
}
.star-page .special-list{
.receive-coupon-page .mask{
width: 100%;
height: auto;
height: 100%;
overflow: hidden;
background-color: #000;
opacity: 0.4;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=40)";
position: fixed;
top: 0;
left: 0;
z-index: 1;
}
.star-page .special-list li{
.receive-coupon-page .activity-message{
width: 100%;
float: left;
background: #000;
margin-top: 0.75rem;
height: 10.25rem;
overflow: scroll;
}
.star-page .special-list li img{
.receive-coupon-page .activity-message h3{
width: 100%;
height: 1rem;
margin-top: 1rem;
margin-bottom: 0.25rem;
line-height: 1rem;
font-size: 0.8rem;
text-align: center;
}
.star-page .special-list li p{
width: 100%;
height: 2.2rem;
box-sizing: border-box;
.receive-coupon-page .activity-message p{
width: 85%;
height: auto;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
padding: 0 0.85rem;
font-size: 0.85rem;
line-height: 2.2rem;
margin: 0 auto;
font-size: 0.65rem;
line-height: 1rem;
padding-left: 0.65rem;
text-indent: -0.65rem;
}
.star-page .special-list li a{
.receive-coupon-page .messages{
width: 84%;
height: 4rem;
position: absolute;
background: rgba(0, 0, 0, 0.9);
border-radius: 0.6rem;
left: 8%;
top: 45%;
margin-top: -2rem;
z-index: 2;
color: #fff;
}
.star-page .collocation-list, .star-page .detail-list{
width: 100%;
float: left;
.receive-coupon-page .messages p{
line-height: 4rem;
font-size: 0.6rem;
}
.star-page .collocation-list li, .star-page .detail-list li{
float: left;
.receive-coupon-page .tip-wrap{
width: 100%;
margin-top: 0.75rem;
background: #000;
height: 100%;
background: #9d1a15;
position: fixed;
top: 0;
left: 0;
z-index: 3;
}
.star-page .collocation-list li .cont-area, .star-page .detail-list li .cont-area{
.receive-coupon-page .tip{
width: 100%;
box-sizing: border-box;
padding: 0.75rem;
}
.star-page .collocation-list li .cont-txt, .star-page .detail-list li .cont-txt{
font-size: 0.7rem;
line-height: 1.15rem;
color: #b0b0b0;
margin-top: 0.25rem;
height: 100%;
background: #9d1a15;
position: absolute;
top: 0;
left: 0;
}
.star-page .collocation-list li img, .star-page .detail-list li img{
width: 100%;
.receive-coupon-page .tip .header{
width: 4.25rem;
height: 4.25rem;
margin-top: 40%;
margin-left: auto;
margin-right: auto;
background-image: url(../img/sprite.img.png);
background-position: 0px -5.45rem;
background-size: 14.5rem 9.65rem;
}
.star-page .collocation-list li .title, .star-page .detail-list li .title{
font-size: 1rem;
line-height: 1.2rem;
.receive-coupon-page .tip .title{
margin-top: 0.75rem;
font-size: 0.7rem;
color: #fff;
width: 100%;
}
.star-page .count-area{
position: relative;
width: 100%;
height: 0.8rem;
}
.star-page .count-area span{
font-size: 0.6rem;
color: #b0b0b0;
height: 0.8rem;
line-height: 0.8rem;
}
.star-page .count-area span i{
display: inline-block;
margin-right: 0.125rem;
font-size: 0.6rem;
position: relative;
top: -0.05rem;
}
.star-page .count-area .time{
float: left;
}
.star-page .count-area .see{
float: left;
margin-left: 0.5rem;
}
.star-page .count-area .time-ico{
width: 0.6rem;
height: 0.6rem;
}
.star-page .count-area .see-ico{
width: 0.775rem;
height: 0.6rem;
}
.star-page .count-area .collection{
float: right;
}
.star-page .count-area .collected-ico{
width: 0.85rem;
height: 0.8rem;
vertical-align: text-bottom;
text-align: center;
margin-left: auto;
margin-right: auto;
}
.star-page .count-area .collected{
color: #d62927;
.receive-coupon-page .tip .logo{
width: 9.775rem;
height: 1.95rem;
margin-top: 4.75rem;
margin-left: auto;
margin-right: auto;
background-image: url(../img/sprite.img.png);
background-position: 0px -3.45rem;
background-size: 14.5rem 9.65rem;
}
.star-page .count-area .forward{
width: 1rem;
height: 0.7rem;
float: right;
margin-left: 1.125rem;
.receive-coupon-page .tip .desc{
font-size: 0.6rem;
color: #b0b0b0;
height: 0.8rem;
line-height: 0.8rem;
color: #444;
}
.star-class-body{
background: #333;
width: 100%;
font: 0.3rem/1.5 Arial, '黑体';
float: left;
.receive-coupon-page .tip .button{
display: block;
margin: 0.75rem auto;
width: 6.75rem;
height: 1.4rem;
font-size: 0.65rem;
line-height: 1.4rem;
text-align: center;
color: #fff;
background: #000;
}
/*# sourceMappingURL=index.css.map */
... ...
This diff could not be displayed because it is too large.
... ... @@ -147,7 +147,7 @@ $('.input-content div').on('click', function() {
return;
}
$.ajax({
url: '/coupon/phone',
url: '/activity/coupon/phone',
data: {
mobile: $('#phone').val(),
ordercode: orderCode
... ... @@ -226,7 +226,7 @@ $('.input-content').on('click', '.get', function() {
$('.input-content div').eq('1').removeClass('get');
if ($(this).siblings('input').val().length === 4) {
$.ajax({
url: '/coupon/verify',
url: '/activity/coupon/verify',
data: {
identifycode: $('#verification').val(),
mobile: $('#phone').val(),
... ...