From fe2ea2fdb966b2b040cb1e9141615bf1f1a7ecc7 Mon Sep 17 00:00:00 2001 From: wyx Date: Mon, 16 Jan 2023 17:29:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E5=AD=A6=E4=B9=A0?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=9B=BEloading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request.js | 3 ++- src/views/roadmap/LearnPath.vue | 21 +++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/api/request.js b/src/api/request.js index 1d8d2a3..9192e02 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -4,7 +4,7 @@ import axios from 'axios'; import { getCookie } from "@/api/utils"; import JSONBigInt from 'json-bigint'; const JSONBigIntStr = JSONBigInt({ storeAsString: true }); -export function usePage(_url, param) { +export function usePage(_url, param, callback) { const state = reactive({ data: {}, @@ -28,6 +28,7 @@ export function usePage(_url, param) { state.total = r.data.total state.current = r.data.current state.loading = false + callback(r) }) } diff --git a/src/views/roadmap/LearnPath.vue b/src/views/roadmap/LearnPath.vue index ca9c46d..7b195a1 100644 --- a/src/views/roadmap/LearnPath.vue +++ b/src/views/roadmap/LearnPath.vue @@ -56,7 +56,11 @@ -
+
+ +
+
+ {{ loading.close() }}
@@ -107,17 +111,30 @@ import {ROUTER_LIST,} from "@/api/api"; import {useRouter} from "vue-router"; import store from "@/store"; import PathDetailImage from "@/components/PathDetailImage.vue"; +import { ElLoading } from 'element-plus'; const detail = ref(); const showmapdetail = ref(false); const currentStageId = ref(); const userInfo = computed(() => store.state.userInfo); -const {data} = usePage(ROUTER_LIST, {pageSize: 60}); +const loading = ref(false); +const isLoading = ref(true); +loading.value = ElLoading.service({ + lock: true, + text: 'Loading', + background: 'rgba(0, 0, 0, 0.7)' +}) + +const {data} = usePage(ROUTER_LIST, {pageSize: 60}, (e)=>{ + console.log('我请求成功了吗', e) + isLoading.value = false; +}); const router = useRouter(); const returnclick = () => { router.back(); }; + // const {unCompleteTaskList} = useRequest(ROUTER_UNCOMPLETE_LIST, {}); const returnfun = () => {