Merge branch 'develop' into feature/channel

 <div id="product-list">
 <div id="product-list">
     <Sort></Sort>
     <Sort></Sort>
     <List url="/product/list" :query='{a:1}'></List>
     <List url="/product/list" :query='{a:1}'></List>
-    <div class="drawer-slide">
-        <div class="drawer-main">
-            <filter></filter>
-        </div>
-    </div>
+    <Drawer>
+        <Filter></Filter>
+    </Drawer>
 </div>
 </div>

 const Vue = require('yoho-vue');
 const Vue = require('yoho-vue');
-const sort = require('component/sort.vue');
-const list = require('component/list.vue');
-const filter = require('component/filter.vue');
+const lazyload = require('yoho-vue-lazyload');
+const infinitScroll = require('yoho-vue-infinite-scroll');
+const sort = require('product/sort.vue');
+const list = require('product/list.vue');
+const drawer = require('product/drawer.vue');
+const filter = require('product/filter.vue');
+
+Vue.use(lazyload);
+Vue.use(infinitScroll);
 
 
 require('common/vue-filter');
 require('common/vue-filter');
 
 
 new Vue({
 new Vue({
     el: '#product-list',
     el: '#product-list',
     components: {
     components: {
-        list, sort, filter
+        list, sort, filter, drawer
     }
     }
 });
 });

@@ -44,3 +44,13 @@ a {
     max-width: 750px;
     max-width: 750px;
     width: 100%;
     width: 100%;
 }
 }
+.right {
+    float: right;
+}
+
+.left {
+    float: right;
+}
+.text-center {
+    text-align: center;
+}

@@ -55,6 +55,7 @@
             height: 8px;
             height: 8px;
             background: #ccc;
             background: #ccc;
             opacity: 1;
             opacity: 1;
+            vertical-align: middle;
 
 
             &.active {
             &.active {
                 width: 12px;
                 width: 12px;

+<template>
+    <div class="drawer" :class="{'drawer-open': on }" v-show="on">
+        <div class="drawer-main" v-el:main>
+            <slot></slot>
+        </div>
+    </div>
+</template>
+<script>
+module.exports = {
+    props: {
+        on: Boolean
+    }
+};
+</script>
+<style>
+.drawer {
+    position: fixed;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    background-color: rgba(0, 0, 0, 0.6);
+}
+
+.drawer-main {
+    position: absolute;
+    top: 0;
+    right: 0%;
+    bottom: 0;
+    min-width: 80%;
+    max-width: 100%;
+    background-color: #fff;
+    transition: all 0.3s 0.2s;
+}
+</style>

 <template>
 <template>
     <div class="filter">
     <div class="filter">
         <div class="filter-actions">
         <div class="filter-actions">
-            <a href="javascript:; filter-action">清空</a>
+            <a href="javascript:;" class="filter-action" @click="clearVals">清空</a>
             <button class="button button-small filter-action">确定</button>
             <button class="button button-small filter-action">确定</button>
         </div>
         </div>
         <div class="filter-params">
         <div class="filter-params">
             <ul class="filter-cates">
             <ul class="filter-cates">
                 <li class="filter-cate" v-for="filter in filters">
                 <li class="filter-cate" v-for="filter in filters">
-                    <i class="icon icon-right"></i>
-                    <span>{{filter.classfly}}</span>
-                    <span class="filter-cate-val">{{val[filter.key]}}</span>
+                    <i class="icon icon-right right"></i>
+                    <span class="filter-cate-label">{{filter.classfly}}</span>
+                    <span class="filter-cate-val">{{vals[filter.key]}}</span>
                 </li>
                 </li>
             </ul>
             </ul>
         </div>
         </div>
     </div>
     </div>
 </template>
 </template>
+<script>
+const $ = require('yoho-jquery');
+
+module.exports = {
+    data: function() {
+        return {
+            vals: {
+                brand: 'Supreme',
+                category: '夹克'
+            },
+            filters: [{
+                classfly: 'Brand品牌',
+                key: 'brand',
+                itemArray: []
+            }, {
+                classfly: 'Category品类',
+                key: 'category',
+                itemArray: []
+            }, {
+                classfly: 'Color颜色',
+                key: 'color',
+                itemArray: []
+            }, {
+                classfly: 'Size尺寸',
+                key: 'size',
+                itemArray: []
+            }]
+        };
+    },
+    methods: {
+        clearVals: function() {
+            const self = this;
+
+            $.each(this.vals, (k) => {
+                self.vals[k] = '';
+            });
+        }
+    }
+};
+</script>
 <style>
 <style>
 @import "../../scss/common/color";
 @import "../../scss/common/color";
 
 
 .filter {
 .filter {
-    padding: 0 20px;
+    padding: 0 30px;
 }
 }
 
 
 .filter-actions {
 .filter-actions {
+    font-size: 34px;
     text-align: right;
     text-align: right;
-    padding: 10px 0;
+    padding: 45px 0;
 }
 }
 
 
 .filter-action {
 .filter-action {
-    margin-left: 20px;
+    font-size: inherit;
+    margin-left: 40px;
 }
 }
 
 
 .filter-actions,
 .filter-actions,
@@ -42,14 +84,24 @@
     padding: 0;
     padding: 0;
 }
 }
 
 
