fix css

htoooth
Commit 5b8b2154d7b48d574d9e7964aa9ba528ef127cf9 1 parent 695e75d6
Showing 4 changed files with 29 additions and 107 deletions
apps/product/views/action/product/detail.hbs
public/hbs/product/consult-item.hbs
public/js/product/detail.page.js
public/scss/product/_detail.css
--- a/apps/product/views/action/product/detail.hbs
View file @5b8b215
+++ b/apps/product/views/action/product/detail.hbs
View file @5b8b215
@@ -47,7 +47,7 @@
                 <div class="other-infos">
                     <div class="description-material info-block getnav" id="goodsMessage" data-id="0">
-                        <p class="block-title" id="block-title-head">
+                        <p class="block-title">
                             <span class="title-head"> <span class="title cur">商品信息</span> </span>
                         </p>
@@ -366,7 +366,7 @@
                                         <span class="top-question"><i class="iconfont">&#xe695;</i>商品都是正品吗？</span>
                                         <span class="bottom-answer"><i class="iconfont">&#xe696;</i>有货www.yohobuy.com所售的商品均经品牌授权，
                                  正品保障，支持专柜验货，与您亲临商场选购的商品一样享受相同的质量保证，
-                                 请您放心购买</span>
+                                 请您放心购买。</span>
                                     </p>
                                 </div>
@@ -455,6 +455,8 @@
                 </div>
             </div>
+
+
             <div class="after-service">
                 <div class="lazy-load-object">
                     <textarea class="datalazyload" style="visibility: hidden;">
@@ -465,11 +467,11 @@
                     </textarea>
                 </div>
-                <p id="after-service-switch" class="after-service-switch">
+                <div id="after-service-switch" class="after-service-switch clearfix">
                     <span class="iconfont">&#xe628;</span>&nbsp;
                     售后服务
                     <span class="iconfont triangle">&#xe60b;</span>
-                </p>
+                </div>
                 <div class="after-service-content info-block">
                     <div class="block-title">
--- a/public/hbs/product/consult-item.hbs
View file @5b8b215
+++ b/public/hbs/product/consult-item.hbs
View file @5b8b215
@@ -4,8 +4,8 @@
    <p>
      <span class="top-question">
        <i class="iconfont">&#xe695;</i>
-       <small>{{question}}</small>
-       <small class="right-time">{{date}}</small>
+       <span class="question">{{question}}</span>
+       <span class="right-time">{{date}}</span>
      </span>
      <span class="answer-wrapper">
        <i class="iconfont">&#xe696;</i>
--- a/public/js/product/detail.page.js
View file @5b8b215
+++ b/public/js/product/detail.page.js
View file @5b8b215
@@ -1819,86 +1819,6 @@ bindEvent.fire();
     dataLoad.fn && dataLoad.fn();
 }());
