默认提交

simon
Showing 6 changed files with 208 additions and 96 deletions
src/common/lang/en.js
src/common/lang/tc.js
src/common/lang/zh.js
src/components/vhis-modal/vhis-modal.js
src/components/vhis-modal/vhis-modal.scss
src/components/vhis-modal/vhis-modal.vue
--- a/src/common/lang/en.js
View file @81f4f81
+++ b/src/common/lang/en.js
View file @81f4f81
@@ -21,8 +21,8 @@ module.exports = {
 			back: "證件反面",
 		}
 	},
-	error : {
+	error: {
-		nameTip : "name illegal"
+		nameTip: "name illegal"
 	},
 	nav: {
 		loginData: {
@@ -69,7 +69,8 @@ module.exports = {
 					{
 						name: "Insurance with Investment Focus",
 						path: "/vhis?p=endowment"
-			}]
+					}
+				]
 			},
 			{
 				name: "Customer Service",
@@ -134,7 +135,8 @@ module.exports = {
 					{
 						name: "Awards",
 						path: "/awards"
-			}]
+					}
+				]
 			},
 			{
 				name: "Join Us",
@@ -148,7 +150,8 @@ module.exports = {
 						path: "/career/opportunities"
 					},
 				]
-		}]
+			}
+		]
 	},
 	footer: {
 		hkPhone: "Hong Kong Phone No.",
@@ -391,7 +394,19 @@ module.exports = {
 		contactTime: "Preferred Contact Date",
 		notice1: "The personal data collected in this form is processed in accordance with Ping An Life Insurance Company of China (HK), Ltd Personal Information Collection Statement and will only be used to contact you. However, the personal data collected will not be transferred to third-party organizations other than those specified in the \"Ping An Life Insurance Company of China (HK), Ltd Personal Data Collection Statement\" without your explicit authorization. You can choose not to provide us with the required personal information, but this may prevent us from contacting you. You can also access and correct your personal data in accordance with Ping An Life Insurance Company of China (HK), Ltd Personal Data Collection Statement。",
 		notice2: "I hereby confirm that I understand and agree that my personal data will be used for the above purposes in accordance with the Ping An Life Insurance Company of China (HK) Personal Data Collection Statement.",
-		contactTypes: [{ name: 'Mobile', value: 1, show: "Mobile", icon: "mobile", placeholder: "HK No./ Mainland No." }, { name: 'Email', value: 2, show: "Email", icon: "email", placeholder: "email" }],
+		contactTypes: [{
+			name: 'Mobile',
+			value: 1,
+			show: "Mobile",
+			icon: "mobile",
+			placeholder: "HK No./ Mainland No."
+		}, {
+			name: 'Email',
+			value: 2,
+			show: "Email",
+			icon: "email",
+			placeholder: "email"
+		}],
 		errorTips: {
 			e1: "Please fill in this item",
 			e2: "Please fill in the correct contact information",
@@ -405,13 +420,21 @@ module.exports = {
 		name: "Name",
 		namePlaceholder: "Name",
 		contactType: "Preferred way of contact",
-		contactTypeCadidates: [{ name: "phone no", value: 1 }],
+		contactTypeCadidates: [{
+			name: "phone no",
+			value: 1
+		}],
 		contact: "Contact Number",
 		contactPlaceholder: "（HK No./ Mainland No.）",
 		reservationType: "Type of Reservation",
-		reservationCandidates: [
+		reservationCandidates: [{
-			{ name: "Insurance consultation", value: "投保諮詢" },
+				name: "Insurance consultation",
-			{ name: "Agent change", value: "代办保单变更" }
+				value: "投保諮詢"
+			},
+			{
+				name: "Agent change",
+				value: "代办保单变更"
+			}
 		],
 		reservationRemark: "Reservation Description",
 		reservationRemarkPlaceholder: "Optional, no more than 500 words, prompt text \"Please briefly explain the insurance type or business you want to consult",
@@ -558,7 +581,8 @@ module.exports = {
 					},
 					{
 						name: "Bank information",
-			}],
+					}
+				],
 			},
 			{
 				project: "Policy Surrender within cool off period",
@@ -691,8 +715,8 @@ module.exports = {
 		},
 		pulbic: {
 			title: "Official WeChat Account",
-			m1: "(1)：Login to the \"WeChat\" APP, press the "+" button in the upper right corner and select \"Add Friend\", select \"Public Account\" Enter and search \"Ping An Life Hong Kong\"",
+			m1: "(1)：Login to the \"WeChat\" APP, press the " + " button in the upper right corner and select \"Add Friend\", select \"Public Account\" Enter and search \"Ping An Life Hong Kong\"",
-			m2: "(2)：Log in to the WeChat APP, press the "+" button in the upper right corner and select \"Scan\" to scan the QR code below（QR Code here）"
+			m2: "(2)：Log in to the WeChat APP, press the " + " button in the upper right corner and select \"Scan\" to scan the QR code below（QR Code here）"
 		},
 		qrcode: {
 			title: "Official WeChat Account"
@@ -814,9 +838,10 @@ module.exports = {
 	},
 	vhis: {
-		title: "Confirmation of policy receipt（to be confirmed by Policy Owner）",
+		title: "Confirmation of policy receipt",
-		desc1: "Thank you for choosing Ping An Life (HK). ",
+		titleAft: "（to be confirmed by Policy Owner）",
-		desc2: "The policy is underwritten and enclosed here for your reference and record. ",
+		desc1: "Thank you for choosing Ping An Life (HK).",
+		desc2: "The policy is underwritten and enclosed here for your reference and record.",
 		desc3: "This is an important document, we recommend you to check the accuracy immediately.",
 		desc4: "Should there be any missing documents or incorrect information, please contact our customer hotline.",
 		desc5: "Please confirm your receipt of the policy by clicking the confirm button below.",
@@ -831,13 +856,13 @@ module.exports = {
 		ymd1: "/",
 		ymd2: "/",
 		ymd3: "",
-		tip1: "I",
+		tip1: "I ",
-		tip2: "confirm the receipt of the above policy on",
+		tip2: " confirm the receipt of the above policy on ",
 		tip3: "",
 		tip4: "contact customer service hotline"
 	},
 	clarms: {
-		title:"File a claim",
+		title: "File a claim",
 		step1: {
 			register: "Register",
 			login: "Login",
--- a/src/common/lang/tc.js
View file @81f4f81
+++ b/src/common/lang/tc.js
View file @81f4f81
@@ -810,6 +810,7 @@ module.exports = {
 	},
 	vhis: {
 		title: "保單確認書",
+		titleAft:"（由保單持有人確認）",
 		desc1: "多謝閣下投保平安人壽保險產品。",
 		desc2: "保單已經承保，內附于此供閣下參考及保存。",
 		desc3: "保單是重要檔，請即查閱其內容準確性，",
--- a/src/common/lang/zh.js
View file @81f4f81
+++ b/src/common/lang/zh.js
View file @81f4f81
@@ -21,8 +21,8 @@ module.exports = {
 			back: "证件反面",
 		}
 	},
-	error : {
+	error: {
-		nameTip : "请输入合法的名字"
+		nameTip: "请输入合法的名字"
 	},
 	nav: {
 		loginData: {
@@ -69,7 +69,8 @@ module.exports = {
 					{
 						name: "投资成份保险",
 						path: "/vhis?p=endowment"
-			}]
+					}
+				]
 			},
 			{
 				name: "客户服务",
@@ -391,7 +392,19 @@ module.exports = {
 		contactTime: "期望联络时间",
 		notice1: "本表格所收集的个人资料根据「平安人寿香港个人资料收集声明」处理及只会被用作于联络 阁下之用。然而所收集的个人资料未经您明确授权将不会转移至「平安人寿香港个人资料收集声明」列明以外之第三者机构。您可选择不向我们提供所需的个人资料，惟这样可能导致我们不能联络您。您亦可根据「平安人寿香港个人资料收集声明」之权利查阅及更正个人资料。",
 		notice2: "本人现确认明白并同意本人的个人资料根据中银人寿个人资料收集声明作以上述用途。",
-		contactTypes: [{ name: '电话', value: 1, show: "联络电话", icon: "mobile", placeholder: "香港号码/内地号码" }, { name: '电邮', value: 2, show: "电邮地址", icon: "email", placeholder: "电邮地址" }],
+		contactTypes: [{
+			name: '电话',
+			value: 1,
+			show: "联络电话",
+			icon: "mobile",
+			placeholder: "香港号码/内地号码"
+		}, {
+			name: '电邮',
+			value: 2,
+			show: "电邮地址",
+			icon: "email",
+			placeholder: "电邮地址"
+		}],
 		errorTips: {
 			e1: "请填写该项内容",
 			e2: "请填写正确的联系方式",
@@ -405,13 +418,21 @@ module.exports = {
 		name: "姓名",
 		namePlaceholder: "姓名",
 		contactType: "联络方式",
-		contactTypeCadidates: [{ name: "电话", value: 1 }],
+		contactTypeCadidates: [{
+			name: "电话",
+			value: 1
+		}],
 		contact: "联络电话",
 		contactPlaceholder: "香港号码/内地号码",
 		reservationType: "预约类型",
-		reservationCandidates: [
+		reservationCandidates: [{
-			{ name: "投保咨询", value: "投保咨询" },
+				name: "投保咨询",
-			{ name: "代办保单变更", value: "代办保单变更" }
+				value: "投保咨询"
+			},
+			{
+				name: "代办保单变更",
+				value: "代办保单变更"
+			}
 		],
 		reservationRemark: "预约说明",
 		reservationRemarkPlaceholder: "请简单说明您想要咨询的产品或业务",
@@ -812,6 +833,7 @@ module.exports = {
 	},
 	vhis: {
 		title: "保单确认书",
+		titleAft: "（由保单持有人确认）",
 		desc1: "多谢阁下投保平安人寿保险产品。",
 		desc2: "保单已经承保，内附于此供阁下参考及保存。",
 		desc3: "保单是重要档，请即查阅其内容准确性，",
@@ -834,7 +856,7 @@ module.exports = {
 		tip4: "我想联络客服"
 	},
 	clarms: {
-		title:"索偿申请",
+		title: "索偿申请",
 		step1: {
 			register: "注册",
 			login: "登入",
@@ -874,8 +896,8 @@ module.exports = {
 			label17: "授权声明：",
 			label18: "收集个人资料声明：",
 			btn: "提交",
-			btnUpload : "上传",
+			btnUpload: "上传",
-			uploadFile : "已上传文件：",
+			uploadFile: "已上传文件：",
 			contact: "我想联络客服",
 			tip1: "本人/我们谨此授权（1）任何雇主、注册西医、医院、诊所、保险公司、银行、政府机构、或其他机构、组织或人士、凡知道或持有任何有关保单持有人/受保人之纪录者，均可将该等数据提供、发放及转交给中国平安人寿保险（香港）有限公司；（2）贵公司或任何其指定之医生或化验所，可就此赔偿申请替保单持有人/受保人进行所需之医疗评价及测试，作为审核保单持有人/受保人之健康状况。此授权对保单持有人/受保人之继承人及授让人具有约束力；即使保单持有人/受保人死亡或无行为能力时，此授权书仍具效力。",
 			tip2: "本人/我们确认已阅读及明白「中国平安人寿保险（香港）有限公司」的收集个人资料声明（本声明）。",
@@ -886,14 +908,14 @@ module.exports = {
 			tip7: "您的理赔申请已经受理，我们会尽快处理本次申请。我们会短信通知理赔进度，因审核需要，可能会通知您补充相关资料或者邮寄实物。如审批通过，理赔款将默认转入投保缴费账户，如需变更，请上传",
 			tip8: "索偿人账户资料。",
 			tip9: "您选择的事故时间不在保单有效期范围内，请核实确认，如有疑问可",
-			toast1 : "医疗收据正本及账单明细表",
+			toast1: "医疗收据正本及账单明细表",
-			toast2 : "载有明确诊断之出院纸/医生证明书等文件",
+			toast2: "载有明确诊断之出院纸/医生证明书等文件",
-			toast3 : "如验血报告、计算机扫描报告、超声波报告等",
+			toast3: "如验血报告、计算机扫描报告、超声波报告等",
-			toast4 : "本次理赔款默认转入投保账户，如需变更，请上传账户资料",
+			toast4: "本次理赔款默认转入投保账户，如需变更，请上传账户资料",
-			toast5 : "如警察报告、交通意外报告等意外事故证明材料",
+			toast5: "如警察报告、交通意外报告等意外事故证明材料",
-			failure : "理赔报案失败，",
+			failure: "理赔报案失败，",
-			failureContact : "请联系客服解决",
+			failureContact: "请联系客服解决",
-			placeHolder1 : "请选择",
+			placeHolder1: "请选择",
 		}
 	}
 }
--- a/src/components/vhis-modal/vhis-modal.js
View file @81f4f81
+++ b/src/components/vhis-modal/vhis-modal.js
View file @81f4f81
@@ -24,7 +24,10 @@ export default {
 		...mapState({
 			userInfo: state => state.userInfo,
 			policyList: state => state.policyList
-		})
+		}),
+		locale() {
+			return this.$i18n.locale || 'tc';
+		},
 	},
 	methods: {
 		initData() {
@@ -101,8 +104,11 @@ export default {
 				let d = now.getDate();
 				if (this.$i18n.locale == 'en') {
-					this.policyDetail.nowYmd1 = m > 10 ? m : "0" + m;
+					// this.policyDetail.nowYmd1 = m > 10 ? m : "0" + m;
-					this.policyDetail.nowYmd2 = d > 10 ? d : "0" + d;
+					// this.policyDetail.nowYmd2 = d > 10 ? d : "0" + d;
+					// this.policyDetail.nowYmd3 = y;
+					this.policyDetail.nowYmd2 = m > 10 ? m : "0" + m;
+					this.policyDetail.nowYmd1 = d > 10 ? d : "0" + d;
 					this.policyDetail.nowYmd3 = y;
 				} else {
 					this.policyDetail.nowYmd1 = y;
--- a/src/components/vhis-modal/vhis-modal.scss
View file @81f4f81
+++ b/src/components/vhis-modal/vhis-modal.scss
View file @81f4f81
@@ -22,7 +22,6 @@
 .bold {
  font-weight: 600;
-  letter-spacing: .083333rem;
 }
 .orange {
@@ -42,30 +41,30 @@
  position: relative;
  @extend .bb;
  width: 1200px;
-  max-height: 80vh;
+  max-height: 84vh;
  border-radius: 16px;
  background-color: #ffffff;
-  padding: 80px 0;
+  padding: 88px 0;
-  font-size: 36px;
+  font-size: 22px;
  overflow-x: hidden;
  overflow-y: auto;
  color: $cFontGray2;
  .content {
-    max-width: 1000px;
+    max-width: 800px;
    margin: 0 auto;
  }
  .statement {
    @extend .bb;
-    padding-left: 40px;
+    padding-left: 92px;
-    margin: 80px auto 0;
+    margin: 50px auto 0;
  }
  .form {
    @extend .bb;
-    padding-left: 40px;
+    padding-left: 92px;
-    margin: 80px auto 0;
+    margin: 50px auto 0;
    &-item {
      display: flex;
@@ -74,11 +73,20 @@
  }
  .bottom-wrap {
-    margin: 80px auto 0;
+    margin: 50px auto 0;
+    .notice {
+      letter-spacing: 2.2px;
+      font-size: 0;
+      span {
+        font-size: 22px;
+      }
+    }
  }
  .title {
-    font-size: 48px;
+    font-size: 36px;
    color: $cOrange2;
    font-weight: bold;
    letter-spacing: 2.45px;
@@ -86,8 +94,9 @@
  .desc {
    text-align: left;
-    line-height: 1.5;
+    line-height: 1.82;
    letter-spacing: 3.6px;
+    @extend .text-jtf;
    span {
      margin: 0 2px;
@@ -95,14 +104,29 @@
  }
  .value {
+    flex: 1;
    text-align: left;
-    line-height: 1.5;
+    line-height: 1.82;
    letter-spacing: 3.6px;
+    font-size: 0;
+    span {
+      font-size: 22px;
+    }
  }
+  .ltz{
+    letter-spacing: 0;
+  }
+  .ltr-zero {
+    @extend .ltz;
+    text-align: justify;
+    text-align-last: left;
+  }
  .line1 {
-    margin: 80px auto 0;
+    margin: 50px auto 0;
  }
@@ -115,15 +139,15 @@
  .download {
    margin: 44px auto 0;
    text-align: center;
-    font-size: 28px;
    &-item {
      @extend .bb;
      @extend .fcc;
      margin: 0 auto 24px;
-      max-width: 738px;
+      max-width: 602px;
-      height: 81px;
+      height: 67px;
-      line-height: 81px;
+      line-height: 67px;
      padding: 2px;
      border-radius: 8px;
      cursor: pointer;
@@ -142,8 +166,8 @@
        border-radius: 8px;
        .icon {
-          height: 60px;
+          height: 47px;
-          margin-right: 64px;
+          margin-right: 52px;
        }
      }
@@ -165,7 +189,7 @@
  }
  .btn-wrap {
-    margin: 40px auto 0;
+    margin: 50px auto 0;
    display: flex;
    justify-content: center;
  }
@@ -174,23 +198,21 @@
    background: url("~@assets/images/vhis/vhis-btn.png");
    background-size: 100% 100%;
    background-repeat: no-repeat;
-    width: 405px;
+    width: 300px;
-    height: 60px;
+    height: 50px;
-    line-height: 60px;
+    line-height: 50px;
    color: #ffffff;
    font-weight: bold;
    cursor: pointer;
-    letter-spacing: 1.4px;
+    letter-spacing: 1.1px;
-    font-size: 28px;
    margin: 0 25px;
  }
  .contact {
-    font-size: 28px;
+    margin: 50px auto 0;
-    margin: 45px auto 0;
    font-weight: bold;
-    span{
+    span {
      text-decoration: underline;
    }
  }
@@ -258,6 +280,11 @@
 @media (max-width: 768px) {
+  .close {
+    right: -15px;
+    top: -40px;
+  }
  .border {
    .modal {
@@ -274,16 +301,29 @@
      .form {
        margin: 24px auto 0;
+        .value {
+          span {
+            font-size: 18px;
+          }
+        }
      }
      .bottom-wrap {
        margin: 24px auto 0;
+        .notice {
+          span {
+            font-size: 18px;
+          }
+        }
        .btn-wrap {
          margin: 16px auto 0;
          flex-wrap: wrap;
-          .submit-btn{
+          .submit-btn {
            height: 48px;
            line-height: 48px;
            font-size: 18px;
@@ -291,7 +331,7 @@
          }
        }
-        .contact{
+        .contact {
          margin: 16px auto 0;
          font-size: 18px;
        }
--- a/src/components/vhis-modal/vhis-modal.vue
View file @81f4f81
+++ b/src/components/vhis-modal/vhis-modal.vue
View file @81f4f81
@@ -6,56 +6,74 @@
 			<div class="close" @click="onOverLayHandler()"><img src="@/assets/images/vhis/close.png"></div>
 			<div class="modal">
 				<div class="content">
-					<div class="title">{{$t('vhis.title')}}</div>
+					<div class="title">{{$t('vhis.title')}}{{$t('vhis.titleAft')}}</div>
 					<div class="statement">
-						<div class="desc orange">{{$t('vhis.desc1')}}</div>
+						<div class="desc orange" :class="{'ltr-zero':locale == 'en'}">{{$t('vhis.desc1')}}</div>
-						<div class="desc">{{$t('vhis.desc2')}}</div>
+						<div class="desc" :class="{'ltr-zero':locale == 'en'}">{{$t('vhis.desc2')}}</div>
-						<div class="desc">{{$t('vhis.desc3')}}</div>
+						<div class="desc" :class="{'ltr-zero':locale == 'en'}">{{$t('vhis.desc3')}}</div>
-						<div class="desc">{{$t('vhis.desc4')}}</div>
+						<div class="desc" :class="{'ltr-zero':locale == 'en'}">{{$t('vhis.desc4')}}</div>
-						<div class="desc">{{$t('vhis.desc5')}}</div>
+						<div class="desc" :class="{'ltr-zero':locale == 'en'}">{{$t('vhis.desc5')}}</div>
 					</div>
 					<hr class="line1">
 					<div class="form ">
 						<div class="form-item">
-							<div class="desc">{{$t('vhis.label1')}}：</div>
+							<div class="desc" :class="{'ltr-zero':locale == 'en'}">{{$t('vhis.label1')}}：</div>
-							<div class="value orange">{{policyDetail.policyCode}}</div>
+							<div class="value orange">
+								<span>{{policyDetail.policyCode}}</span>
+							</div>
 						</div>
 						<div class="form-item">
-							<div class="desc">{{$t('vhis.label2')}}：</div>
+							<div class="desc" :class="{'ltr-zero':locale == 'en'}">{{$t('vhis.label2')}}：</div>
-							<div class="value orange">{{policyDetail.productName}}</div>
+							<div class="value orange">
+								<span>{{policyDetail.productName}}</span>
+							</div>
 						</div>
 						<div class="form-item">
-							<div class="desc">{{$t('vhis.label3')}}：</div>
+							<div class="desc" :class="{'ltr-zero':locale == 'en'}">{{$t('vhis.label3')}}：</div>
 							<div class="value">
-								<span class="orange">{{policyDetail.ymd1}}</span>{{$t('vhis.ymd1')}}
+								<span class="orange">{{policyDetail.ymd1}}</span>
-								<span class="orange">{{policyDetail.ymd2}}</span>{{$t('vhis.ymd2')}}
+								<span>{{$t('vhis.ymd1')}}</span>
-								<span class="orange">{{policyDetail.ymd2}}</span>{{$t('vhis.ymd3')}}
+								<span class="orange">{{policyDetail.ymd2}}</span>
+								<span>{{$t('vhis.ymd2')}}</span>
+								<span class="orange">{{policyDetail.ymd3}}</span>
+								<span>{{$t('vhis.ymd3')}}</span>
 							</div>
 						</div>
 						<div class="form-item">
-							<div class="desc">{{$t('vhis.label4')}}：</div>
+							<div class="desc" :class="{'ltr-zero':locale == 'en'}">{{$t('vhis.label4')}}：</div>
-							<div class="value orange">{{policyDetail.clientNameCn}}</div>
+							<div class="value orange">
+								<span>{{policyDetail.clientNameCn}}</span>
+							</div>
 						</div>
 						<div class="form-item">
-							<div class="desc">{{$t('vhis.label5')}}：</div>
+							<div class="desc" :class="{'ltr-zero':locale == 'en'}">{{$t('vhis.label5')}}：</div>
-							<div class="value orange">{{policyDetail.insuredNameCn}}</div>
+							<div class="value orange">
+								<span>{{policyDetail.insuredNameCn}}</span>
+							</div>
 						</div>
 						<div class="download">
 							<div class="border2 download-item" @click="downloadPolicy">
 								<div class="cont">
-									<img class="icon" src="@/assets/images/vhis/vhis-download.png"> {{$t('vhis.btn1')}}
+									<img class="icon" src="@/assets/images/vhis/vhis-download.png">
+									<span class="t1">{{$t('vhis.btn1')}}</span>
 								</div>
 							</div>
 						</div>
 					</div>
 					<hr class="line1">
 					<div class="bottom-wrap ">
-						<span class="desc">{{$t('vhis.tip1')}}
+						<span class="notice">
-							<span class="orange">{{policyDetail.clientNameCn}}</span>{{$t('vhis.tip2')}}
+							<span>{{$t('vhis.tip1')}}</span>
-							<span class="orange">{{policyDetail.nowYmd1}}</span>{{$t('vhis.ymd1')}}
+							<span class="orange">{{policyDetail.clientNameCn}}</span>
-							<span class="orange">{{policyDetail.nowYmd2}}</span>{{$t('vhis.ymd2')}}
+							<span>{{$t('vhis.tip2')}}</span>
-							<span class="orange">{{policyDetail.nowYmd3}}</span>{{$t('vhis.ymd3')}}{{$t('vhis.tip3')}}</span>
+							<span class="orange">{{policyDetail.nowYmd1}}</span>
+							<span>{{$t('vhis.ymd1')}}</span>
+							<span class="orange">{{policyDetail.nowYmd2}}</span>
+							<span>{{$t('vhis.ymd2')}}</span>
+							<span class="orange">{{policyDetail.nowYmd3}}</span>
+							<span>{{$t('vhis.ymd3')}}{{$t('vhis.tip3')}}</span>
+						</span>
 						<div class="btn-wrap">
 							<div class="submit-btn" @click="handleConfirmPolicy">{{$t('vhis.btn2')}}</div>
 							<div class="submit-btn " @click="handleIgnorePolicy">{{$t('vhis.btn3')}}</div>