From 11f601a0d48e04f8026746b7e9689746c6859498 Mon Sep 17 00:00:00 2001
From: xiaofeng <xinjianfeng@126.com>
Date: Wed, 10 Jul 2019 22:44:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=88=91=E7=9A=84=E6=94=B6?=
 =?UTF-8?q?=E8=97=8F=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile-web/src/api/user.js                    | 16 ++++++-------
 mobile-web/src/page/user/favorite/list.vue    | 24 +++++++++++--------
 .../UserProductSpuCollectionsMapper.xml       |  1 -
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/mobile-web/src/api/user.js b/mobile-web/src/api/user.js
index ae6d70b8c..52dfacbbc 100644
--- a/mobile-web/src/api/user.js
+++ b/mobile-web/src/api/user.js
@@ -1,18 +1,18 @@
 import request from "../config/request";
 
-export function GetFavorite(data){
+export function GetFavoritePage(pageNo,pageSize){
   return request({
-    url: '/User/GetFavorite',
-    method: 'post',
-    params: { data }
+    url: '/user-api/users/favorite/page',
+    method: 'get',
+    params: { pageNo,pageSize }
   })
 }
 
-export function DelFavorite(id){
+export function DelFavorite(spuId){
   return request({
-    url: '/User/DelFavorite',
-    method: 'get',
-    params: { id:id }
+    url: '/user-api/users/favorite/remove',
+    method: 'DELETE',
+    params: { spuId }
   })
 }
 
diff --git a/mobile-web/src/page/user/favorite/list.vue b/mobile-web/src/page/user/favorite/list.vue
index 44966336a..efa611cb9 100644
--- a/mobile-web/src/page/user/favorite/list.vue
+++ b/mobile-web/src/page/user/favorite/list.vue
@@ -9,6 +9,7 @@
         <div v-for="(item,index) in list" :key="index">
             <van-swipe-cell :right-width="65" :on-close="onClose(item)">
                 <product-card :product='item' />
+                    <span>{{item.spuName}}</span>
                     <span slot="right" >删除</span>
                 </van-swipe-cell>
         </div>
@@ -17,7 +18,7 @@
 </template>
 
 <script>
-import { GetFavorite ,DelFavorite} from "../../../api/user.js";
+import { GetFavoritePage ,DelFavorite} from "../../../api/user.js";
 
 export default {
     data(){
@@ -26,6 +27,7 @@ export default {
             finished:false,
             list:[],
             page:0,
+            pageSize:10
         }
     },
     methods:{
@@ -41,9 +43,9 @@ export default {
                         this.$dialog.confirm({
                             message: '确定删除吗？'
                         }).then(() => {
-                            DelFavorite(item.id).then(response=>{
+                            DelFavorite(item.spuId).then(response=>{
                                 this.$toast('删除成功');
-                                this.$router.go(0);  
+                                this.$router.go(0);
                             })
                             instance.close();
                         }).catch(() => {
@@ -54,16 +56,18 @@ export default {
             }
         },
         onLoad() {
-            this.page++;
-            GetFavorite().then(response=>{
-                response.list.forEach(item => {
-                    this.list.push(item);
-                });
+            let pageNo = this.page + 1;
+            GetFavoritePage(pageNo,this.pageSize).then(response=>{
+                this.page = pageNo;
+                this.list.push(...response.list);
+                // response.list.forEach(item => {
+                //     this.list.push(item);
+                // });
                 this.loading = false;
-                if(response.TotalPage<=this.page){
+                if(this.list.length >= response.total){
                     this.finished = true;
                 }
-            
+
             })
         }
     },
diff --git a/user/user-service-impl/src/main/resources/mapper/UserProductSpuCollectionsMapper.xml b/user/user-service-impl/src/main/resources/mapper/UserProductSpuCollectionsMapper.xml
index fb0287887..d4d3b3daa 100644
--- a/user/user-service-impl/src/main/resources/mapper/UserProductSpuCollectionsMapper.xml
+++ b/user/user-service-impl/src/main/resources/mapper/UserProductSpuCollectionsMapper.xml
@@ -24,7 +24,6 @@
         <where>
             user_id = #{userId} AND deleted = 0
         </where>
-        ORDER BY sort ASC
         <if test="offset != null and limit != null">
             LIMIT #{offset}, #{limit}
         </if>