2e56ce0f by simon

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

# Conflicts:
#	src/common/lang/tc.js
2 parents 9cfd2890 5840b74d
...@@ -75,6 +75,8 @@ module.exports = { ...@@ -75,6 +75,8 @@ module.exports = {
75 clarmsCustomerList: "/pingan_hklife_webapi/policy/clarmsCustomerList", 75 clarmsCustomerList: "/pingan_hklife_webapi/policy/clarmsCustomerList",
76 // 理赔报案 76 // 理赔报案
77 clarmsRegisterCase: "/pingan_hklife_webapi/policy/clarmsRegisterCase", 77 clarmsRegisterCase: "/pingan_hklife_webapi/policy/clarmsRegisterCase",
78 // 用户电子函列表
79 letterRecordList: "/pingan_hklife_webapi/policy/letterRecordList",
78 80
79 81
80 // cms相关 82 // cms相关
......
...@@ -51,10 +51,10 @@ function encryptContent(obj) { ...@@ -51,10 +51,10 @@ function encryptContent(obj) {
51 // let base = COM.baseUrl; 51 // let base = COM.baseUrl;
52 // console.log(process.env); 52 // console.log(process.env);
53 let baseURL = process.env.VUE_APP_BASE_URL; 53 let baseURL = process.env.VUE_APP_BASE_URL;
54 // baseURL = "http://localhost:9101"; 54 baseURL = "http://localhost:9101";
55 if (window.location.href.indexOf("192.168") != -1) { 55 // if (window.location.href.indexOf("192.168") != -1) {
56 baseURL = "https://ow.go.qudone.com"; 56 // baseURL = "https://ow.go.qudone.com";
57 } 57 // }
58 const axios = axiosIns.create({ 58 const axios = axiosIns.create({
59 baseURL: baseURL, 59 baseURL: baseURL,
60 timeout: 10000 60 timeout: 10000
......
...@@ -744,6 +744,10 @@ module.exports = { ...@@ -744,6 +744,10 @@ module.exports = {
744 SentOutDate: "Sent Out Date", 744 SentOutDate: "Sent Out Date",
745 DownloadLink: "Download link", 745 DownloadLink: "Download link",
746 Status: "Status", 746 Status: "Status",
747 letterName : "Notice of Policy Issuance and Cooling-off Period",
748 DownloadDoc : "Download document",
749 Read : "Read",
750 UnRead : "Unread"
747 }, 751 },
748 customService: { 752 customService: {
749 name: "Customer service", 753 name: "Customer service",
......
...@@ -730,14 +730,18 @@ module.exports = { ...@@ -730,14 +730,18 @@ module.exports = {
730 } 730 }
731 }, 731 },
732 eCorrespondenceEnquiry: { 732 eCorrespondenceEnquiry: {
733 PolicyNumber:"保單號碼", 733 PolicyNumber: "保單號碼",
734 TypeOfCorrespondence:"通知書類型", 734 TypeOfCorrespondence: "通知書類型",
735 SentOutDate:"發出時間", 735 SentOutDate: "發出時間",
736 DownloadLink:"下載鏈接", 736 DownloadLink: "下載鏈接",
737 Status:"狀况", 737 Status: "狀况",
738 }, 738 letterName: "保單繕發及冷靜期通知書",
739 FAQ:{ 739 DownloadDoc: "下載文檔",
740 title:"常見問題", 740 Read: "已閱讀",
741 UnRead: "未閱讀"
742 },
743 FAQ: {
744 title: "常見問題",
741 }, 745 },
742 customService: { 746 customService: {
743 name: "客戶服務", 747 name: "客戶服務",
...@@ -888,7 +892,7 @@ module.exports = { ...@@ -888,7 +892,7 @@ module.exports = {
888 tip5: "聯絡客服", 892 tip5: "聯絡客服",
889 tip6: "保單已簽收,如需查詢保單資訊或下載電子保單可點擊", 893 tip6: "保單已簽收,如需查詢保單資訊或下載電子保單可點擊",
890 tip7: "保單查詢", 894 tip7: "保單查詢",
891 notice:"謹此確認本人/我們已收到中國平安人壽保險(香港)有限公司的保單,並已細閱保單細節內容(包括但不限於保單冷静期權益)。", 895 notice: "謹此確認本人/我們已收到中國平安人壽保險(香港)有限公司的保單,並已細閱保單細節內容(包括但不限於保單冷静期權益)。",
892 agreeTips: "請下載並细閱“保單繕發及冷靜期通知書”及“電子保單”" 896 agreeTips: "請下載並细閱“保單繕發及冷靜期通知書”及“電子保單”"
893 }, 897 },
894 clarms: { 898 clarms: {
......
...@@ -736,6 +736,10 @@ module.exports = { ...@@ -736,6 +736,10 @@ module.exports = {
736 SentOutDate: "发出时间", 736 SentOutDate: "发出时间",
737 DownloadLink: "下载链接", 737 DownloadLink: "下载链接",
738 Status: "状况", 738 Status: "状况",
739 letterName : "保单缮发及冷静期通知",
740 DownloadDoc : "下載文檔",
741 Read : "已阅读",
742 UnRead : "未阅读"
739 }, 743 },
740 FAQ: { 744 FAQ: {
741 title: "常见问题", 745 title: "常见问题",
......
...@@ -138,7 +138,7 @@ export default { ...@@ -138,7 +138,7 @@ export default {
138 138
139 for (let index = 0; index < this.policyDetail.policyAcknowledges.length; index++) { 139 for (let index = 0; index < this.policyDetail.policyAcknowledges.length; index++) {
140 let policyAcknowledge = this.policyDetail.policyAcknowledges[index]; 140 let policyAcknowledge = this.policyDetail.policyAcknowledges[index];
141 switch (policyAcknowledge.letterNo) { 141 switch (policyAcknowledge.letterType) {
142 case "1": 142 case "1":
143 this.policyDetail.letterNo1Id = policyAcknowledge.recordId; 143 this.policyDetail.letterNo1Id = policyAcknowledge.recordId;
144 break; 144 break;
......
...@@ -31,10 +31,10 @@ export default { ...@@ -31,10 +31,10 @@ export default {
31 default: "download" 31 default: "download"
32 }, 32 },
33 }, 33 },
34 name: "PolicyHeadList", 34 name: "LetterListHeader",
35 data() { 35 data() {
36 return { 36 return {
37 myPolicyList: [], 37 contentList: [],
38 maxShow: 2, 38 maxShow: 2,
39 selectPolicyCode: "", 39 selectPolicyCode: "",
40 selectPolicyCodes: {}, 40 selectPolicyCodes: {},
...@@ -45,9 +45,6 @@ export default { ...@@ -45,9 +45,6 @@ export default {
45 } 45 }
46 }, 46 },
47 computed: { 47 computed: {
48 ...mapState({
49 policyList: state => state.policyList
50 }),
51 lan() { 48 lan() {
52 return this.$i18n.locale; 49 return this.$i18n.locale;
53 }, 50 },
...@@ -56,6 +53,15 @@ export default { ...@@ -56,6 +53,15 @@ export default {
56 }, 53 },
57 }, 54 },
58 methods: { 55 methods: {
56 initData() {
57 httpPost({
58 url: api.letterRecordList,
59 sid: true
60 }).then(res => {
61 this.contentList = res;
62 this.$set(this, 'contentList', res);
63 });
64 },
59 onShowTipsOverHandler(event, item, index) { 65 onShowTipsOverHandler(event, item, index) {
60 let child = event.currentTarget.childNodes[0]; 66 let child = event.currentTarget.childNodes[0];
61 child.style.display = "block"; 67 child.style.display = "block";
...@@ -98,11 +104,41 @@ export default { ...@@ -98,11 +104,41 @@ export default {
98 */ 104 */
99 onCheckConfirmHandler(evt) { 105 onCheckConfirmHandler(evt) {
100 console.log("checkList evt :", evt); 106 console.log("checkList evt :", evt);
107 },
108 changeLetterType(letterNo) {
109 return this.i18n.eCorrespondenceEnquiry.LetterMap[letterNo];
110 },
111 toContactUs() {
112 this.$router.push({
113 path: "/custom/service",
114 query: {
115 q: "m1"
116 }
117 });
118 },
119 downloadPolicy(item) {
120 httpPost({
121 url: api.getDownloadPath,
122 sid: true,
123 data: {
124 policyCode: item.bizNo,
125 recordId: item.recordId
126 }
127 }).then(res => {
128 if (res) {
129 let url = requestDomain() + api.downloadPolicy + "/" + res;
130 window.open(url);
131 } else {
132 this.showDownloadError = true;
133 }
134 });
101 } 135 }
102 }, 136 },
103 components: { 137 components: {
104 Modal2Comp, 138 Modal2Comp,
105 FilterComp 139 FilterComp
106 }, 140 },
107 mounted() {}, 141 mounted() {
142 this.initData();
143 },
108 } 144 }
......
...@@ -25,30 +25,30 @@ ...@@ -25,30 +25,30 @@
25 </div> 25 </div>
26 </div> 26 </div>
27 <div class="table-content" :class="{hide : hide}"> 27 <div class="table-content" :class="{hide : hide}">
28 <template v-if="myPolicyList"> 28 <template v-if="contentList && contentList.length > 0">
29 <div v-for="(item,index) in 5" :key="index"> 29 <div v-for="(item,index) in contentList" :key="index">
30 <template v-if="index < maxShow"> 30 <template v-if="index < maxShow">
31 <div class="data-line" @click="handlePolicySelect(item,index)"> 31 <div class="data-line">
32 <div class="td w1">P388888880772</div> 32 <div class="td w1">{{item.bizNo}}</div>
33 <div class="td w1">保單繕發及冷靜期通知書</div> 33 <div class="td w1">{{$t("eCorrespondenceEnquiry.letterName")}}</div>
34 <div class="td w2">2020-3-1</div> 34 <div class="td w2">{{item.printTime.split(" ")[0]}}</div>
35 <div class="td w2 pointer"> 35 <div class="td w2 pointer" @click="downloadPolicy(item)">
36 <div class="download" @mouseover="onShowTipsOverHandler($event,item,index)" @mouseout="onShowTipsOutHandler($event,item,index)" @click="downloadPolicy(item)"> 36 <div class="download" @mouseover="onShowTipsOverHandler($event,item,index)" @mouseout="onShowTipsOutHandler($event,item,index)" >
37 <div class="download-tips"> 37 <div class="download-tips">
38 <div class="cont">{{$t('customService.insuranceQuery.downloadClick')}}</div> 38 <div class="cont">{{$t('customService.insuranceQuery.downloadClick')}}</div>
39 </div> 39 </div>
40 <img class="icon-download" src="@/assets/images/insurance-query/icon-down-load.png" alt=""> 40 <img class="icon-download" src="@/assets/images/insurance-query/icon-down-load.png" alt="">
41 </div> 41 </div>
42 下載文檔 42 {{$t("eCorrespondenceEnquiry.DownloadDoc")}}
43 </div> 43 </div>
44 <div class="td w2">已閱讀</div> 44 <div class="td w2">{{item.isRead == "N" ? $t('eCorrespondenceEnquiry.UnRead') : $t('eCorrespondenceEnquiry.Read')}}</div>
45 </div> 45 </div>
46 <div class="separator-h" v-if="index < myPolicyList.length - 1 && index < maxShow - 1"></div> 46 <div class="separator-h" v-if="index < contentList.length - 1 && index < maxShow - 1"></div>
47 </template> 47 </template>
48 </div> 48 </div>
49 <template v-if="!policyList || maxShow < policyList.length"> 49 <template v-if="maxShow < contentList.length">
50 <div class="separator-h"></div> 50 <div class="separator-h"></div>
51 <div class="data-line show-more-btn" @click="maxShow = policyList.length">{{$t('customService.insuranceQuery.showMore')}}</div> 51 <div class="data-line show-more-btn" @click="maxShow = contentList.length">{{$t('customService.insuranceQuery.showMore')}}</div>
52 </template> 52 </template>
53 </template> 53 </template>
54 54
......