From aeb103cec0c519f295fffb44b5bc60f8bcd5f61b Mon Sep 17 00:00:00 2001
From: liyuetong <li.yuetong@ebiz-fooge.com>
Date: Wed, 1 Dec 2021 11:29:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=A1=E5=B1=95=E7=A4=BA=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=E6=97=A5=E9=97=AE=E9=A2=98=EF=BC=8C=E7=8E=B0?=
 =?UTF-8?q?=E5=9C=A8activeType=E4=BB=8E=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=8E=A5=E5=8F=A3=E5=8F=96=E5=80=BC=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index ff696961f..26afa8b65 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -431,7 +431,8 @@ export default {
     return {
       isEnterAddtionRisk: true, //附加险list
       activeRadio: '1',
-      activeType: localStorage.getItem('active_type'),
+      // activeType: localStorage.getItem('active_type'),  现在从订单详情接口取值了
+      activeType: '',
       cvalidateFlag: false,
       cvalidateStr: '', //活动生效日
       chooseProducts: [],
@@ -504,7 +505,6 @@ export default {
         this.saleInsuredPersonInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo'))
       }
       // this.cvalidateFlag = (this.activeType == 'KMH'||this.activeType == 'SQY') && this.isFrom != 'proposal'
-      this.cvalidateFlag = this.activeType && this.isFrom != 'proposal'
       // this.cvalidateStr = this.cvalidateFlag?this.activeType == 'KMH'?'2021-01-01':this.activeType == 'SQY'?'2021-06-01':'':''
       //GFRS-2552【需求】关于金掌桂投保流程增设指定生效日按钮的申请
       const orderNo = this.$CacheUtils.getLocItem('orderNo')
@@ -512,7 +512,9 @@ export default {
       if (this.isFrom != 'proposal') {
         //活动生效日期
         this.cvalidateStr = detailPromise.orderDTO.orderInfoDTO.cvaliDate
+        this.activeType = detailPromise.orderDTO.orderInfoDTO.activeType
       }
+      this.cvalidateFlag = this.activeType && this.isFrom != 'proposal'
 
       //构建提交数据、渲染险种
       this.chooseProducts = JSON.parse(localStorage.chooseProducts)
diff --git a/src/views/ebiz/common/SelectedProduct.vue b/src/views/ebiz/common/SelectedProduct.vue
index e27888adf..142738b4b 100644
--- a/src/views/ebiz/common/SelectedProduct.vue
+++ b/src/views/ebiz/common/SelectedProduct.vue
@@ -161,7 +161,7 @@ export default {
   mounted() {
     if (localStorage.isFrom == 'sale') {
       // 清除活动标志
-      localStorage.removeItem('active_type')
+      // localStorage.removeItem('active_type')
       setTimeout(() => {
         // eslint-disable-next-line no-undef
         EWebBridge.webCallAppInJs('webview_left_button', {
@@ -536,7 +536,7 @@ export default {
         this.active_show = false
         this.active_sqy_show = false
         // localStorage.setItem('active_type', type=='KMH'?this.active_radio == '1'?'KMH':'':type=='SQY'?this.active_sqy_radio=='1'?'SQY':'':'')
-        localStorage.setItem('active_type', this.activityList[this.active_sqy_radio].isKmh)
+        // localStorage.setItem('active_type', this.activityList[this.active_sqy_radio].isKmh)
         if (res.result == 0) {
           this.$jump({
             flag: 'h5',