wangshusheng / YOHOBUYPC · Commits

Go to a project

Authored by Rock Zhang
Commit 304df337a7efd2db20991f1ede7871943681cc6d 2 parents 3248024d 8064e8ea

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

Inline Side-by-side
Showing 12 changed files with 55 additions and 26 deletions
... ... @@ -6,6 +6,7 @@
var $ = require('jquery');
var $footer = $('#yoho-footer'),
$yohoPage = $('.yoho-page'),
$header = $('.yoho-header');
function cookie(name) {
... ... @@ -176,6 +177,13 @@ $header.on('touchstart', 'a', function() {
$(this).removeClass('highlight');
});
$yohoPage.on('touchstart', '.tap-hightlight', function() {
$(this).siblings('.tap-hightlight').removeClass('highlight');
$(this).addClass('highlight');
}).on('touchend touchcancel', '.tap-hightlight', function() {
$(this).removeClass('highlight');
});
(function() {
var lastTime = 0,
prefixes = 'webkit moz ms o'.split(' '),
... ...
... ... @@ -105,6 +105,12 @@ a {
@include border-radius(10px);
}
.tap-hightlight {
&.highlight {
background: #eee!important;
}
}
.load-more-info {
width: 100%;
height: 70rem / $pxConvertRem;
... ...
... ... @@ -127,6 +127,7 @@
.price-underline {
text-decoration: line-through;
margin-left: pxToRem(15px);
color: #b0b0b0;
}
}
... ... @@ -142,6 +143,8 @@
&.save-price-number {
text-indent: $width + pxToRem(10px);
color: #b0b0b0;
padding-top: pxToRem(3px);
&:before {
content: '';
... ... @@ -157,8 +160,12 @@
margin-top: -$height / 2;
}
span {
margin-left: pxToRem(15px);
}
.del-fav {
text-indent: 0;
margin-left: 0;
}
}
... ...
... ... @@ -59,8 +59,16 @@
.more-icon {
position: absolute;
top: 0;
right: 30rem / $pxConvertRem;
top: pxToRem(40px);
right: pxToRem(30px);
width: pxToRem(88px);
height: pxToRem(88px);
line-height: pxToRem(88px);
text-align: center;
&.highlight {
background: rgba(200,200,200,.1)!important;
}
}
}
... ... @@ -92,6 +100,10 @@
width: pxToRem(320px);
// width: pxToRem(213px); 三栏宽度
&.highlight {
background: rgba(200,200,200,.1) !important;
}
p {
font-size: pxToRem(24px);
}
... ...
... ... @@ -8,7 +8,7 @@
{{#vip_info}}
<span class="vip-icon vip-{{cur_level}}"></span>
{{/vip_info}}
<div class="iconfont more-icon">&#xe604;</div>
<div class="iconfont more-icon tap-hightlight">&#xe604;</div>
</a>
{{/isLogin}}
{{^isLogin}}
... ... @@ -20,16 +20,16 @@
{{/isLogin}}
</div>
<div class="my-link clearfix {{^isLogin}}no-login{{/isLogin}}">
<a class="link-item" href="/home/favorite">
<a class="link-item tap-hightlight" href="/home/favorite">
{{#isLogin}}{{product_favorite_total}}{{/isLogin}}
<p>收藏的商品</p>
</a>
<a class="link-item" href="/home/favorite?tab=brand">
<a class="link-item tap-hightlight" href="/home/favorite?tab=brand">
{{#isLogin}}{{brand_favorite_total}}{{/isLogin}}
<p>收藏的品牌</p>
</a>
{{!
<a class="link-item" href="/home/record">
<a class="link-item tap-hightlight" href="/home/record">
<!-- product_browse -->
<p>浏览记录</p>
... ...
... ... @@ -3,7 +3,7 @@
{{# order}}
<ul id="order-nav" class="order-nav clearfix">
{{#each navs}}
<li {{#if active}}class="active"{{/if}} data-type="{{typeId}}">
<li class="tap-hightlight {{#if active}}active{{/if}}" data-type="{{typeId}}">
<a href="{{url}}">{{name}}</a>
</li>
{{/each}}
... ...
{{> layout/header}}
<div class="personal-details">
<div class="personal-details yoho-page">
<ul>
<li><span>头像</span><span><i class="head-portrait user-avatar" data-avatar="{{head_ico}}"></i></span></li>
<li><span>昵称</span><span>{{ nickname }}</span></li>
<li><span>性别</span><span>{{ gender }}</span></li>
<li><span>生日</span><span>{{ birthday }}</span></li>
<li><span>会员等级</span>
<li class="tap-hightlight"><span>会员等级</span>
<span>
<a href="grade" class="grade">
{{# vip_info}}
... ...
... ... @@ -6,7 +6,7 @@
我们希望了解您的意见和建议
</h2>
<div class="create-new-suggest">
<div class="create-new-suggest tap-hightlight">
<a class="list-item" href="./suggestSub">
反馈问题 (功能意见，界面意见)<span class="iconfont new-right">&#xe604;</span>
</a>
... ... @@ -24,13 +24,13 @@
<p>{{content}}</p>
<div class="suggest-type suggest-good {{#good}}show{{/good}}">
<div class="active">
<div class="active tap-hightlight">
<span class="iconfont">&#xe601;</span>
<span>靠谱，谢谢您的反馈</span>
</div>
</div>
<div class="suggest-type suggest-bad {{# bad}}show{{/ bad}}">
<div class="active">
<div class="active tap-hightlight">
<span class="iconfont">&#xe601;</span>
<span>不靠谱，谢谢您的反馈</span>
</div>
... ...
... ... @@ -23,7 +23,7 @@
</div>
{{/unless}}
<a class="all-privilege block" href="{{allUrl}}">
<a class="all-privilege block tap-hightlight" href="{{allUrl}}">
查看全部VIP特权
<span class="iconfont">&#xe604;</span>
</a>
... ...
{{> layout/header}}
<div class="goods-consults-page yoho-page">
<div class="goto-consult" id="goto-consult" data-href="{{link}}">
<div class="goto-consult tap-hightlight" id="goto-consult" data-href="{{link}}">
<i class="iconfont consult-logo">&#xe639;</i>
<span>我要咨询</span>
<a href="javascript:;" class="iconfont enter-consult-page">&#xe604;</a>
... ...
... ... @@ -68,7 +68,7 @@
{{# list}}
{{#if @first}}
{{#if text}}
<h1 class="first-item short-text">{{text}}<span class="icon-down iconfont dropdown">&#xe609;</span></h1>
<h1 class="first-item short-text tap-hightlight">{{text}}<span class="icon-down iconfont dropdown">&#xe609;</span></h1>
{{/if}}
{{/if}}
{{/ list}}
... ... @@ -77,7 +77,7 @@
{{#if @first}}
{{else}}
{{#if text}}
<h1 class="folder-item">{{text}}</h1>
<h1 class="folder-item tap-hightlight">{{text}}</h1>
{{/if}}
{{/if}}
{{/list}}
... ... @@ -93,7 +93,7 @@
{{#if consultsNum}}
{{> product/feedback-tab}}
{{else}}
<div class="nodata">
<div class="nodata tap-hightlight">
<span>暂无商品评价和咨询</span>
<a href="{{link}}" class="go-consult">我要咨询<span class="iconfont">&#xe604;</span></a>
</div>
... ... @@ -103,7 +103,7 @@
{{/ feedbacks}}
{{# enterStore}}
<div id="enter-store" class="enter-store page-block">
<div id="enter-store" class="enter-store page-block tap-hightlight">
<a class="store-logo" href="{{url}}" style="">
<img class="lazy" data-original="{{img}}" alt="{{storeName}}">
</a>
... ... @@ -113,7 +113,6 @@
{{/ enterStore}}
<div id="productDesc"> </div>
<!-- {{> product/product-description}} -->
{{> product/recommend-for-you}}
{{#cartInfo}}
... ...
<ul id="nav-tab" class="nav-tab clearfix">
<li class="comment-nav">商品评价<span class="comments-num">{{commentsNum}}</span></li>
<li class="consult-nav">购买咨询(<span class="consults-num">{{consultsNum}}</span>)</li>
<li class="comment-nav tap-hightlight">商品评价<span class="comments-num">{{commentsNum}}</span></li>
<li class="consult-nav tap-hightlight">购买咨询(<span class="consults-num">{{consultsNum}}</span>)</li>
</ul>
<div id="feedback-content" >
<div class="comment-content content ">
... ... @@ -26,9 +26,6 @@
<span class="iconfont">&#xe63d;</span>暂无评论
</div>
{{/if}}
<!-- <div class="comment-content-footer">
<a href="{{link}}">查看更多 <span class="iconfont">&#xe604;</span></a>
</div> -->
</div>
<div class="consult-content content hide ">
... ... @@ -49,7 +46,7 @@
</div>
{{/ consults}}
</div>
<div class="consult-content-footer" data-href="{{link}}">
<div class="consult-content-footer tap-hightlight" data-href="{{link}}">
<a href="javascript:;">
查看更多
<span class="iconfont">&#xe604;</span></a>
... ... @@ -59,7 +56,7 @@
<span class="iconfont">&#xe63f;</span>暂无咨询
</div>
<div class="consult-content-footer" data-href="{{link}}">
<div class="consult-content-footer tap-hightlight" data-href="{{link}}">
<a href="javascript:;">
我要咨询
<span class="iconfont">&#xe604;</span></a>
... ...