diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index d4337eca4..0a8e70961 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -393,7 +393,7 @@ export default {
       activeRadio: '1',
       activeType: localStorage.getItem('active_type'),
       cvalidateFlag : false,
-      cvalidateStr:'',
+      cvalidateStr:'', //活动生效日
       chooseProducts: [],
       productIndex: '',
       calFactorIndex: '',
@@ -450,7 +450,7 @@ export default {
       })
     },
     //初始化数据
-    init() {
+    async init() {
       // 获取是否从建议书过来的
       let that = this
       this.isFrom = window.localStorage.isFrom
@@ -462,8 +462,17 @@ export default {
       if (this.$CacheUtils.getLocItem('saleInsuredPersonInfo')) {
         this.saleInsuredPersonInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredPersonInfo'))
       }
-      this.cvalidateFlag = (this.activeType == 'KMH'||this.activeType == 'SQY') && this.isFrom != 'proposal'
-      this.cvalidateStr = this.cvalidateFlag?this.activeType == 'KMH'?'2021-01-01':this.activeType == 'SQY'?'2021-06-01':'':''
+      // 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')
+      let detailPromise = this.isFrom === 'proposal' ? localStorage.proposalMedical : await getOrderDetail({ orderNo })
+       if(this.isFrom != 'proposal'){
+         //活动生效日期
+        this.cvalidateStr = detailPromise.orderDTO.orderInfoDTO.cvaliDate
+       }
+      
       //构建提交数据、渲染险种
       this.chooseProducts = JSON.parse(localStorage.chooseProducts)
       this.chooseProducts.forEach((item, index) => {
@@ -1484,6 +1493,7 @@ export default {
     },
     //试算
     async getTrial() {
+      let that = this
       this.nextStepFlag = true
       this.$toast.clear()
       this.$toast.loading({
@@ -1492,10 +1502,12 @@ export default {
       })
       this.setRemitRisk()
       let params = this.getParams()
-      // 开门红产品试算增加标识
-      if (this.activeType == 'KMH' && this.isFrom != 'proposal') {
+      // 开门红产品试算增加标识,活动产品试算增加标识
+      if (this.activeType && this.isFrom != 'proposal') {
         for (let product of params.trialInfos) {
           product.isKmh = '1'
+           //GFRS-2552【需求】关于金掌桂投保流程增设指定生效日按钮的申请
+          product.cvaliDate = that.cvalidateStr
         }
       }
       let resultData = await trial(params)
diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue
index a93c9175e..46ff9e49f 100644
--- a/src/views/ebiz/common/MainRiskList.vue
+++ b/src/views/ebiz/common/MainRiskList.vue
@@ -109,11 +109,51 @@ export default {
     },
     //获取主险列表--活动下的产品
     async getActProductListFunc() {
-      let res = await getActProductList({
-        activityCode:this.isActivityCode
+      let mainRiskCodes = localStorage.mainRiskCodes && JSON.parse(localStorage.mainRiskCodes)
+      let resultData = await getActProductList({
+        activityCode:this.isActivityCode,
+        type:'app'
       })
-      if (res.result == 0) {
-        this.list = res.content
+      if (resultData.result == 0) {
+        resultData.content.mainRiskDTOS.forEach(item => {
+          //已选主险不能再选、险种互斥
+          if (mainRiskCodes && mainRiskCodes.includes(item.riskProductCode)) {
+            this.delList.push(item.riskProductCode)
+            if (item.mutexRisk) {
+              this.delList = this.delList.concat(item.mutexRisk.split(','))
+            }
+          }
+        })
+        //删除已选或互斥险种
+        for (let i = 0; i < resultData.content.mainRiskDTOS.length; i++) {
+          if (this.delList && this.delList.includes(resultData.content.mainRiskDTOS[i].riskProductCode)) {
+            resultData.content.mainRiskDTOS.splice(i, 1)
+            i--
+          }
+        }
+        this.list = resultData.content.mainRiskDTOS
+        //------------------------专为惠企写死--begin---------------//
+        if (this.list.length > 0 && this.specilFlag == '1' && localStorage.isFrom == 'sale') {
+          this.result = this.list.find(v => {
+            return v.riskProductCode == 'GFRS_M0040'
+          })
+        }
+        // ------------------------专为惠企写死--end---------------//
+
+        if (this.list.length == 0) {
+          this.$dialog({ message: '暂无可选产品!' }).then(() => {
+            this.$jump({
+              flag: 'goBack',
+              // extra: {
+              //   url: location.origin + '/#/common/selectedProduct'
+              // },
+              routerInfo: {
+                type: 1,
+                path: '/common/selectedProduct'
+              }
+            })
+          })
+        }
       }
     },
     //获取主险列表--普通产品
diff --git a/src/views/ebiz/common/SelectedProduct.vue b/src/views/ebiz/common/SelectedProduct.vue
index 90e727f7b..835ef7428 100644
--- a/src/views/ebiz/common/SelectedProduct.vue
+++ b/src/views/ebiz/common/SelectedProduct.vue
@@ -509,6 +509,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)
         if (res.result == 0) {
           this.$jump({
             flag: 'h5',
diff --git a/src/views/ebiz/sale/apointValidDoc.vue b/src/views/ebiz/sale/apointValidDoc.vue
index d8c96343d..f183220d9 100644
--- a/src/views/ebiz/sale/apointValidDoc.vue
+++ b/src/views/ebiz/sale/apointValidDoc.vue
@@ -3,13 +3,17 @@
     <van-notice-bar :scrollable="false" v-if="!Time" class="notice">{{ `提示：阅读时长需在${this.Time ? this.time : this.number}秒以上` }}</van-notice-bar>
     <div class="bg-white flex justify-content-c flex-direction-colunm align-it<po>ems-center p20 fs14 mt20">
       <div>
-        <h2 v-if="activeType=='KMH'" style="text-align:center" class="mb20">指定保单生效日说明</h2>
-        <h2 v-if="activeType=='SQY'" style="text-align:center" class="mb20">指定保险合同生效日说明</h2>
+        <!-- <h2 v-if="activeType=='KMH'" style="text-align:center" class="mb20">指定保单生效日说明</h2> -->
+        <!-- <h2 v-if="activeType=='SQY'" style="text-align:center" class="mb20">指定保险合同生效日说明</h2> -->
+        <h2 style="text-align:center" class="mb20">指定保险合同生效日说明</h2>
         <p style="text-indent:2rem;" :class="[activeType=='SQY' ? 'fontb' : '']">
           尊敬的客户，您好！以下为指定保险合同生效日重要说明，请您务必仔细阅读和确认。
         </p>
         <p style="text-indent:2rem;">
-          如您于{{ activeType=='KMH' ? '2020年12月31日':activeType=='SQY'? '2021年5月31日':'' }}(包含当日）之前申请投保并交费成功、且国富人寿保险股份有限公司（以下简称国富人寿）收取首期保险费并签发保险单，保险合同于{{ activeType=='KMH' ? '2021年1月1日':activeType=='SQY'? '2021年6月1日':'' }}零时起生效；您交费成功日或签发保单日如在{{ activeType=='KMH' ? '2021年1月1日':activeType=='SQY'? '2021年6月1日':'' }}（包含当日）之后，保险合同于国富人寿收取首期保险费并签发保险单次日零时起生效。
+          <!-- 如您于{{ activeType=='KMH' ? '2020年12月31日':activeType=='SQY'? '2021年5月31日':'' }}(包含当日）之前申请投保并交费成功、且国富人寿保险股份有限公司（以下简称国富人寿）
+          收取首期保险费并签发保险单，保险合同于{{ activeType=='KMH' ? '2021年1月1日':activeType=='SQY'? '2021年6月1日':'' }}零时起生效；您交费成功日或签发保单日如在{{ activeType=='KMH' ? 
+           '2021年1月1日':activeType=='SQY'? '2021年6月1日':'' }}（包含当日）之后，保险合同于国富人寿收取首期保险费并签发保险单次日零时起生效。 -->
+          如您于{{ cvalidateStr }}(包含当日）之前申请投保并交费成功、且国富人寿保险股份有限公司（以下简称国富人寿）收取首期保险费并签发保险单，保险合同于{{ cvalidateStr }}零时起生效；您交费成功日或签发保单日如在{{ cvalidateStr }}（包含当日）之后，保险合同于国富人寿收取首期保险费并签发保险单次日零时起生效。
         </p>
         <p style="text-indent:2rem;">
           国富人寿承担的保险责任从保险合同生效日零时开始。 签发保险单后， 国富人寿将电子保单发送至您的电子邮箱。
@@ -32,7 +36,9 @@
 </template>
 <script>
 import { RadioGroup, Radio, Dialog, NoticeBar } from 'vant'
-import { saveInformation } from '@/api/ebiz/sale/sale'
+import { saveInformation, getOrderDetail } from '@/api/ebiz/sale/sale'
+import utils from '@/assets/js/utils/date-utils'
+
 // import config from '@/config'
 // import axios from 'axios'
 export default {
@@ -61,7 +67,9 @@ export default {
       isWeixin,
       productCode: localStorage.productCode, //获取产品编号
       protocol: false,
-      activeType: ''
+      activeType: '',
+      isFrom:'',
+      cvalidateStr:'', //活动生效日
     }
   },
   components: {
@@ -69,6 +77,12 @@ export default {
     [Radio.name]: Radio,
     [Dialog.name]: Dialog,
     [NoticeBar.name]: NoticeBar
+  },
+   computed: {
+    cvalidateStrToFormat() {
+      let date = utils.formatDate(new Date(this.cvalidateStr), 'yyyy年MM月dd日') 
+      return date
+    }
   },
   mounted() {
     let readingType = localStorage.getItem('readingProtocolType')
@@ -98,6 +112,15 @@ export default {
     }
   },
   methods: {
+    async init(){
+    this.isFrom = window.localStorage.isFrom
+    const orderNo = this.$CacheUtils.getLocItem('orderNo')
+      let detailPromise = this.isFrom === 'proposal' ? localStorage.proposalMedical : await getOrderDetail({ orderNo })
+       if(this.isFrom != 'proposal'){
+         //活动生效日期
+        this.cvalidateStr = detailPromise.orderDTO.orderInfoDTO.cvaliDate
+       }
+    },
     timeOut() {
       let that = this
       let time = that.time