Merge branch 'release/1226' into dev

src/views/ebiz/proposal/Exhibition.vue

@@ -130,8 +130,7 @@
               </tr>
             </tbody>
           </table>
-          <div class="bg-green-base pt20 pl15 pr15" v-if="mainRiskCodes.length !=0">
-            <div v-if='mainRiskCodes[0] == "GFRS_M0008"'>
+          <div class="bg-green-base pt20 pl15 pr15" v-if="mainRiskCodes.length !=0 && mainRiskCodes[0] == 'GFRS_M0008'">
               <div class="text-center fw500 c-gray-darker fs14">产品总利益</div>
               <!-- {{risk.demoLabel}} -->
               <div
@@ -175,7 +174,6 @@
               ></select-radio>
 
               <div class="green fs12 text-center pb15">拖动按钮查看不同年龄的保单利益</div>
-            </div>
           </div>
           <div class="bg-green-base pt20 pl15 pr15" v-else>
             <div class="text-center fw500 c-gray-darker fs14">产品总利益</div>
@@ -339,9 +337,10 @@ export default {
         //在app端
         
         params.proposalInfoDTO.proposalNo = localStorage.orderNo
-        if (localStorage.mainRiskCodes) {
-          this.mainRiskCodes = JSON.parse(localStorage.mainRiskCodes)
-        }
+        // if (localStorage.mainRiskCodes) {
+        //   this.mainRiskCodes = JSON.parse(localStorage.mainRiskCodes)
+        // }
+        this.mainRiskCodes.push(localStorage.mainRiskCode)
         getDemo(params).then(res => {
           this.formatLocal(res)
         })

src/views/ebiz/proposal/List.vue

@@ -230,7 +230,10 @@ export default {
     },
     //预览 跳转至利益演示
     preview(item) {
+      console.log(item.insuredDTOs[0].mainRisk[0].mainRiskCode)
       localStorage.orderNo = item.orderInfoDTO.orderNo
+      //新增 解决直接点击预览报错问题
+      localStorage.mainRiskCode = item.insuredDTOs[0].mainRisk[0].mainRiskCode
       this.$jump({
         flag: 'h5',
         extra: {