From 1e9519a19ecab0e451c1aabc4e571262cea955dd Mon Sep 17 00:00:00 2001
From: wangasdfghjk <13834834+wangasdfghjk@user.noreply.gitee.com>
Date: Wed, 18 Sep 2024 17:00:06 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=B7=E9=A2=98=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/UserAnswerList/UserAnswerList.vue | 112 +++++++++++++++---------
 1 file changed, 70 insertions(+), 42 deletions(-)

diff --git a/pages/UserAnswerList/UserAnswerList.vue b/pages/UserAnswerList/UserAnswerList.vue
index e80f35b..bfa049f 100644
--- a/pages/UserAnswerList/UserAnswerList.vue
+++ b/pages/UserAnswerList/UserAnswerList.vue
@@ -1,11 +1,10 @@
 <template>
   <view class="u-page">
- <u-scroll-list indicatorWidth="400">
-   <view v-for="(item, index) in category" :key="index" @click.stop="handleItemClick(item)">
-     <view class="category-item">{{ item.CateName }}</view>
-   </view>
- </u-scroll-list>
-
+    <u-scroll-list indicatorWidth="400">
+      <view v-for="(item, index) in category" :key="index" @click.stop="handleItemClick(item)">
+        <view class="category-item">{{ item.CateName }}</view>
+      </view>
+    </u-scroll-list>
 
     <u-list @scrolltolower="scrolltolower">
       <u-checkbox-group>
@@ -14,9 +13,6 @@
         <u-button text="删除" @click="deleteSelected"></u-button>
       </u-checkbox-group>
 
-      <u-list-item style="padding-left: 10px; display: flex; flex-direction: row; flex-wrap: nowrap; align-items: center;">
-      </u-list-item>
-
       <u-checkbox-group v-model="checkboxValue1" @change="checkboxChange" placement="column">
         <u-list-item
           v-for="(item, index) in infos" :key="index"
@@ -28,22 +24,23 @@
           </view>
         </u-list-item>
       </u-checkbox-group>
+
+      <view v-if="noMoreData" class="no-more-data">没有更多数据了</view>
     </u-list>
   </view>
 </template>
 
-
 <script>
 import {
   getUserInterview,
   userInterviewdelete
-} from '@/utils/api/user_interview.js'
+} from '@/utils/api/user_interview.js';
 import {
   useranswerList
-} from '../../utils/api/category'
+} from '../../utils/api/category';
 import {
   getCateGoryListAny
-} from '../../utils/api/category'
+} from '../../utils/api/category';
 
 export default {
   data() {
@@ -51,54 +48,82 @@ export default {
       infos: [], // 题目列表
       category: [], // 类别
       checkboxValue1: undefined, // 选中的复选框值
-      isAllChecked: false // 全选状态
-    }
+      isAllChecked: false, // 全选状态
+      noMoreData: false // Flag for no more data
+    };
   },
   onLoad() {
-    this.getInterview()
-    this.userAnswerList()
-    this.cateGoryListAny()
+    this.getInterview();
+    this.userAnswerList();
+    this.cateGoryListAny(); // Ensure this is correctly spelled
   },
   methods: {
     // 加载更多数据
     scrolltolower() {
-      this.loadmore()
+      if (this.noMoreData) return; // Stop if there's no more data
+      this.loadMoreData();
+    },
+    // Load more data
+    loadMoreData() {
+      // Check for existing data before loading more
+      if (this.infos.length >= 10) { // Assuming a limit of 10
+        this.noMoreData = true; // Set to true if all data is loaded
+      } else {
+        getUserInterview({ p_id: 1, page: 1, page_size: 2 }).then(res => {
+          if (res.data.code !== 0 || (res.data.data && res.data.data.length === 0)) {
+            this.noMoreData = true; // No more data available
+          } else {
+            this.infos.push(...(res.data.data || []).map(item => ({ ...item, checked: false })));
+          }
+        }).catch(error => {
+          console.error('Error fetching interview data:', error);
+        });
+      }
     },
     // 获取面试题数据
     getInterview() {
-      getUserInterview({ is_grasps: 0, p_id: 0 }).then(res => {
+      getUserInterview({ p_id: 1, page: 0, page_size: 2 }).then(res => {
         if (res.data.code !== 0) return;
-        this.infos = res.data.data.map(item => ({ ...item, checked: false }));
-      })
+        this.infos = (res.data.data || []).map(item => ({ ...item, checked: false }));
+      }).catch(error => {
+        console.error('Error fetching interview data:', error);
+      });
     },
     // 获取用户回答列表
     userAnswerList() {
       useranswerList({ p_id: 1 }).then(res => {
-        this.list = res.data.data
-      })
+        this.list = res.data.data || []; // Ensure list is an empty array if data is null
+      }).catch(error => {
+        console.error('Error fetching user answer list:', error);
+      });
     },
     // 获取分类列表
     cateGoryListAny() {
       getCateGoryListAny({ level: 1 }).then(res => {
-        this.category = res.data.data
-      })
+        this.category = res.data.data || []; // Ensure category is an empty array if data is null
+      }).catch(error => {
+        console.error('Error fetching category list:', error);
+      });
     },
     // 点击分类项后重新加载题目列表
     handleItemClick(item) {
-      this.isAllChecked = false
+      this.isAllChecked = false;
       useranswerList({ p_id: item.ID }).then(res => {
-        this.infos = res.data.data.map(item => ({ ...item, checked: false }));
+        this.infos = (res.data.data || []).map(item => ({ ...item, checked: false }));
+        this.noMoreData = false; // Reset flag on category change
+      }).catch(error => {
+        console.error('Error fetching user answers for category:', error);
       });
     },
     // 全选/取消全选
     selectAll() {
       this.isAllChecked = !this.isAllChecked;
       this.infos.forEach(item => item.checked = this.isAllChecked);
-      this.$forceUpdate()
+      this.$forceUpdate();
     },
     checkboxChange(e) {},
     check(index, checked) {
-      this.infos[index].checked = !checked
+      this.infos[index].checked = !checked;
       this.isAllChecked = this.infos.every(item => item.checked);
     },
     deleteSelected() {
@@ -109,7 +134,9 @@ export default {
       }
       userInterviewdelete({ id: selectedIds }).then(res => {
         alert(res.data.code == 0 ? "删除成功" : "删除失败");
-      })
+      }).catch(error => {
+        console.error('Error deleting selected items:', error);
+      });
     },
     handleTextClick(item) {
       uni.showModal({
@@ -117,11 +144,6 @@ export default {
         content: item.interview.inter_solution,
         showCancel: false,
         confirmText: '确定',
-        success: (res) => {
-          if (res.confirm) {
-            
-          }
-        }
       });
     }
   }