-$(window).scroll(function() {
-    var sc = $(document);
-    var win = $(window);
-    var scrollStart = $('.other-infos').offset().top;
-    var scrollBottom = sc.height() - $('#after-service-switch').offset().top;
-    var scrollEnd = $('#textbox').offset().top;
-    var scrollShoppingcar = $('#block-title-head').offset().top;
-
-    if (sc.scrollTop() >= scrollStart && sc.scrollTop() <= scrollEnd) {
-        $('.shoppingCar').addClass('fixednav');
-    } else {
-        $('.shoppingCar').removeClass('fixednav');
-    }
-
-    if (sc.height() - win.height() - sc.scrollTop() <= scrollBottom) {
-        $('.shoppingCar').height(win.height() - (scrollBottom + win.height() + sc.scrollTop() - sc.height()));
-
-    } else {
-        $('.shoppingCar').height(1000);
-    }
-
-    if (sc.scrollTop() >= scrollShoppingcar) {
-        $('.shoppingCar-btn').css('display', 'block');
-    } else {
-        $('.shoppingCar-btn').css('display', 'none');
-    }
-
-    $('.getnav').each(function(i, ele) {
-
-        var data;
-
-        if ($(ele).offset().top - $(window).scrollTop() < 100) {
-            data = $(ele).data('id');
-            $('.shoppingCar-nav li:eq(' + data + ')').siblings().find('a').removeClass('fixed');
-            $('.shoppingCar-nav li:eq(' + data + ')').find('a').addClass('fixed');
-
-        }
-    });
-
-});
-
-$('.shoppingCar').on('click', '.option', function(e) {
-    e.stopPropagation();
-
-    var $this = $(this);
-
-    if ($this.hasClass('fixed')) {
-        return;
-    }
-
-    $this.closest('li').siblings().find('.option').removeClass('fixed');
-    $this.addClass('fixed');
-
-    if ($this.hasClass('comment') || $this.hasClass('consult')) {
-        $.when(window.fetchComment(), window.fetchConsult(), window.fetchRecommend());
-    }
-});
-
-$('.shoppingCar-btn').on('click', function() {
-    var $this = $(this);
-    var $addToCart = $('#add-to-cart');
-
-    if ($this.hasClass('disable')) {
-        return;
-    }
-
-    if ($this.data('gocart') === 1) {
-        window.jumpUrl($('#go-to-cart-url').attr('href'));
-        return;
-    }
-
-    if (maxStock === -1) {
-        $('#sizes').children('.size-warn').removeClass('hide');
-        $('.shoppingCar-nav li:eq(0)').siblings().find('a').removeClass('fixed');
-        $('.shoppingCar-nav li:eq(0)').find('a').addClass('fixed');
-    } else {
-        $addToCart.trigger('click');
-    }
-});
-
 $(function() {
     $('.bottom-tab .change').click(function() {
         $('.img-brand-switch .next').trigger('click');
--- a/public/scss/product/_detail.css
View file @5b8b215
+++ b/public/scss/product/_detail.css
View file @5b8b215
@@ -601,7 +601,7 @@
         }
         .size-warn {
-            position: absolute;
+            display: inline-block;
             height: 21px;
             left: 0;
             bottom: -21px;
@@ -854,10 +854,7 @@
     .other-infos {
         padding-bottom: 30px;
-        border-left: 1px solid #eaeceb;
-        border-right: 1px solid #eaeceb;
-        border-bottom: 1px solid #eaeceb;
-        width: 960px;
+        width: 1150px;
         float: left;
         margin-top: 30px;
@@ -1045,16 +1042,12 @@
      }
-     #goodsMessage{
-       margin-top: 0;
-       margin-left: 0;
-       margin-right: 0;
+
        .description-content{
          margin-left: 80px;
          margin-right: 80px;
        }
-     }
     .info-block {
@@ -1066,7 +1059,7 @@
         font-size: 12px;
         .basic {
-            width: 800px;
+            width: 990px;
             margin: 0 auto;
             li {
@@ -1130,11 +1123,6 @@
       margin: 0px;
     }
-     #block-title-head {
-       margin-top: 20px;
-       margin-bottom: 20px;
-     }
-
       .block-title {
         margin-bottom: 30px;
         margin-top: -16px;
@@ -2203,15 +2191,15 @@
            }
              textarea{
-                width: 770px;
-                height: 70px;
+                width: 96%;
+                height: 100px;
                 padding: 0;
                 outline: #e0e0e0;
                 resize: none;
                 background-color: #fff;
                 border: 1px solid #e0e0e0;
                 font-size: 14px;
-                padding: 15px;
+                padding: 15px 2%;
              }
              .err{
@@ -2232,7 +2220,9 @@
                 margin: 0 auto;
                 cursor: pointer;
                 margin-top: -2px;
-                border: 1px solid #e0e0e0;
+                 border-left: 1px solid #e0e0e0;
+                 border-right: 1px solid #e0e0e0;
+                 border-bottom: 1px solid #e0e0e0;
              }
@@ -2258,6 +2248,13 @@
                color: #000;
                font-size: 14px;
+
+
+                 .question {
+                    display: inline-block;
+                     margin-left: -5px;
+                 }
+
                .right-time{
                  display: inline-block;
                  float: right;
@@ -2329,7 +2326,7 @@
               .answer {
                   display: inline-block;
-                  width: 772px;
+                  width: 960px;
                   float: left;
                   margin-top: 0 !important;
               }
@@ -2439,6 +2436,9 @@
      .total-content{
        position: relative;
+         width: 100%;
+         overflow: hidden;
+         border: 1px solid #e0e0e0;
      }
 .buy-product {