Merge branch 'master' of http://117.187.233.158:32779/hxhxhx/Onlife

pages/login/forget.vue

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