fe / yohobuywap-node · Commits

Go to a project

Authored by ccbikai(👎🏻🍜)
Commit d590b8fc02e50b30dd540b8ee15dcf9f457c8edd 2 parents 308751c8 21d586a2

Merge branch 'master' into release/5.0.0

Inline Side-by-side
Showing 11 changed files with 29 additions and 22 deletions
... ... @@ -45,7 +45,7 @@ exports.index = (req, res, next) => {
res.locals.width750 = true;
let cate = {
goods1: [51203592, 51228151, 51315660],
goods1: [51281456, 51228151, 51315660],
goods2: [51362376, 51339512, 51316684],
goods3: [51374524, 51338322, 51344316]
};
... ...
... ... @@ -11,7 +11,7 @@
{{#if isVipDay}}
<strong class="fz17">每月28日，会员潮集狂欢</strong>
{{else}}
<strong class="fz17">奔跑吧,潮人们</strong>
<strong class="fz17">动动指尖吧！潮人们</strong>
{{/if}}
</p>
<a href="javascript:void(0)" class="weal-btn fz16" id="send_gift">立刻发福利</a>
... ...
... ... @@ -3,7 +3,7 @@
<div>
<img src="//cdn.yoho.cn/m-yohobuy-node/assets/img/activity/invite/title_new.png" />
<br />
<p class="fz14">只需1位小伙伴领取，<br/>即得<strong class="fz17">10元现金券</strong>！<br/>全部领完，可继续发，上不封顶！<br/>奔跑吧，潮人们！</p>
<p class="fz14">只需1位小伙伴领取，<br/>即得<strong class="fz17">10元现金券</strong>！<br/>全部领完，可继续发，上不封顶！<br/>动动指尖吧！潮人们</p>
<a href="javascript:void(0)" class="invite-btn fz16">立刻发福利</a>
<h2 class="rule-tit fz15">活动细则</h2>
... ...
... ... @@ -30,13 +30,13 @@
<ul class="clearfix">
<li class="item item-1 pull-left" id="js-qiandao">
<!--<a href="http://m.yohobuy.com/home/mycurrency?openby:yohobuy={'action':'go.h5','params':{'islogin':'Y','url':'http://m.yohobuy.com/home/mycurrency'}}">-->
<img class="play-icon-flag" src="{{imgSrc 'img/activity/vip_day/play-coin-1.png'}}" alt="签到福利">
<img class="play-icon-flag play-coin-left" src="{{imgSrc 'img/activity/vip_day/play-coin-1.png'}}" alt="签到福利">
<!--</a>-->
</li>
<li class="play-coin-div"></li>
<li class="item item-2 pull-right" id="js-game-luck">
<a href='http://m.yohobuy.com/activity/vip-day/crazy-luck?openby:yohobuy={"action":"go.h5","params":{"islogin":"Y","url":"http://m.yohobuy.com/activity/vip-day/crazy-luck"}}'>
<img class="play-icon-flag" src="{{imgSrc 'img/activity/vip_day/play-coin-2.png'}}" alt="拼手气">
<a href='http://m.yohobuy.com/activity/vip-day/crazy-luck{{#if isApp}}?openby:yohobuy={"action":"go.h5","params":{"islogin":"Y","url":"http://m.yohobuy.com/activity/vip-day/crazy-luck"}}{{/if}}'>
<img class="play-icon-flag play-coin-right" src="{{imgSrc 'img/activity/vip_day/play-coin-2.png'}}" alt="拼手气">
</a>
</li>
</ul>
... ... @@ -62,14 +62,14 @@
<div class="content">
<div class="vip-goods-sec">
<!-- good class 1-->
<h5 class="vip-goods-sec-label">潮牌尖货</h5>
<h5 class="vip-goods-sec-label">明星潮牌</h5>
<ul class="vip-goods-list clearfix">
{{#each goods1}}
{{> vip_day/vip-good}}
{{/each}}
</ul>
<!-- good class 2-->
<h5 class="vip-goods-sec-label">新品示出</h5>
<h5 class="vip-goods-sec-label">新品释出</h5>
<ul class="vip-goods-list clearfix">
{{#each goods2}}
{{> vip_day/vip-good}}
... ...
... ... @@ -32,7 +32,7 @@
<link rel="apple-touch-startup-image" sizes="640x920" href="http://static.yohobuy.com/m/v1/img/startup/startup-retina.png" media="screen and (max-device-width: 480px) and (-webkit-min-device-pixel-ratio: 2)">
<link rel="apple-touch-startup-image" sizes="320x460" href="http://static.yohobuy.com/m/v1/img/startup/startup.png" media="screen and (max-device-width: 320)">
</head>
<body class="{{pageStyle}} {{#if width750}}width750{{/if}} {{#if isPassportPage}}passport-body{{/if}} {{#if isStarIndexPage}}star-index-bg{{/if}} {{#if isStarDetailPage}}star-class-body{{/if}} {{#if isInstallmentPage}}installment-body{{/if}}">
<body class="{{pageStyle}} {{#if isWechat}}wechat-body{{/if}} {{#if width750}}width750{{/if}} {{#if isPassportPage}}passport-body{{/if}} {{#if isStarIndexPage}}star-index-bg{{/if}} {{#if isStarDetailPage}}star-class-body{{/if}} {{#if isInstallmentPage}}installment-body{{/if}}">
<div class="main-wrap">
{{#if systemUpdate}}
{{> updata}}
... ...

39.9 KB | W: | H:

55.8 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

45.9 KB | W: | H:

84.2 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -39,9 +39,9 @@ var page = {
this.fetchMsg();
share({
title: '有货【会员日】开启啦！9月28日潮集狂欢趴等你来HI！限时6大福利，快参与起来喽~',
title: '有货【会员日】潮集狂欢，限时六大福利，还不快参与起来？！',
link: location.href,
desc: 'm.yohobuy.com',
desc: '每月28日，尽情释放！',
imgUrl: 'http://img10.static.yhbimg.com/taobaocms/2016/09/23/18/010ccac2955e7e50ffb66b75110e73e3e1.png'
});
},
... ... @@ -173,6 +173,8 @@ var page = {
},
fetchMsg: function() {
var self = this;
$.get('/activity/vip-day/msg/fetch.json?app_version=1&uid=' + yoho.getUid())
.done(function(res) {
if (res.code !== 200) {
... ... @@ -180,7 +182,7 @@ var page = {
return;
}
window.clearTimeout(this.rollTimer);
window.clearTimeout(self.rollTimer);
var $frag = $('<ul></ul>'),
$fragClone;
... ...
... ... @@ -42,6 +42,5 @@ $(function() {
content: '<p class="primary">恭喜你获得<span class="award">' + score + '</span>元优惠券，请到【我的-优惠券】中查收奖品</p>'
});
$gameNotify.text('您的机会已用完,请下月28号再来');
game.destory();
};
});
... ...
... ... @@ -5,7 +5,7 @@
.vip-day-header {
background: resolve("activity/vip_day/activity.jpg");
background-size: 100% 100%;
height: 466px;
height: 363px;
/*box-shadow: inset -6px -6px 7px rgba(15, 5, 10, 0.32);*/
}
... ... @@ -136,6 +136,16 @@
}
}
.play-coin-left {
width: 218px;
height: 170px;
}
.play-coin-right {
width: 182px;
height: 169px;
}
.play-coin-div {
content: '';
position: absolute;
... ... @@ -147,11 +157,6 @@
background-color: #e95d3f;
}
.play-icon-flag {
width: 218px;
height: 170px;
}
/* VIP 等级加速 */
.vip-rocket {
.title-pic {
... ... @@ -257,8 +262,8 @@
text-align: center;
sup {
font-size: 10px;
vertical-align: text-top;
// font-size: 20px;
// vertical-align: super;
}
.disable-price {
... ... @@ -316,7 +321,7 @@
margin-top: 64px;
margin-bottom: 56px;
color: transparent;
height: 297px;
height: 327px;
background-image: resolve('activity/vip_day/invite.jpg');
background-size: 100% 100%;
}
... ... @@ -361,6 +366,7 @@
color: #fff;
width: 100%;
border-radius: 8px;
font-weight: bold;
}
.txt {
... ...