Browse Source

特价产品楼层修改

yangc 8 years ago
parent
commit
7db8b1176d

+ 5 - 1
components/home/floor/Floor.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="floor" :class="!isDefault ? 'normal-floor' : ''">
+  <div class="floor" :class="!isDefault ? 'normal-floor' : 'price-floor'">
     <h3><span v-if="!isDefault">F{{ floor.floorNumber }}&nbsp;{{ floor.name }}</span></h3>
     <ul class="list-unstyled clearfix" :style="{borderColor: floor.items[1].backGroundColor || '#d8d8d8'}">
       <li v-for="(item, index) in floor.items" :key="index" class="floor-item" :class="item.size + (isDefault ? ' default-floor' : '')"
@@ -35,6 +35,10 @@
   }
   .floor {
 
+    &.price-floor {
+      margin-top: -35px;
+    }
+
     ul {
       border-bottom: 1px solid #d8d8d8;
     }

+ 7 - 4
components/home/floor/FloorList.vue

@@ -83,9 +83,13 @@
       },
       isEmpty () {
         let data = this.$store.state.floor.list_expand.data
-        for (let i = 0; i < data.length; i++) {
-          if (!(data.length && data[0] && data[0] !== null)) {
-            return true
+        if (!data.length) {
+          return true
+        } else {
+          for (let i = 0; i < data.length; i++) {
+            if (!(data[0] && data[0] !== null)) {
+              return true
+            }
           }
         }
         return false
@@ -112,7 +116,6 @@
     margin-bottom: $xlg-pad;
   }
   .floor-list .container > a > img {
-    margin-bottom: -48px;
     margin-top: 30px;
   }
 </style>

+ 1 - 1
components/store/RecommendProduct.vue

@@ -3,7 +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="">
+          <img v-if="isConsignment" class="specific-img" src="/images/floor/specificPrice-home.png" alt="">
           <div class="img">
             <a href="javascript:void(0);">
               <img :src="commodity.comImg.startsWith('static')?'/'+commodity.comImg:commodity.comImg"/>

+ 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://10.1.51.90:8080/platform-b2c/')
+const baseUrl = process.env.BASE_URL || (isProdMode ? 'http://192.168.253.60:9090/platform-b2c/' : 'http://192.168.253.121:9090/platform-b2c/')
 
 module.exports = {
   router: {

+ 12 - 12
pages/index.vue

@@ -75,18 +75,18 @@
         store.dispatch('loadProductKinds', { id: 0 }),
         store.dispatch('loadNewsSnapshot', { page: 1, pageSize: 10 }),
         store.dispatch('loadBatchCommodities', {batchCodeList: store.state.option.url === 'http://www.usoftmall.com' ? [
-          'BT2018012500000141',
-          'BT2018012500000126',
-          'BT2018012500000131',
-          'BT2018012500000152',
-          'BT2018012500000124',
-          'BT2018012500000164',
-          'BT2018012500000167',
-          'BT2018012500000145',
-          'BT2018012500000151',
-          'BT2018012500000161',
-          'BT2018012500000149',
-          'BT2018012500000162'] : [
+          'BT2018013000000043',
+          'BT2018013000000026',
+          'BT2018013000000030',
+          'BT2018013000000052',
+          'BT2018013000000025',
+          'BT2018013000000053',
+          'BT2018013000000033',
+          'BT2018013000000047',
+          'BT2018013000000057',
+          'BT2018013000000048',
+          'BT2018013000000051',
+          'BT2018013000000020'] : [
             'BT2018012900002056',
             'BT2018012900002056',
             'BT2018012900002056',