内容修

joe
Showing 10 changed files with 36 additions and 23 deletions
src/common/lang/en.js
src/common/lang/tc.js
src/common/lang/zh.js
src/components/vhis-modal/vhis-modal.js
src/pages/login/login.js
src/pages/login/login.vue
src/pages/password-reset/password-reset.js
src/pages/register/register.vue
src/pages/vhis-detail/vhis-detail.scss
src/pages/vhis-detail/vhis-detail.vue
--- a/src/common/lang/en.js
View file @f6af636
+++ b/src/common/lang/en.js
View file @f6af636
@@ -942,10 +942,10 @@ module.exports = {
 			t3: "優惠碼：CISAVE20"
 		},
 		title: {
-			t1: "自願醫保計畫",
+			t1: "自願醫保計劃",
 			t2: "平安人壽（香港）",
-			t3: "自願醫保標準計畫",
+			t3: "自願醫保標準計劃",
-			t4: "為政府自願醫保認可的標準計畫，可同時申請享有稅務扣减優惠。",
+			t4: "為政府自願醫保認可的標準計劃，可同時申請享有稅務扣减優惠。",
 		},
 		main: {
 			t1: "產品特點",
@@ -953,7 +953,7 @@ module.exports = {
 		guarantee1: {
 			t1: "保障一覽",
 			t2: "產品性質",
-			t3: "醫療保障保險計畫",
+			t3: "醫療保障保險計劃",
 			t4: "投保人投保時的年齡",
 			t5: "15日至80歲",
 			t6: "保證續保",
@@ -967,22 +967,22 @@ module.exports = {
 		},
 		guarantee2: {
 			t1: "更多特點：",
-			t2: "若您更改計畫、終止保單或您未能支付保費導致保單被終止，便有機會獲退還部分款項",
+			t2: "若您更改計劃、終止保單或您未能支付保費導致保單被終止，便有機會獲退還部分款項",
 			t3: "（如適用）。",
 			t4: "保證自動續保，無需進一步提供健康證明。",
 			t5: "保證於保費繳付期內保費不變。",
-			t6: "計畫不包括",
+			t6: "計劃不包括",
 			t7: "若受保人於保單簽發日後一年內自殺，將不能獲發身故賠償，但將獲退還於現行保單保障期內所繳的總保費。",
 		},
 		download: {
 			t1: "下載產品簡介",
-			t2: "下載標準保費錶",
+			t2: "下載標準保費表",
 			t3: "下載保單契約",
 		},
 		submitBtn: "立即投保",
 		productList: [{
 			title: "保證續保至100歲",
-			desc: "平安人壽（香港）「好e時」自願醫保標準計劃 接受任何介乎14天至80歲人士投保，您可以一直續保至100歲。計劃保證不會因您的索償記錄或身體狀況變而調高續保保費，而您的續保保費將根據當時保單週年日之保費表釐定。",
+			desc: "平安人壽（香港）「好e時」自願醫保標準計劃 接受任何介乎15天至80歲人士投保，您可以一直續保至100歲。計劃保證不會因您的索償記錄或身體狀況變而調高續保保費，而您的續保保費將根據當時保單周年日之保費表厘定。",
 			tips: ""
 		}, {
 			title: "不設終身保障限額",
--- a/src/common/lang/tc.js
View file @f6af636
+++ b/src/common/lang/tc.js
View file @f6af636
@@ -934,10 +934,10 @@ module.exports = {
 			t3: "優惠碼：CISAVE20"
 		},
 		title: {
-			t1: "自願醫保計畫",
+			t1: "自願醫保計劃",
 			t2: "平安人壽（香港）",
-			t3: "自願醫保標準計畫",
+			t3: "自願醫保標準計劃",
-			t4: "為政府自願醫保認可的標準計畫，可同時申請享有稅務扣减優惠。",
+			t4: "為政府自願醫保認可的標準計劃，可同時申請享有稅務扣减優惠。",
 		},
 		main: {
 			t1: "產品特點",
@@ -945,7 +945,7 @@ module.exports = {
 		guarantee1: {
 			t1: "保障一覽",
 			t2: "產品性質",
-			t3: "醫療保障保險計畫",
+			t3: "醫療保障保險計劃",
 			t4: "投保人投保時的年齡",
 			t5: "15日至80歲",
 			t6: "保證續保",
@@ -959,22 +959,22 @@ module.exports = {
 		},
 		guarantee2: {
 			t1: "更多特點：",
-			t2: "若您更改計畫、終止保單或您未能支付保費導致保單被終止，便有機會獲退還部分款項",
+			t2: "若您更改計劃、終止保單或您未能支付保費導致保單被終止，便有機會獲退還部分款項",
 			t3: "（如適用）。",
 			t4: "保證自動續保，無需進一步提供健康證明。",
 			t5: "保證於保費繳付期內保費不變。",
-			t6: "計畫不包括",
+			t6: "計劃不包括",
 			t7: "若受保人於保單簽發日後一年內自殺，將不能獲發身故賠償，但將獲退還於現行保單保障期內所繳的總保費。",
 		},
 		download: {
 			t1: "下載產品簡介",
-			t2: "下載標準保費錶",
+			t2: "下載標準保費表",
 			t3: "下載保單契約",
 		},
 		submitBtn: "立即投保",
 		productList: [{
 			title: "保證續保至100歲",
-			desc: "平安人壽（香港）「好e時」自願醫保標準計劃 接受任何介乎14天至80歲人士投保，您可以一直續保至100歲。計劃保證不會因您的索償記錄或身體狀況變而調高續保保費，而您的續保保費將根據當時保單週年日之保費表釐定。",
+			desc: "平安人壽（香港）「好e時」自願醫保標準計劃 接受任何介乎15天至80歲人士投保，您可以一直續保至100歲。計劃保證不會因您的索償記錄或身體狀況變而調高續保保費，而您的續保保費將根據當時保單週年日之保費表厘定。",
 			tips: ""
 		}, {
 			title: "不設終身保障限額",
--- a/src/common/lang/zh.js
View file @f6af636
+++ b/src/common/lang/zh.js
View file @f6af636
@@ -976,7 +976,7 @@ module.exports = {
 		submitBtn: "立即投保",
 		productList: [{
 			title: "保证续保至100岁",
-			desc: "平安人寿（香港）「好e时」自愿医保标准计划 接受任何介乎14天至80岁人士投保，您可以一直续保至100岁。计划保证不会因您的索偿记录或身体状况变而调高续保保费，而您的续保保费将根据当时保单週年日之保费表釐定。",
+			desc: "平安人寿（香港）「好e时」自愿医保标准计划 接受任何介乎15天至80岁人士投保，您可以一直续保至100岁。计划保证不会因您的索偿记录或身体状况变而调高续保保费，而您的续保保费将根据当时保单周年日之保费表厘定。",
 			tips: ""
 		}, {
 			title: "不设终身保障限额",
--- a/src/components/vhis-modal/vhis-modal.js
View file @f6af636
+++ b/src/components/vhis-modal/vhis-modal.js
View file @f6af636
@@ -217,6 +217,7 @@ export default {
 		},
 		toTarget() {
 			this.showPolicy = false;
+			this.showSuccessTip = false;
 			sessionStorage.setItem("hidePolicy", "true");
 			this.$router.push({
 				path: "/custom/service?q=m3"
--- a/src/pages/login/login.js
View file @f6af636
+++ b/src/pages/login/login.js
View file @f6af636
@@ -238,6 +238,9 @@ export default {
 			}
 		},
 		selfLogin() {
+			if (this.pwdLoginDisabled) {
+				return;
+			}
 			if (this.loading) {
 				return;
 			}
--- a/src/pages/login/login.vue
View file @f6af636
+++ b/src/pages/login/login.vue
View file @f6af636
@@ -25,6 +25,11 @@
 							<div @click="onLoginTypeHandler(2)" class="login-nav-tit pointer">{{$t('login.loginType2')}}</div>
 						</div>
 					</template>
+					<template v-else>
+						<div class="login-nav">
+							<div class="login-nav-tit text-c pointer active">{{$t('login.loginType1')}}</div>
+						</div>
+					</template>
 					<div class="gird-g form">
 						<div class="pure-u-1 form-item">
 							<div class="label">
--- a/src/pages/password-reset/password-reset.js
View file @f6af636
+++ b/src/pages/password-reset/password-reset.js
View file @f6af636
@@ -119,7 +119,7 @@ export default {
 				let message = this.i18n().passwordCheck.success;
 				switch (response.returnCode) {
 					case "0":
-						this.targetPath = "";
+						this.targetPath = "/";
 						this.showModal(message, "succ");
 						break
 					case "COMMON_ERROR_E0":
--- a/src/pages/register/register.vue
View file @f6af636
+++ b/src/pages/register/register.vue
View file @f6af636
@@ -2,7 +2,7 @@
 <template>
 	<div>
 		<modal-simple-comp :visible="modalSimpleVisiable" :show-confirm="false" :icon="modalIcon" :content="modalContent" :confirm="modalCallback" :overlay="closeModal" :close="closeModal"></modal-simple-comp>
-		<modal-comp :visible="modalVisiable" :show-confirm="false" :icon="modalIcon" :content="modalContent" :confirm="modalCallback" :overlay="modalCallback"></modal-comp>
+		<modal-comp :visible="modalVisiable" :show-confirm="true" :icon="modalIcon" :content="modalContent" :confirm="modalCallback" :overlay="modalCallback" :confirmText="$t('register.sure')"></modal-comp>
 		<!-- 会员协议 -->
 		<modal-protocol-comp :visible="modalProtocolVisiable" :overlay="closeModal" :close="closeModal"></modal-protocol-comp>
 		<div class="ebg"></div>
@@ -131,6 +131,7 @@
 				<!-- 手机验证 -->
 				<div class="login">
+					<div class="login-tit2">{{$t('register.title')}}</div>
 					<div class="gird-g form">
 						<div class="pure-u-1 form-item">
--- a/src/pages/vhis-detail/vhis-detail.scss
View file @f6af636
+++ b/src/pages/vhis-detail/vhis-detail.scss
View file @f6af636
@@ -274,11 +274,14 @@ $borderSize: 6px;
          .more {
            display: flex;
+            margin-top: 6px;
            // margin: 12px auto 0;
            &-icon-wrap {
+              @extend .fcc;
              cursor: pointer;
-              margin: 6px 6px 0 0;
+              // margin: 6px 6px 0 0;
+              margin-right: 6px;
            }
            .c1 {
@@ -299,7 +302,7 @@ $borderSize: 6px;
          .tips {
            font-style: italic;
-            margin-top: 10px;
+            margin-top: 6px;
          }
        }
      }
--- a/src/pages/vhis-detail/vhis-detail.vue
View file @f6af636
+++ b/src/pages/vhis-detail/vhis-detail.vue
View file @f6af636
@@ -128,7 +128,7 @@
 							<ul>
 								<li>
 									<span>{{$t('vhisDetail.guarantee2.t2')}}</span>
-									<span class="small">1</span>
+									<!-- <span class="small">1</span> -->
 									<span>{{$t('vhisDetail.guarantee2.t3')}}</span>
 								</li>
 								<li>{{$t('vhisDetail.guarantee2.t4')}}
@@ -139,7 +139,7 @@
 						<div class="tt tt2 label label2">
 							<div class="t1">
 								<span>{{$t('vhisDetail.guarantee2.t6')}}</span>
-								<span class="small">2</span>
+								<!-- <span class="small">2</span> -->
 							</div>
 							<ul>
 								<li>{{$t('vhisDetail.guarantee2.t7')}}