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

simon
Showing 8 changed files with 29 additions and 19 deletions
src/common/lang/en.js
src/common/lang/tc.js
src/common/lang/zh.js
src/pages/login/login.js
src/pages/login/login.scss
src/pages/login/login.vue
src/pages/register/register.scss
src/pages/register/register.vue
--- a/src/common/lang/en.js
View file @fed2c00
+++ b/src/common/lang/en.js
View file @fed2c00
@@ -183,7 +183,7 @@ module.exports = {
 		passwordPlaceholder: "Please enter password",
 		verifyPlaceholder: "Please enter password",
 		agree: "Agree with ",
-		protocol: " PingAn Member Service Agreement",
+		protocol: "Ping An Hong Kong’s Online Account Service Agreement",
 		login: "Confirm",
 		register: "Register",
 		forget: "Forget password",
@@ -196,7 +196,7 @@ module.exports = {
 			e1: "Please enter account",
 			e2: "Please enter the password",
 			e3: "Please enter the picture verification code",
-			e4: "Agree with PingAn Member Service Agreement",
+			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!",
@@ -229,7 +229,7 @@ module.exports = {
 		verifyCodePlaceholder: "Please enter SMS verification code",
 		verifyCodeGet: "Get SMS verification code",
 		agree: "Agree with ",
-		protocol: " PingAn Member Service Agreement",
+		protocol: "Ping An Hong Kong’s Online Account Service Agreement",
 		register: "Click to reister",
 		newPassword: "Password",
 		newPasswordPlaceholder: "Please enter password",
@@ -238,7 +238,7 @@ module.exports = {
 		sure: "Confirm",
 		tips: {
 			e1: "Invalidate mobile no. , please re-enter",
-			e2: "Agree with PingAn Member Service Agreement",
+			e2: "Agree with Ping An Hong Kong’s Online Account Service Agreement",
 			e3: "Your verify code is not correct. Please try again.",
 			e4: "Please get SMS verification code first",
 			e5: "The mobile number has been registered.",
--- a/src/common/lang/tc.js
View file @fed2c00
+++ b/src/common/lang/tc.js
View file @fed2c00
@@ -183,7 +183,7 @@ module.exports = {
 		passwordPlaceholder: "輸入登入密碼",
 		verifyPlaceholder: "請輸入驗證碼",
 		agree: "同意",
-		protocol: "《平安賬戶會員服務協議》",
+		protocol: "《平安香港會員網上帳戶服務協定》",
 		login: "登入",
 		register: "註冊",
 		forget: "忘記密碼",
@@ -196,7 +196,7 @@ module.exports = {
 			e1: "請輸入賬號信息",
 			e2: "請輸入密碼",
 			e3: "請輸入圖像驗證碼",
-			e4: "請同意《平安賬戶會員服務協議》",
+			e4: "請同意《平安香港會員網上帳戶服務協定》",
 			e5: "賬號或密碼不正確",
 			e6: "您的密碼已輸錯4次，帳戶即將被鎖定，請找回密碼！",
 			e7: "您的密碼已輸錯5次，24小時內無法再登入！",
@@ -226,7 +226,7 @@ module.exports = {
 		verifyCodePlaceholder: "請輸入驗證碼",
 		verifyCodeGet: "獲取驗證碼",
 		agree: "同意",
-		protocol: "《平安賬戶會員服務協議》",
+		protocol: "《平安香港會員網上帳戶服務協定》",
 		register: "點擊註冊",
 		newPassword: "新密碼",
 		newPasswordPlaceholder: "請輸入新密碼",
@@ -235,7 +235,7 @@ module.exports = {
 		sure: "確認",
 		tips: {
 			e1: "手機號不正確，請輸入正確的手機號",
-			e2: "請同意《平安賬戶會員服務協議》",
+			e2: "請同意《平安香港會員網上帳戶服務協定》",
 			e3: "驗證碼錯誤，請重試。",
 			e4: "請先獲取短信驗證碼",
 			e5: "手機號已經被註冊，請使用其他手機號註冊或直接登入",
--- a/src/common/lang/zh.js
View file @fed2c00
+++ b/src/common/lang/zh.js
View file @fed2c00
@@ -183,7 +183,7 @@ module.exports = {
 		passwordPlaceholder: "输入登入密码",
 		verifyPlaceholder: "请输入验证码",
 		agree: "同意",
-		protocol: "《平安账户会员服务协议》",
+		protocol: "《平安香港会员网上账户服务协议》",
 		login: "登入",
 		register: "注册",
 		forget: "忘记密码",
@@ -196,7 +196,7 @@ module.exports = {
 			e1: "请输入账号信息",
 			e2: "请输入密码",
 			e3: "请输入图像验证码",
-			e4: "请同意《平安账户会员服务协议》",
+			e4: "请同意《平安香港会员网上账户服务协议》",
 			e5: "账号或密码不正确",
 			e6: "您的密码已输错4次,账户即将被锁定,请找回密码!",
 			e7: "您的密码已输错5次, 24小时内无法再登录!",
@@ -229,7 +229,7 @@ module.exports = {
 		verifyCodePlaceholder: "请输入验证码",
 		verifyCodeGet: "获取验证码",
 		agree: "同意",
-		protocol: "《平安账户会员服务协议》",
+		protocol: "《平安香港会员网上账户服务协议》",
 		register: "点击注册",
 		newPassword: "新密码",
 		newPasswordPlaceholder: "请输入新密码",
@@ -238,7 +238,7 @@ module.exports = {
 		sure: "确认",
 		tips: {
 			e1: "手机号不正确，请输入正确的手机号",
-			e2: "请同意《平安账户会员服务协议》",
+			e2: "请同意《平安香港会员网上账户服务协议》",
 			e3: "验证码错误，请重试。",
 			e4: "请先获取短信验证码",
 			e5: "手机号已经被注册，请使用其他手机号注册或直接登入",
--- a/src/pages/login/login.js
View file @fed2c00
+++ b/src/pages/login/login.js
View file @fed2c00
@@ -120,9 +120,10 @@ export default {
 			if (this.oneAccountCenterOff && !b) {
 				let mobile = this.loginForm.userId;
-				let m1 = !contactMethodCheck('hkmobile', mobile);
+				let m1 = contactMethodCheck('hkmobile', mobile);
-				let m2 = !contactMethodCheck('mobile', mobile);
+				let m2 = contactMethodCheck('mobile', mobile);
-				b = b || m1 || m2;
+				console.log(b, m1, m2)
+				b = b || !(m1 || m2);
 			}
 			return b;
--- a/src/pages/login/login.scss
View file @fed2c00
+++ b/src/pages/login/login.scss
View file @fed2c00
@@ -105,7 +105,7 @@
    margin: 3rem auto 0;
    display: flex;
    align-items: center;
-    padding-left: 1rem;
+    // padding-left: 1rem;
    .check {
      height: 1rem;
@@ -117,6 +117,10 @@
    }
  }
+  .loginLeft {
+    padding-left: 1rem;
+  }
  &-submit {
    @include btc2(17.25rem, 5.25rem, 16px);
    margin: 4rem auto 0;
--- a/src/pages/login/login.vue
View file @fed2c00
+++ b/src/pages/login/login.vue
View file @fed2c00
@@ -65,7 +65,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="login-protocol pointer" @click="loginCheck.agreeProtocol = !loginCheck.agreeProtocol">
+					<div class="login-protocol pointer" :class="{loginLeft:locale!='en'}" @click="loginCheck.agreeProtocol = !loginCheck.agreeProtocol">
 						<img v-if="!loginCheck.agreeProtocol" class="check" src="@/assets/images/login/uncheck.png">
 						<img v-if="loginCheck.agreeProtocol" class="check" src="@/assets/images/login/check.png">{{$t('login.agree')}} &nbsp;
 						<span @click="onProtocolHandler()" class="protocol pointer">{{$t('login.protocol')}}</span>
--- a/src/pages/register/register.scss
View file @fed2c00
+++ b/src/pages/register/register.scss
View file @fed2c00
@@ -110,7 +110,7 @@
    margin: 3rem auto 0;
    display: flex;
    align-items: center;
-    padding-left: 1rem;
+    // padding-left: 1rem;
    .check {
      height: 1rem;
@@ -122,6 +122,11 @@
    }
  }
+  .loginLeft {
+    padding-left: 1rem;
+  }
  &-submit {
    @include btc2(17.25rem, 5.25rem, 16px);
    margin: 4.166667rem auto 0;
--- a/src/pages/register/register.vue
View file @fed2c00
+++ b/src/pages/register/register.vue
View file @fed2c00
@@ -180,7 +180,7 @@
 					</div>
-					<div class="login-protocol pointer" @click="registerCheck.agreeProtocol = !registerCheck.agreeProtocol">
+					<div class="login-protocol pointer" :class="{loginLeft:locale!='en'}" @click="registerCheck.agreeProtocol = !registerCheck.agreeProtocol">
 						<img v-if="!registerCheck.agreeProtocol" class="check" src="@/assets/images/login/uncheck.png">
 						<img v-if="registerCheck.agreeProtocol" class="check" src="@/assets/images/login/check.png"> {{$t('login.agree')}} &nbsp;
 						<span @click="onProtocolHandler()" class="protocol pointer">{{$t('login.protocol')}}</span>