From 808f849ed23e2ad6be7540cd8bc8adaf5a8acd23 Mon Sep 17 00:00:00 2001
From: "yang.huaxiang" <yang.huaxiang@ebiz-fooge.com>
Date: Thu, 12 Nov 2020 16:45:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E9=97=A8=E7=BA=A2=E9=9C=80=E6=B1=82-?=
 =?UTF-8?q?=E7=94=B5=E6=8A=95=E6=8F=90=E7=A4=BA=EF=BC=9A=E7=94=B5=E6=8A=95?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=A4=84=E7=90=86=E5=88=9D=E7=89=88=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4=20--=E6=8F=90=E4=BA=A4=E4=BA=BA?=
 =?UTF-8?q?=EF=BC=9A=E9=98=B3=E5=8D=8E=E7=A5=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/common/MainRiskList.vue    | 25 +++----
 src/views/ebiz/common/SelectedProduct.vue | 88 +++++++++++------------
 src/views/ebiz/sale/apointValidDoc.vue    | 33 ++++-----
 3 files changed, 74 insertions(+), 72 deletions(-)

diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue
index a1f605e40..9f6757831 100644
--- a/src/views/ebiz/common/MainRiskList.vue
+++ b/src/views/ebiz/common/MainRiskList.vue
@@ -2,20 +2,16 @@
   <div class="main-risk-list-container pt10 redRadioCheckbox">
     <van-radio-group v-model="result">
       <van-cell-group>
-        <van-cell v-for="(item, index) in list" clickable @click="result = item" :key="index">
-          <div v-if="checkItemShow(item)">
-            <p slot="default">
-              <van-tag plain class="green fs12 mr10">{{ item.productType }}</van-tag>
-              <span class="c-gray-dark fs14">{{ item.riskName }}</span>
-            </p>
-            <van-radio checked-color="red" slot="right-icon" :name="item" />
-          </div>
+        <van-cell v-for="(item, index) in list" clickable @click="result = item" :key="index" v-show="checkItemShow(item)">
+          <p slot="default">
+            <van-tag plain class="green fs12 mr10">{{ item.productType }}</van-tag>
+            <span class="c-gray-dark fs14">{{ item.riskName }}</span>
+          </p>
+          <van-radio checked-color="red" slot="right-icon" :name="item" />
         </van-cell>
-        <van-cell> </van-cell>
-        <van-cell> </van-cell>
       </van-cell-group>
     </van-radio-group>
-
+    <div class="white_block"></div>
     <van-button class="bottom-btn" type="danger" @click="nextStep">完成</van-button>
   </div>
 </template>
@@ -354,4 +350,9 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.white_block {
+  width: 100%;
+  height: 11.73333vw;
+}
+</style>
diff --git a/src/views/ebiz/common/SelectedProduct.vue b/src/views/ebiz/common/SelectedProduct.vue
index da77965f1..bbed03c07 100644
--- a/src/views/ebiz/common/SelectedProduct.vue
+++ b/src/views/ebiz/common/SelectedProduct.vue
@@ -33,22 +33,26 @@
       </div>
     </div>
 
-    <van-dialog v-model="active_show" title="提示" @confirm="comfirmCheckActive">
-      <div>
+    <van-dialog v-model="active_show" :show-confirm-button="false">
+      <div class="pl20 pr20 mt20">
+        <p class="fs14 black">请选择：</p>
         <van-radio-group v-model="active_radio">
-          <van-radio name="1" icon-size="12px">
-            <div class="flex justify-content-fs">
-              <van-image round width="10rem" height="10rem" src="https://img.yzcdn.cn/vant/cat.jpeg" />
-              <div class="fs18 bold">开门红产品</div>
+          <van-radio name="1" icon-size="14px" class="radio_class">
+            <div class="flex justify-content-fs align-items-c pl10 fs18">
+              <van-image round width="1.5rem" height="1.5rem" src="https://img.yzcdn.cn/vant/cat.jpeg" />
+              <div class="fs18 fwb pl10">开门红产品</div>
             </div>
           </van-radio>
-          <van-radio name="2" icon-size="12px">
-            <div class="flex justify-content-fs">
-              <van-image round width="10rem" height="10rem" src="https://img.yzcdn.cn/vant/cat.jpeg" />
-              <div class="fs18 bold">普通产品</div>
+          <van-radio name="2" icon-size="14px" class="radio_class">
+            <div class="flex justify-content-fs align-items-c pl10 fs18">
+              <van-image round width="1.5rem" height="1.5rem" src="https://img.yzcdn.cn/vant/cat.jpeg" />
+              <div class="fs18 fwb pl10">普通产品</div>
             </div>
           </van-radio>
         </van-radio-group>
+        <div class="flex justify-content-c bg-white mt20 mb20 align-items-c">
+          <van-button type="danger" size="normal" class="dialog-comfirm-button" @click="comfirmCheckActive" v-no-more-click="1000">确认</van-button>
+        </div>
       </div>
     </van-dialog>
 
