部分修改

joe
Showing 7 changed files with 40 additions and 25 deletions
src/common/lang/en.js
src/common/lang/tc.js
src/common/lang/zh.js
src/pages/custom-service/components/insurance-query.js
src/pages/custom-service/components/insurance-query.vue
src/pages/custom-service/custom-service.js
src/pages/custom-service/custom-service.vue
--- a/src/common/lang/en.js
View file @35b77d2
+++ b/src/common/lang/en.js
View file @35b77d2
@@ -246,6 +246,7 @@ module.exports = {
 			t4Title: "Beneficiary information",
 			t4NameCn: "Name (Cn)",
 			t4NameEn: "Name (En)",
+			t4Relation : "與受保人關係",
 			t4Allocation: "Distribution ratio",
 			t5Title: "Payment information",
--- a/src/common/lang/tc.js
View file @35b77d2
+++ b/src/common/lang/tc.js
View file @35b77d2
@@ -220,10 +220,10 @@ module.exports = {
 		menu8: "常用表格",
 		insuranceQuery: {
 			InsurantNumber: "保單號碼",
-			Insurant: "被保人",
+			Insurant: "受保人",
 			InsurantName: "險種名稱",
-			InsurantAmount: "保障金額",
+			InsurantAmount: "保額",
-			effectiveDate: "生效日期",
+			effectiveDate: "保費到期日",
 			period: "保障年期",
 			t2Title: "保障內容",
@@ -246,6 +246,7 @@ module.exports = {
 			t4Title: "受益人資料", // t4BeneficiaryInformation
 			t4NameCn: "姓名（中文）",
 			t4NameEn: "姓名（英文）",
+			t4Relation : "與受保人關係",
 			t4Allocation: "分配比例",
 			t5Title: "繳費資料",
--- a/src/common/lang/zh.js
View file @35b77d2
+++ b/src/common/lang/zh.js
View file @35b77d2
@@ -220,10 +220,10 @@ module.exports = {
 		menu8: "常用表格",
 		insuranceQuery: {
 			InsurantNumber: "保单号码",
-			Insurant: "被保人",
+			Insurant: "受保人",
 			InsurantName: "险种名称",
-			InsurantAmount: "保障金额",
+			InsurantAmount: "保额",
-			effectiveDate: "生效日期",
+			effectiveDate: "保费到期日",
 			period: "保障年期",
 			t2Title: "保障内容",
@@ -246,6 +246,7 @@ module.exports = {
 			t4Title: "受益人资料", // t4BeneficiaryInformation
 			t4NameCn: "姓名（中文）",
 			t4NameEn: "姓名（英文）",
+			t4Relation : "与受保人关系",
 			t4Allocation: "分配比例",
 			t5Title: "缴费资料",
--- a/src/pages/custom-service/components/insurance-query.js
View file @35b77d2
+++ b/src/pages/custom-service/components/insurance-query.js
View file @35b77d2
@@ -29,6 +29,8 @@ export default {
                data.v2 = "终身";
                data.v3 = "深圳市益田路5033号";
                data.v4 = "张三";
+                data.v4_2 = "父母";
+                data.v4_3 = "子女";
                data.v5 = "银行转账";
                data.v6 = "港币";
                data.v7 = "平安银行";
@@ -38,6 +40,8 @@ export default {
                data.v2 = "終身";
                data.v3 = "深圳市益田路5033號";
                data.v4 = "張三";
+                data.v4_2 = "父母";
+                data.v4_3 = "子女";
                data.v5 = "銀行轉帳";
                data.v6 = "港幣";
                data.v7 = "平安銀行";
--- a/src/pages/custom-service/components/insurance-query.vue
View file @35b77d2
+++ b/src/pages/custom-service/components/insurance-query.vue
View file @35b77d2
@@ -193,21 +193,24 @@
      </div>
      <div class="table-content" :class="{hide : !insuranceForm.f3}">
        <div class="data-line">
-          <div class="td">{{$t('customService.insuranceQuery.t4NameCn')}}</div>
+          <div class="td w2">{{$t('customService.insuranceQuery.t4NameCn')}}</div>
-          <div class="td">{{$t('customService.insuranceQuery.t4NameEn')}}</div>
+          <div class="td w2">{{$t('customService.insuranceQuery.t4NameEn')}}</div>
-          <div class="td">{{$t('customService.insuranceQuery.t4Allocation')}}</div>
+          <div class="td w2">{{$t('customService.insuranceQuery.t4Relation')}}</div>
+          <div class="td w2">{{$t('customService.insuranceQuery.t4Allocation')}}</div>
        </div>
        <div class="separator-h"></div>
        <div class="data-line">
-          <div class="td">{{dataForm.v4}}</div>
+          <div class="td w2">{{dataForm.v4}}</div>
-          <div class="td">Zhangsan</div>
+          <div class="td w2">Zhangsan</div>
-          <div class="td">50%</div>
+          <div class="td w2">{{dataForm.v4_2}}</div>
+          <div class="td w2">50%</div>
        </div>
        <div class="separator-h"></div>
        <div class="data-line">
-          <div class="td">李四</div>
+          <div class="td w2">李四</div>
-          <div class="td">Lisi</div>
+          <div class="td w2">Lisi</div>
-          <div class="td">50%</div>
+          <div class="td w2">{{dataForm.v4_3}}</div>
+          <div class="td w2">50%</div>
        </div>
      </div>
    </div>
@@ -285,14 +288,14 @@
        </div>
        <div class="separator-h"></div>
        <div class="data-line">
-          <div class="td w2">首期</div>
+          <div class="td w2">第二期</div>
          <div class="td w2">{{dataForm.v8}}</div>
-          <div class="td w2">2020-1-1</div>
+          <div class="td w2">2021-1-1</div>
          <div class="td w2">HK$2,000</div>
        </div>
        <div class="separator-h"></div>
        <div class="data-line">
-          <div class="td w2">第二期</div>
+          <div class="td w2">首期</div>
          <div class="td w2">{{dataForm.v8}}</div>
          <div class="td w2">2020-1-1</div>
          <div class="td w2">HK$2,000</div>
--- a/src/pages/custom-service/custom-service.js
View file @35b77d2
+++ b/src/pages/custom-service/custom-service.js
View file @35b77d2
@@ -20,6 +20,11 @@ export default {
 			this.$router.push({
 				path: path
 			});
+		},
+		changeActivity(a){
+			this.activity = a;
+			this.$route.query.q = a;
+			console.log(this.$route.query);
 		}
 	},
 	watch: {
--- a/src/pages/custom-service/custom-service.vue
View file @35b77d2
+++ b/src/pages/custom-service/custom-service.vue
View file @35b77d2
@@ -2,7 +2,7 @@
 	<div class="content">
 		<div class="left-panel">
-			<div class="menu-item" :class="{activity : activity == 'm1'}" @click="activity = 'm1'">
+			<div class="menu-item" :class="{activity : activity == 'm1'}" @click="changeActivity('m1')">
 				<i class="m1"></i>{{$t('customService.menu1')}}
 			</div>
 			<div class="separator"></div>
@@ -10,27 +10,27 @@
 				<i class="m2"></i>{{$t('customService.menu2')}}
 			</div>
 			<div class="separator"></div>
-			<div class="menu-item" :class="{activity : activity == 'm3'}" @click="activity = 'm3'">
+			<div class="menu-item" :class="{activity : activity == 'm3'}" @click="changeActivity('m3')">
 				<i class="m3"></i>{{$t('customService.menu3')}}
 			</div>
 			<div class="separator"></div>
-			<div class="menu-item" :class="{activity : activity == 'm4'}" @click="activity = 'm4'">
+			<div class="menu-item" :class="{activity : activity == 'm4'}" @click="changeActivity('m4')">
 				<i class="m4"></i>{{$t('customService.menu4')}}
 			</div>
 			<div class="separator"></div>
-			<div class="menu-item" :class="{activity : activity == 'm5'}" @click="activity = 'm5'">
+			<div class="menu-item" :class="{activity : activity == 'm5'}" @click="changeActivity('m5')">
 				<i class="m5"></i>{{$t('customService.menu5')}}
 			</div>
 			<div class="separator"></div>
-			<div class="menu-item" :class="{activity : activity == 'm6'}" @click="/*toPath('/reservation')*/activity = 'm6'">
+			<div class="menu-item" :class="{activity : activity == 'm6'}" @click="/*toPath('/reservation')*/changeActivity('m6')">
 				<i class="m6"></i>{{$t('customService.menu6')}}
 			</div>
 			<div class="separator"></div>
-			<div class="menu-item" :class="{activity : activity == 'm7'}" @click="activity = 'm7'">
+			<div class="menu-item" :class="{activity : activity == 'm7'}" @click="changeActivity('m7')">
 				<i class="m7"></i>{{$t('customService.menu7')}}
 			</div>
 			<div class="separator"></div>
-			<div class="menu-item" :class="{activity : activity == 'm8'}" @click="activity = 'm8'">
+			<div class="menu-item" :class="{activity : activity == 'm8'}" @click="changeActivity('m8')">
 				<i class="m8"></i>{{$t('customService.menu8')}}
 			</div>
 		</div>