From ee97224d9cc768b56c4ac8a399752ad8c5cf2208 Mon Sep 17 00:00:00 2001
From: "li.yuetong" <li.yuetong@ebiz-digits.com>
Date: Fri, 18 Nov 2022 10:05:31 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=87=91=E6=8E=8C=E6=A1=822023?=
 =?UTF-8?q?=E5=B9=B4=E5=BC=80=E9=97=A8=E7=BA=A2=E7=9B=B8=E5=85=B3=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=91=E3=80=91=E9=93=B6=E4=BF=9D=E6=B8=A0?=
 =?UTF-8?q?=E9=81=93=E6=9C=89=E5=BC=80=E9=97=A8=E7=BA=A2=E6=A0=87=E8=AF=86?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=B8=BA=E4=BA=A4=E5=8F=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/common/CalculatePremium.vue | 48 ++++++++++++++++++++--
 src/views/ebiz/common/MainRiskList.vue     | 18 ++++----
 2 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index 17e063d44..fdbd5d0e9 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -336,13 +336,42 @@
       </van-radio-group>
       <span class="pl5">{{ cvalidateStr }}</span>
     </div>
-    <div class="bottom-btn bg-white">
+    <div class="bottom-btn bg-white flex">
+      <!-- <van-button plain type="danger" size="large" @click="nextStep" :disabled="nextStepFlag" v-no-more-click="1000">核保试算</van-button> -->
+      <!-- <van-button type="danger" size="large" @click="nextStep" :disabled="nextStepFlag" v-no-more-click="1000">下一步</van-button> -->
       <van-button type="danger" size="large" @click="nextStep" :disabled="nextStepFlag" v-no-more-click="1000">完成</van-button>
     </div>
     <van-action-sheet v-model="show" cancel-text="取消" :actions="policyInfo" @select="openDocument" />
 
     <!-- 字段选择 -->
     <van-popup v-model="popupShow" position="bottom"><van-picker show-toolbar :columns="columns" @confirm="onConfirm" @cancel="onCancel" /></van-popup>
+    <van-dialog v-model="trialResultsShow" title="核保试算结果" :show-cancel-button="false">
+    <!-- <van-dialog v-model="trialResultsShow" :show-confirm-button="false" class="dialog_class" style="position: relative; overflow: visible;"> -->
+      <div class="pl20 pr20 mt30">
+        <!-- <div class="flex justify-content-c align-items-c">
+          <img class="icon_title_image" src="@/assets/images/kmh/title_bg.png" />
+        </div> -->
+        <!-- <van-radio-group v-model="active_radio" style="align-items: center;padding-top: 140px">
+          <van-radio name="1" class="radio_class ml50">
+            <template #icon="props">
+              <img class="img-icon radio_icon_image" :src="props.checked ? checkedUrl : noCheckedUrl" />
+            </template>
+            <div class="flex justify-content-fs align-items-c pl5">
+              <img class="icon_select_image" src="@/assets/images/kmh/kmh_pro.png" />
+            </div>
+          </van-radio>
+          <van-radio name="0" class="radio_class ml50">
+            <template #icon="props">
+              <img class="img-icon radio_icon_image" :src="props.checked ? checkedUrl : noCheckedUrl" />
+            </template>
+            <div class="flex justify-content-fs align-items-c pl5">
+              <img class="icon_select_image" src="@/assets/images/kmh/normal_pro.png" />
+            </div>
+          </van-radio>
+        </van-radio-group> -->
+        
+      </div>
+    </van-dialog>
   </div>
 </template>
 <script>
@@ -475,8 +504,9 @@ export default {
       mainRiskCode: '',
       renewal: '-1',
       richChildrenFlag: false,
-      isCrossChannel: '0' //是否交叉渠道 1-是 0-否
-    }
+      isCrossChannel: '0', //是否交叉渠道 1-是 0-否
+      trialResultsShow:false  //核保试算结果
+    } 
   },
   mounted() {
     getAgentInfo({}).then(res => {
@@ -2669,6 +2699,18 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+/deep/ .van-dialog .van-dialog__header{
+  font-size: 16px;
+  font-weight: 700; 
+}
+/deep/ .van-button--danger{
+  border-radius: 0;
+}
+
+/deep/ .van-button--plain {
+  border: none !important;
+  border-top: 1px solid #E9332E !important;
+}
 .renewalWrappser {
   display: flex;
   justify-content: space-between;
diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue
index 0950becc1..81dc7fea8 100644
--- a/src/views/ebiz/common/MainRiskList.vue
+++ b/src/views/ebiz/common/MainRiskList.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="main-risk-list-container pt10 redRadioCheckbox">
-    <template v-if="recommendType == '03'">
+    <template v-if="recommendType == '03' && !isActivityCode">
       <van-tabs v-model="active" @click="onChangeMainList">
         <van-tab title="银保渠道产品" name="normal">
           <van-radio-group v-model="result">
@@ -99,16 +99,17 @@ export default {
               } else if (res.orderDTO.orderInfoDTO.productCode == 'GFRS_M0024' || res.orderDTO.orderInfoDTO.productCode == 'GFRS_M0040') {
                 this.specilFlag = '1'
               }
-              this.recommendType = res.orderDTO.recmdDTO.recommendType;
-              if (this.recommendType == '02' || this.recommendType == '11') {
-                // 电投 团险渠道产品  均为交叉渠道销售
-                this.isCrossChannel = '1';
-              }
-              // ------------------------专为桂/惠企写死--end---------------//
               // 处理活动产品
               // this.activeFlag = res.orderDTO.orderInfoDTO.activeType
               //isActivityCode 有值代表是活动，无值代表是普通产品
               this.isActivityCode = res.orderDTO.orderInfoDTO.activityCode
+              // recommendType 03 银保渠道
+              this.recommendType = res.orderDTO.recmdDTO.recommendType;
+              if (this.recommendType == '02' || this.recommendType == '11' || (this.recommendType == '03' && this.isActivityCode)) {
+                // 电投 团险渠道产品  均为交叉渠道销售
+                this.isCrossChannel = '1';
+              }
+              // ------------------------专为桂/惠企写死--end---------------//
             }
             resolve(this.isActivityCodeFunc())
           },
@@ -168,7 +169,8 @@ export default {
     },
     isActivityCodeFunc(){
         //isActivityCode 有值代表是活动，无值代表是普通产品
-       if(this.isActivityCode && this.isCrossChannel == '0'){
+      //  if(this.isActivityCode && this.isCrossChannel == '0'){
+       if(this.isActivityCode){
          this.getActProductListFunc()
        }else{
          this.getMainRiskList()