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

hf
Commit c62267463d4cd39fd295ff024df7e035ec5ad654 2 parents 0aeb356a 8064e8ea
Showing 5 changed files with 19 additions and 16 deletions
static/sass/me/_fav.scss
template/m.yohobuy.com/actions/index/home/suggest.phtml
template/m.yohobuy.com/actions/product/detail/consults.phtml
template/m.yohobuy.com/actions/product/detail/index.phtml
template/m.yohobuy.com/partials/product/feedback-tab.phtml
--- a/static/sass/me/_fav.scss
View file @c622674
+++ b/static/sass/me/_fav.scss
View file @c622674
@@ -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;
                         }
                     }
--- a/template/m.yohobuy.com/actions/index/home/suggest.phtml
View file @c622674
+++ b/template/m.yohobuy.com/actions/index/home/suggest.phtml
View file @c622674
@@ -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>
--- a/template/m.yohobuy.com/actions/product/detail/consults.phtml
View file @c622674
+++ b/template/m.yohobuy.com/actions/product/detail/consults.phtml
View file @c622674
 {{> 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>
--- a/template/m.yohobuy.com/actions/product/detail/index.phtml
View file @c622674
+++ b/template/m.yohobuy.com/actions/product/detail/index.phtml
View file @c622674
@@ -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}}
--- a/template/m.yohobuy.com/partials/product/feedback-tab.phtml
View file @c622674
+++ b/template/m.yohobuy.com/partials/product/feedback-tab.phtml
View file @c622674
 <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>