From 3b83aeaa8780d5adcfc0f4071119dabcb99e27fe Mon Sep 17 00:00:00 2001
From: jyx <2012969435@qq.com>
Date: Fri, 27 Sep 2024 15:02:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=BB=E4=BD=9C=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/index/index.vue | 100 ++++++++++++++++++++------------------
 1 file changed, 54 insertions(+), 46 deletions(-)

diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 0996cd8..1c0b02e 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -16,9 +16,9 @@
           color="#EFC54E" 
           throttleTime="5" 
           :loading="loading" 
-          @click="paintingList">搜索</up-button>
+          @click="paintingList(state.page=1)">搜索</up-button>
       </view>
-      <up-list @scrolltolower="scrolltolower">
+      <up-list @scrolltolower="scrolltolower" style="height:1120rpx">
       <up-list-item class="painting-box" v-for="(painting,index) in state.tableData" :key="index">
         <span style="display: flex; align-items: center;position: relative;" >
           <up-image :show-loading="true" :src="painting.HdPic" width="100px" height="100px" @click="click"></up-image>
@@ -97,32 +97,36 @@ const groupChange =(e) =>{
 }
 // 获取可添加的画作列表
 const paintingList = async (param) => {
-  loading.value = true;
-  const res = await creChangepainting({
-    Tfnum: "",
-    ArtworkName: "",
-    Tnum: "",
-    ArtistName: "",
-    page:state.page,
-    pageSize:state.pageSize,
-    keywords:state.searchValue,
-    ...param,
-  });
-  if (res.status === 0) {
-        loading.value = false
-        state.tableData = res.data.Data.map((item) =>{
-          return {
-            ...item,
-            checked:''
-          }
-        })||[];
-        
-        console.log(1111,state.tableData)
-      } else {
+    loading.value = true;
+    const res = await creChangepainting({
+        Tfnum: "",
+        ArtworkName: "",
+        Tnum: "",
+        ArtistName: "",
+        page: state.page,
+        pageSize: state.pageSize,
+        keywords: state.searchValue,
+       ...param,
+    });
+    loading.value = false;
+    if (res.status === 0) {
+        if (res.data.Data !== null) {
+            state.tableData = res.data.Data.map((item) => {
+                return {
+                   ...item,
+                    checked: ''
+                }
+            });
+            console.log(1111, state.tableData);
+        } else {
+            state.tableData = [];
+            showMessage({ type: "error", message: "查询失败，暂无画作!" });
+        }
+    } else {
         showMessage({ type: "error", message: res.msg });
-      }
-      loading.value = false
+    }
 }
+
 //添加画作
 const doneSet = async () => {
   loading.value = true;
@@ -156,27 +160,31 @@ const doneSet = async () => {
 };
 //下拉刷新数据
 const scrolltolower = async () => {
-    const newPage = state.page++;
-    const res = await creChangepainting({
-        Tfnum: "",
-        ArtworkName: "",
-        Tnum: "",
-        ArtistName: "",
-        page: newPage,
-        pageSize: state.pageSize,
-        searchValue: state.searchValue
+  state.page = state.page + 1;
+  const res = await creChangepainting({
+    Tfnum: "",
+    ArtworkName: "",
+    Tnum: "",
+    ArtistName: "",
+    page: state.page,
+    pageSize: state.pageSize,
+    keywords: state.searchValue
+  });
+  if (res.status === 0) {
+    if(res.data.Data!==null){ const newData = res.data.Data.map((item) => {
+      return {
+      ...item,
+        checked: ''
+      }
     });
-    if (res.status === 0) {
-        const newData = res.data.Data.map((item) => {
-            return {
-               ...item,
-                checked: ''
-            }
-        });
-        state.tableData = state.tableData.concat(newData);
-    } else {
-        showMessage({ type: "error", message: res.msg });
-    }
+    const uniqueData = newData.filter((newItem) => {
+      return!state.tableData.some((existingItem) => existingItem.ArtworkUuid === newItem.ArtworkUuid);
+    });
+    state.tableData = state.tableData.concat(uniqueData);
+  } }
+   else {
+    showMessage({type: "error", message: res.msg});
+  }
 };