Browse Source

楼层限制型号长度,产品详情页底部去除寄售banner

yangc 7 years ago
parent
commit
bdbc2850c7
2 changed files with 12 additions and 7 deletions
  1. 8 6
      components/home/floor/Floor.vue
  2. 4 1
      layouts/shop.vue

+ 8 - 6
components/home/floor/Floor.vue

@@ -8,7 +8,7 @@
         <a :href="item.hrefUrl" target="_blank">
           <img :src="item.pictureUrl" class="floor-item-img"/>
           <div class="floor-content">
-            <p v-if="item.name" class="floor-item-name">{{ item.name }}</p>
+            <p v-if="item.name" class="floor-item-name" :title="item.name">{{ item.name }}</p>
             <p v-if="item.body" v-html="item.body" class="floor-item-body"></p>
             <p class="floor-item-price" v-if="item.size != 'large' && isDefault">{{item.currency == 'RMB' ? '¥' : '$'}}&nbsp;{{item.price}}</p>
           </div>
@@ -128,11 +128,12 @@
           font-weight: 600;
           overflow: hidden;
           text-overflow: ellipsis;
-          display: -webkit-box;
-          -webkit-box-orient: vertical;
-          -webkit-line-clamp: 2;
+          /*display: -webkit-box;*/
+          /*-webkit-box-orient: vertical;*/
+          /*-webkit-line-clamp: 2;*/
           width: 300px;
           word-wrap: break-word;
+          white-space: nowrap;
         }
 
         .floor-item-body {
@@ -185,11 +186,12 @@
           font-weight: 600;
           text-overflow: ellipsis;
           overflow: hidden;
-          display: -webkit-box;
+         /* display: -webkit-box;
           -webkit-box-orient: vertical;
-          -webkit-line-clamp: 2;
+          -webkit-line-clamp: 2;*/
           word-break: break-all;
           display: inherit;
+          white-space: nowrap;
         }
 
         .floor-item-body {

+ 4 - 1
layouts/shop.vue

@@ -6,7 +6,7 @@
     <img v-if="isConsignment" class="banner-img" src="/images/all/banner-consignment.png" alt="">
     <!--<img v-if="isConsignment" class="cuxiao-banner" src="/images/all/banner-cuxiao.png" alt="">-->
     <nuxt/>
-    <img v-if="isConsignment" class="banner-img" src="/images/all/banner-consignment2.jpg" alt="" style="margin: -30px auto 30px;">
+    <img v-if="isConsignment && !isInDetail" class="banner-img" src="/images/all/banner-consignment2.jpg" alt="" style="margin: 10px auto 30px;">
     <footer-view></footer-view>
     <right-bar></right-bar>
   </div>
@@ -95,6 +95,9 @@
       isConsignment () {
         return this.storeInfo.type === 'CONSIGNMENT'
       },
+      isInDetail () {
+        return this.$route.path.indexOf('/store/productDetail/') !== -1
+      },
       commodity () {
         return this.$store.state.shop.storeInfo.commodity.data
       }