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

@@ -215,8 +215,10 @@ module.exports = {
             e3: "Please enter the picture verification code",
             e4: "Agree with Ping An Hong Kong’s Online Account Service Agreement",
             e5: "Invalidate account or password, please re-enter",
-            e6: "Your password has been mistyped 4 times. Your account will be locked soon. Please retrieve your password!",
-            e7: "Your password has been mistyped 5 times. You can't log in again in 24 hours!",
+            // e6: "Your password has been mistyped 4 times. Your account will be locked soon. Please retrieve your password!",
+            // 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!",
             oe0: "Invalidate mobile no. , please re-enter",
             oe1: "Please get SMS verification code first",

@@ -217,8 +217,10 @@ module.exports = {
             e3: "請輸入圖像驗證碼",
             e4: "請同意《平安香港會員網上帳戶服務協定》",
             e5: "賬號或密碼不正確",
-            e6: "您的密碼已輸錯4次，帳戶即將被鎖定，請找回密碼！",
-            e7: "您的密碼已輸錯5次，24小時內無法再登入！",
+            // e6: "您的密碼已輸錯4次，帳戶即將被鎖定，請找回密碼！",
+            // e7: "您的密碼已輸錯5次，24小時內無法再登入！",
+            e6: "您的验证码已輸錯4次，帳戶即將被鎖定！",
+            e7: "您的验证码已輸錯5次，24小時內無法再登入！",
             e8: "您的手機號還未註冊，請註冊後再使用!",
             oe0: "請輸入正確的手機號",
             oe1: "請先獲取短信驗證碼",

@@ -217,8 +217,10 @@ module.exports = {
             e3: "请输入图像验证码",
             e4: "请同意《平安香港会员网上账户服务协议》",
             e5: "账号或密码不正确",
-            e6: "您的密码已输错4次,账户即将被锁定,请找回密码!",
-            e7: "您的密码已输错5次, 24小时内无法再登录!",
+            // e6: "您的密码已输错4次,账户即将被锁定,请找回密码!",
+            // e7: "您的密码已输错5次, 24小时内无法再登录!",
+            e6: "您的验证码已输错4次,账户即将被锁定!",
+            e7: "您的验证码已输错5次, 24小时内无法再登录!",
             e8: "您的手机号还未注册，请注册后再使用!",
             oe0: "请输入正确的手机号",
             oe1: "请先获取短信验证码",

@@ -297,10 +297,10 @@ export default {
 						this.errorTips.oe2 = this.i18n.login.tips.oe4;
 						break;
 					case 1102:
-						this.errorTips.e2 = this.i18n.login.tips.e6;
+						this.errorTips.oe2 = this.i18n.login.tips.e6;
 						break;
 					case 1101:
-						this.errorTips.e2 = this.i18n.login.tips.e7;
+						this.errorTips.oe2 = this.i18n.login.tips.e7;
 						break;
 				}
 			})