@@ -395,43 +399,31 @@ export default {
       })
     },
     comfirmCheckActive() {
-      if (this.active_radio == '1') {
-        let param = {
-          orderDTO: {
-            orderInfoDTO: {
-              orderNo: localStorage.orderNo,
-              activeType: 'KMH'
-            }
+      let param = {
+        orderDTO: {
+          orderInfoDTO: {
+            orderNo: localStorage.orderNo,
+            activeType: this.active_radio == '1' ? 'KMH' : ''
           }
         }
-        saveOrderActiveType(param).then(res => {
-          this.active_show = false
-          localStorage.setItem('active_type', 'KMH')
-          if (res.result == 0) {
-            this.$jump({
-              flag: 'h5',
-              extra: {
-                url: location.origin + '/#/common/mainRiskList'
-              },
-              routerInfo: {
-                path: '/common/mainRiskList'
-              }
-            })
-          } else {
-            this.$toast(res.resultMessage)
-          }
-        })
-      } else {
-        this.$jump({
-          flag: 'h5',
-          extra: {
-            url: location.origin + '/#/common/mainRiskList'
-          },
-          routerInfo: {
-            path: '/common/mainRiskList'
-          }
-        })
       }
+      saveOrderActiveType(param).then(res => {
+        this.active_show = false
+        localStorage.setItem('active_type', this.active_radio == '1' ? 'KMH' : '')
+        if (res.result == 0) {
+          this.$jump({
+            flag: 'h5',
+            extra: {
+              url: location.origin + '/#/common/mainRiskList'
+            },
+            routerInfo: {
+              path: '/common/mainRiskList'
+            }
+          })
+        } else {
+          this.$toast(res.resultMessage)
+        }
+      })
     },
     showTipForDoubleRecord() {
       //判断投保人年龄是否大于等于60岁
@@ -484,5 +476,13 @@ export default {
     font-weight: bold;
     font-size: 15px;
   }
+  .radio_class {
+    height: 80px;
+    border-bottom: 1px solid #8e8d8d;
+  }
+  .dialog-comfirm-button {
+    width: 50%;
+    border-radius: 6px;
+  }
 }
 </style>
diff --git a/src/views/ebiz/sale/apointValidDoc.vue b/src/views/ebiz/sale/apointValidDoc.vue
index bebc33f76..95c410a42 100644
--- a/src/views/ebiz/sale/apointValidDoc.vue
+++ b/src/views/ebiz/sale/apointValidDoc.vue
@@ -1,29 +1,30 @@
 <template>
   <div class="insuranceInformation-container pb50 redRadioCheckbox">
     <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">
+    <div class="bg-white flex justify-content-c flex-direction-colunm align-it<po>ems-center p20 fs14 mt20">
       <div>
         <h2 style="text-align:center" class="mb20">指定保单生效日说明</h2>
-        <p>
-          尊敬的客户，您好！以下指定保单生效日相关说明，请您务必仔细阅读和确认。
+        <p style="text-indent:2rem;">
+          尊敬的客户，您好！以下为指定保险合同生效日重要说明，请您务必仔细阅读和确认。
         </p>
-        <p>
-          交费成功，即承保成功。如您于2020年12月31日(包含当日）之前承保，保单生效日指定为2021年1月1日零时；如您于2021年1月1日（包含当日）之后承保，保单生效日为承保次日零时。
+        <p style="text-indent:2rem;">
+          如您于2020年12月31日(包含当日）之前申请投保并交费成功、且国富人寿保险股份有限公司（以下简称国富人寿）收取首期保险费并签发保险单，保险合同于2021年1月1日零时起生效；您交费成功日或签发保单日如在2021年1月1日（包含当日）之后，保险合同于国富人寿收取首期保险费并签发保险单次日零时起生效。
         </p>
-        <p>
-          国富人寿保险股份有限公司（以下简称国富人寿）承担的保险责任从保单生效日零时开始。
+        <p style="text-indent:2rem;">
+          国富人寿承担的保险责任从保险合同生效日零时开始。 签发保险单后， 国富人寿将电子保单发送至您的电子邮箱。
         </p>
-        <p>
-          承保成功后，保险合同成立，国富人寿将电子保单发送至您的电子邮箱。
+        <p style="text-indent:2rem;">
+          请您务必仔细阅读保险条款中的等待期、犹豫期、保险责任等各项重要内容和提示。
         </p>
       </div>
     </div>
-    <van-radio-group v-model="radio" class="pb10 pb20 pl30">
-      <van-radio name="1" @click="click" class="fs14">
-        <span>本人已详细阅读并同意上述指定保单生效日说明 </span>
-      </van-radio>
-    </van-radio-group>
+
     <div class="bg-white bottom-btn">
+      <van-radio-group v-model="radio" class="pb10 pb20 pl30">
+        <van-radio name="1" @click="click" class="fs14">
+          <span>本人已详细阅读并同意上述指定保单生效日说明 </span>
+        </van-radio>
+      </van-radio-group>
       <van-button type="danger" size="large" :disabled="isDisable" @click="goNext" v-no-more-click="1000">我已阅读并知晓</van-button>
     </div>
   </div>
@@ -170,7 +171,7 @@ export default {
             if (res.result == '0') {
               this.$toast.clear()
               window.localStorage.setItem('detailJump', '')
-              let url = this.productCode == 'GFRS_M0003' || this.productCode == 'GFRS_M0015' || this.productCode == 'GFRS_M0017' ? 'productTip' : 'insuranceTip'
+              let url = 'insuranceInformation'
               this.$jump({
                 flag: 'h5',
                 extra: {
@@ -275,7 +276,7 @@ export default {
             if (res.result == '0') {
               this.$toast.clear()
               window.localStorage.setItem('detailJump', '')
-              let url = this.productCode == 'GFRS_M0003' || this.productCode == 'GFRS_M0015' || this.productCode == 'GFRS_M0017' ? 'productTip' : 'insuranceTip'
+              let url = 'insuranceInformation'
               this.$jump({
                 flag: 'h5',
                 extra: {