diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f9e78f3b4..000000000
--- a/.gitignore
+++ /dev/null
@@ -1,22 +0,0 @@
-.DS_Store
-node_modules
-/dist
-
-# local env files
-.env.local
-.env.*.local
-
-# Log files
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# Editor directories and files
-.idea
-.vscode
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?
-.history/
diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index 57aee52e3..b5af19ae4 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -921,11 +921,11 @@ export default {
console.log('trialInfo == ', trialInfo)
//通用规则1:交费方式为一次交情,无交费期限
if (trialInfo['payIntv'] == '0') {
- console.log(11111)
trialInfo['payEndYear'] = '1000'
trialInfo['payEndYearFlag'] = 'Y'
// 福宝宝和万能险传A
- if (item.mainRiskCode != 'GFRS_M0006' && item.mainRiskCode != 'GFRS_M0003' && item.mainRiskCode != 'GFRS_M0013') {
+ if (item.mainRiskCode != 'GFRS_M0006' && item.mainRiskCode != 'GFRS_M0017'
+ && item.mainRiskCode != 'GFRS_M0003' && item.mainRiskCode != 'GFRS_M0013') {
trialInfo['insuYearFlag'] = 'Y'
}
}
@@ -1151,7 +1151,9 @@ export default {
//万能型产品保费赋值给保额
//增加判断是否是从建议书跳转过来了的
if (localStorage.isFrom != 'proposal') {
- if (this.trialList[index].productCode == 'GFRS_M0003' || this.trialList[index].productCode == 'GFRS_M0015') {
+ if (this.trialList[index].productCode == 'GFRS_M0003'
+ || this.trialList[index].productCode == 'GFRS_M0015'
+ || this.trialList[index].productCode == 'GFRS_M0017') {
riskItem['amt'] = this.trialList[index].prem
}
}
diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue
index c20e35b6e..d105bde18 100644
--- a/src/views/ebiz/common/MainRiskList.vue
+++ b/src/views/ebiz/common/MainRiskList.vue
@@ -9,6 +9,10 @@
+
+
+
+
diff --git a/src/views/ebiz/sale/Detail.vue b/src/views/ebiz/sale/Detail.vue
index e4c40172f..024f41697 100644
--- a/src/views/ebiz/sale/Detail.vue
+++ b/src/views/ebiz/sale/Detail.vue
@@ -63,7 +63,8 @@
-
+
+
@@ -75,7 +76,8 @@
-
+
+
diff --git a/src/views/ebiz/sale/InsuranceInformation.vue b/src/views/ebiz/sale/InsuranceInformation.vue
index 4449f739a..f30f42bf5 100644
--- a/src/views/ebiz/sale/InsuranceInformation.vue
+++ b/src/views/ebiz/sale/InsuranceInformation.vue
@@ -273,7 +273,8 @@ export default {
}
})
} else {
- url = this.productCode == 'GFRS_M0003' || this.productCode == 'GFRS_M0015' ? 'productTip' : 'insuranceTip'
+ url = this.productCode == 'GFRS_M0003' || this.productCode == 'GFRS_M0015' || this.productCode == 'GFRS_M0017'
+ ? 'productTip' : 'insuranceTip'
this.$jump({
flag: 'h5',
extra: {
@@ -406,7 +407,7 @@ export default {
if (that.changeCard) {
url = 'SignatureConfirmation'
} else {
- url = this.productCode == 'GFRS_M0003' || this.productCode == 'GFRS_M0015' ? 'productTip' : 'insuranceTip'
+ url = this.productCode == 'GFRS_M0003' || this.productCode == 'GFRS_M0015' || this.productCode == 'GFRS_M0017' ? 'productTip' : 'insuranceTip'
}
this.$jump({
flag: 'h5',
diff --git a/src/views/ebiz/sale/NotifyingMessage.vue b/src/views/ebiz/sale/NotifyingMessage.vue
index 96f4ed587..e4377d92d 100644
--- a/src/views/ebiz/sale/NotifyingMessage.vue
+++ b/src/views/ebiz/sale/NotifyingMessage.vue
@@ -15,7 +15,7 @@
{{ impartTypeNumber[im.impartType] }}
{{
- im.impartType == 0 || im.impartType == 2 || im.impartType == 4 || im.impartType == 6 || im.impartType == 9 || im.impartType == 11
+ im.impartType == 0 || im.impartType == 2 || im.impartType == 4 || im.impartType == 6 || im.impartType == 8 || im.impartType == 10
? saleInsuredInfo.name
: saleInsuredPersonInfo.name
}}
diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue
index b08934e95..62d37fbde 100644
--- a/src/views/ebiz/sale/SignatureConfirmation.vue
+++ b/src/views/ebiz/sale/SignatureConfirmation.vue
@@ -437,7 +437,7 @@ export default {
if (that.changeCard) {
path = 'insuranceInformation'
} else {
- if (localStorage.productCode == 'GFRS_M0003' || localStorage.productCode == 'GFRS_M0015') {
+ if (localStorage.productCode == 'GFRS_M0003' || localStorage.productCode == 'GFRS_M0015' || this.productCode == 'GFRS_M0017') {
if (that.appntSign[0].documentStatus == 0) {
path = 'insuranceInformation'
} else if (that.appntSign[1].documentStatus == 2) {
diff --git a/src/views/ebiz/sale/SignatureOfElectronic.vue b/src/views/ebiz/sale/SignatureOfElectronic.vue
index cfa0a0f9a..769671df3 100644
--- a/src/views/ebiz/sale/SignatureOfElectronic.vue
+++ b/src/views/ebiz/sale/SignatureOfElectronic.vue
@@ -752,7 +752,7 @@ export default {
let comment = window.localStorage.getItem('productCode')
// if (comment == 'GFRS_M0003') {
- if (comment == 'GFRS_M0003' || comment == 'GFRS_M0015') {
+ if (comment == 'GFRS_M0003' || comment == 'GFRS_M0015' || comment == 'GFRS_M0017') {
this.isComment = true
}