Compare commits

..

No commits in common. "6cd813318dff93d4316fcd522a4aa854e201649f" and "94d9adfe643a79a285486237fa5188221053bc33" have entirely different histories.

View File

@ -123,7 +123,6 @@
export default { export default {
data() { data() {
return { return {
userIsRegister:false,
googleimg: "", googleimg: "",
googlesecret: "", googlesecret: "",
googleDialog: false, googleDialog: false,
@ -170,15 +169,6 @@
this.codeIsLen = true; this.codeIsLen = true;
} }
}, },
watch:{
memail:{
handler(val){
this.userIsRegister = false;
},
immediate:true,
deep:true
},
},
methods: { methods: {
copyadd() { copyadd() {
uni.setClipboardData({ uni.setClipboardData({
@ -216,20 +206,12 @@
title: res.msg, title: res.msg,
icon: 'none' icon: 'none'
}); });
this.userIsRegister = true;
} }
} else { } else {
return return
} }
}, },
async googleemail() { async googleemail() {
if(!this.code || this.emaiTip == "發送"){
uni.showToast({
title: '請先寄送並輸入郵箱驗證碼',
icon: 'none'
});
return
}
if (this.googleTip == "發送") { if (this.googleTip == "發送") {
let num = 60; let num = 60;
let googleTimer = setInterval(() => { let googleTimer = setInterval(() => {
@ -240,7 +222,6 @@
clearInterval(googleTimer) clearInterval(googleTimer)
} }
}, 1000) }, 1000)
if(this.userIsRegister) return
let res = await _getgoogleauthurl({ let res = await _getgoogleauthurl({
email: this.activeTab == "register" ? this.email : this.memail email: this.activeTab == "register" ? this.email : this.memail
}); });