fe / yohobuywap-node · Commits

Go to a project

Authored by 王水玲
Commit fd78f6513302602771e9c80f8c88ccfb31991f28 1 parent 4e5a16c9

年度账单 商品修改

Inline Side-by-side
Showing 38 changed files with 221 additions and 39 deletions
... ... @@ -26,7 +26,7 @@ const index = (req, res, next) => {
pic: 'https://feature.yoho.cn/300x300.png',
title: title,
url: sUrl,
content: 'YOHO!2016潮流轨迹'
content: 'YOHO!BUY有货2016潮流轨迹'
});
}
... ...
... ... @@ -31,12 +31,7 @@
<div class="purdah2">
<div class="month-4"></div>
<div class="month-list">
<ul>
<li class="month-5"></li>
<li class="month-8"></li>
<li class="month-10"></li>
<li class="month-12"></li>
</ul>
<ul></ul>
</div>
</div>
</div>
... ...
... ... @@ -17,21 +17,21 @@ module.exports = {
assetUrl: '//127.0.0.1:5001',
testCode: 'yoho4946abcdef#$%&!@',
domains: {
// api: 'http://api-test3.yohops.com:9999/',
// service: 'http://service-test3.yohops.com:9999/',
// liveApi: 'http://testapi.live.yohops.com:9999/',
// singleApi: 'http://api-test3.yohops.com:9999/',
// imSocket: 'ws://im.yohobuy.com:10240',
// imCs: 'http://im.yohobuy.com/api',
// imServer: 'http://im.yohobuy.com/server'
api: 'http://api-test3.yohops.com:9999/',
service: 'http://service-test3.yohops.com:9999/',
liveApi: 'http://testapi.live.yohops.com:9999/',
singleApi: 'http://api-test3.yohops.com:9999/',
imSocket: 'ws://im.yohobuy.com:10240',
imCs: 'http://im.yohobuy.com/api',
imServer: 'http://im.yohobuy.com/server'
api: 'http://api.yoho.cn/',
service: 'http://192.168.102.14:8090',
liveApi: 'http://api.live.yoho.cn/',
singleApi: 'http://single.yoho.cn/',
imSocket: 'wss://imsocket.yohobuy.com:443',
imCs: 'https://imhttp.yohobuy.com/api',
imServer: 'https://imhttp.yohobuy.com/server'
// api: 'http://api.yoho.cn/',
// service: 'http://192.168.102.14:8090',
// liveApi: 'http://api.live.yoho.cn/',
// singleApi: 'http://single.yoho.cn/',
// imSocket: 'wss://imsocket.yohobuy.com:443',
// imCs: 'https://imhttp.yohobuy.com/api',
// imServer: 'https://imhttp.yohobuy.com/server'
},
subDomains: {
host: '.m.yohobuy.com',
... ...
... ... @@ -79,13 +79,14 @@ $(function() {
imgUrl: 'https://feature.yoho.cn/300x300.png',
title: 'YOHO!BUY有货年度潮流账单——快来看看你的潮流形象！速戳>>',
link: $('#s-url').val(),
desc: 'YOHO!2016潮流轨迹'
desc: 'YOHO!BUY有货2016潮流轨迹'
});
mySwiper = new Swiper('.swiper-container', {
direction: 'vertical',
onSlideChangeEnd: function(swiper) {
onTransitionEnd: function(swiper) {
var aIndex = swiper.activeIndex;
var i = 1;
if (aIndex === 1) {
setTimeout(function() {
... ... @@ -97,6 +98,15 @@ $(function() {
if (aIndex === 2) {
$purdahLeft.addClass('purdah-l-animation');
$purdahRight.addClass('purdah-r-animation');
if ($monthList.find('li').length === 0) {
for (i; i <= 32; i++) {
if (i === 7) {
$monthList.find('ul').append('<li class="goods-' + i + '"><div class="goods-gif-' + i + '"></div></li>');
} else {
$monthList.find('ul').append('<li class="goods-' + i + '"></li>');
}
}
}
$monthList.fadeIn();
}
... ... @@ -138,6 +148,7 @@ $(function() {
$purdahLeft.removeClass('purdah-l-animation');
$purdahRight.removeClass('purdah-r-animation');
$monthList.fadeOut();
$monthList.find('ul').scrollLeft(0);
}
if (aIndex === 0 || aIndex === 2) {
... ...
... ... @@ -240,10 +240,10 @@
.month-list {
position: absolute;
left: 40px;
top: 520px;
top: 535px;
z-index: 1;
width: 550px;
height: 287px;
height: 370px;
overflow: hidden;
display: none;
... ... @@ -251,38 +251,214 @@
white-space: nowrap;
overflow-x: scroll;
width: 570px;
height: 320px;
height: 390px;
padding-right: 20px;
}
li {
display: inline-block;
height: 287px;
height: 370px;
}
.month-5 {
.goods-1 {
width: 222px;
background: resolve("activity/annual-account/annual-goods-1.png") no-repeat;
background-size: contain;
margin-left: 35px;
}
.goods-2 {
width: 250px;
background: resolve("activity/annual-account/annual-goods-2.png") no-repeat;
background-size: contain;
}
.goods-3 {
width: 259px;
background: resolve("activity/annual-account/annual-goods-3.png") no-repeat;
background-size: contain;
}
.goods-4 {
width: 267px;
background: resolve("activity/annual-account/annual-goods-4.png") no-repeat;
background-size: contain;
}
.goods-5 {
width: 261px;
background: resolve("activity/annual-account/annual-goods-5.png") no-repeat;
background-size: contain;
}
.goods-6 {
width: 262px;
background: resolve("activity/annual-account/5month.png") no-repeat;
background: resolve("activity/annual-account/annual-goods-6.png") no-repeat;
background-size: contain;
}
.goods-7 {
width: 315px;
background: resolve("activity/annual-account/annual-goods-7.png") no-repeat;
background-size: contain;
}
.goods-gif-7 {
width: 251px;
height: 182px;
background-image: resolve("activity/annual-account/annual-goods-7.gif");
background-size: contain;
margin: 108px auto 0;
}
.goods-8 {
width: 266px;
background: resolve("activity/annual-account/annual-goods-8.png") no-repeat;
background-size: contain;
}
.goods-9 {
width: 283px;
background: resolve("activity/annual-account/annual-goods-9.png") no-repeat;
background-size: contain;
}
.goods-10 {
width: 299px;
background: resolve("activity/annual-account/annual-goods-10.png") no-repeat;
background-size: contain;
}
.goods-11 {
width: 292px;
background: resolve("activity/annual-account/annual-goods-11.png") no-repeat;
background-size: contain;
}
.goods-12 {
width: 232px;
background: resolve("activity/annual-account/annual-goods-12.png") no-repeat;
background-size: contain;
}
.goods-13 {
width: 293px;
background: resolve("activity/annual-account/annual-goods-13.png") no-repeat;
background-size: contain;
}
.goods-14 {
width: 297px;
background: resolve("activity/annual-account/annual-goods-14.png") no-repeat;
background-size: contain;
}
.goods-15 {
width: 291px;
background: resolve("activity/annual-account/annual-goods-15.png") no-repeat;
background-size: contain;
}
.goods-16 {
width: 303px;
background: resolve("activity/annual-account/annual-goods-16.png") no-repeat;
background-size: contain;
}
.goods-17 {
width: 274px;
background: resolve("activity/annual-account/annual-goods-17.png") no-repeat;
background-size: contain;
}
.goods-18 {
width: 336px;
background: resolve("activity/annual-account/annual-goods-18.png") no-repeat;
background-size: contain;
}
.goods-19 {
width: 346px;
background: resolve("activity/annual-account/annual-goods-19.png") no-repeat;
background-size: contain;
}
.goods-20 {
width: 336px;
background: resolve("activity/annual-account/annual-goods-20.png") no-repeat;
background-size: contain;
}
.goods-21 {
width: 274px;
background: resolve("activity/annual-account/annual-goods-21.png") no-repeat;
background-size: contain;
}
.goods-22 {
width: 303px;
background: resolve("activity/annual-account/annual-goods-22.png") no-repeat;
background-size: contain;
}
.goods-23 {
width: 319px;
background: resolve("activity/annual-account/annual-goods-23.png") no-repeat;
background-size: contain;
}
.goods-24 {
width: 297px;
background: resolve("activity/annual-account/annual-goods-24.png") no-repeat;
background-size: contain;
}
.goods-25 {
width: 332px;
background: resolve("activity/annual-account/annual-goods-25.png") no-repeat;
background-size: contain;
}
.goods-26 {
width: 301px;
background: resolve("activity/annual-account/annual-goods-26.png") no-repeat;
background-size: contain;
}
.goods-27 {
width: 276px;
background: resolve("activity/annual-account/annual-goods-27.png") no-repeat;
background-size: contain;
}
.goods-28 {
width: 313px;
background: resolve("activity/annual-account/annual-goods-28.png") no-repeat;
background-size: contain;
}
.goods-29 {
width: 320px;
background: resolve("activity/annual-account/annual-goods-29.png") no-repeat;
background-size: contain;
}
.month-8 {
width: 210px;
background: resolve("activity/annual-account/8month.png") no-repeat;
.goods-30 {
width: 331px;
background: resolve("activity/annual-account/annual-goods-30.png") no-repeat;
background-size: contain;
}
.month-10 {
width: 233px;
background: resolve("activity/annual-account/10month.png") no-repeat;
.goods-31 {
width: 316px;
background: resolve("activity/annual-account/annual-goods-31.png") no-repeat;
background-size: contain;
}
.month-12 {
width: 187px;
background: resolve("activity/annual-account/12month.png") no-repeat;
.goods-32 {
width: 304px;
background: resolve("activity/annual-account/annual-goods-32.png") no-repeat;
background-size: contain;
margin-right: 20px;
}
}
... ...