From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 16 十月 2023 09:03:47 +0800 Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3 --- h5_standard/src/views/tabPage/toBeHandled.vue | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/h5_standard/src/views/tabPage/toBeHandled.vue b/h5_standard/src/views/tabPage/toBeHandled.vue index 0fc2b4b..4da7c81 100644 --- a/h5_standard/src/views/tabPage/toBeHandled.vue +++ b/h5_standard/src/views/tabPage/toBeHandled.vue @@ -58,7 +58,7 @@ </template> <script setup lang="ts"> - import { reactive, ref, onMounted, getCurrentInstance } from 'vue' + import { reactive, ref, onMounted, onActivated, getCurrentInstance } from 'vue' import { useRouter } from 'vue-router' import { useStore } from 'vuex' import { judgmentPlatform } from "@/utils/utils" @@ -275,6 +275,8 @@ refreshing.value = false loading.value = false finished.value = true + }).finally(() => { + loading.value = false }) } one.value = true @@ -305,10 +307,17 @@ await proxy.$onWait; onLoad() // pageCounts() + // await store.dispatch('getUpcomingNum') + // tagList[0].num = store.state.upcomingNum.d + // tagList[1].num = store.state.upcomingNum.y + status.value = judgmentPlatform() + }) + + onActivated(async() => { + await proxy.$onWait; await store.dispatch('getUpcomingNum') tagList[0].num = store.state.upcomingNum.d tagList[1].num = store.state.upcomingNum.y - status.value = judgmentPlatform() }) // const info = reactive({ -- Gitblit v1.9.3