@@ -130,23 +152,23 @@ export default {
 
 <style>
 .text-container {
-  width: 100%; /* Or set a specific width */
+  width: 100%;
   display: flex;
   align-items: center;
-  justify-content: space-between; /* Align items */
+  justify-content: space-between;
   overflow: hidden;
-  padding: 5px 10px; /* Add padding to the text container */
+  padding: 5px 10px;
 }
 
 .category-item {
   margin-left: 10rpx;
   border: 1rpx solid black;
   padding: 10rpx;
-  margin-bottom: 5px; /* Add margin between category items */
+  margin-bottom: 5px;
 }
 
 .info-item {
-  padding: 10px 0; /* Add vertical padding for spacing */
+  padding: 10px 0;
   display: flex;
   flex-direction: row;
   align-items: center;
@@ -155,6 +177,12 @@ export default {
 .info-icon {
   margin-left: 10px;
   cursor: pointer;
-  align-self: center; /* Center the icon vertically */
+  align-self: center;
+}
+
+.no-more-data {
+  text-align: center;
+  padding: 10px;
+  color: gray;
 }
 </style>
-- 
Gitee


From 7b04b5438d3fddf760696084371c4252eddf028c Mon Sep 17 00:00:00 2001
From: wangasdfghjk <13834834+wangasdfghjk@user.noreply.gitee.com>
Date: Wed, 18 Sep 2024 17:29:30 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=B7=E9=A2=98=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/UserAnswerList/UserAnswerList.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pages/UserAnswerList/UserAnswerList.vue b/pages/UserAnswerList/UserAnswerList.vue
index bfa049f..0da1a5f 100644
--- a/pages/UserAnswerList/UserAnswerList.vue
+++ b/pages/UserAnswerList/UserAnswerList.vue
@@ -49,7 +49,9 @@ export default {
       category: [], // 类别
       checkboxValue1: undefined, // 选中的复选框值
       isAllChecked: false, // 全选状态
-      noMoreData: false // Flag for no more data
+      noMoreData: false ,// Flag for no more data
+	  page:1,
+	  pageSize:10,
     };
   },
   onLoad() {
@@ -69,7 +71,7 @@ export default {
       if (this.infos.length >= 10) { // Assuming a limit of 10
         this.noMoreData = true; // Set to true if all data is loaded
       } else {
-        getUserInterview({ p_id: 1, page: 1, page_size: 2 }).then(res => {
+        getUserInterview({ p_id: 1, page: this.page, page_size: this.pageSize }).then(res => {
           if (res.data.code !== 0 || (res.data.data && res.data.data.length === 0)) {
             this.noMoreData = true; // No more data available
           } else {
-- 
Gitee