fe / YOHOBUYPC · Commits

Go to a project

Authored by Rock Zhang
Commit da24f36c40eacd8af6e1acc8a70a899c3780f1df 2 parents 428dddaf 8064e8ea

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

Inline Side-by-side
Showing 12 changed files with 62 additions and 33 deletions
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
6 var $ = require('jquery'); 6 var $ = require('jquery');
7 7
8 var $footer = $('#yoho-footer'), 8 var $footer = $('#yoho-footer'),
  9 + $yohoPage = $('.yoho-page'),
9 $header = $('.yoho-header'); 10 $header = $('.yoho-header');
10 11
11 function cookie(name) { 12 function cookie(name) {
@@ -176,6 +177,13 @@ $header.on('touchstart', 'a', function() { @@ -176,6 +177,13 @@ $header.on('touchstart', 'a', function() {
176 $(this).removeClass('highlight'); 177 $(this).removeClass('highlight');
177 }); 178 });
178 179
  180 +$yohoPage.on('touchstart', '.tap-hightlight', function() {
  181 + $(this).siblings('.tap-hightlight').removeClass('highlight');
  182 + $(this).addClass('highlight');
  183 +}).on('touchend touchcancel', '.tap-hightlight', function() {
  184 + $(this).removeClass('highlight');
  185 +});
  186 +
179 (function() { 187 (function() {
180 var lastTime = 0, 188 var lastTime = 0,
181 prefixes = 'webkit moz ms o'.split(' '), 189 prefixes = 'webkit moz ms o'.split(' '),
@@ -23,10 +23,10 @@ html, body { @@ -23,10 +23,10 @@ html, body {
23 } 23 }
24 24
25 .clearfix:after { 25 .clearfix:after {
26 - clear: both; 26 + clear: both;
27 } 27 }
28 28
29 -.clearfix { 29 +.clearfix {
30 *zoom: 1; 30 *zoom: 1;
31 } 31 }
32 32
@@ -105,6 +105,12 @@ a { @@ -105,6 +105,12 @@ a {
105 @include border-radius(10px); 105 @include border-radius(10px);
106 } 106 }
107 107
  108 +.tap-hightlight {
  109 + &.highlight {
  110 + background: #eee!important;
  111 + }
  112 +}
  113 +
108 .load-more-info { 114 .load-more-info {
109 width: 100%; 115 width: 100%;
110 height: 70rem / $pxConvertRem; 116 height: 70rem / $pxConvertRem;
@@ -127,6 +127,7 @@ @@ -127,6 +127,7 @@
127 .price-underline { 127 .price-underline {
128 text-decoration: line-through; 128 text-decoration: line-through;
129 margin-left: pxToRem(15px); 129 margin-left: pxToRem(15px);
  130 + color: #b0b0b0;
130 } 131 }
131 } 132 }
132 133
@@ -142,6 +143,8 @@ @@ -142,6 +143,8 @@
142 143
143 &.save-price-number { 144 &.save-price-number {
144 text-indent: $width + pxToRem(10px); 145 text-indent: $width + pxToRem(10px);
  146 + color: #b0b0b0;
  147 + padding-top: pxToRem(3px);
145 148
146 &:before { 149 &:before {
147 content: ''; 150 content: '';
@@ -157,8 +160,12 @@ @@ -157,8 +160,12 @@
157 margin-top: -$height / 2; 160 margin-top: -$height / 2;
158 161
159 } 162 }
  163 + span {
  164 + margin-left: pxToRem(15px);
  165 + }
160 .del-fav { 166 .del-fav {
161 text-indent: 0; 167 text-indent: 0;
  168 + margin-left: 0;
162 } 169 }
163 } 170 }
164 171
@@ -59,8 +59,16 @@ @@ -59,8 +59,16 @@
59 59
60 .more-icon { 60 .more-icon {
61 position: absolute; 61 position: absolute;
62 - top: 0;  
63 - right: 30rem / $pxConvertRem; 62 + top: pxToRem(40px);
  63 + right: pxToRem(30px);
  64 + width: pxToRem(88px);
  65 + height: pxToRem(88px);
  66 + line-height: pxToRem(88px);
  67 + text-align: center;
  68 +
  69 + &.highlight {
  70 + background: rgba(200,200,200,.1)!important;
  71 + }
64 } 72 }
65 } 73 }
66 74
@@ -92,6 +100,10 @@ @@ -92,6 +100,10 @@
92 width: pxToRem(320px); 100 width: pxToRem(320px);
93 // width: pxToRem(213px); 三栏宽度 101 // width: pxToRem(213px); 三栏宽度
94 102
  103 + &.highlight {
  104 + background: rgba(200,200,200,.1) !important;
  105 + }
  106 +
95 p { 107 p {
96 font-size: pxToRem(24px); 108 font-size: pxToRem(24px);
97 } 109 }
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 {{#vip_info}} 8 {{#vip_info}}
9 <span class="vip-icon vip-{{cur_level}}"></span> 9 <span class="vip-icon vip-{{cur_level}}"></span>
10 {{/vip_info}} 10 {{/vip_info}}
11 - <div class="iconfont more-icon">&#xe604;</div> 11 + <div class="iconfont more-icon tap-hightlight">&#xe604;</div>
12 </a> 12 </a>
13 {{/isLogin}} 13 {{/isLogin}}
14 {{^isLogin}} 14 {{^isLogin}}
@@ -20,16 +20,16 @@ @@ -20,16 +20,16 @@
20 {{/isLogin}} 20 {{/isLogin}}
21 </div> 21 </div>
22 <div class="my-link clearfix {{^isLogin}}no-login{{/isLogin}}"> 22 <div class="my-link clearfix {{^isLogin}}no-login{{/isLogin}}">
23 - <a class="link-item" href="/home/favorite"> 23 + <a class="link-item tap-hightlight" href="/home/favorite">
24 {{#isLogin}}{{product_favorite_total}}{{/isLogin}} 24 {{#isLogin}}{{product_favorite_total}}{{/isLogin}}
25 <p>收藏的商品</p> 25 <p>收藏的商品</p>
26 </a> 26 </a>
27 - <a class="link-item" href="/home/favorite?tab=brand"> 27 + <a class="link-item tap-hightlight" href="/home/favorite?tab=brand">
28 {{#isLogin}}{{brand_favorite_total}}{{/isLogin}} 28 {{#isLogin}}{{brand_favorite_total}}{{/isLogin}}
29 <p>收藏的品牌</p> 29 <p>收藏的品牌</p>
30 </a> 30 </a>
31 {{! 31 {{!
32 - <a class="link-item" href="/home/record"> 32 + <a class="link-item tap-hightlight" href="/home/record">
33 <!-- product_browse --> 33 <!-- product_browse -->
34 34
35 <p>浏览记录</p> 35 <p>浏览记录</p>
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 {{# order}} 3 {{# order}}
4 <ul id="order-nav" class="order-nav clearfix"> 4 <ul id="order-nav" class="order-nav clearfix">
5 {{#each navs}} 5 {{#each navs}}
6 - <li {{#if active}}class="active"{{/if}} data-type="{{typeId}}"> 6 + <li class="tap-hightlight {{#if active}}active{{/if}}" data-type="{{typeId}}">
7 <a href="{{url}}">{{name}}</a> 7 <a href="{{url}}">{{name}}</a>
8 </li> 8 </li>
9 {{/each}} 9 {{/each}}
@@ -16,4 +16,4 @@ @@ -16,4 +16,4 @@
16 </div> 16 </div>
17 {{/ order}} 17 {{/ order}}
18 </div> 18 </div>
19 -{{> layout/footer}}  
  19 +{{> layout/footer}}
1 {{> layout/header}} 1 {{> layout/header}}
2 - <div class="personal-details"> 2 + <div class="personal-details yoho-page">
3 <ul> 3 <ul>
4 <li><span>头像</span><span><i class="head-portrait user-avatar" data-avatar="{{head_ico}}"></i></span></li> 4 <li><span>头像</span><span><i class="head-portrait user-avatar" data-avatar="{{head_ico}}"></i></span></li>
5 <li><span>昵称</span><span>{{ nickname }}</span></li> 5 <li><span>昵称</span><span>{{ nickname }}</span></li>
6 <li><span>性别</span><span>{{ gender }}</span></li> 6 <li><span>性别</span><span>{{ gender }}</span></li>
7 <li><span>生日</span><span>{{ birthday }}</span></li> 7 <li><span>生日</span><span>{{ birthday }}</span></li>
8 - <li><span>会员等级</span> 8 + <li class="tap-hightlight"><span>会员等级</span>
9 <span> 9 <span>
10 <a href="grade" class="grade"> 10 <a href="grade" class="grade">
11 - {{# vip_info}} 11 + {{# vip_info}}
12 <i class="vip-icon vip-{{ cur_level}}"></i> 12 <i class="vip-icon vip-{{ cur_level}}"></i>
13 {{/ vip_info}} 13 {{/ vip_info}}
14 <span class="iconfont">&#xe604;</span> 14 <span class="iconfont">&#xe604;</span>
15 - </a> 15 + </a>
16 </span> 16 </span>
17 </li> 17 </li>
18 </ul> 18 </ul>
19 </div> 19 </div>
20 -{{> layout/footer}}  
  20 +{{> layout/footer}}
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 我们希望了解您的意见和建议 6 我们希望了解您的意见和建议
7 </h2> 7 </h2>
8 8
9 - <div class="create-new-suggest"> 9 + <div class="create-new-suggest tap-hightlight">
10 <a class="list-item" href="./suggestSub"> 10 <a class="list-item" href="./suggestSub">
11 反馈问题 (功能意见，界面意见)<span class="iconfont new-right">&#xe604;</span> 11 反馈问题 (功能意见，界面意见)<span class="iconfont new-right">&#xe604;</span>
12 </a> 12 </a>
@@ -24,13 +24,13 @@ @@ -24,13 +24,13 @@
24 <p>{{content}}</p> 24 <p>{{content}}</p>
25 25
26 <div class="suggest-type suggest-good {{#good}}show{{/good}}"> 26 <div class="suggest-type suggest-good {{#good}}show{{/good}}">
27 - <div class="active"> 27 + <div class="active tap-hightlight">
28 <span class="iconfont">&#xe601;</span> 28 <span class="iconfont">&#xe601;</span>
29 <span>靠谱，谢谢您的反馈</span> 29 <span>靠谱，谢谢您的反馈</span>
30 </div> 30 </div>
31 </div> 31 </div>
32 <div class="suggest-type suggest-bad {{# bad}}show{{/ bad}}"> 32 <div class="suggest-type suggest-bad {{# bad}}show{{/ bad}}">
33 - <div class="active"> 33 + <div class="active tap-hightlight">
34 <span class="iconfont">&#xe601;</span> 34 <span class="iconfont">&#xe601;</span>
35 <span>不靠谱，谢谢您的反馈</span> 35 <span>不靠谱，谢谢您的反馈</span>
36 </div> 36 </div>
@@ -23,10 +23,10 @@ @@ -23,10 +23,10 @@
23 </div> 23 </div>
24 {{/unless}} 24 {{/unless}}
25 25
26 - <a class="all-privilege block" href="{{allUrl}}"> 26 + <a class="all-privilege block tap-hightlight" href="{{allUrl}}">
27 查看全部VIP特权 27 查看全部VIP特权
28 <span class="iconfont">&#xe604;</span> 28 <span class="iconfont">&#xe604;</span>
29 </a> 29 </a>
30 {{/ vipGrade}} 30 {{/ vipGrade}}
31 </div> 31 </div>
32 -{{> layout/footer}}  
  32 +{{> layout/footer}}
1 {{> layout/header}} 1 {{> layout/header}}
2 <div class="goods-consults-page yoho-page"> 2 <div class="goods-consults-page yoho-page">
3 - <div class="goto-consult" id="goto-consult" data-href="{{link}}"> 3 + <div class="goto-consult tap-hightlight" id="goto-consult" data-href="{{link}}">
4 <i class="iconfont consult-logo">&#xe639;</i> 4 <i class="iconfont consult-logo">&#xe639;</i>
5 <span>我要咨询</span> 5 <span>我要咨询</span>
6 <a href="javascript:;" class="iconfont enter-consult-page">&#xe604;</a> 6 <a href="javascript:;" class="iconfont enter-consult-page">&#xe604;</a>
@@ -68,7 +68,7 @@ @@ -68,7 +68,7 @@
68 {{# list}} 68 {{# list}}
69 {{#if @first}} 69 {{#if @first}}
70 {{#if text}} 70 {{#if text}}
71 - <h1 class="first-item short-text">{{text}}<span class="icon-down iconfont dropdown">&#xe609;</span></h1> 71 + <h1 class="first-item short-text tap-hightlight">{{text}}<span class="icon-down iconfont dropdown">&#xe609;</span></h1>
72 {{/if}} 72 {{/if}}
73 {{/if}} 73 {{/if}}
74 {{/ list}} 74 {{/ list}}
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
77 {{#if @first}} 77 {{#if @first}}
78 {{else}} 78 {{else}}
79 {{#if text}} 79 {{#if text}}
80 - <h1 class="folder-item">{{text}}</h1> 80 + <h1 class="folder-item tap-hightlight">{{text}}</h1>
81 {{/if}} 81 {{/if}}
82 {{/if}} 82 {{/if}}
83 {{/list}} 83 {{/list}}
@@ -93,7 +93,7 @@ @@ -93,7 +93,7 @@
93 {{#if consultsNum}} 93 {{#if consultsNum}}
94 {{> product/feedback-tab}} 94 {{> product/feedback-tab}}
95 {{else}} 95 {{else}}
96 - <div class="nodata"> 96 + <div class="nodata tap-hightlight">
97 <span>暂无商品评价和咨询</span> 97 <span>暂无商品评价和咨询</span>
98 <a href="{{link}}" class="go-consult">我要咨询<span class="iconfont">&#xe604;</span></a> 98 <a href="{{link}}" class="go-consult">我要咨询<span class="iconfont">&#xe604;</span></a>
99 </div> 99 </div>
@@ -103,7 +103,7 @@ @@ -103,7 +103,7 @@
103 {{/ feedbacks}} 103 {{/ feedbacks}}
104 104
105 {{# enterStore}} 105 {{# enterStore}}
106 - <div id="enter-store" class="enter-store page-block"> 106 + <div id="enter-store" class="enter-store page-block tap-hightlight">
107 <a class="store-logo" href="{{url}}" style=""> 107 <a class="store-logo" href="{{url}}" style="">
108 <img class="lazy" data-original="{{img}}" alt="{{storeName}}"> 108 <img class="lazy" data-original="{{img}}" alt="{{storeName}}">
109 </a> 109 </a>
@@ -113,7 +113,6 @@ @@ -113,7 +113,6 @@
113 {{/ enterStore}} 113 {{/ enterStore}}
114 114
115 <div id="productDesc"> </div> 115 <div id="productDesc"> </div>
116 - <!-- {{> product/product-description}} -->  
117 {{> product/recommend-for-you}} 116 {{> product/recommend-for-you}}
118 117
119 {{#cartInfo}} 118 {{#cartInfo}}
1 <ul id="nav-tab" class="nav-tab clearfix"> 1 <ul id="nav-tab" class="nav-tab clearfix">
2 - <li class="comment-nav">商品评价<span class="comments-num">{{commentsNum}}</span></li>  
3 - <li class="consult-nav">购买咨询(<span class="consults-num">{{consultsNum}}</span>)</li> 2 + <li class="comment-nav tap-hightlight">商品评价<span class="comments-num">{{commentsNum}}</span></li>
  3 + <li class="consult-nav tap-hightlight">购买咨询(<span class="consults-num">{{consultsNum}}</span>)</li>
4 </ul> 4 </ul>
5 <div id="feedback-content" > 5 <div id="feedback-content" >
6 <div class="comment-content content "> 6 <div class="comment-content content ">
@@ -26,9 +26,6 @@ @@ -26,9 +26,6 @@
26 <span class="iconfont">&#xe63d;</span>暂无评论 26 <span class="iconfont">&#xe63d;</span>暂无评论
27 </div> 27 </div>
28 {{/if}} 28 {{/if}}
29 - <!-- <div class="comment-content-footer">  
30 - <a href="{{link}}">查看更多 <span class="iconfont">&#xe604;</span></a>  
31 - </div> -->  
32 </div> 29 </div>
33 30
34 <div class="consult-content content hide "> 31 <div class="consult-content content hide ">
@@ -49,7 +46,7 @@ @@ -49,7 +46,7 @@
49 </div> 46 </div>
50 {{/ consults}} 47 {{/ consults}}
51 </div> 48 </div>
52 - <div class="consult-content-footer" data-href="{{link}}"> 49 + <div class="consult-content-footer tap-hightlight" data-href="{{link}}">
53 <a href="javascript:;"> 50 <a href="javascript:;">
54 查看更多 51 查看更多
55 <span class="iconfont">&#xe604;</span></a> 52 <span class="iconfont">&#xe604;</span></a>
@@ -59,7 +56,7 @@ @@ -59,7 +56,7 @@
59 <span class="iconfont">&#xe63f;</span>暂无咨询 56 <span class="iconfont">&#xe63f;</span>暂无咨询
60 </div> 57 </div>
61 58
62 - <div class="consult-content-footer" data-href="{{link}}"> 59 + <div class="consult-content-footer tap-hightlight" data-href="{{link}}">
63 <a href="javascript:;"> 60 <a href="javascript:;">
64 我要咨询 61 我要咨询
65 <span class="iconfont">&#xe604;</span></a> 62 <span class="iconfont">&#xe604;</span></a>