From 6fb6f52bbe642454ffa79f6e78e93fd06d8aadd4 Mon Sep 17 00:00:00 2001
From: YunaiV <>
Date: Fri, 26 Apr 2019 00:15:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E4=B8=8B=E7=9A=84=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8=E6=90=9C=E6=90=9C=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/productcard.vue     |  6 --
 mobile-web/src/page/product/list.vue          | 70 +++++++++++++++----
 .../main/resources/config/application.yaml    |  2 +-
 3 files changed, 56 insertions(+), 22 deletions(-)

diff --git a/mobile-web/src/components/common/productcard.vue b/mobile-web/src/components/common/productcard.vue
index e5e9444f1..d9a006b33 100644
--- a/mobile-web/src/components/common/productcard.vue
+++ b/mobile-web/src/components/common/productcard.vue
@@ -9,16 +9,10 @@
             >
                 <template slot="thumb">
                     <img :src="product.picUrls && product.picUrls ? product.picUrls[0] : ''"/>
-                    <!--  TODO 芋艿 暂时去掉 -->
-<!--                    <p v-if="product.imageTag!=null&&product.imageTag!=''" class="image_tag">{{product.imageTag}}</p>-->
                 </template>
                 <template slot="tags">
                     <p class="price" v-if="product.buyPrice || product.price">
                         ￥<span>{{product.buyPrice ? product.buyPrice / 100.00 : product.price / 100.00}}</span>
-                        <!--  TODO 芋艿 暂时去掉 -->
-<!--                        <van-tag v-if="product.tags!=null" v-for="tag in product.tags" :key="tag" plain type="danger">-->
-<!--                            {{tag}}-->
-<!--                        </van-tag>-->
                         <van-tag v-if="product.promotionActivityTitle" plain type="danger">
                             {{ product.promotionActivityTitle }}
                         </van-tag>
diff --git a/mobile-web/src/page/product/list.vue b/mobile-web/src/page/product/list.vue
index e86c9364a..91a97ad55 100644
--- a/mobile-web/src/page/product/list.vue
+++ b/mobile-web/src/page/product/list.vue
@@ -8,14 +8,26 @@
             <van-tab v-for="category in childCategories" :title="category.name"  />
         </van-tabs>
 
-        <div v-for="(product,i) in products" :key="i">
-          <product-card :product='product' @click="showProduct(product)" />
-        </div>
+<!--        <div v-for="(product,i) in products" :key="i">-->
+<!--          <product-card :product='product' @click="showProduct(product)" />-->
+<!--        </div>-->
+
+        <van-list
+                v-model="loading"
+                :finished="finished"
+                finished-text="没有更多了"
+                @load="onLoad"
+        >
+            <div v-for="(product,i) in products" :key="i">
+                <product-card :product='product' @click="showProduct(product)" />
+            </div>
+        </van-list>
     </div>
 </template>
 
 <script>
 import { getProductCategoryList, getProductSpuPage } from '../../api/product';
+import {getProductPage} from "../../api/search";
 
 export default {
   data() {
@@ -28,8 +40,14 @@ export default {
         id: parseInt(this.$route.query.cidSecond),
       },
       childCategories: [],
-      active: 2,
+
+      active: -1,
       products: [],
+
+      page: 0,
+      pageSize: 10,
+      loading: false,
+      finished: false,
     };
   },
   methods: {
@@ -41,18 +59,40 @@ export default {
       this.active = key;
       // 加载商品
       this.products = [];
-      this.loadProductList(this.childCategories[key].id);
+      // 加载商品
+
+      this.loadProductList(this.childCategories[key].id, 1);
     },
-    loadProductList(categoryId) {
-      // 设置当前选中的分类
+    loadProductList(categoryId, page) {
       this.childCategory.id = categoryId;
-      // 读取商品
-      // alert('商品分类：' + categoryId);
-      let response = getProductSpuPage(categoryId);
-      response.then(data => {
-        this.products.push(...data.spus);
-      })
-    }
+      getProductPage({
+        pageNo: page,
+        pageSize: this.pageSize,
+        cid: this.childCategory.id,
+      }).then(data => {
+        this.handleData(page, data);
+      });
+    },
+    onLoad() {
+      // debugger;
+      // 进入下一页
+      let page = this.page + 1;
+      // 加载商品
+      this.loadProductList(this.childCategory.id, page);
+    },
+    handleData(page, data) {
+      this.loading = true;
+      // 设置下页面
+      this.page = page;
+      // 数据保存到 list 中
+      this.products.push(...data.list);
+      // 判断页数
+      if (this.products.length >= data.total) {
+        this.finished = true;
+      }
+      // 标记不在加载中
+      this.loading = false;
+    },
   },
   mounted() {
     let response = getProductCategoryList(this.rootCategory.id);
@@ -70,7 +110,7 @@ export default {
         }
       }
       // 加载商品列表
-      this.loadProductList(this.childCategory.id);
+      // this.loadProductList(this.childCategory.id);
     });
   }
 };
diff --git a/search/search-service-impl/src/main/resources/config/application.yaml b/search/search-service-impl/src/main/resources/config/application.yaml
index 64bf51411..3ca895c2e 100644
--- a/search/search-service-impl/src/main/resources/config/application.yaml
+++ b/search/search-service-impl/src/main/resources/config/application.yaml
@@ -3,7 +3,7 @@ spring:
   data:
     elasticsearch:
       cluster-name: elasticsearch
-      cluster-nodes: 192.168.88.10:9300
+      cluster-nodes: 180.167.213.26:9300
       repositories:
         enable: true