hz/ebiz-h5
1
0
Fork 0
mirror of http://112.124.100.131/GFRS/ebiz-h5.git synced 2025-12-19 18:26:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/GFRS-413_【0116】豁免险' into dev

Browse Source
This commit is contained in:
yuweiqi
2020-01-09 11:22:14 +08:00
parent fc0de1af11 bc02b52801
commit 3b909b9bbb
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/views/ebiz/common/CalculatePremium.vue
View File

@@ -550,6 +550,7 @@ export default {
} }
//2、豁免险跟主险联动，值减一 //2、豁免险跟主险联动，值减一
//2、豁免险跟主险联动，豁免险缴费期间和保险期间同主险的缴费期间
let remitIndex = this.getRemitIndex() let remitIndex = this.getRemitIndex()
if (!remitIndex) return if (!remitIndex) return
@@ -562,13 +563,13 @@ export default {
if (item.code == 'payEndYear') { if (item.code == 'payEndYear') {
item.hasFlag = '1' item.hasFlag = '1'
item.payEndYearFlag = 'Y' item.payEndYearFlag = 'Y'
item.payEndYear = Number(mainRiskInfo.payEndYear.payEndYear) - 1 item.payEndYear = Number(mainRiskInfo.payEndYear.payEndYear)
item.showContent = item.payEndYear + '年交' item.showContent = item.payEndYear + '年交'
} }
if (item.code == 'insuYear') { if (item.code == 'insuYear') {
item.hasFlag = '1' item.hasFlag = '1'
item.insuYearFlag = 'Y' item.insuYearFlag = 'Y'
item.insuYear = Number(mainRiskInfo.payEndYear.payEndYear) - 1 item.insuYear = Number(mainRiskInfo.payEndYear.payEndYear)
item.showContent = item.insuYear + '年' item.showContent = item.insuYear + '年'
} }
if (item.code == 'amt') { if (item.code == 'amt') {

28
src/views/ebiz/sale/SignatureOfElectronic.vue
View File

@@ -24,13 +24,13 @@
<van-notice-bar :scrollable="false" v-if="!Time" class="notice">{{ `提示：阅读时长需在${this.Time ? this.time : this.number}秒以上` }}</van-notice-bar> <van-notice-bar :scrollable="false" v-if="!Time" class="notice">{{ `提示：阅读时长需在${this.Time ? this.time : this.number}秒以上` }}</van-notice-bar>
<iframe :src="src + pdfUrl" class="iframe"></iframe> <iframe :src="src + pdfUrl" class="iframe"></iframe>
<!-- <img :src="'data:image/jpeg;base64,' + url" /> --> <!-- <img :src="'data:image/jpeg;base64,' + url" /> -->
<van-radio-group v-model="radio" class="pb10 pt20 pl30 fs14" v-if="!dayShow && chooseProductCodes[0] == 'GFRS_M0011'"> <!-- <van-radio-group v-model="radio" class="pb10 pt20 pl30 fs14" v-if="!dayShow && chooseProductCodes[0] == 'GFRS_M0011'">
<van-radio name="1" @click="click" class="ml-25 pl10 pr10"> <van-radio name="1" @click="click" class="ml-25 pl10 pr10">
本人确认已阅读 本人确认已阅读
<span>{{`${pdfName}并指定本保险合同生效日为2020年1月1日`}}</span> <span>{{`${pdfName}并指定本保险合同生效日为2020年1月1日`}}</span>
</van-radio> </van-radio>
</van-radio-group> </van-radio-group> -->
<van-radio-group v-model="radio" class="pb10 pt20 pl30 fs14" v-else> <van-radio-group v-model="radio" class="pb10 pt20 pl30 fs14">
<van-radio name="1" @click="click"> <van-radio name="1" @click="click">
本人确认已阅读 本人确认已阅读
<span>{{`${pdfName}`}}</span> <span>{{`${pdfName}`}}</span>
@@ -150,9 +150,9 @@ export default {
// 判断回执里面签名是否可以点击 // 判断回执里面签名是否可以点击
isSure: true, isSure: true,
// 判断时间展示不同pdf勾选不同话术 // 判断时间展示不同pdf勾选不同话术
dayShow: false, // dayShow: false,
// 产品编码 // // 产品编码
chooseProductCodes: '', // chooseProductCodes: '',
// pdf名字 // pdf名字
pdfName: '' pdfName: ''
} }
@@ -733,16 +733,16 @@ export default {
async created() { async created() {
let that = this let that = this
// 获取当前时间的时间戳 // 获取当前时间的时间戳
var day2 = new Date() // var day2 = new Date()
var day = day2.setTime(day2.getTime()) // var day = day2.setTime(day2.getTime())
console.log(day) // console.log(day)
console.log(new Date('2020-01-01 23:59:59').getTime()) // console.log(new Date('2020-01-01 23:59:59').getTime())
if (day > new Date('2020-01-01 23:59:59').getTime()) { // if (day > new Date('2020-01-01 23:59:59').getTime()) {
this.dayShow = true // this.dayShow = true
} // }
// 获取产品编码 // 获取产品编码
this.chooseProductCodes = JSON.parse(localStorage.chooseProductCodes) // this.chooseProductCodes = JSON.parse(localStorage.chooseProductCodes)
that.detailJump = window.localStorage.getItem('detailJump') that.detailJump = window.localStorage.getItem('detailJump')
if (this.detailJump == '1') { if (this.detailJump == '1') {
this.pdfUrl = encodeURIComponent(config.imgDomain + `/returnDirectStream?imgPath=${localStorage.getItem('insurance-policyUrl')}`) this.pdfUrl = encodeURIComponent(config.imgDomain + `/returnDirectStream?imgPath=${localStorage.getItem('insurance-policyUrl')}`)