Browse Source

楼层测试问题修改

yangc 7 years ago
parent
commit
f1b7b5f880

+ 3 - 3
components/home/floor/FloorBar.vue

@@ -36,7 +36,7 @@
             this.visible = scrolled >= floors[0].offsetTop + this.floor_scrollTop - barOffset && scrolled <= floors[floors.length - 1].offsetTop + floors[floors.length - 1].offsetHeight - barOffset - document.querySelector('.floor-bar').offsetHeight + this.floor_scrollTop
             if (this.visible) {
               for (let i = 0; i < floors.length; i++) {
-                if (barOffset >= floors[i].offsetTop + this.floor_scrollTop - scrolled + 60) {
+                if (barOffset >= floors[i].offsetTop + this.floor_scrollTop - scrolled + 20) {
                   this.activeFloor = i
                 }
               }
@@ -45,7 +45,7 @@
             this.visible = scrolled >= floors[0].offsetTop - barOffset + 40 && scrolled <= floors[floors.length - 1].offsetTop + floors[floors.length - 1].offsetHeight - barOffset - document.querySelector('.floor-bar').offsetHeight
             if (this.visible) {
               for (let i = 0; i < floors.length; i++) {
-                if (barOffset >= floors[i].offsetTop - scrolled + 60) {
+                if (barOffset >= floors[i].offsetTop - scrolled + 20) {
                   this.activeFloor = i
                 }
               }
@@ -55,7 +55,7 @@
       },
       jumpFloor (index) {
         if (this.visible) {
-          scrollTo(document.querySelectorAll('.floor').item(index), 300, { offset: -60 })
+          scrollTo(document.querySelectorAll('.normal-floor').item(index), 300, { offset: -60 })
         }
       }
     },

+ 5 - 0
components/home/floor/FloorList.vue

@@ -2,6 +2,7 @@
   <div class="floor-list">
     <div class="container">
       <floor-bar :floors="floors"></floor-bar>
+      <a href="/store/33069557578d44e69bd91ad12d28a8d4" target="_blank"><img src="/images/all/banner-cuxiao.png" alt=""></a>
       <floor :floor="defaultFloors[0]" :isDefault="true" v-if="!isEmpty"></floor>
       <floor :floor="defaultFloors[1]" :isDefault="true" v-if="!isEmpty"></floor>
       <floor v-for="(floor, index) in floors.data" :floor="floor" :isDefault="false" :key="index"></floor>
@@ -110,4 +111,8 @@
   .floor-list {
     margin-bottom: $xlg-pad;
   }
+  .floor-list .container > a > img {
+    margin-bottom: -48px;
+    margin-top: 30px;
+  }
 </style>

+ 9 - 0
components/store/RecommendProduct.vue

@@ -3,6 +3,7 @@
     <div class="recommend-list">
       <ul>
         <li v-for="commodity in commodities">
+          <img v-if="isConsignment" class="specific-img" src="/images/floor/specificPrice-store.png" alt="">
           <div class="img">
             <a href="javascript:void(0);">
               <img :src="commodity.comImg.startsWith('static')?'/'+commodity.comImg:commodity.comImg"/>
@@ -44,6 +45,9 @@
       },
       storeInfo () {
         return this.$store.state.shop.storeInfo.store.data
+      },
+      isConsignment () {
+        return this.storeInfo.type === 'CONSIGNMENT'
       }
     },
     filters: {
@@ -260,6 +264,11 @@
     text-align: center;
     line-height: 170px;
   }
+  #recommend-fragment ul li .specific-img {
+    position: absolute;
+    left: 0;
+    top: 0;
+  }
   #recommend-fragment ul li .img img{
     max-width: 120px;
     max-height: 120px;

+ 5 - 0
layouts/shop.vue

@@ -4,6 +4,7 @@
     <store-header/>
     <store-title/>
     <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;">
     <footer-view></footer-view>
@@ -118,4 +119,8 @@
   .banner-img {
     margin-top: -10px;
   }
+  .cuxiao-banner {
+    margin: 15px auto 20px ;
+    display: block;
+  }
 </style>

+ 1 - 1
nuxt.config.js

@@ -1,6 +1,6 @@
 const path = require('path')
 const isProdMode = Object.is(process.env.NODE_ENV, 'production')
-const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://192.168.253.60:9090/platform-b2c/' : 'http://192.168.253.60:9090/platform-b2c/')
+const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://192.168.253.60:9090/platform-b2c/' : 'http://10.1.51.90:8080/platform-b2c/')
 
 module.exports = {
   router: {

BIN
static/images/all/banner-cuxiao.png