diff --git a/Yi.Bbs.Vue3/src/config/axios/service.js b/Yi.Bbs.Vue3/src/config/axios/service.js
index 141385a8..7c677d5d 100644
--- a/Yi.Bbs.Vue3/src/config/axios/service.js
+++ b/Yi.Bbs.Vue3/src/config/axios/service.js
@@ -17,6 +17,7 @@ const service = axios.create({
timeout: request_timeout, // 请求超时时间
headers: { "Content-Type": "application/json" },
hideerror: false, //是否在底层显示错误信息
+ isFinish: false,
});
// 添加请求拦截器
@@ -41,9 +42,12 @@ service.interceptors.request.use(
// 添加响应拦截器
service.interceptors.response.use(
(response) => {
+ const { config } = response;
+ config.isFinish = true;
return Promise.resolve(response);
},
(error) => {
+ const { config } = error;
// 对响应错误做点什么
if (error.message.indexOf("timeout") != -1) {
ElMessage({
@@ -86,6 +90,7 @@ service.interceptors.response.use(
}
}
}
+ config.isFinish = true;
return Promise.reject(error.response);
}
);
diff --git a/Yi.Bbs.Vue3/src/views/Discuss.vue b/Yi.Bbs.Vue3/src/views/Discuss.vue
index 7cec67e9..acfb77b5 100644
--- a/Yi.Bbs.Vue3/src/views/Discuss.vue
+++ b/Yi.Bbs.Vue3/src/views/Discuss.vue
@@ -69,7 +69,7 @@
-
+
@@ -121,6 +121,7 @@ const router = useRouter();
const activeName = ref("new");
//主题内容
const discussList = ref([]);
+const isDiscussFinished = ref(false);
//置顶主题内容
const topDiscussList = ref([]);
const total = ref(100);
@@ -158,6 +159,7 @@ const handleReset = () => {
//加载discuss
const loadDiscussList = async () => {
const response = await getList(query);
+ isDiscussFinished.value = response.config.isFinish;
discussList.value = response.data.items;
total.value = Number(response.data.totalCount);
diff --git a/Yi.Bbs.Vue3/src/views/home/Index.vue b/Yi.Bbs.Vue3/src/views/home/Index.vue
index cfbe3b8c..965ed3e6 100644
--- a/Yi.Bbs.Vue3/src/views/home/Index.vue
+++ b/Yi.Bbs.Vue3/src/views/home/Index.vue
@@ -22,7 +22,7 @@
:isPublish="i.isDisableCreateDiscuss"
/>
-
+
@@ -30,7 +30,7 @@
-
+
@@ -77,7 +77,7 @@
-
+
-
+
-
+
{
access();
const { data: plateData } = await getList();
plateList.value = plateData.items;
- const { data: discussData } = await getHomeDiscuss();
+ const { data: discussData, config: discussConfig } = await getHomeDiscuss();
discussList.value = discussData;
+ isDiscussFinished.value = discussConfig.isFinish;
const { data: bannerData } = await bannerGetList();
bannerList.value = bannerData.items;
const { data: weekData } = await getWeek();
weekList.value = weekData;
- const { data: pointData } = await getRankingPoints();
+ const { data: pointData, config: pointConfig } = await getRankingPoints();
pointList.value = pointData;
- const { data: friendData } = await getRecommendedFriend();
+ isPointFinished.value = pointConfig.isFinish;
+ const { data: friendData, config: friendConfig } =
+ await getRecommendedFriend();
friendList.value = friendData;
- const { data: themeData } = await getRecommendedTopic();
+ isFriendFinished.value = friendConfig.isFinish;
+ const { data: themeData, config: themeConfig } = await getRecommendedTopic();
themeList.value = themeData;
- const { data: allDiscussData } = await getAllDiscussList({
- Type: 0,
- skipCount: 1,
- maxResultCount: 5,
- });
+ isThemeFinished.value = themeConfig.isFinish;
+ const { data: allDiscussData, config: allDiscussConfig } =
+ await getAllDiscussList({
+ Type: 0,
+ skipCount: 1,
+ maxResultCount: 5,
+ });
+ isAllDiscussFinished.value = allDiscussConfig.isFinish;
allDiscussList.value = allDiscussData.items;
});