1648c940 by simon

Merge branch 'master' of 120.27.44.69:dev/pingan-life-index-pro

2 parents e5ad7063 40f58663
...@@ -215,8 +215,10 @@ module.exports = { ...@@ -215,8 +215,10 @@ module.exports = {
215 e3: "Please enter the picture verification code", 215 e3: "Please enter the picture verification code",
216 e4: "Agree with Ping An Hong Kong’s Online Account Service Agreement", 216 e4: "Agree with Ping An Hong Kong’s Online Account Service Agreement",
217 e5: "Invalidate account or password, please re-enter", 217 e5: "Invalidate account or password, please re-enter",
218 e6: "Your password has been mistyped 4 times. Your account will be locked soon. Please retrieve your password!", 218 // e6: "Your password has been mistyped 4 times. Your account will be locked soon. Please retrieve your password!",
219 e7: "Your password has been mistyped 5 times. You can't log in again in 24 hours!", 219 // e7: "Your password has been mistyped 5 times. You can't log in again in 24 hours!",
220 e6: "Your SMS verification code has been mistyped 4 times. Your account will be locked soon!",
221 e7: "Your SMS verification code has been mistyped 5 times. You can't log in again in 24 hours!",
220 e8: "The mobile no. has not been registered, please register before using!", 222 e8: "The mobile no. has not been registered, please register before using!",
221 oe0: "Invalidate mobile no. , please re-enter", 223 oe0: "Invalidate mobile no. , please re-enter",
222 oe1: "Please get SMS verification code first", 224 oe1: "Please get SMS verification code first",
......
...@@ -217,8 +217,10 @@ module.exports = { ...@@ -217,8 +217,10 @@ module.exports = {
217 e3: "請輸入圖像驗證碼", 217 e3: "請輸入圖像驗證碼",
218 e4: "請同意《平安香港會員網上帳戶服務協定》", 218 e4: "請同意《平安香港會員網上帳戶服務協定》",
219 e5: "賬號或密碼不正確", 219 e5: "賬號或密碼不正確",
220 e6: "您的密碼已輸錯4次,帳戶即將被鎖定,請找回密碼!", 220 // e6: "您的密碼已輸錯4次,帳戶即將被鎖定,請找回密碼!",
221 e7: "您的密碼已輸錯5次,24小時內無法再登入!", 221 // e7: "您的密碼已輸錯5次,24小時內無法再登入!",
222 e6: "您的验证码已輸錯4次,帳戶即將被鎖定!",
223 e7: "您的验证码已輸錯5次,24小時內無法再登入!",
222 e8: "您的手機號還未註冊,請註冊後再使用!", 224 e8: "您的手機號還未註冊,請註冊後再使用!",
223 oe0: "請輸入正確的手機號", 225 oe0: "請輸入正確的手機號",
224 oe1: "請先獲取短信驗證碼", 226 oe1: "請先獲取短信驗證碼",
......
...@@ -217,8 +217,10 @@ module.exports = { ...@@ -217,8 +217,10 @@ module.exports = {
217 e3: "请输入图像验证码", 217 e3: "请输入图像验证码",
218 e4: "请同意《平安香港会员网上账户服务协议》", 218 e4: "请同意《平安香港会员网上账户服务协议》",
219 e5: "账号或密码不正确", 219 e5: "账号或密码不正确",
220 e6: "您的密码已输错4次,账户即将被锁定,请找回密码!", 220 // e6: "您的密码已输错4次,账户即将被锁定,请找回密码!",
221 e7: "您的密码已输错5次, 24小时内无法再登录!", 221 // e7: "您的密码已输错5次, 24小时内无法再登录!",
222 e6: "您的验证码已输错4次,账户即将被锁定!",
223 e7: "您的验证码已输错5次, 24小时内无法再登录!",
222 e8: "您的手机号还未注册,请注册后再使用!", 224 e8: "您的手机号还未注册,请注册后再使用!",
223 oe0: "请输入正确的手机号", 225 oe0: "请输入正确的手机号",
224 oe1: "请先获取短信验证码", 226 oe1: "请先获取短信验证码",
......
...@@ -297,10 +297,10 @@ export default { ...@@ -297,10 +297,10 @@ export default {
297 this.errorTips.oe2 = this.i18n.login.tips.oe4; 297 this.errorTips.oe2 = this.i18n.login.tips.oe4;
298 break; 298 break;
299 case 1102: 299 case 1102:
300 this.errorTips.e2 = this.i18n.login.tips.e6; 300 this.errorTips.oe2 = this.i18n.login.tips.e6;
301 break; 301 break;
302 case 1101: 302 case 1101:
303 this.errorTips.e2 = this.i18n.login.tips.e7; 303 this.errorTips.oe2 = this.i18n.login.tips.e7;
304 break; 304 break;
305 } 305 }
306 }) 306 })
......