Merge branch 'develop' of git.yoho.cn:fe/yohoblk-wap into develop

@@ -16,10 +16,10 @@
                 </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>
+        <p class="cardlist--loading text-center" v-show="state === 1">正在加载...</p>
+        <p class="cardlist--end text-center" v-show="state === 0 ">--End--</p>
 
 
-        <div class="empty-tip" v-show="empty">
+        <div class="empty-tip" v-show="state === -1">
             <i class="icon icon-search"></i>
             <i class="icon icon-search"></i>
             <p class="empty-tip-cn">未找到相关商品</p>
             <p class="empty-tip-cn">未找到相关商品</p>
             <p class="empty-tip-en">Did not find the relevant goods</p>
             <p class="empty-tip-en">Did not find the relevant goods</p>
@@ -43,7 +43,7 @@
 
 
             // 数据
             // 数据
             data: Array,
             data: Array,
-            empty: Boolean
+            state: [Number, Object]   // -1: 无数据 0: 全部加载完  1: 正在加载
         },
         },
         computed: {
         computed: {
             // 空列表: data.length === 0
             // 空列表: data.length === 0

@@ -4,7 +4,7 @@
             <i class="icon icon-filter" slot="right" @touchstart="openFilter"></i>
             <i class="icon icon-filter" slot="right" @touchstart="openFilter"></i>
         </cheader>
         </cheader>
         <order :config="orderConfig" :val="order" v-if="enableOrder"></order>
         <order :config="orderConfig" :val="order" v-if="enableOrder"></order>
-        <List :data="productList" :empty="empty"></List>
+        <List :data="productList" :state="listState"></List>
         <Filter :config="filterConfig" v-ref:filter></Filter>
         <Filter :config="filterConfig" v-ref:filter></Filter>
     </div>
     </div>
 </template>
 </template>
@@ -53,6 +53,23 @@
         computed: {
         computed: {
             empty: function() {
             empty: function() {
                 return this.page !== 0 && !this.productList.length;
                 return this.page !== 0 && !this.productList.length;
+            },
+            listState: function() {
+                let state; // 0: 全部加载完  1: 正在加载
+
+                if (!this.page) {
+                    return;
+                }
+
+                if (!this.productList.length) {
+                    return -1;
+                } else if (this.page === this.totalPage) {
+                    return 0;
+                } else if (this.inSearching) {
+                    return 1;
+                }
+
+                return state;
             }
             }
         },
         },
         components: {
         components: {
@@ -91,7 +108,7 @@
                             }
                             }
                         }
                         }
                     })
                     })
-                    .fail(error => {
+                    .fail(error => {  // eslint-disable-line
                         tip('网络出错~');
                         tip('网络出错~');
                     })
                     })
                     .always(() => {
                     .always(() => {

@@ -3,7 +3,7 @@
         <cheader title="新品抢先看">
         <cheader title="新品抢先看">
             <i class="icon icon-filter" slot="right" @touchstart="openFilter"></i>
             <i class="icon icon-filter" slot="right" @touchstart="openFilter"></i>
         </cheader>
         </cheader>
-        <List :data="productList"  :empty="empty"></List>
+        <List :data="productList"  :state="listState"></List>
         <Filter :config="filterConfig" action="/product/list.json" v-ref:filter></Filter>
         <Filter :config="filterConfig" action="/product/list.json" v-ref:filter></Filter>
     </div>
     </div>
 </template>
 </template>
@@ -46,8 +46,22 @@
             };
             };
         },
         },
         computed: {
         computed: {
-            empty: function() {
-                return this.page !== 0 && !this.productList.length;
+            listState: function() {
+                let state; // 0: 全部加载完  1: 正在加载
+
+                if (!this.page) {
+                    return;
+                }
+
+                if (!this.productList.length) {
+                    return -1;
+                } else if (this.page === this.totalPage) {
+                    return 0;
+                } else if (this.inSearching) {
+                    return 1;
+                }
+
+                return state;
             }
             }
         },
         },
         components: {
         components: {
@@ -84,7 +98,7 @@
                             }
                             }
                         }
                         }
                     })
                     })
-                    .fail(error => {
+                    .fail(error => { // eslint-disable-line
                         tip('网络出错~');
                         tip('网络出错~');
                     })
                     })
                     .always(() => {
                     .always(() => {

@@ -2,7 +2,7 @@
     <div>
     <div>
         <Order :config="orderConfig" :val="order" v-if="enableOrder">
         <Order :config="orderConfig" :val="order" v-if="enableOrder">
         </Order>
         </Order>
-        <List :data="productList" :empty="empty"></List>
+        <List :data="productList" :state="listState"></List>
     </div>
     </div>
 </template>
 </template>
 <script>
 <script>
@@ -45,9 +45,22 @@
             };
             };
         },
         },
         computed: {
         computed: {
-            // 无数据
-            empty: function() {
-                return this.page !== 0 && !this.productList.length;
+            listState: function() {
+                let state; // 0: 全部加载完  1: 正在加载
+
+                if (!this.page) {
+                    return;
+                }
+
+                if (!this.productList.length) {
+                    return -1;
+                } else if (this.page === this.totalPage) {
+                    return 0;
+                } else if (this.inSearching) {
+                    return 1;
+                }
+
+                return state;
             }
             }
         },
         },
         components: {
         components: {

@@ -3,7 +3,7 @@
 
 
     <shop-top :shop-info="shopInfo"></shop-top>
     <shop-top :shop-info="shopInfo"></shop-top>
     <div :class='{"shop-goods-top": !shopInfo.isBlkShop}'>
     <div :class='{"shop-goods-top": !shopInfo.isBlkShop}'>
-        <goods-list :data="productList" :empty="empty"></goods-list>
+        <goods-list :data="productList" :state="listState"></goods-list>
     </div>
     </div>
     <filter :config="filterConfig" v-ref:filter></filter>
     <filter :config="filterConfig" v-ref:filter></filter>
 </template>
 </template>
@@ -57,6 +57,23 @@
         computed: {
         computed: {
             empty: function() {
             empty: function() {
                 return this.page !== 0 && !this.productList.length;
                 return this.page !== 0 && !this.productList.length;
+            },
+            listState: function() {
+                let state; // 0: 全部加载完  1: 正在加载
+
+                if (!this.page) {
+                    return;
+                }
+
+                if (!this.productList.length) {
+                    return -1;
+                } else if (this.page === this.totalPage) {
+                    return 0;
+                } else if (this.inSearching) {
+                    return 1;
+                }
+
+                return state;
             }
             }
         },
         },
         watch: {
         watch: {