-.filter-cate {
-    .icon-right {
-        float: right;
-    }
+.filter-cate .icon-right {
+    margin-left: 24px;
+}
+
+.filter-cate,
+.icon-right {
+    height: 118px;
+    line-height: 118px;
+}
+
+.filter-cate-label {
+    font-size: 36px;
+    font-weight: bold;
 }
 }
 
 
 .filter-cate-val {
 .filter-cate-val {
     float: right;
     float: right;
+    font-size: 28px;
 }
 }
 
 
 .filter-cate-val,
 .filter-cate-val,
@@ -57,32 +109,3 @@
     color: $grey;
     color: $grey;
 }
 }
 </style>
 </style>
-<script>
-module.exports = {
-    data: function() {
-        return {
-            val: {
-                brand: 'Supreme',
-                category: '夹克'
-            },
-            filters: [{
-                classfly: 'Brand品牌',
-                key: 'brand',
-                itemArray: []
-            }, {
-                classfly: 'Category品类',
-                key: 'category',
-                itemArray: []
-            }, {
-                classfly: 'Color颜色',
-                key: 'color',
-                itemArray: []
-            }, {
-                classfly: 'Size尺寸',
-                key: 'size',
-                itemArray: []
-            }]
-        };
-    }
-};
-</script>

 <template>
 <template>
-    <div class="goods-box">
-        <ul class="cardlist card-large">
+    <div class="goods-box" v-infinite-scroll="fetch()" infinite-scroll-disable="disableFetch">
+        <ul class="cardlist card-large clearfix">
             <li class="card" v-for="item in products">
             <li class="card" v-for="item in products">
                 <div class="card-pic">
                 <div class="card-pic">
                     <a href="">
                     <a href="">
-                        <img :src="item.goodsList[0].imagesUrl | resize 372 499" alt="{{item.productName}}">
+                        <img v-lazy="item.goodsList[0].imagesUrl | resize 372 499" alt="{{item.productName}}">
                     </a>
                     </a>
                 </div>
                 </div>
                 <div class="card-bd">
                 <div class="card-bd">
@@ -16,43 +16,76 @@
                 </div>
                 </div>
             </li>
             </li>
         </ul>
         </ul>
+        <p class="cardlist--loading text-center" v-show="inLoading">正在加载...</p>
+        <p class="cardlist--end text-center" v-show="atEnd ">--End--</p>
     </div>
     </div>
 </template>
 </template>
 <script>
 <script>
 let $ = require('yoho-jquery');
 let $ = require('yoho-jquery');
 
 
