wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by ccbikai
Commit a050b417e7c768b22672f1860ecc7342f69415d5 2 parents e5e0cce6 06d05838

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

Inline Side-by-side
Showing 12 changed files with 112 additions and 48 deletions
... ... @@ -149,7 +149,7 @@ function rePosFooter() {
window._ozuid = uid;//暴露ozuid
if (window._yas) {
window._yas(1 * new Date(), '1.0.13', 'yohobuy_m', uid, '');
window._yas(1 * new Date(), '1.0.13.1', 'yohobuy_m', uid, '');
}
}());
... ...
... ... @@ -2,10 +2,12 @@ var $ = require('jquery'),
Hammer = require('yoho.hammer');
var employ;
window.rePosFooter();
$('.employ span').each(function(index) {
employ = new Hammer($('.employ span')[index]);
employ.on('tap', function(e) {
$('.employ-list').addClass('none').eq(index).removeClass('none');
$('.employ span').removeClass('active').eq(index).addClass('active');
window.rePosFooter();
});
});
\ No newline at end of file
... ...
... ... @@ -34,6 +34,7 @@
background: image-url('me/employ/employ.jpg') top center no-repeat;
background-size: 100% 100%;
color: #fff;
position: relative;
span{
width: 34.482759%;
height: 100%;
... ... @@ -52,16 +53,60 @@
font-size: 60em / $pxConvertRem;
}
}
i{
width: 100%;
height: 100%;
overflow: hidden;
display: block;
position: absolute;
top: 0;
left: 0;
background: image-url('me/employ/employsy.png') right top no-repeat;
background-size:auto 100%;
}
}
.null{
text-align: center;
color: #333;
margin-top: 55%;
font-size:56em / $pxConvertRem;
color: #333;
width: 100%;
height:auto;
overflow: hidden;
position: absolute;
left: 0;
top:50%;
@include transform(translateY(-60%));
i{
width: 100%;
height: 120rem / $pxConvertRem;
overflow: hidden;
display: block;
background: image-url('me/employ/not.png') center top no-repeat;
background-size:auto 100%;
}
p{
width: 100%;
height: auto;
overflow: hidden;
padding:20rem / $pxConvertRem 0 0;
font-size: 48em / $pxConvertRem;
text-align: center;
color: #444;
}
a{
width: 73.75%;
height: 80rem / $pxConvertRem;
overflow: hidden;
font-size: 56em / $pxConvertRem;
line-height: 80rem / $pxConvertRem;
display: block;
background: #444444;
color: #fff;
text-align: center;
margin: 32em / $pxConvertRem auto;
@include border-radius(.2rem);
}
}
}
.none{
display: none;
}
\ No newline at end of file
}
\ No newline at end of file
... ...
... ... @@ -58,7 +58,7 @@
position: absolute;
right: 40rem / $pxConvertRem;
top:50%;
@include transform(translateY(-50%))
@include transform(translateY(-50%));
}
span{
color: #b0b0b0;
... ...
... ... @@ -4,32 +4,6 @@ $subFontC:#b0b0b0;
$borderC:#e0e0e0;
$tableCellC:#eee;
$basicBtnC:#eb0313;
.my-swiper-button-prev,
.my-swiper-button-next {
position: absolute;
top: 50%;
width: pxToRem(48px);
height: pxToRem(48px);
margin-top: pxToRem(-44px);
cursor: pointer;
-moz-background-size: pxToRem(48px) pxToRem(48px);
-webkit-background-size: pxToRem(48px) pxToRem(48px);
background-size: pxToRem(48px) pxToRem(48px);
background-position: center;
background-repeat: no-repeat;
}
.next-grey {
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23f0f0f0'%2F%3E%3C%2Fsvg%3E");
right: pxToRem(30px);
left: auto;
}
.prev-grey {
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23f0f0f0'%2F%3E%3C%2Fsvg%3E");
left: pxToRem(30px);
right: auto;
}
.good-detail-page {
overflow: hidden;
... ... @@ -78,11 +52,38 @@ $basicBtnC:#eb0313;
border-right: none;
}
}
// }
}
}
}
.my-swiper-button-prev,
.my-swiper-button-next {
position: absolute;
top: 50%;
width: pxToRem(48px);
height: pxToRem(48px);
margin-top: pxToRem(-44px);
cursor: pointer;
-moz-background-size: pxToRem(48px) pxToRem(48px);
-webkit-background-size: pxToRem(48px) pxToRem(48px);
background-size: pxToRem(48px) pxToRem(48px);
background-position: center;
background-repeat: no-repeat;
}
.next-grey {
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M27%2C22L27%2C22L5%2C44l-2.1-2.1L22.8%2C22L2.9%2C2.1L5%2C0L27%2C22L27%2C22z'%20fill%3D'%23f0f0f0'%2F%3E%3C%2Fsvg%3E");
right: pxToRem(30px);
left: auto;
}
.prev-grey {
background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20xmlns%3D'http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg'%20viewBox%3D'0%200%2027%2044'%3E%3Cpath%20d%3D'M0%2C22L22%2C0l2.1%2C2.1L4.2%2C22l19.9%2C19.9L22%2C44L0%2C22L0%2C22L0%2C22z'%20fill%3D'%23f0f0f0'%2F%3E%3C%2Fsvg%3E");
left: pxToRem(30px);
right: auto;
}
.tag-container {
position: absolute;
left: pxToRem(108px);
... ... @@ -256,7 +257,7 @@ $basicBtnC:#eb0313;
height: pxToRem(32px);
}
&:nth-child(1) {
text-align: right;
text-align: left;
.vip-img {
background: image-url('product/silver.png') no-repeat;
}
... ... @@ -267,7 +268,7 @@ $basicBtnC:#eb0313;
}
}
&:nth-child(3) {
text-align: left;
text-align: right;
.vip-img {
background: image-url('product/platinum.png') no-repeat;
}
... ...
... ... @@ -13,7 +13,11 @@
</div>
{{/ used}}
{{^ used}}
<p class="null">未找到相关相关优惠券</p>
<div class="null">
<i></i>
<p>您还没有未使用的优惠券</p>
<a href="{{topURL}}">随便逛逛</a>
</div>
{{/ used}}
</div>
<div class="employ-list not none">
... ... @@ -22,10 +26,15 @@
<span>{{ money}}</span>
<p>{{ coupon_name}}</p>
<p>{{ couponValidity}}</p>
<i></i>
</div>
{{/ unused}}
{{^ unused}}
<p class="null">未找到相关相关优惠券</p>
<div class="null">
<i></i>
<p>您还没有已使用的优惠券</p>
<a href="{{topURL}}">随便逛逛</a>
</div>
{{/ unused}}
</div>
{{/ couponsUrl}}
... ...
... ... @@ -66,20 +66,28 @@
{{# goodsDiscount}}
<div class="goodsDiscount">
{{# list}}
{{# list}}
{{#if @first}}
<h1 class="first-item">{{text}}<span class="icon-down iconfont dropdown">&#xe609;</span></h1>
{{#if text}}
<h1 class="first-item">{{text}}<span class="icon-down iconfont dropdown">&#xe609;</span></h1>
{{/if}}
{{/if}}
{{/ list}}
<div class="discount-folder">
{{# list}}
{{#if @first}}
{{else}}
{{#if text}}
<h1 class="folder-item">{{text}}</h1>
{{/if}}
{{/ list}}
</div>
{{/if}}
{{/list}}
</div>
</div>
{{/ goodsDiscount}}
<div class="feedback-list ">
{{# feedbacks}}
<div class="feedback-list ">
{{#if commentsNum}}
{{> product/feedback-tab}}
{{else}}
... ... @@ -92,8 +100,8 @@
</div>
{{/if}}
{{/if}}
{{/ feedbacks}}
</div>
{{/ feedbacks}}
{{# enterStore}}
<div id="enter-store" class="enter-store page-block">
... ...
... ... @@ -28,7 +28,7 @@
a.async=1;
a.src=j;
m.parentNode.insertBefore(a,m);
})(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.13/yas-debug.js','_yas');
})(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.13.1/yas.js','_yas');
</script>
{{> layout/use}}
{{> layout/analysis}}
... ...
... ... @@ -15,7 +15,6 @@
</div>
</div>
<!-- 如果需要导航按钮 -->
<div class="my-swiper-button-prev prev-grey"></div>
<div class="my-swiper-button-next next-grey"></div>
</div>
\ No newline at end of file
... ...
... ... @@ -243,7 +243,7 @@ class HomeController extends AbstractAction
'couponsUrl' => UserModel::getCouponData($uid),
'couponsPage' => true
);
$coupons['pageFooter'] = true;
$this->_view->display('coupons', $coupons);
}
... ...