Merge branch 'release/4.0' into 'gray'

commit



See merge request !66

@@ -3,7 +3,7 @@
         <ul class="resource-goods">
             <li class="product-item" v-for="(item, index) in value" :key="index">
                 <product-link :value="item" class="link"></product-link>
-                <img-format :lazy="true" :src="item.src" :w="94" :h="125"></img-format>
+                <img-format :lazy="lazy" :src="item.src" :w="94" :h="125"></img-format>
                 <div class="ellipsis">
                     <p class="title">{{item.product_name}}</p>
                     <p class="price">￥{{item.sales_price}}</p>
@@ -19,7 +19,8 @@ import Resource from './resource';
 export default {
     name: 'ResourceGoods',
     props: {
-        value: Array
+        value: Array,
+        lazy: Boolean
     },
     computed: {
     },

@@ -3,7 +3,7 @@
         <ul class="resource-blk-new-products" v-if="value.showType == 1">
             <li class="product-item" v-for="(item, index) in value.list" :key="index">
                 <product-link :value="item" class="link"></product-link>
-                <img-format :lazy="true" :src="item.default_images" :w="188" :h="250"></img-format>
+                <img-format :lazy="lazy" :src="item.default_images" :w="188" :h="250"></img-format>
                 <div class="ellipsis">
                     <p class="title" v-if="item.brand_name">{{item.brand_name}}</p>
                     <p class="title" v-if="item.product_name">{{item.product_name}}</p>
@@ -15,7 +15,7 @@
             <div class="one">
                 <li class="product-item" v-for="(item, index) in value.list" :key="index" v-if="index % 2 == 0">
                     <product-link :value="item" class="link"></product-link>
-                    <img-format :lazy="true" :src="item.default_images" :w="188" :h="250"></img-format>
+                    <img-format :lazy="lazy" :src="item.default_images" :w="188" :h="250"></img-format>
                     <div class="ellipsis">
                         <p class="title" v-if="item.brand_name">{{item.brand_name}}</p>
                         <p class="title" v-if="item.product_name">{{item.product_name}}</p>
@@ -26,7 +26,7 @@
             <div class="two">
                 <li class="product-item" v-for="(item, index) in value.list" :key="index" v-if="index % 2 == 1">
                     <product-link :value="item" class="link"></product-link>
-                    <img-format :lazy="true" :src="item.default_images" :w="188" :h="250"></img-format>
+                    <img-format :lazy="lazy" :src="item.default_images" :w="188" :h="250"></img-format>
                     <div class="ellipsis">
                         <p class="title" v-if="item.brand_name">{{item.brand_name}}</p>
                         <p class="title" v-if="item.product_name">{{item.product_name}}</p>
@@ -44,7 +44,8 @@ import Resource from './resource';
 export default {
     name: 'ResourceBlkNewProductList',
     props: {
-        value: Object
+        value: Object,
+        lazy: Boolean
     },
     computed: {
         showFloor() {

@@ -2,7 +2,7 @@
     <resource class="no-padding-right">
         <ul class="resource-products">
             <li class="product-item" v-for="(item, index) in value.list" :key="index">
-                <img-format :lazy="true" :src="item.default_images" :w="94" :h="125"></img-format>
+                <img-format :lazy="lazy" :src="item.default_images" :w="94" :h="125"></img-format>
                 <div class="ellipsis">
                     <p class="brand" v-if="item.brand_name">{{item.brand_name}}</p>
                     <p class="title" v-if="item.product_name">{{item.product_name}}</p>
@@ -19,7 +19,8 @@ import Resource from './resource';
 export default {
     name: 'ResourceProductList',
     props: {
-        value: Object
+        value: Object,
+        lazy: Boolean
     },
     computed: {
     },

@@ -6,7 +6,7 @@
             v-for="(img, index) in value.list"
             :key="index">
             <img-format
-                :lazy="true"
+                :lazy="lazy"
                 :src="img.src"
                 :w="value.imageWidth"
                 :h="value.imageHeight"
@@ -22,7 +22,8 @@ import Resource from './resource';
 export default {
     name: 'ResourceSingleImage',
     props: {
-        value: Object
+        value: Object,
+        lazy: Boolean
     },
     components: {Resource}
 };

@@ -3,7 +3,7 @@
         <ul class="resource-tf-goods">
             <li class="product-item" v-for="(item, index) in value.list" :key="index">
                 <product-link :value="item" class="link"></product-link>
-                <img-format :lazy="true" :src="item.default_images" :w="188" :h="250"></img-format>
+                <img-format :lazy="lazy" :src="item.default_images" :w="188" :h="250"></img-format>
                 <div class="ellipsis">
                     <p class="title" v-if="item.product_name">{{item.product_name}}</p>
                     <p class="price" v-if="item.sales_price">￥{{item.sales_price}}</p>
@@ -19,7 +19,8 @@ import Resource from './resource';
 export default {
     name: 'ResourceTfGoodsList',
     props: {
-        value: Object
+        value: Object,
+        lazy: Boolean
     },
     computed: {
     },

@@ -2,14 +2,14 @@
     <resource class="resource-ti-image">
         <div class="resource-ti-image-item">
             <a-link :href="value.list[0].url">
-                <img-format :lazy="true" :src="value.list[0].src" :w="value.imageWidth"
+                <img-format :lazy="lazy" :src="value.list[0].src" :w="value.imageWidth"
                             :h="value.imageHeight"></img-format>
             </a-link>
         </div>
         <div class="split"></div>
         <div class="resource-ti-image-item">
             <a-link :href="value.list[1].url">
-                <img-format :lazy="true" :src="value.list[1].src" :w="value.imageWidth"
+                <img-format :lazy="lazy" :src="value.list[1].src" :w="value.imageWidth"
                             :h="value.imageHeight"></img-format>
             </a-link>
         </div>
@@ -22,7 +22,8 @@ import Resource from './resource';
 export default {
     name: 'ResourceTwoImage',
     props: {
-        value: Object
+        value: Object,
+        lazy: Boolean
     },
     components: {Resource}
 };

@@ -13,7 +13,8 @@
             <scroller ref="scroller" @loading="loading" class="channel-scroll">
                 <component
                     :is="component.template_name"
-                        v-for="(component, index) in (floors || []).filter(c => ['twoPicture', 'goods', 'tfGoodsList', 'focus', 'blkCategory', 'newSingleImage', 'BlkNewProductFloorResource'].some(k => k === c.template_name) )"
+                    v-for="(component, index) in (floors || []).filter(c => ['twoPicture', 'goods', 'tfGoodsList', 'focus', 'blkCategory', 'newSingleImage', 'BlkNewProductFloorResource'].some(k => k === c.template_name) )"
+                    :lazy="index > 5"
                     :value="component.data"
                     :key="index"></component>
             </scroller>

@@ -19,6 +19,7 @@
                     <component
                         :is="component.template_name"
                         v-for="(component, index) in (channel.home || []).filter(c => ['twoPicture', 'tfGoodsList', 'newSingleImage', 'BlkNewProductFloorResource'].some(k => k === c.template_name) )"
+                        :lazy="index > 5"
                         :value="component.data"
                         :key="index"></component>
                 </div>