Skip to content

dev / pingan-life-index-pro

Go to a project
Toggle navigation
Toggle navigation pinning
9f9a9aef by joe
Options

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

# Conflicts:
#	src/components/clarms/clarms-plugins-modal1.vue
2 parents eecd8829 0179c704
Inline Side-by-side
Showing 16 changed files with 121 additions and 44 deletions
......@@ -837,6 +837,7 @@ module.exports = {
tip4: "contact customer service hotline"
},
clarms: {
title:"File a claim",
step1: {
register: "Register",
login: "Login",
......
......@@ -832,6 +832,7 @@ module.exports = {
tip4: "我想聯絡客服"
},
clarms: {
title:"索償申請",
step1: {
register: "註冊",
login: "登入",
......
......@@ -834,6 +834,7 @@ module.exports = {
tip4: "我想联络客服"
},
clarms: {
title:"索偿申请",
step1: {
register: "注册",
login: "登入",
......
......@@ -17,6 +17,9 @@ export default {
},
components: {},
computed: {
locale() {
return this.$i18n.locale || 'tc';
},
},
methods: {
initData() {
......
......@@ -55,18 +55,24 @@
.message {
margin-left: 48px;
// font-size: 1.333333rem;
font-weight: bold;
color: $cOrange2;
letter-spacing: 1.4px;
text-align: left;
line-height: 1.5;
display: inline-block;
height: 100%;
min-width: 100px;
text-align: justify;
text-align-last: left;
span {
cursor: pointer;
text-decoration: underline;
}
}
.lsp {
line-height: 1.4;
letter-spacing: 0.7px;
}
}
.close {
......
......@@ -8,8 +8,8 @@
<div class="content">
<div class="info-icon">
<img src="@/assets/images/clarms/info.png">
</div>
<div class="message">
</div>
<div class="message" :class="{'lsp':locale != 'en'}">
<template v-if="type == 1">
{{$t('clarms.step2.tip5')}}
</template>
......
......@@ -5,7 +5,11 @@ export default {
}
},
components: {},
computed: {},
computed: {
locale() {
return this.$i18n.locale || 'tc';
},
},
methods: {
initData() {
......
......@@ -55,12 +55,13 @@
.message {
margin-left: 48px;
// font-size: 1.333333rem;
font-weight: bold;
color: $cOrange2;
letter-spacing: 1.4px;
text-align: left;
line-height: 1.5;
display: inline-block;
height: 100%;
min-width: 100px;
text-align: justify;
text-align-last: left;
span {
cursor: pointer;
......@@ -69,6 +70,11 @@
}
}
.lsp {
line-height: 1.4;
letter-spacing: 0.7px;
}
.close {
cursor: pointer;
......
......@@ -9,7 +9,7 @@
<div class="info-icon">
<img src="@/assets/images/clarms/suc.png">
</div>
<div class="message">
<div class="message" :class="{'lsp':locale != 'en'}">
{{$t('clarms.step2.tip7')}}
<span @click="toAccountInformation">{{$t('clarms.step2.tip8')}}</span>
</div>
......
......@@ -13,19 +13,21 @@ $borderSize: 8px;
background-image: linear-gradient(to right, #ffb31d, #f15907);
.clarms-box {
@extend .bb;
position: relative;
width: 100%;
height: 100%;
border-radius: .416667rem;
background: #fff;
padding: 40px 50px 20px 40px;
// padding: 40px 50px 20px 40px;
padding: 40px 0 20px;
.clarms-tips {
top: 20px;
left: 80px;
top: 40px;
left: 98px;
position: absolute;
z-index: 11;
border-radius: 2px;
border-radius: 4px;
padding: 2px;
background-image: linear-gradient(to right, #ffb31d, #f15907);
max-width: 400px;
......@@ -36,29 +38,36 @@ $borderSize: 8px;
width: 100%;
height: 100%;
background-color: #ffffff;
border-radius: 2px;
font-size: 18px;
border-radius: 4px;
}
}
.clarms-header {
display: flex;
align-items: center;
padding-bottom: 1.666667rem;
padding-bottom: 20px;
padding-right: 40px;
.clarms-header-2 {
position: relative;
flex-grow: 1;
display: flex;
align-items: center;
}
.clarms-icon {
.clarms-icon {
@extend .fcc;
width: 182px;
height: 100%;
}
}
}
.clarms-title-container {
margin-left: 2.5rem;
// margin-left: 2.5rem;
flex-grow: 1;
width: 100%;
......@@ -80,12 +89,11 @@ $borderSize: 8px;
}
}
hr {
margin: 0 .833333rem 1.666667rem .833333rem;
border-top: 1px solid #dddede;
}
.clarms-btn {
background: url(~@/assets/images/clarms/button.png);
background-size: 100% 100%;
width: 150px;
......@@ -98,7 +106,20 @@ $borderSize: 8px;
cursor: pointer;
}
.line {
@extend .bb;
padding: 0 24px;
}
hr {
border-top: 1px solid #dddede;
width: 100%;
margin-bottom: 20px;
}
.clarms-img-group {
@extend .bb;
padding: 0 28px;
display: flex;
flex-wrap: wrap;
......
......@@ -7,8 +7,8 @@
</div>
<div class="clarms-header">
<div class="clarms-header-2">
<div @mouseover="onShowTipsOverHandler($event)" @mouseout="onShowTipsOutHandler($event)">
<img class="clarms-icon" :src='icon'>
<div class="clarms-icon" @mouseover="onShowTipsOverHandler($event)" @mouseout="onShowTipsOutHandler($event)">
<img :src='icon'>
</div>
<div class="clarms-title-container">
<div class="clarms-t1" :class="{clarmsActivty:images && images.length > 0}">{{options.name}}</div>
......@@ -20,7 +20,9 @@
</div>
</div>
<div v-if="images && images.length > 0">
<hr>
<div class="line">
<hr>
</div>
<div class="clarms-img-group">
<div class="clarms-img-item-plugin" @mouseover="onOverHandler($event,item,index)" v-for="(item,index) in images" :key="index">
<div class="clarms-img-item">
......@@ -39,7 +41,7 @@
</div>
</div>
</div>
<div class="clarms-empty-line"></div>
<!-- <div class="clarms-empty-line"></div> -->
</div>
</div>
</div>
......
......@@ -3,7 +3,7 @@
<div class="navigate">
<div class="bg"></div>
<div class="cont">
<span class="tt">{{$t('customService.menu5')}}</span>
<span class="tt">{{$t('clarms.title')}}</span>
</div>
</div>
<div class="content" v-if="step == 3">
......
......@@ -152,20 +152,37 @@ export default {
},
initProduct() {
let productList = [{
title: "保證續保至100歲"
showMore: false,
title: "保證續保至100歲",
desc: "平安人壽（香港）「好e時」自願醫保標準計劃 接受任何介乎14天至80歲人士投保，您可以一直續保至100歲。計劃保證不會因您的索償記錄或身體狀況變而調高續保保費，而您的續保保費將根據當時保單週年日之保費表釐定。"
}, {
showMore: false,
title: "不設終身保障限額"
}, {
showMore: false,
title: "一家投保 盡享稅務扣減"
}, {
showMore: false,
title: "承保投保前未知的已有疾病"
}, {
showMore: false,
title: "出院免找數 讓您安心無憂"
}, {
showMore: false,
title: "無索償折扣"
}];
this.productList = productList;
},
onShowMoreHandler(idx) {
console.log("idx:", idx);
let productList = this.productList;
let curProduct = productList[idx];
if (curProduct) {
curProduct.showMore = !curProduct.showMore;
}
this.productList = productList;
console.log("this.productList:",this.productList);
},
initData() {
this.initProduct();
let targetData = null;
......@@ -210,8 +227,7 @@ export default {
try {
this.sourceData = JSON.parse(d);
this.initData();
} catch (e) {
}
} catch (e) {}
}
}
},
......@@ -219,7 +235,12 @@ export default {
this.initActivity();
},
created() {
httpGet({ url: api.productInfo, data: { code: "voluntary" } }).then(res => {
httpGet({
url: api.productInfo,
data: {
code: "voluntary"
}
}).then(res => {
if (res) {
localStorage.setItem("voluntaryInfo", JSON.stringify(res));
this.sourceData = res;
......
......@@ -104,7 +104,9 @@
right: 50px;
top: 50px;
padding: 2px;
border-radius: $borderSize;
// border-radius: $borderSize;
background-image: url('~@assets/images/vhis/vhis-tips-bg.png');
@extend .bis;
.close {
cursor: pointer;
......@@ -119,7 +121,6 @@
position: relative;
width: 100%;
height: 100%;
background-color: rgba($color: #ffffff, $alpha: 0.8);
border-radius: $borderSize;
.tit {
......@@ -221,7 +222,7 @@
@extend .fcc;
padding: 2px;
width: 582px;
height: 262px;
height: 280px;
margin-bottom: 25px;
.cont {
......@@ -237,8 +238,8 @@
}
.detail {
padding: 52px 40px 0 0;
// flex: 1;
padding: 52px 32px 0 0;
flex: 1;
flex-grow: 1;
.t1 {
......@@ -247,7 +248,7 @@
font-weight: bold;
}
.desc {
.more {
display: flex;
// margin: 12px auto 0;
......@@ -261,6 +262,13 @@
font-size: 18px;
}
}
.desc {
margin-top: 6px;
font-size: 18px;
font-weight: 300;
// letter-spacing: -0.45px;
}
}
}
}
......
......@@ -35,7 +35,7 @@
<!-- <div class="swiper-button-prev" slot="button-prev"></div>
<div class="swiper-button-next" slot="button-next"></div> -->
<div v-if="bannerTipsVisible" class="border2 banner-tips">
<div v-if="bannerTipsVisible" class="banner-tips">
<div class="cont">
<div class="tit">
<img class="icon" src="@/assets/images/vhis/hot-deal-icon.png"> 【期間限定保費8折優惠】
......@@ -67,11 +67,14 @@
</div>
<div class="detail">
<div class="t1" v-html="item.title">{{item.title}}</div>
<div class="desc">
<div class="desc-icon-wrap">
<div class="more pointer" @click="onShowMoreHandler(index)">
<div class="more-icon-wrap" >
<img src="@/assets/images/vhis/vhis-plus.png">
</div>
<div class="c1">展開</div>
<div class="c1">{{item.showMore ? '收起' : '展開'}}</div>
</div>
<div v-if="item.showMore" class="desc">
{{item.desc}}
</div>
</div>
</div>
......