Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/layout/components/Message/src/Message.vue

@@ -8,7 +8,7 @@ const { push } = useRouter()
 const activeName = ref('notice')
 const unreadCount = ref(0) // 未读消息数量
 const list = ref<any[]>([]) // 消息列表
-
+const  interval = ref<NodeJS.Timeout | number>()
 // 获得消息列表
 const getList = async () => {
   list.value = await NotifyMessageApi.getUnreadNotifyMessageList()
@@ -35,13 +35,18 @@ onMounted(() => {
   // 首次加载小红点
   getUnreadCount()
   // 轮询刷新小红点
-  setInterval(
+  interval.value  = setInterval(
     () => {
       getUnreadCount()
     },
     1000 * 60 * 2
   )
 })
+onBeforeUnmount(() => {
+  if(interval.value){
+    clearInterval(interval.value)
+  }
+})
 </script>
 <template>
   <div class="message">

src/views/login/components/LoginForm.vue

@@ -224,7 +224,7 @@ const handleLogin = async (params) => {
     console.log('登录-224')
     getCode()
     loginLoading.value = false
-    loading.value.close()
+    loading?.value?.close()
   }
 }
 

src/views/login/components/MobileForm.vue

@@ -148,6 +148,7 @@ const smsVO = reactive({
   }
 })
 const mobileCodeTimer = ref(0)
+const msgTimer = ref<NodeJS.Timeout | number>()
 const redirect = ref<string>('')
 const getSmsCode = async () => {
   await getTenantId()
@@ -156,14 +157,19 @@ const getSmsCode = async () => {
     message.success(t('login.SmsSendMsg'))
     // 设置倒计时
     mobileCodeTimer.value = 60
-    let msgTimer = setInterval(() => {
+    msgTimer.value = setInterval(() => {
       mobileCodeTimer.value = mobileCodeTimer.value - 1
       if (mobileCodeTimer.value <= 0) {
-        clearInterval(msgTimer)
+        clearInterval(msgTimer.value)
       }
     }, 1000)
   })
 }
+onBeforeUnmount(() => {
+  if(msgTimer.value){
+    clearInterval(msgTimer.value)
+  }
+})
 watch(
   () => currentRoute.value,
   (route: RouteLocationNormalizedLoaded) => {