+/**
+ *  @example
+ *  <List url='' :query='{}' disable-fetch></List>
+ *  <List :init-data='{}'></List>
+ */
+
 module.exports = {
 module.exports = {
     props: {
     props: {
+
         /* 请求地址 */
         /* 请求地址 */
         url: {
         url: {
             type: String,
             type: String,
             required: true
             required: true
         },
         },
-        initData: Array, /* 初始数据, 应该只单次绑定, 然后fetch数据全靠url */
-        query: Object /* 请求参数 */
+
+        /* 初始数据, 应该只单次绑定, 然后fetch数据全靠url */
+        initData: Array,
+
+        /* 请求参数 */
+        query: Object,
+
+        /* 开启滚动加载 */
+        disableFetch: Boolean 
     },
     },
     data: function() {
     data: function() {
         return {
         return {
-            products: []
+            state: {
+                curPage: 0,
+                totalPage: 10
+            },
+            products: [],
+            inLoading: false,
+            atEnd: false
         };
         };
     },
     },
     methods: {
     methods: {
         fetch: function() {
         fetch: function() {
+            if (this.atEnd) {
+                return;
+            }
             let self = this;
             let self = this;
 
 
+            this.state.curPage++;
+            this.inLoading = true;
             $.ajax({
             $.ajax({
                 url: this.url,
                 url: this.url,
                 type: 'POST',
                 type: 'POST',
             })
             })
-            .then(result => {
+            .done(result => {
                 self.$set('products', self.products.concat(result.data.productList));
                 self.$set('products', self.products.concat(result.data.productList));
+            })
+            .always(() => {
+                self.inLoading = false;
+                self.atEnd = self.state.curPage === self.state.totalPage;
             });
             });
+
         }
         }
     },
     },
     created: function() {
     created: function() {
         // 有初始数据，用初始数据
         // 有初始数据，用初始数据
         if (this.initData) {
         if (this.initData) {
-            self.$set('products', self.products.concat(this.initData));
+            this.$set('products', this.products.concat(this.initData));
+            this.atEnd = true;
         } else if (this.url) {
         } else if (this.url) {
             this.fetch();
             this.fetch();
         }
         }
@@ -115,23 +148,4 @@ module.exports = {
         color: $red;
         color: $red;
     }
     }
 }
 }
-
-.drawer-slide {
-    position: fixed;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    background-color: rgba(0, 0, 0, 0.6);
-}
-
-.drawer-main {
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    min-width: 80%;
-    max-width: 100%;
-    background-color: #fff;
-}
 </style>
 </style>

@@ -3,22 +3,30 @@
         <li class="sort-item active"><span>默认</span></li>
         <li class="sort-item active"><span>默认</span></li>
         <li class="sort-item">
         <li class="sort-item">
             <span class="sort-name">最新</span>
             <span class="sort-name">最新</span>
+            <span class="sort-icon">
+                <i class="icon icon-sort-asc"></i>
+                <i class="icon icon-sort-desc"></i>
+            </span>
         </li>
         </li>
         <li class="sort-item">
         <li class="sort-item">
             <span class="sort-name">价格</span>
             <span class="sort-name">价格</span>
         </li>
         </li>
         <li class="sort-item">
         <li class="sort-item">
             <span class="sort-name">折扣</span>
             <span class="sort-name">折扣</span>
+            <span class="sort-icon">
+                <i class="icon icon-sort-asc"></i>
+                <i class="icon icon-sort-desc"></i>
+            </span>
         </li>
         </li>
     </ul>
     </ul>
 </template>
 </template>
 <script>
 <script>
 module.exports = {
 module.exports = {
 
 
-}
+};
 </script>
 </script>
 <style>
 <style>
-@import '../../scss/common/color';
+@import "../../scss/common/color";
 
 
 .sort-navs {
 .sort-navs {
     list-style: none;
     list-style: none;
@@ -35,7 +43,7 @@ module.exports = {
     text-align: center;
     text-align: center;
 
 
     &:after {
     &:after {
-        content: '|';
+        content: "|";
         position: absolute;
         position: absolute;
         right: 0;
         right: 0;
         color: $grey;
         color: $grey;
@@ -49,6 +57,18 @@ module.exports = {
         font-size: 28px;
         font-size: 28px;
     }
     }
 
 
+    .sort-icon {
+        position: relative;
+        margin-left: 10px;
+
+        .icon-sort-asc,
+        .icon-sort-desc {
+            position: absolute;
+            left: 0;
+            top: 0;
+        }
+    }
+
     &.active {
     &.active {
         color: $black;
         color: $black;
     }
     }