29cf57cd by joe

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

# Conflicts:
#	src/pages/custom-service/components/complaint-acceptance.vue
2 parents 66761cf1 0fa49424
...@@ -508,22 +508,22 @@ module.exports = { ...@@ -508,22 +508,22 @@ module.exports = {
508 download: "./doc/保險合同解除申請書.pdf", 508 download: "./doc/保險合同解除申請書.pdf",
509 }, 509 },
510 { 510 {
511 name: "Application for Change of Policy Form(Policy Loan Repayment)", 511 name: "Application for Change of Policy Form<br>(Policy Loan Repayment)",
512 desc: "Policy loan", 512 desc: "Policy loan",
513 download: "./doc/保險合同變更申請書( 保單貸款還款類).pdf", 513 download: "./doc/保險合同變更申請書( 保單貸款還款類).pdf",
514 }, 514 },
515 { 515 {
516 name: "Application for Change of Policy Form(Change of Policy)", 516 name: "Application for Change of Policy Form<br>(Change of Policy)",
517 desc: "Newly added premium, deducted premium", 517 desc: "Newly added premium, deducted premium",
518 download: "./doc/保險合同變更申請書( 保險合同計劃變更類).pdf", 518 download: "./doc/保險合同變更申請書( 保險合同計劃變更類).pdf",
519 }, 519 },
520 { 520 {
521 name: "Application for Change of Policy Form(Change of Customer Information)", 521 name: "Application for Change of Policy Form<br>(Change of Customer Information)",
522 desc: "Basic Information Change", 522 desc: "Basic Information Change",
523 download: "./doc/保險合同變更申請書( 客戶權益變更類).pdf", 523 download: "./doc/保險合同變更申請書( 客戶權益變更類).pdf",
524 }, 524 },
525 { 525 {
526 name: "Application for Change of Policy Form(Change of Beneficiary)", 526 name: "Application for Change of Policy Form<br>(Change of Beneficiary)",
527 desc: "Mode of payment, self-replacement and reissues", 527 desc: "Mode of payment, self-replacement and reissues",
528 download: "./doc/保險合同變更申請書( 客戶信息變更類).pdf", 528 download: "./doc/保險合同變更申請書( 客戶信息變更類).pdf",
529 }, 529 },
......
...@@ -96,6 +96,9 @@ export default { ...@@ -96,6 +96,9 @@ export default {
96 lan() { 96 lan() {
97 return this.$i18n.locale; 97 return this.$i18n.locale;
98 }, 98 },
99 locale() {
100 return this.$i18n.locale || 'tc';
101 },
99 i18n() { 102 i18n() {
100 return this.$i18n.messages && this.$i18n.locale ? this.$i18n.messages[this.$i18n.locale] : {}; 103 return this.$i18n.messages && this.$i18n.locale ? this.$i18n.messages[this.$i18n.locale] : {};
101 }, 104 },
......
...@@ -7,6 +7,8 @@ $borderRadius:6px; ...@@ -7,6 +7,8 @@ $borderRadius:6px;
7 margin: 0 auto; 7 margin: 0 auto;
8 } 8 }
9 9
10
11
10 input { 12 input {
11 padding: 0 2.083333rem; 13 padding: 0 2.083333rem;
12 color: $cFontGray2; 14 color: $cFontGray2;
...@@ -452,6 +454,13 @@ input { ...@@ -452,6 +454,13 @@ input {
452 } 454 }
453 } 455 }
454 456
457 .en {
458 .reservation-container-2 .check-item {
459 margin-right: 0;
460 width: 50%;
461 }
462 }
463
455 @media (max-width: 1200px) { 464 @media (max-width: 1200px) {
456 .comp { 465 .comp {
457 .reservation-container-2 { 466 .reservation-container-2 {
...@@ -501,13 +510,13 @@ input { ...@@ -501,13 +510,13 @@ input {
501 .check-item { 510 .check-item {
502 align-items: flex-start; 511 align-items: flex-start;
503 flex-wrap: wrap; 512 flex-wrap: wrap;
504 margin:0 0 24px; 513 margin: 0 0 24px;
505 width: 100%; 514 width: 100%;
506 } 515 }
507 } 516 }
508 } 517 }
509 518
510 .date-container{ 519 .date-container {
511 width: 100%; 520 width: 100%;
512 } 521 }
513 } 522 }
......
1 <template> 1 <template>
2 2 <div class="comp clarms-plugins-material" :class="{'en':locale == 'en'}">
3 <div class="comp clarms-plugins-material">
4 <template v-if="!insuredList || insuredList.length == 0"> 3 <template v-if="!insuredList || insuredList.length == 0">
5 <div class="reservation-container-2"> 4 <div class="reservation-container-2">
6 <div class="empty"> 5 <div class="empty">
......
...@@ -30,9 +30,10 @@ ...@@ -30,9 +30,10 @@
30 .modal { 30 .modal {
31 position: relative; 31 position: relative;
32 @extend .bb; 32 @extend .bb;
33 max-width: 1000px; 33 width: 1000px;
34 margin: 0 auto;
34 35
35 .content { 36 &-content {
36 display: flex; 37 display: flex;
37 justify-content: flex-start; 38 justify-content: flex-start;
38 align-items: center; 39 align-items: center;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <div class="border"> 5 <div class="border">
6 <div class="close" @click="onOverLayHandler()"><img src="@/assets/images/clarms/close.png"></div> 6 <div class="close" @click="onOverLayHandler()"><img src="@/assets/images/clarms/close.png"></div>
7 <div class="modal"> 7 <div class="modal">
8 <div class="content"> 8 <div class="modal-content">
9 <div class="info-icon"> 9 <div class="info-icon">
10 <img src="@/assets/images/clarms/info.png"> 10 <img src="@/assets/images/clarms/info.png">
11 </div> 11 </div>
......
...@@ -29,14 +29,16 @@ ...@@ -29,14 +29,16 @@
29 .modal { 29 .modal {
30 position: relative; 30 position: relative;
31 @extend .bb; 31 @extend .bb;
32 max-width: 1000px; 32 width: 1000px;
33 margin: 0 auto;
33 34
34 .content { 35 .content {
36 // @extend .bb;
35 display: flex; 37 display: flex;
36 justify-content: flex-start; 38 justify-content: flex-start;
37 align-items: center; 39 align-items: center;
38 padding: 162px 60px 162px 60px; 40 padding: 162px 60px 162px 60px;
39 // max-height:534px; 41 // max-height:640px;
40 42
41 43
42 .info-icon { 44 .info-icon {
......
...@@ -34,8 +34,9 @@ ...@@ -34,8 +34,9 @@
34 .modal { 34 .modal {
35 position: relative; 35 position: relative;
36 width: 1000px; 36 width: 1000px;
37 margin: 0 auto;
37 38
38 .content { 39 &-content {
39 display: flex; 40 display: flex;
40 justify-content: flex-start; 41 justify-content: flex-start;
41 align-items: center; 42 align-items: center;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <div class="border"> 5 <div class="border">
6 <div class="close" @click="onCloseHandler()"><img src="@/assets/images/clarms/close.png"></div> 6 <div class="close" @click="onCloseHandler()"><img src="@/assets/images/clarms/close.png"></div>
7 <div class="modal"> 7 <div class="modal">
8 <div class="content"> 8 <div class="modal-content">
9 <div class="info-icon"> 9 <div class="info-icon">
10 <img src="@/assets/images/clarms/info.png"> 10 <img src="@/assets/images/clarms/info.png">
11 </div> 11 </div>
......
...@@ -9,7 +9,9 @@ import { ...@@ -9,7 +9,9 @@ import {
9 } from '@/api/fetch-api.js' 9 } from '@/api/fetch-api.js'
10 10
11 import Modal2Comp from '@/components/modal2-comp/modal2-comp.vue'; 11 import Modal2Comp from '@/components/modal2-comp/modal2-comp.vue';
12 import { getPolicyName } from "@/utils/biz.js"; 12 import {
13 getPolicyName
14 } from "@/utils/biz.js";
13 15
14 export default { 16 export default {
15 data() { 17 data() {
...@@ -19,9 +21,9 @@ export default { ...@@ -19,9 +21,9 @@ export default {
19 hadLoadPolicy: false, 21 hadLoadPolicy: false,
20 ignorePolicyCodes: [], 22 ignorePolicyCodes: [],
21 // 显示 23 // 显示
22 policyDetail: null, 24 policyDetail: {},
23 showSuccessTip : false, 25 showSuccessTip: false,
24 showDownloadError:false 26 showDownloadError: false
25 } 27 }
26 }, 28 },
27 components: { 29 components: {
...@@ -35,9 +37,9 @@ export default { ...@@ -35,9 +37,9 @@ export default {
35 locale() { 37 locale() {
36 return this.$i18n.locale || 'tc'; 38 return this.$i18n.locale || 'tc';
37 }, 39 },
38 i18n() { 40 i18n() {
39 return this.$i18n.messages && this.$i18n.locale ? this.$i18n.messages[this.$i18n.locale] : {}; 41 return this.$i18n.messages && this.$i18n.locale ? this.$i18n.messages[this.$i18n.locale] : {};
40 }, 42 },
41 }, 43 },
42 methods: { 44 methods: {
43 initData() { 45 initData() {
...@@ -159,8 +161,7 @@ export default { ...@@ -159,8 +161,7 @@ export default {
159 url: api.policyReceipt, 161 url: api.policyReceipt,
160 sid: true, 162 sid: true,
161 data: params 163 data: params
162 }).then(res => { 164 }).then(res => {}).catch(e => {
163 }).catch(e => {
164 165
165 }); 166 });
166 167
...@@ -203,16 +204,16 @@ export default { ...@@ -203,16 +204,16 @@ export default {
203 path: "/custom/service?q=m1" 204 path: "/custom/service?q=m1"
204 }); 205 });
205 }, 206 },
206 toTarget(){ 207 toTarget() {
207 this.showPolicy = false; 208 this.showPolicy = false;
208 sessionStorage.setItem("hidePolicy", "true"); 209 sessionStorage.setItem("hidePolicy", "true");
209 this.$router.push({ 210 this.$router.push({
210 path : "/custom/service?q=m3" 211 path: "/custom/service?q=m3"
211 }) 212 })
212 }, 213 },
213 formatPolicyName(c, n) { 214 formatPolicyName(c, n) {
214 return getPolicyName(this.$i18n.locale, c, n); 215 return getPolicyName(this.$i18n.locale, c, n);
215 }, 216 },
216 loginAction() { 217 loginAction() {
217 this.showPolicy = true; 218 this.showPolicy = true;
218 this.initData(); 219 this.initData();
......
...@@ -83,10 +83,12 @@ $borderRadius:6px; ...@@ -83,10 +83,12 @@ $borderRadius:6px;
83 } 83 }
84 84
85 .title { 85 .title {
86 @extend .bb;
86 font-size: 36px; 87 font-size: 36px;
87 color: $cOrange2; 88 color: $cOrange2;
88 font-weight: bold; 89 font-weight: bold;
89 letter-spacing: 2.45px; 90 letter-spacing: 2.45px;
91 // padding:0 92px;
90 } 92 }
91 93
92 .desc { 94 .desc {
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
102 </div> 102 </div>
103 103
104 <div class="box notice"> 104 <div class="box notice">
105 <p class="notice-item"> 105 <p class="notice-item text-jtf">
106 <img class="notice-item-icon" src="@/assets/images/reservation/icon-re-notice.png"> &nbsp;&nbsp;&nbsp;&nbsp;{{$t('reservation.notice1')}} 106 <img class="notice-item-icon" src="@/assets/images/reservation/icon-re-notice.png"> &nbsp;&nbsp;&nbsp;&nbsp;{{$t('reservation.notice1')}}
107 </p> 107 </p>
108 <p class="notice-item pointer" @click="checked = !checked"> 108 <p class="notice-item pointer" @click="checked = !checked">
......
1 1
2 <template> 2 <template>
3 <div class="content"> 3 <div class="content">
4
5
6 <div > 4 <div >
7 <div class="top-space"></div> 5 <div class="top-space"></div>
8 <h2 class="tit">{{data.title}}</h2> 6 <h2 class="tit">{{data.title}}</h2>
...@@ -11,7 +9,7 @@ ...@@ -11,7 +9,7 @@
11 <div class="date"> <img class="icon-clock" src="@/assets/images/news-detail/icon-clock.png" alt=""> {{$t('newsDetail.publishAt')}}{{data.dateFormat}}</div> 9 <div class="date"> <img class="icon-clock" src="@/assets/images/news-detail/icon-clock.png" alt=""> {{$t('newsDetail.publishAt')}}{{data.dateFormat}}</div>
12 <div class="pv">{{$t('newsDetail.readers')}}{{data.pv}} {{$t('newsDetail.per')}}</div> 10 <div class="pv">{{$t('newsDetail.readers')}}{{data.pv}} {{$t('newsDetail.per')}}</div>
13 </div> 11 </div>
14 <div class="box desc ql-editor" v-html="data.content" > 12 <div class="box desc ql-editor text-jtf" v-html="data.content" >
15 {{data.content}} 13 {{data.content}}
16 </div> 14 </div>
17 </div> 15 </div>
...@@ -102,7 +100,7 @@ ...@@ -102,7 +100,7 @@
102 <strong>We will make targeted efforts to alleviate poverty and ensure comprehensive resources</strong> 100 <strong>We will make targeted efforts to alleviate poverty and ensure comprehensive resources</strong>
103 <br><br>&nbsp;&nbsp;&nbsp;&nbsp;In recent years, PINGAN has been actively engaged in poverty alleviation, focusing on poverty alleviation through industry, health and education, and constructing and implementing the "village official, village doctor and village education" poverty alleviation project. Under the call of the party committee of the group and more than 1,000 grassroots party organizations, more than 800,000 anzans have participated in poverty alleviation work. 101 <br><br>&nbsp;&nbsp;&nbsp;&nbsp;In recent years, PINGAN has been actively engaged in poverty alleviation, focusing on poverty alleviation through industry, health and education, and constructing and implementing the "village official, village doctor and village education" poverty alleviation project. Under the call of the party committee of the group and more than 1,000 grassroots party organizations, more than 800,000 anzans have participated in poverty alleviation work.
104 <br><br>&nbsp;&nbsp;&nbsp;&nbsp;Village official project, help village industry upgrade. PINGAN starts with planting and breeding, and provides comprehensive production, technical and financial support for remote and poor areas. In front of planting industry, we initiated the "ping an poverty alleviation and protection" industry poverty alleviation model, leveraged poverty alleviation loans, and provided poor households with one-stop services including excellent seeds, cooperative planting and protective buyback free of charge. In the middle, provide remote sensing, intelligent identification and other technologies to improve agricultural productivity; At the back end, we provide e-marketing platform services. Up to now, the group and ping an bank have provided poverty alleviation loans of over 80 billion yuan to the poor areas in 9 provinces including Inner Mongolia and guizhou, and the group has assisted in the sales of poverty alleviation products of tens of millions of yuan, which has helped hundreds of thousands of poor people get rid of poverty faster. 102 <br><br>&nbsp;&nbsp;&nbsp;&nbsp;Village official project, help village industry upgrade. PINGAN starts with planting and breeding, and provides comprehensive production, technical and financial support for remote and poor areas. In front of planting industry, we initiated the "ping an poverty alleviation and protection" industry poverty alleviation model, leveraged poverty alleviation loans, and provided poor households with one-stop services including excellent seeds, cooperative planting and protective buyback free of charge. In the middle, provide remote sensing, intelligent identification and other technologies to improve agricultural productivity; At the back end, we provide e-marketing platform services. Up to now, the group and ping an bank have provided poverty alleviation loans of over 80 billion yuan to the poor areas in 9 provinces including Inner Mongolia and guizhou, and the group has assisted in the sales of poverty alleviation products of tens of millions of yuan, which has helped hundreds of thousands of poor people get rid of poverty faster.
105 <br><br>&nbsp;&nbsp;&nbsp;&nbsp;Village doctor project, help build healthy village. PINGAN connects the villagers and the city's high-quality medical resources and improves the level of rural medical services through telemedicine, intelligent video reading and other technologies. In the past two years, we have upgraded nearly 800 rural health centers, purchased a number of mobile hospital equipment, organized famous medical experts, and carried out free medical examinations for villagers in poverty-stricken areas. Through the innovative cloud platform, the inspection report can be uploaded to the rear data center in real time, and the disease risk can be timely warned to the villagers, and the serious disease situation can be reported to the local health institutions, so as to reduce the risk of poverty caused by disease or poverty returned due to disease. PINGAN's mobile hospital has traveled hundreds of thousands of kilometers, providing free medical services to nearly 100 villages.  103 <br><br>&nbsp;&nbsp;&nbsp;&nbsp;Village doctor project, help build healthy village. PINGAN connects the villagers and the city's high-quality medical resources and improves the level of rural medical services through telemedicine, intelligent video reading and other technologies. In the past two years, we have upgraded nearly 800 rural health centers, purchased a number of mobile hospital equipment, organized famous medical experts, and carried out free medical examinations for villagers in poverty-stricken areas. Through the innovative cloud platform, the inspection report can be uploaded to the rear data center in real time, and the disease risk can be timely warned to the villagers, and the serious disease situation can be reported to the local health institutions, so as to reduce the risk of poverty caused by disease or poverty returned due to disease. PINGAN's mobile hospital has traveled hundreds of thousands of kilometers, providing free medical services to nearly 100 villages. 
106 <br><br>&nbsp;&nbsp;&nbsp;&nbsp;The village teaches the project, helps the village child to enjoy the wisdom education. With cloud technology as a bridge, ping an has built a "double-division classroom" platform to introduce high-quality urban education resources to poor areas. There are more than 700 wisdom primary schools in PINGAN shingle, training nearly 3,000 village teachers. 104 <br><br>&nbsp;&nbsp;&nbsp;&nbsp;The village teaches the project, helps the village child to enjoy the wisdom education. With cloud technology as a bridge, ping an has built a "double-division classroom" platform to introduce high-quality urban education resources to poor areas. There are more than 700 wisdom primary schools in PINGAN shingle, training nearly 3,000 village teachers.
107 <br><br>&nbsp;&nbsp;&nbsp;&nbsp;Never forget your original intention. We firmly believe that behind China's development, there must be a group of outstanding national enterprises standing tall in the world as the support, ping an has the confidence and faith to continue to strive for the great rejuvenation of the Chinese nation, hard work. 105 <br><br>&nbsp;&nbsp;&nbsp;&nbsp;Never forget your original intention. We firmly believe that behind China's development, there must be a group of outstanding national enterprises standing tall in the world as the support, ping an has the confidence and faith to continue to strive for the great rejuvenation of the Chinese nation, hard work.
108 106
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <div> 5 <div>
6 <div class="top-space"></div> 6 <div class="top-space"></div>
7 <h2 class="tit">{{title}}</h2> 7 <h2 class="tit">{{title}}</h2>
8 <div class="box desc ql-editor" v-html="content"> 8 <div class="box desc ql-editor text-jtf" v-html="content">
9 </div> 9 </div>
10 </div> 10 </div>
11 11
......