From cf821b6f171b51b2ba28cab4b3b36ac80fd65112 Mon Sep 17 00:00:00 2001
From: yuweiqi <yu.weiqi@ebiz-fooge.com>
Date: Sun, 19 Jan 2020 15:27:40 +0800
Subject: [PATCH] =?UTF-8?q?[FIX]=E5=BB=BA=E8=AE=AE=E4=B9=A6=E4=BF=9D?=
 =?UTF-8?q?=E8=B4=B9=E8=AF=95=E7=AE=97bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/common/CalculatePremium.vue | 4 ++--
 src/views/ebiz/common/MainRiskList.vue     | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index 9773f147e..310d0fc0a 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -18,7 +18,7 @@
         <van-icon name="delete" size="22" @click="deleteRisk(index)" class="green" />
       </div>
       <!-- 险种条件-->
-      <div v-if="(item.isRemit == 1 && isTrial === '1') || (item.isRemit == 1 && isTrial != '1' && item.isMainRisk == 1)">
+      <div v-if="(item.isRemit == 1 && isTrial == '1') || (item.isRemit == 1 && isTrial != '1' && item.isMainRisk == 1)">
         <div v-for="(riskFactor, riskFactorIndex) in item.calFactorLst" :key="riskFactorIndex">
           <div class="flex justify-content-s pv10 border-bottom" v-if="riskFactor.type == 1">
             <div class="flex align-items-c">
@@ -103,7 +103,7 @@
         </div>
       </div>
       <!-- 为富娃娃两全保险（万能型）专写 -->
-      <div v-if="item.isRemit == 1 && isTrial !== '1' && item.isMainRisk == 0">
+      <div v-if="item.isRemit == 1 && isTrial != '1' && item.isMainRisk == 0">
         <div v-for="(riskFactor, riskFactorIndex) in item.calFactorLst" :key="riskFactorIndex">
           <div class="flex justify-content-s pv10 border-bottom" v-if="riskFactor.type == 1">
             <div class="flex align-items-c">
diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue
index 157fa417c..b6458186b 100644
--- a/src/views/ebiz/common/MainRiskList.vue
+++ b/src/views/ebiz/common/MainRiskList.vue
@@ -99,8 +99,8 @@ export default {
       let resultData = await calculatePremium({ productCodes: [riskProductCode], platform: 'app', type: '1' })
       if (resultData.result == 0) {
         resultData = resultData.trialDTOS[0]
+        localStorage.isTrial = resultData.productTrialInfoDTO.isTrial
         localStorage.hint = resultData.hint
-        console.log('localStorage.isTrial==', localStorage.isTrial, typeof localStorage.isTrial)
         if (resultData.productTrialInfoDTO.dutyGroup != null) {
           resultData.productTrialInfoDTO.dutyGroup.map(item => {
             if (item.dutyName == '意外身故/伤残保险金') {
@@ -125,7 +125,7 @@ export default {
         if (riskRules.lifeGradeLimit(resultData, this)) {
           return
         }
-        if (resultData.productCode == 'GFRS_M0006') {
+        if (resultData.productInsuredDTO.validateAppntFlag == '0') {
           if (riskRules.lifeGradeLimitForBaby(resultData, this)) {
             return
           }
@@ -138,10 +138,10 @@ export default {
         localStorage.isRenew = resultData.isRenew
         localStorage.isRelated = resultData.isRelated
         let calFactorLst = this.getFactorList(resultData)
-        let productTrialYearDTOS = localStorage.isTrial === '999' ? null : resultData.productTrialInfoDTO.productTrialYearDTOS
+        let productTrialYearDTOS = localStorage.isTrial === '1' ? null : resultData.productTrialInfoDTO.productTrialYearDTOS
         let hasAddtionRisk = resultData.productTrialInfoDTO.addtionRiskLst ? true : false
         let currentProductInfo =
-          localStorage.isTrial == '999'
+          localStorage.isTrial == '1'
             ? {
                 calFactorLst,
                 hasAddtionRisk,