Authored by uedxwg

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

... ... @@ -55,7 +55,7 @@
position: absolute;
right: 0.75rem;
bottom: 0.25rem;
color: #ccc;
color: #999;
}
}
... ...
... ... @@ -181,7 +181,11 @@
top: 50%;
margin-top: -0.75rem;
right: 0;
color: #666;
color: #999;
padding-right: 0.75rem;
text-align: right;
}
}
}
... ... @@ -343,5 +347,10 @@
height: 2rem;
background: image_url('loading.gif') center center no-repeat;
@include background-size(auto 40%);
position: absolute;
top: 50%;
left: 0;
margin-top: -1rem;
}
}
\ No newline at end of file
... ...
$vip: sprite-map("me/vip/*.png", $spacing: 10px);
$fav: sprite-map("me/fav/*.png", $spacing: 5px);
@import "home", "vip-grade", "order", "order-detail", "coupons", "personal-details", "yoho-coin", "fav", "suggest", "address", "online-service", "my-guang", "ihelp", "browse-record", "pay";
@import "home", "vip-grade", "order", "order-detail", "coupons", "personal-details", "yoho-coin", "fav", "suggest", "address", "online-service", "my-guang", "ihelp", "browse-record", "logistic", "pay";
... ...
... ... @@ -135,7 +135,7 @@ $basicBtnC:#eb0313;
// overflow: hidden;
}
.banner-top-single{
width: pxToRem(448px);
margin:pxToRem(30px) pxToRem(72px);
overflow: hidden;
... ... @@ -181,8 +181,8 @@ $basicBtnC:#eb0313;
min-height: pxToRem(83px);
font-size: pxToRem(28px);
color: #fff;
padding-left: pxToRem(25px);
padding-right: pxToRem(25px);
padding-left: pxToRem(28px);
padding-right: pxToRem(28px);
line-height: pxToRem(36px);
background-color: #515150;
}
... ...
... ... @@ -22,7 +22,7 @@
{{/comments}}
{{#if loadmore}}
<input id="loadMoreUrl" type="hidden" value={{loadMoreUrl}}>
<input id="loadMoreUrl" type="hidden" value="{{loadMoreUrl}}">
{{/if}}
</div>
... ...
... ... @@ -28,7 +28,7 @@
{{/ consults}}
{{#if loadmore}}
<input id="loadMoreUrl" type="hidden" value={{loadMoreUrl}}>
<input id="loadMoreUrl" type="hidden" value="{{loadMoreUrl}}">
{{/if}}
</div>
{{> layout/footer}}
... ...
... ... @@ -131,10 +131,10 @@
</div>
{{/cartInfo}}
{{#if introUrl}}
<input id="introUrl" type="hidden" value='{{introUrl}}'>
<input id="introUrl" type="hidden" value="{{introUrl}}">
{{/if}}
{{#if id}}
<input id="productId" type="hidden" value='{{id}}'>
<input id="productId" type="hidden" value="{{id}}">
{{/if}}
</div>
... ...
... ... @@ -288,7 +288,9 @@
</script>
{{/if}}
{{#if logisticInfoPage}}
<script>
seajs.use('js/me/logistic');
</script>
{{/if}}
{{#if payCenterPage}}
<script>
... ...