Commit 3a73f07b authored by zhengke's avatar zhengke

修复bug

parent 3e253dcd
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<template v-if="!multipleUsers || multipleUsers.length==0"> <template v-if="!multipleUsers || multipleUsers.length==0">
<div class="q-mb-md" style="padding: 0 50px;"> <div class="q-mb-md" style="padding: 0 50px;">
<passwordLogin v-if="currentLogin==1" @submitForm="(multUser)=> {multipleUsers=multUser}"></passwordLogin> <passwordLogin v-if="currentLogin==1" @submitForm="(multUser)=> {multipleUsers=multUser}"></passwordLogin>
<wechatLogin :current="currentLogin" v-if="currentLogin==2"></wechatLogin> <wechatLogin :current="currentLogin" v-show="currentLogin==2"></wechatLogin>
<div class="q-pt-lg"> <div class="q-pt-lg">
<el-divider class="q-pb-md"> <span class="fz12 PingFangSC" style="color:#7f8792">其他方式登录</span></el-divider> <el-divider class="q-pb-md"> <span class="fz12 PingFangSC" style="color:#7f8792">其他方式登录</span></el-divider>
</div> </div>
...@@ -201,7 +201,7 @@ const currentLogin = ref(1) ...@@ -201,7 +201,7 @@ const currentLogin = ref(1)
if(parmas.value.Current) currentLogin.value = parmas.value.Current if(parmas.value.Current) currentLogin.value = parmas.value.Current
const loadingType = () =>{ const loadingType = () =>{
if(!parmas.value.Current) return ElMessage({message:'开发中...'}) // if(!parmas.value.Current) return ElMessage({message:'开发中...'})
if(currentLogin.value==1) currentLogin.value = 2 if(currentLogin.value==1) currentLogin.value = 2
else currentLogin.value = 1 else currentLogin.value = 1
} }
......
...@@ -42,9 +42,8 @@ const props = defineProps({ ...@@ -42,9 +42,8 @@ const props = defineProps({
required: 0, required: 0,
}, },
}) })
watch(()=>props.current,(n,o)=>{
if(n==1) stopTimerHandler()
})
const beginTimerHandler = ()=>{ const beginTimerHandler = ()=>{
queryTimer.value = setInterval(async ()=>{ queryTimer.value = setInterval(async ()=>{
await userLoginHandler() await userLoginHandler()
...@@ -85,7 +84,14 @@ const userLoginHandler = async ()=>{ ...@@ -85,7 +84,14 @@ const userLoginHandler = async ()=>{
location.href='/space'; location.href='/space';
} }
} }
getQrcode()
watch(()=>props.current,(n,o)=>{
if(n==1) stopTimerHandler()
if(n==2) getQrcode()
},{
immediate: true
})
</script> </script>
<style> <style>
.wechatLoginForm{ .wechatLoginForm{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment