Merge branch 'feature/GFRS-502_【0206】国富人寿富娃娃两全保险（万能型）' into dev

# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue

src/views/ebiz/common/MainRiskList.vue

@@ -94,13 +94,14 @@ export default {
     },
     //储存主险
     async addMainRisk() {
-      localStorage.setItem('isTrial', '')
+      localStorage.setItem('isTrial', '999')
       let riskProductCode = this.result.riskProductCode
       let resultData = await calculatePremium({ productCodes: [riskProductCode], platform: 'app', type: '1' })
       if (resultData.result == 0) {
         resultData = resultData.trialDTOS[0]
         localStorage.hint = resultData.hint
-        localStorage.isTrial = resultData.productTrialInfoDTO.isTrial
+        localStorage.isTrial = resultData.productTrialInfoDTO.isTrial === undefined ? '999' : resultData.productTrialInfoDTO.isTrial
+        console.log('localStorage.isTrial==', localStorage.isTrial, typeof localStorage.isTrial)
         if (resultData.productTrialInfoDTO.dutyGroup != null) {
           resultData.productTrialInfoDTO.dutyGroup.map(item => {
             if (item.dutyName == '意外身故/伤残保险金') {
@@ -141,7 +142,7 @@ export default {
         let productTrialYearDTOS = localStorage.isTrial === '' ? null : resultData.productTrialInfoDTO.productTrialYearDTOS
         let hasAddtionRisk = resultData.productTrialInfoDTO.addtionRiskLst ? true : false
         let currentProductInfo =
-          localStorage.isTrial === ''
+          localStorage.isTrial == '' || localStorage.isTrial === undefined || localStorage.isTrial == null
             ? {
                 calFactorLst,
                 hasAddtionRisk,