Skip to content

dev / pingan-life-index-pro

Go to a project
Toggle navigation
Toggle navigation pinning
5eb34117 by joe
Options

#5,#16

1 parent e40c995b
Inline Side-by-side
Showing 6 changed files with 63 additions and 38 deletions
......@@ -224,7 +224,7 @@ module.exports = {
verifyCodeGet: "Get verification codee",
SMSVerificationCode:"SMS verification code",
tips: {
e1: "Please enter account",
e1: "Please enter user name",
e2: "Please enter the password",
e3: "Please enter the picture verification code",
e4: "Agree with Ping An Hong Kong’s Online Account Service Agreement",
......@@ -233,7 +233,7 @@ module.exports = {
// e7: "Your password has been mistyped 5 times. You can't log in again in 24 hours!",
e6: "Your SMS verification code has been mistyped 4 times. Your account will be locked soon!",
e7: "Your SMS verification code has been mistyped 5 times. You can't log in again in 24 hours!",
e8: "The mobile no. has not been registered, please register before using!",
e8: "The user name was not registered, please register before using!",
oe0: "Invalidate mobile no. , please re-enter",
oe1: "Please get SMS verification code first",
oe2: "Please enter the picture verification code",
......@@ -284,7 +284,8 @@ module.exports = {
e11: "Registration failed, please contact the staff",
e12: "Success",
e13: "The name can't not contain numbers, special numbers",
e14: "Please enter your name"
e14: "Please setup user name",
e15: "The user name has been registered."
},
account:"Account",
accountPlaceholder:"Please setup user name",
......
......@@ -210,7 +210,7 @@ module.exports = {
loginType1: "動態密碼登錄",
loginType2: "動態密碼登入",
account: "賬號",
accountPlaceholder: "請輸入用戶名稱",
accountPlaceholder: "請輸入用戶名",
password: "密碼",
passwordPlaceholder: "輸入登入密碼",
verifyPlaceholder: "請輸入驗證碼",
......@@ -226,7 +226,7 @@ module.exports = {
verifyCodeGet: "獲取驗證碼",
SMSVerificationCode:"手機短信驗證碼",
tips: {
e1: "請輸入賬號信息",
e1: "請輸入用戶名",
e2: "請輸入密碼",
e3: "請輸入圖像驗證碼",
e4: "請同意《平安香港會員網上帳戶服務協定》",
......@@ -235,7 +235,7 @@ module.exports = {
// e7: "您的密碼已輸錯5次，24小時內無法再登入！",
e6: "您的验证码已輸錯4次，帳戶即將被鎖定！",
e7: "您的验证码已輸錯5次，24小時內無法再登入！",
e8: "您的手機號還未註冊，請註冊後再使用!",
e8: "您的用戶名還未註冊，請註冊後再使用!",
oe0: "請輸入正確的手機號",
oe1: "請先獲取短信驗證碼",
oe2: "請輸入圖片驗證碼",
......@@ -285,10 +285,11 @@ module.exports = {
e11: "註冊失敗，請聯繫工作人員",
e12: "註冊成功",
e13: "姓名不能包含數字、特殊號碼",
e14: "請輸入您的姓名"
e14: "請輸入您的用戶名",
e15: "用戶名已經被註冊，請使用其他用戶名註冊或直接登入",
},
account:"賬號",
accountPlaceholder:"請設置用戶名稱",
accountPlaceholder:"請設置用戶名",
},
session: {
sidExpire: "長時間未操作，為了您賬戶的安全，請登入後再操作"
......
......@@ -230,7 +230,7 @@ module.exports = {
verifyCodeGet: "获取验证码",
SMSVerificationCode:"手机短信验证码",
tips: {
e1: "请输入账号信息",
e1: "请输入用户名",
e2: "请输入密码",
e3: "请输入图像验证码",
e4: "请同意《平安香港会员网上账户服务协议》",
......@@ -239,7 +239,7 @@ module.exports = {
// e7: "您的密码已输错5次, 24小时内无法再登录!",
e6: "您的验证码已输错4次,账户即将被锁定!",
e7: "您的验证码已输错5次, 24小时内无法再登录!",
e8: "您的手机号还未注册，请注册后再使用!",
e8: "您的用户名还未注册，请注册后再使用!",
oe0: "请输入正确的手机号",
oe1: "请先获取短信验证码",
oe2: "请输入图片验证码",
......@@ -292,7 +292,8 @@ module.exports = {
e11: "注册失败，请联系工作人员",
e12: "注册成功",
e13: "姓名不能包含数字、特殊字符",
e14: "請輸入您的姓名"
e14: "請輸入您的用户名",
e15: "用户名已经被注册，请使用其他用户名注册或直接登入",
},
account:"账号",
accountPlaceholder:"请设置用户名",
......
......@@ -68,9 +68,10 @@ export default {
// res.push({ "recordId": "10", "bizNo": "P000000000000322", "letterType": "2", "printTime": "2020-05-07 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "Y" })
// res.push({ "recordId": "10", "bizNo": "P000000000000323", "letterType": "2", "printTime": "2020-05-08 16:02:21", "key": "c4ace2829737459cb6c95f523e0f5223", "isRead": "Y" })
// }
console.log(res);
for (let index = 0; index < res.length; index++) {
let letter = res[index];
if (letter.letterType == "2") {
if (letter.letterType == "5") {
this.originalList.push(letter);
this.contentList.push(letter);
}
......
......@@ -134,12 +134,12 @@ export default {
let b = b1 || b2 || b3 || b4;
if (!b) {
let mobile = this.loginForm.userId;
let m1 = contactMethodCheck('hkmobile', mobile);
let m2 = contactMethodCheck('mobile', mobile);
b = b || !(m1 || m2);
}
// if (!b) {
// let mobile = this.loginForm.userId;
// let m1 = contactMethodCheck('hkmobile', mobile);
// let m2 = contactMethodCheck('mobile', mobile);
// b = b || !(m1 || m2);
// }
return b;
},
......@@ -256,13 +256,17 @@ export default {
},
userIdLegalCheck() {
let mobile = this.loginForm.userId;
let m1 = contactMethodCheck('hkmobile', mobile);
let m2 = contactMethodCheck('mobile', mobile);
// console.log("userIdLegalCheck:", m1, m2)
if (!m1 && !m2) {
this._showMobileNoIllegalTip()
if (!mobile) {
this.errorTips.oe1 = this.i18n.login.tips.e1;
return false;
}
// let m1 = contactMethodCheck('hkmobile', mobile);
// let m2 = contactMethodCheck('mobile', mobile);
// console.log("userIdLegalCheck:", m1, m2)
// if (!m1 && !m2) {
// this._showMobileNoIllegalTip()
// return false;
// }
return true;
},
// 不接入一账通登陆
......@@ -309,25 +313,40 @@ export default {
sendOTPWhenOneAccountCenterOff() {
// 发送短信验证码
let m1 = contactMethodCheck('hkmobile', this.loginForm.userId);
let m2 = contactMethodCheck('mobile', this.loginForm.userId);
if (!m1 && !m2) {
this._showMobileNoIllegalTip();
if (!this.loginForm.userId) {
this.errorTips.e1 = this.i18n.login.tips.e1;
return;
}
// let m1 = contactMethodCheck('hkmobile', this.loginForm.userId);
// let m2 = contactMethodCheck('mobile', this.loginForm.userId);
// if (!m1 && !m2) {
// this._showMobileNoIllegalTip();
// return;
// }
if (this.times.remain > 0) {
return;
}
if (this.loading) {
return;
}
this.loading = true;
let data = {
mobile: this.loginForm.userId,
lan: this.locale
}
this._startTimeClick();
httpPost({
url: api.refreshSmgOtp,
data: data
}).then(res => {
this.loading = false;
this._startTimeClick();
}).catch(e => {
this.loading = false;
switch (e.code) {
case 1106:
this.errorTips.e1 = this.i18n.login.tips.e8;
break;
}
console.error(e);
})
},
......
......@@ -116,7 +116,7 @@ export default {
let b2 = false;
let b3 = !this.registerCheck.agreeProtocol;
let b4 = !this.registerForm.mobileNo ? true : false;
let b5 = !this.registerForm.userId ? true : false;
let b5 = !this.registerForm.userId || this.registerForm.userId < 5 ? true : false;
return b1 || b2 || b3 || b4 || b5;
},
submitDisabled() {
......@@ -310,10 +310,10 @@ export default {
this.errorTips.e1 = this.i18n.register.tips.e14;
return false;
}
if (!checkName(this.registerForm.userId)) {
this.errorTips.e1 = this.i18n.register.tips.e13;
return false;
}
// if (!checkName(this.registerForm.userId)) {
// this.errorTips.e1 = this.i18n.register.tips.e13;
// return false;
// }
return true;
},
registerV2Handler() {
......@@ -332,8 +332,8 @@ export default {
}
this._checkMobileLegal().then(() => {
let data = {
account: this.registerForm.mobileNo,
userName: this.registerForm.userId,
mobile: this.registerForm.mobileNo,
account: this.registerForm.userId,
otp: this.registerForm.otp
};
this.loading = true;
......@@ -350,12 +350,14 @@ export default {
this.loading = false;
switch (e.code) {
case 1103:
let message = this.i18n.register.tips.e5;
this.errorTips.p1 = message;
this.errorTips.e1 = this.i18n.register.tips.e15;
break;
case 1104:
this.errorTips.p2 = this.i18n.login.tips.oe4;
break;
case 1105:
this.errorTips.p1 = this.i18n.login.tips.e5;
break;
}
});
});
......@@ -659,10 +661,10 @@ export default {
}).catch(e => {
switch (e.code) {
case 1103:
case 1105:
this.errorTips.p1 = this.i18n.register.tips.e5
break;
}
console.error(e);
})
},
},
......