From a8b0fbc30248863d9c026a68673ce35e205c44f8 Mon Sep 17 00:00:00 2001
From: Junling Bu <linlinjavaer@gmail.com>
Date: Mon, 1 Jul 2019 11:47:50 +0800
Subject: [PATCH] =?UTF-8?q?chore[litemall-vue]:=20=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E9=A1=B5=E9=9D=A2=E5=9F=BA=E4=BA=8Evant?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 litemall-vue/src/views/items/list/index.vue | 157 +++++++++-----------
 1 file changed, 68 insertions(+), 89 deletions(-)

diff --git a/litemall-vue/src/views/items/list/index.vue b/litemall-vue/src/views/items/list/index.vue
index a472ee61..9912a50e 100755
--- a/litemall-vue/src/views/items/list/index.vue
+++ b/litemall-vue/src/views/items/list/index.vue
@@ -1,38 +1,37 @@
 <template>
-  <div class="item_list over-hide">
-    <van-tabs v-model="navActive" @click="handleTabClick">
-      <van-tab v-for="(nav, index) in navList" :title="nav.name" :key="index">
-        <!-- <InfinityScroll
-          :ref="'tabScrolls' + tabIndex"
-          class="full-page scroll-wrap fix-height"
-          :beforeRequest="beforeRequest"
-          :apiUrl="listApi"
-          @onLoad="onLoad(tabIndex, $event)"
-        > -->
-        <div class="h">
-          <div class="name">{{currentCategory.name}}</div>
-          <div class="desc">{{currentCategory.desc}}</div>
-        </div>
-          <item-group>
-            <item-card-hori
-              v-for="(item, i) in goodsList"
-              :key="i"
-              :goods="item"
-              @click="itemClick(item.id)"
-            />
-          </item-group>
-        <!-- </InfinityScroll> -->
+  <div class="item_list">
+    <van-tabs v-model="navActive"
+              @click="handleTabClick">
+      <van-tab v-for="(nav, index) in navList"
+               :title="nav.name"
+               :key="index">
+        <van-list v-model="loading"
+                  :finished="finished"
+                  :immediate-check="false"
+                  finished-text="没有更多了"
+                  @load="getGoodsList">
+          <div class="h">
+            <div class="name">{{currentCategory.name}}</div>
+            <div class="desc">{{currentCategory.desc}}</div>
+          </div>
+          <van-card v-for="(item, i) in goodsList"
+                    :key="i"
+                    :desc="item.brief"
+                    :title="item.name"
+                    :thumb="item.picUrl"
+                    :price="item.retailPrice"
+                    :origin-price="item.counterPrice"
+                    @click="itemClick(item.id)" />
+        </van-list>
+
       </van-tab>
     </van-tabs>
   </div>
 </template>
 
 <script>
-import { goodsCategory, goodsList, GoodsList } from '@/api/api';
-
-import ItemGroup from '@/components/item-group';
-import ItemCardHori from '@/components/item-card-hori/';
-import { Search, Tab, Tabs, Popup } from 'vant';
+import { goodsCategory, goodsList } from '@/api/api';
+import { Card, List, Tab, Tabs } from 'vant';
 import InfinityScroll from '@/components/infinity-scroll';
 
 export default {
@@ -47,11 +46,14 @@ export default {
   data() {
     return {
       categoryId: this.itemClass,
-      listApi: GoodsList,
       goodsList: [],
+      page: 0,
+      limit: 10,
       currentCategory: {},
       navList: [],
-      navActive: 0
+      navActive: 0,
+      loading: false,
+      finished: false
     };
   },
 
@@ -61,88 +63,66 @@ export default {
 
   methods: {
     handleTabClick(index) {
-      this.categoryId= this.navList[index].id;
+      this.categoryId = this.navList[index].id;
       this.$router.replace({
         name: 'list',
         query: { itemClass: this.categoryId }
       });
       this.init();
     },
-  init() {
-    goodsCategory({id: this.categoryId}).then(res => {
-      this.navList = res.data.data.brotherCategory;
-      this.currentCategory= res.data.data.currentCategory;
+    init() {
+      goodsCategory({ id: this.categoryId }).then(res => {
+        this.navList = res.data.data.brotherCategory;
+        this.currentCategory = res.data.data.currentCategory;
 
-      // 当id是L1分类id时，这里需要重新设置成L1分类的一个子分类的id
-      if (res.data.data.parentCategory.id == this.categoryId) {
-        this.categoryId = res.data.data.currentCategory.id;
-      }
-
-      for (let i = 0; i < this.navList.length; i++) {
-        if (this.navList[i].id == this.categoryId) {
-          this.navActive = i
-          break;
+        // 当id是L1分类id时，这里需要重新设置成L1分类的一个子分类的id
+        if (res.data.data.parentCategory.id == this.categoryId) {
+          this.categoryId = res.data.data.currentCategory.id;
         }
-      }
-      this.getGoodsList();
-    });
+
+        for (let i = 0; i < this.navList.length; i++) {
+          if (this.navList[i].id == this.categoryId) {
+            this.navActive = i;
+            break;
+          }
+        }
+        this.page = 0;
+        this.goodsList = [];
+        this.getGoodsList();
+      });
+    },
+    getGoodsList() {
+      this.page++;
+      goodsList({
+        categoryId: this.categoryId,
+        page: this.page,
+        limit: this.limit
+      }).then(res => {
+        this.goodsList.push(...res.data.data.list);
+        this.loading = false;
+        this.finished = res.data.data.page >= res.data.data.pages;
+      });
+    }
   },
-  getGoodsList() {
-    goodsList({categoryId: this.categoryId}).then(res => {
-      this.goodsList= res.data.data.list
-    });
-  },  
-},
 
   components: {
-    InfinityScroll,
-    [ItemGroup.name]: ItemGroup,
-    [ItemCardHori.name]: ItemCardHori,
+    [List.name]: List,
+    [Card.name]: Card,
     [Tab.name]: Tab,
-    [Tabs.name]: Tabs,
-    [Search.name]: Search,
-    [Popup.name]: Popup
+    [Tabs.name]: Tabs
   }
 };
 </script>
 
 <style lang="scss" scoped>
-.fade-enter,
-.fade-leave-to {
-  opacity: 0;
-}
-
-.fade-enter-active,
-.fade-leave-active {
-  transition: all 0.5s;
-}
-
-.fix-height {
-  padding-bottom: 88px;
-}
-
-.over-hide {
-  overflow: hidden;
-}
-
 .item_list {
   background-color: #fff;
-  padding-bottom: 0;
-}
-.fixedTop {
-  position: fixed;
-  width: 100%;
-  top: 0;
-  z-index: 999;
-}
-
-.items_loading {
-  margin: 0 auto;
 }
 
 .h {
   height: 100px;
   width: 100%;
+  margin-top: 10px;
   display: flex;
   flex-direction: column;
   align-items: center;
@@ -162,5 +142,4 @@ export default {
   font-size: 16px;
   color: #999;
 }
-
 </style>