diff --git a/src/i18n/de.json b/src/i18n/de.json index c6c3eaf..ebeb3e5 100644 --- a/src/i18n/de.json +++ b/src/i18n/de.json @@ -272,7 +272,8 @@ "sign-in":"Melden Sie sich", "find-password":"Finde das Passwort", "submit":"Senden", - "confirmpassword":"Die beiden Passwörter sind inkonsistent" + "confirmpassword":"Die beiden Passwörter sind inkonsistent", + "Remembered": "Haben Sie Ihr Passwort vergessen?" }, "application": { "form":"Antragsformular für die Projektwährung", diff --git a/src/i18n/en.json b/src/i18n/en.json index b449b18..37c6db1 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -364,7 +364,8 @@ "sign-in": "Account Login", "find-password": "Reset login password", "submit": "Submit", - "confirmpassword": "The two passwords are inconsistent" + "confirmpassword": "The two passwords are inconsistent", + "Remembered": "Remembered your password?" }, "application": { "form": "project’s application form of listing currency", diff --git a/src/i18n/fra.json b/src/i18n/fra.json index aa7087f..a7549bc 100644 --- a/src/i18n/fra.json +++ b/src/i18n/fra.json @@ -272,7 +272,8 @@ "sign-in":"Connexion", "find-password":"Récupérer le mot de passe", "submit":"Présentation", - "confirmpassword":"Les mots de passe sont incohérents deux fois" + "confirmpassword":"Les mots de passe sont incohérents deux fois", + "Remembered": "Vous vous souvenez de votre mot de passe ?" }, "application": { "form":"Formulaire de demande de monnaie pour le projet", diff --git a/src/i18n/it.json b/src/i18n/it.json index a38db7e..04fc2bc 100644 --- a/src/i18n/it.json +++ b/src/i18n/it.json @@ -272,7 +272,8 @@ "sign-in":"Firma in", "find-password":"Trova la password", "submit":"Invia", - "confirmpassword":"Le due password sono incoerenti" + "confirmpassword":"Le due password sono incoerenti", + "Remembered": "Hai ricordato la password?" }, "application": { "form":"Modulo di richiesta valuta del progetto", diff --git a/src/i18n/jp.json b/src/i18n/jp.json index 91fd39f..c978f11 100644 --- a/src/i18n/jp.json +++ b/src/i18n/jp.json @@ -272,7 +272,8 @@ "enter-account":"アカウントを入力してください", "sign-in":"ログイン", "find-password":"パスワードを取得", - "confirmpassword":"二回のパスワードが一致しません。" + "confirmpassword":"二回のパスワードが一致しません。", + "Remembered": "パスワードを覚えていますか?" }, "application": { "email":"メールボックス", diff --git a/src/i18n/kor.json b/src/i18n/kor.json index 4a2b48f..b97e181 100644 --- a/src/i18n/kor.json +++ b/src/i18n/kor.json @@ -272,7 +272,8 @@ "enter-account":"계 정 을 입력 하 세 요", "sign-in":"등록 하 다.", "find-password":"비밀번호 찾기", - "confirmpassword":"두 번 의 비밀번호 가 일치 하지 않 습 니 다." + "confirmpassword":"두 번 의 비밀번호 가 일치 하지 않 습 니 다.", + "Remembered": "비밀번호를 기억하시나요?" }, "application": { "email":"메 일주 소", diff --git a/src/i18n/pt.json b/src/i18n/pt.json index 9f9aa2b..82dbc6c 100644 --- a/src/i18n/pt.json +++ b/src/i18n/pt.json @@ -272,7 +272,8 @@ "sign-in":"autenticação", "find-password":"Recupera o código.", "submit":"apresentação", - "confirmpassword":"Duas vezes as senhas não coincidem" + "confirmpassword":"Duas vezes as senhas não coincidem", + "Remembered": "Lembrou-se da sua senha?" }, "application": { "form":"Formulário de candidatura ao financiamento do projecto", diff --git a/src/i18n/spa.json b/src/i18n/spa.json index 8c18517..f22339e 100644 --- a/src/i18n/spa.json +++ b/src/i18n/spa.json @@ -272,7 +272,8 @@ "sign-in":"Iniciar sesión", "find-password":"Recuperar contraseña", "submit":"Submission", - "confirmpassword":"Dos contraseñas inconsistentes" + "confirmpassword":"Dos contraseñas inconsistentes", + "Remembered": "¿Recordaste tu contraseña?" }, "application": { "form":"Formulario de solicitud de moneda del proyecto", diff --git a/src/i18n/tr.json b/src/i18n/tr.json index 1314ca2..99fb23b 100644 --- a/src/i18n/tr.json +++ b/src/i18n/tr.json @@ -272,7 +272,8 @@ "sign-in":"oturum aç", "find-password":"Parola Al", "submit":"Sunmak", - "confirmpassword":"İki şifre tutarsız" + "confirmpassword":"İki şifre tutarsız", + "Remembered": "Şifrenizi hatırladınız mı?" }, "application":{ "form":"Proje listeleme başvuru formu", diff --git a/src/i18n/tw.json b/src/i18n/tw.json index f6911dd..3a43dc7 100644 --- a/src/i18n/tw.json +++ b/src/i18n/tw.json @@ -302,8 +302,12 @@ "password": "密碼", "login": "登入", "country": "區號", + "enter-account": "請輸入賬號", "sign-in": "登錄", - "confirmpassword": "兩次密碼不一致" + "find-password": "找回密碼", + "submit": "提交", + "confirmpassword": "兩次密碼不一致", + "Remembered": "還記得你的密碼?" }, "application": { "form": "項目上幣申請表", diff --git a/src/views/forgotPwd/index.vue b/src/views/forgotPwd/index.vue index a69c586..e88c858 100644 --- a/src/views/forgotPwd/index.vue +++ b/src/views/forgotPwd/index.vue @@ -29,6 +29,11 @@ + +
+ + +
@@ -46,12 +51,13 @@ + -

Remembered your password? - Log In +

{{$t("login.Remembered")}} + {{$t("common.sign_in")}}

@@ -69,12 +75,15 @@ export default { account: "", password : "", password_confirmation : "", + gc_code: '', + gc_key: '' }, codes : { google_code : '', email_code : '', sms_code : '' - } + }, + Graph_che: '' } }, @@ -95,6 +104,7 @@ export default { step2() { if (utils.validate(".chk-body")) { Member.forgetPwdSumit(Object.assign(this.user, this.codes)).then(dta => { + console.log(dta, '121323') this.$message({ type : "success", message : "修改密码成功,正在跳转到登录页", @@ -104,9 +114,30 @@ export default { this.$router.push("/sign-in"); } }) - }).catch(err => {}) + }).catch(err => { + this.gett_gc_code(); + }) } - } + }, + // get gc code from api + gett_gc_code(){ + Member.sendGCode().then( (res) =>{ + this.gc_key = res.key + this.Graph_che = res.img + console.log("gc",res); + this.$message({ + message: `${type} ${this.$t("login.sendOK")}`, + type: "success", + duration : 2000, + }); + }).catch( err =>{ + console.log(err) + }); + }, + }, + mounted(){ + // bind get gc code + this.gett_gc_code(); } } diff --git a/src/views/signUp/index.vue b/src/views/signUp/index.vue index 4fb0d11..99f468a 100644 --- a/src/views/signUp/index.vue +++ b/src/views/signUp/index.vue @@ -336,7 +336,9 @@ export default { this.$refs.spaces[0].focus(); }); }) - .catch(err => { }); + .catch(err => { + this.gett_gc_code(); + }); break; case 2: // 发送手机验证码