From 0a5d9dc480edd0da6badb294a6a9896663858726 Mon Sep 17 00:00:00 2001
From: WangHao <43278047@qq.com>
Date: Sat, 13 Feb 2021 21:16:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A0=E4=B9=A6=E7=AD=BE?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=8F=90=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bookmark/bookmark/index.vue     | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/ruoyi-ui/src/views/bookmark/bookmark/index.vue b/ruoyi-ui/src/views/bookmark/bookmark/index.vue
index 0d670b670..efda3e8ae 100644
--- a/ruoyi-ui/src/views/bookmark/bookmark/index.vue
+++ b/ruoyi-ui/src/views/bookmark/bookmark/index.vue
@@ -769,7 +769,7 @@
       getBookmarkList() {
         this.loading = true;
         selectByUseridList(this.queryParams).then(response => {
-            if (response.total != 0 &&response.code == 200) {
+            if (response.code == 200) {
               this.bookmarkList = this.bookmarkList.concat(response.rows);
               this.total = response.total;
               this.listloading = false
@@ -827,19 +827,18 @@
       getList() {
         this.loading = true;
         selectBymenuIdUserID(this.queryParams).then(response => {
-          if (response.total != 0 &&response.code == 200) {
+          if (response.code == 200) {
             this.bookmarkList = response.rows;
             this.total = response.total;
             this.loading = false;
-            if (this.bookmarkList==null||this.bookmarkList.length==0) {
-              this.showimg=true;
-            }
+            this.showimg=response.rows==0?true:false;
             this.listloading = false
           } else {
-            this.showbookmark = false;
             this.showimg = true;
             this.loading = false;
             this.listloading = false
+            //出错了加载完毕了 禁止滚动
+            this.noMore = true;
           }
         });
       },
@@ -878,12 +877,12 @@
       //查看目录下的书签
       getlistByMenuId(){
         selectBymenuIdUserID(this.queryParams).then(response => {
-          if (response.total != 0 &&response.code == 200) {
+          if (response.code == 200) {
             this.bookmarkList = this.bookmarkList.concat(response.rows);
             this.total = response.total;
             this.listloading = false
             this.loading = false;
-            console.log("请求完毕" + this.queryParams.pageNum)
+            this.showimg=response.rows==0?true:false;
           } else {
             //出错了加载完毕了 禁止滚动
             this.noMore = true;
@@ -901,20 +900,21 @@
             this.bookmarkList = response.rows;
             this.total = response.total;
             this.loading = false;
-            if (this.bookmarkList==null||this.bookmarkList.length==0) {
-              this.showimg=true;
-            }
+            this.showimg=response.rows==0?true:false;
         });
       },
       /**查询便签 滚动加载分页拼接*/
       getNoteListConcat(){
         this.loading = true;
         selectBymenuNote(this.noteParams).then(response => {
-          if (response.total != 0 && response.code == 200) {
+          if ( response.code == 200) {
             this.bookmarkList = this.bookmarkList.concat(response.rows);
             this.total = response.total;
             this.loading = false;
             this.listloading = false
+            if (response.total==0||this.bookmarkList.length==0) {
+              this.showimg=true;
+            }
           }else {
             //出错了加载完毕了 禁止滚动
             this.noMore = true;