From ed7d5575ef69963094b201757922de0b06507803 Mon Sep 17 00:00:00 2001
From: "yang.huaxiang" <yang.huaxiang@ebiz-fooge.com>
Date: Wed, 11 Nov 2020 10:46:50 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=BC=80=E9=97=A8=E7=BA=A2=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82-=E7=94=B5=E6=8A=95=E6=8F=90=E7=A4=BA=EF=BC=9A?=
 =?UTF-8?q?=E7=94=B5=E6=8A=95=E6=8F=90=E7=A4=BA=E5=A4=84=E7=90=86=E5=88=9D?=
 =?UTF-8?q?=E7=89=88=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20--=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=BA=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/api/ebiz/sale/sale.js                     |  18 +
 src/router/ebiz/sale.js                       |   9 +
 src/views/ebiz/common/CalculatePremium.vue    |   4 +
 src/views/ebiz/common/MainRiskList.vue        |  31 +-
 src/views/ebiz/common/SelectedProduct.vue     |  80 +++-
 src/views/ebiz/sale/InsuranceInformation.vue  |   5 +
 src/views/ebiz/sale/SignatureConfirmation.vue |  41 +-
 src/views/ebiz/sale/apointValidDoc.vue        | 376 ++++++++++++++++++
 8 files changed, 535 insertions(+), 29 deletions(-)
 create mode 100644 src/views/ebiz/sale/apointValidDoc.vue

diff --git a/src/api/ebiz/sale/sale.js b/src/api/ebiz/sale/sale.js
index b8e3ca7f9..0c1d2e10d 100644
--- a/src/api/ebiz/sale/sale.js
+++ b/src/api/ebiz/sale/sale.js
@@ -253,3 +253,21 @@ export function checkCard(data) {
     data
   })
 }
+
+// 获取订单活动信息
+export function getOrderActiveInfo(data) {
+  return request({
+    url: getUrl('/sale/order/getActiveInfo', 1),
+    method: 'post',
+    data
+  })
+}
+
+// 获取订单活动信息
+export function saveOrderActiveType(data) {
+  return request({
+    url: getUrl('/sale/order/saveActiveType', 1),
+    method: 'post',
+    data
+  })
+}
diff --git a/src/router/ebiz/sale.js b/src/router/ebiz/sale.js
index 8f2e7ae98..75456c643 100644
--- a/src/router/ebiz/sale.js
+++ b/src/router/ebiz/sale.js
@@ -25,6 +25,7 @@ const productTip = () => import('@/views/ebiz/sale/productTip')
 const avoidDutyTip = () => import('@/views/ebiz/sale/AvoidDutyTip')
 const doubleRecordTip = () => import('@/views/ebiz/sale/DoubleRecordTip')
 const PayResultFail = () => import('@/views/ebiz/sale/PayResultFail')
+const apointValidDoc = () => import('@/views/ebiz/sale/apointValidDoc')
 let riskName = localStorage.riskName
 console.log('sale/riskName==', riskName)
 export default [
@@ -161,6 +162,14 @@ export default [
       title: '免除保险人责任条款说明书'
     }
   },
+  {
+    path: '/sale/apointValidDoc',
+    name: 'apointValidDoc',
+    component: apointValidDoc,
+    meta: {
+      title: '免除保险人责任条款说明书'
+    }
+  },
   {
     path: '/sale/doubleRecordTip',
     name: 'doubleRecordTip',
diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index bc9c82878..451edf603 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -270,6 +270,9 @@
         <span style="font-weight:bold" v-else>保额（元）：</span>
         <span class="fee red" v-if="trialList && trialList.length > 0">{{ trialList[index].showPrem | moneyFormat }}</span>
       </div>
+      <div class="flex justify-content-s pv10 border-bottom prem" v-if="item.isMainRisk == 0 && activeType == 'KMH'">
+        <span>指定保单生效日:2021年1月1日</span>
+      </div>
     </div>
     <div class="bottom-btn bg-white">
       <van-button type="danger" size="large" @click="nextStep" :disabled="nextStepFlag" v-no-more-click="1000">完成</van-button>
@@ -350,6 +353,7 @@ export default {
   },
   data() {
     return {
+      activeType: localStorage.getItem('active_type'),
       chooseProducts: [],
       productIndex: '',
       calFactorIndex: '',
diff --git a/src/views/ebiz/common/MainRiskList.vue b/src/views/ebiz/common/MainRiskList.vue
index 8566e49d3..a1f605e40 100644
--- a/src/views/ebiz/common/MainRiskList.vue
+++ b/src/views/ebiz/common/MainRiskList.vue
@@ -3,11 +3,13 @@
     <van-radio-group v-model="result">
       <van-cell-group>
         <van-cell v-for="(item, index) in list" clickable @click="result = item" :key="index">
-          <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 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>
         <van-cell> </van-cell>
         <van-cell> </van-cell>
@@ -40,7 +42,8 @@ export default {
       result: '',
       delList: [],
       radioVal: '',
-      isFrom: localStorage.isFrom
+      isFrom: localStorage.isFrom,
+      activeFlag: ''
     }
   },
   async mounted() {
@@ -61,6 +64,8 @@ export default {
                 this.specilFlag = '1'
               }
               // ------------------------专为桂企写死--end---------------//
+              // 处理活动产品
+              this.activeFlag = res.orderDTO.orderInfoDTO.activeType
             }
             resolve(this.getMainRiskList())
           },
@@ -74,6 +79,20 @@ export default {
     }
   },
   methods: {
+    checkItemShow(item) {
+      if (this.activeFlag != 'KMH') {
+        return true
+      }
+      let showFlag = false
+      if (item.activeLst && item.activeLst.length > 0) {
+        item.activeLst.forEach(subItem => {
+          if (subItem == 'KMH') {
+            showFlag = true
+          }
+        })
+      }
+      return showFlag
+    },
     //获取主险列表
     async getMainRiskList() {
       let mainRiskCodes = localStorage.mainRiskCodes && JSON.parse(localStorage.mainRiskCodes)
diff --git a/src/views/ebiz/common/SelectedProduct.vue b/src/views/ebiz/common/SelectedProduct.vue
index e52b0ae70..d07cb6c96 100644
--- a/src/views/ebiz/common/SelectedProduct.vue
+++ b/src/views/ebiz/common/SelectedProduct.vue
@@ -33,6 +33,25 @@
       </div>
     </div>
 
+    <van-dialog v-model="active_show" title="提示" @confirm="comfirmCheckActive">
+      <div>
+        <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>
+            </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>
+            </div>
+          </van-radio>
+        </van-radio-group>
+      </div>
+    </van-dialog>
+
     <div>
       <van-submit-bar button-text="下一步" @submit="nextStep" :disabled="nextStepFlag">
         <div class="fs15 ml15 fwb" style="flex:1" slot="default">
@@ -45,11 +64,12 @@
   </div>
 </template>
 <script>
-import { Tag, SubmitBar, Icon, Dialog } from 'vant'
+import { Tag, SubmitBar, Icon, Dialog, RadioGroup, Radio, Image as VanImage } from 'vant'
 import FieldPicker from '@/components/ebiz/FieldPicker'
 import { orderDetail, deleteOrderInfo } from '@/api/ebiz/common/common'
 import { formatAllRisk } from '@/assets/js/utils/formatRiskList'
 import { getDetail, deleteProposal } from '@/api/ebiz/proposal/proposal.js'
+import { getOrderActiveInfo, saveOrderActiveType } from '@/api/ebiz/sale/sale.js'
 import utilsAge from '@/assets/js/utils/age'
 import IndexBar from '@/components/ebiz/sale/IndexBar'
 
@@ -63,7 +83,9 @@ export default {
       isShow: true,
       appntDTO: {},
       isFrom: localStorage.isFrom,
-      salePageFlag: '3'
+      salePageFlag: '3',
+      active_show: false,
+      active_radio: ''
     }
   },
   components: {
@@ -71,10 +93,15 @@ export default {
     [FieldPicker.name]: FieldPicker,
     [SubmitBar.name]: SubmitBar,
     [Icon.name]: Icon,
-    [IndexBar.name]: IndexBar
+    [IndexBar.name]: IndexBar,
+    [RadioGroup.name]: RadioGroup,
+    [Radio.name]: Radio,
+    [VanImage.name]: VanImage
   },
   mounted() {
     if (localStorage.isFrom == 'sale') {
+      // 清除活动标志
+      localStorage.removeItem('active_type')
       setTimeout(() => {
         // eslint-disable-next-line no-undef
         EWebBridge.webCallAppInJs('webview_left_button', {
@@ -339,7 +366,25 @@ export default {
       }
     },
     //添加产品
-    addProduct() {
+    async addProduct() {
+      // 1、处理判断活动  1、电投流程  2、后端接口提供弹出判断
+      if (localStorage.isFrom == 'sale') {
+        let param = {
+          activeType: 'KMH'
+        }
+        let resultData = await getOrderActiveInfo(param)
+        if (resultData.result == 0) {
+          if (resultData.content.activeFlag != '1') {
+            // todo 弹框 显示
+            this.active_show = true
+            return
+          }
+          //正常后续跳转流程
+        } else {
+          this.$toast(resultData.resultMessage)
+          return
+        }
+      }
       this.$jump({
         flag: 'h5',
         extra: {
@@ -350,6 +395,33 @@ export default {
         }
       })
     },
+    comfirmCheckActive() {
+      let param = {
+        orderDTO: {
+          orderInfoDTO: {
+            orderNo: localStorage.orderNo,
+            activeType: '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)
+        }
+      })
+    },
     showTipForDoubleRecord() {
       //判断投保人年龄是否大于等于60岁
       let showFlag = false
diff --git a/src/views/ebiz/sale/InsuranceInformation.vue b/src/views/ebiz/sale/InsuranceInformation.vue
index c87006901..0dd401c98 100644
--- a/src/views/ebiz/sale/InsuranceInformation.vue
+++ b/src/views/ebiz/sale/InsuranceInformation.vue
@@ -297,6 +297,11 @@ export default {
                 })
               } else {
                 url = this.productCode == 'GFRS_M0003' || this.productCode == 'GFRS_M0015' || this.productCode == 'GFRS_M0017' ? 'productTip' : 'insuranceTip'
+                that.appntSign.map(item => {
+                  if (item.documentCode == '8') {
+                    url = 'apointValidDoc'
+                  }
+                })
                 this.$jump({
                   flag: 'h5',
                   extra: {
diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue
index 86457f5fd..b8de2999e 100644
--- a/src/views/ebiz/sale/SignatureConfirmation.vue
+++ b/src/views/ebiz/sale/SignatureConfirmation.vue
@@ -38,11 +38,11 @@
             </div>
             <div v-else>
               <div v-for="(item, index) in appntSign" :key="index">
-                <p>{{ item.documentCode == '1' ? '需阅读' : '需签署' }}</p>
+                <p>{{ item.documentCode == '1' || item.documentCode == '8' ? '需阅读' : '需签署' }}</p>
                 <p class="mb20">
                   <span class="text">{{ item.documentName }}</span>
-                  <img :src="src" v-if="item.documentCode == '1' && item.documentStatus == '1'" />
-                  <img :src="src" v-if="item.documentCode !== '1' && item.documentStatus == '3'" />
+                  <img :src="src" v-if="(item.documentCode == '1' || item.documentCode == '8') && item.documentStatus == '1'" />
+                  <img :src="src" v-if="!(item.documentCode == '1' || item.documentCode == '8') && item.documentStatus == '3'" />
                 </p>
               </div>
             </div>
@@ -83,11 +83,11 @@
               </div>
               <p class="mb20">以下内容需要您按照顺序阅读并签字确认:</p>
               <div v-for="(item, index) in insuredSign" :key="index">
-                <p>{{ item.documentCode == '1' ? '需阅读' : '需签署' }}</p>
+                <p>{{ item.documentCode == '1' || item.documentCode == '8' ? '需阅读' : '需签署' }}</p>
                 <p class="mb20">
                   <span class="text">{{ item.documentName }}</span>
-                  <img :src="src" v-if="item.documentCode == '1' && item.documentStatus == '1'" />
-                  <img :src="src" v-if="item.documentCode !== '1' && item.documentStatus == '3'" />
+                  <img :src="src" v-if="(item.documentCode == '1' || item.documentCode == '8') && item.documentStatus == '1'" />
+                  <img :src="src" v-if="!(item.documentCode == '1' || item.documentCode == '8') && item.documentStatus == '3'" />
                 </p>
               </div>
               <p class="start" v-if="airSign != '1'">点击【开始】或【分享】，进行相关操作</p>
@@ -131,11 +131,11 @@
               </div>
               <div v-else>
                 <div v-for="(item, index) in appntSign" :key="index">
-                  <p>{{ item.documentCode == '1' ? '需阅读' : '需签署' }}</p>
+                  <p>{{ item.documentCode == '1' || item.documentCode == '8' ? '需阅读' : '需签署' }}</p>
                   <p class="mb20">
                     <span class="text">{{ item.documentName }}</span>
-                    <img :src="src" v-if="item.documentCode == '1' && item.documentStatus == '1'" />
-                    <img :src="src" v-if="item.documentCode !== '1' && item.documentStatus == '3'" />
+                    <img :src="src" v-if="(item.documentCode == '1' || item.documentCode == '8') && item.documentStatus == '1'" />
+                    <img :src="src" v-if="(item.documentCode == '1' || item.documentCode == '8') && item.documentStatus == '3'" />
                   </p>
                 </div>
               </div>
@@ -165,11 +165,11 @@
               </div>
               <p class="mb20">以下内容需要您按照顺序阅读并签字确认:</p>
               <div v-for="(item, index) in insuredSign" :key="index">
-                <p>{{ item.documentCode == '1' ? '需阅读' : '需签署' }}</p>
+                <p>{{ item.documentCode == '1' || item.documentCode == '8' ? '需阅读' : '需签署' }}</p>
                 <p class="mb20">
                   <span class="text">{{ item.documentName }}</span>
-                  <img :src="src" v-if="item.documentCode == '1' && item.documentStatus == '1'" />
-                  <img :src="src" v-if="item.documentCode !== '1' && item.documentStatus == '3'" />
+                  <img :src="src" v-if="(item.documentCode == '1' || item.documentCode == '8') && item.documentStatus == '1'" />
+                  <img :src="src" v-if="(item.documentCode == '1' || item.documentCode == '8') && item.documentStatus == '3'" />
                 </p>
               </div>
               <p class="start" v-if="airSign != '1'">点击【开始】或【分享】，进行相关操作</p>
@@ -687,7 +687,7 @@ export default {
       } else {
         console.log('that.appntSign.length ==', that.appntSign.length, typeof that.appntSign.length)
         for (let i = 0; i < that.appntSign.length; i++) {
-          if (that.appntSign[i].documentCode == '1' && that.appntSign[0].documentStatus == 0) {
+          if ((that.appntSign[i].documentCode == '1' || that.appntSign[i].documentCode == '8') && that.appntSign[i].documentStatus == 0) {
             //1投保须知 未读
             path = that.appntSign[i].routePath
             break
@@ -1124,23 +1124,26 @@ export default {
     addKey(item) {
       //ducumentCode 1投保须知 2投保单 3产品说明书 4提示书 6免除保险人责任条款说明书 7保险销售行为双录说明
       if (item.documentCode == '1') {
-        item.key = 1
+        item.key = 2
         item.routePath = 'insuranceInformation'
       } else if (item.documentCode == '2') {
-        item.key = 6
+        item.key = 7
         item.routePath = 'SignatureOfElectronic'
       } else if (item.documentCode == '3') {
-        item.key = 2
+        item.key = 3
         item.routePath = 'productTip'
       } else if (item.documentCode == '4') {
-        item.key = 3
+        item.key = 4
         item.routePath = 'InsuranceTip'
       } else if (item.documentCode == '6') {
-        item.key = 4
+        item.key = 5
         item.routePath = 'avoidDutyTip'
       } else if (item.documentCode == '7') {
-        item.key = 5
+        item.key = 6
         item.routePath = 'doubleRecordTip'
+      } else if (item.documentCode == '8') {
+        item.key = 1
+        item.routePath = 'apointValidDoc'
       }
     },
     getSignInvalid() {
diff --git a/src/views/ebiz/sale/apointValidDoc.vue b/src/views/ebiz/sale/apointValidDoc.vue
new file mode 100644
index 000000000..bebc33f76
--- /dev/null
+++ b/src/views/ebiz/sale/apointValidDoc.vue
@@ -0,0 +1,376 @@
+<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>
+        <h2 style="text-align:center" class="mb20">指定保单生效日说明</h2>
+        <p>
+          尊敬的客户，您好！以下指定保单生效日相关说明，请您务必仔细阅读和确认。
+        </p>
+        <p>
+          交费成功，即承保成功。如您于2020年12月31日(包含当日）之前承保，保单生效日指定为2021年1月1日零时；如您于2021年1月1日（包含当日）之后承保，保单生效日为承保次日零时。
+        </p>
+        <p>
+          国富人寿保险股份有限公司（以下简称国富人寿）承担的保险责任从保单生效日零时开始。
+        </p>
+        <p>
+          承保成功后，保险合同成立，国富人寿将电子保单发送至您的电子邮箱。
+        </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-button type="danger" size="large" :disabled="isDisable" @click="goNext" v-no-more-click="1000">我已阅读并知晓</van-button>
+    </div>
+  </div>
+</template>
+<script>
+import { RadioGroup, Radio, Dialog, NoticeBar } from 'vant'
+import { saveInformation } from '@/api/ebiz/sale/sale'
+// import config from '@/config'
+// import axios from 'axios'
+export default {
+  data() {
+    let isWeixin = this.$utils.device().isWeixin //判断环境
+    return {
+      // 投保人还是被保险人信息
+      signVal: '',
+      // 被保险人签名信息
+      insuredSign: {},
+      // 投保人签名信息
+      appntSign: {},
+      radio: '',
+      // 倒计时时间
+      number: '',
+      // 定时器时间
+      time: '10',
+      // 定时器名称
+      timer: null,
+      isOver: false,
+      // 判断验证码是否开始倒计时
+      Time: true,
+      // 按钮是否可以点击
+      isDisable: true,
+      // 是否在微信
+      isWeixin,
+      productCode: localStorage.productCode, //获取产品编号
+      protocol: false
+    }
+  },
+  components: {
+    [RadioGroup.name]: RadioGroup,
+    [Radio.name]: Radio,
+    [Dialog.name]: Dialog,
+    [NoticeBar.name]: NoticeBar
+  },
+  mounted() {
+    let readingType = localStorage.getItem('readingProtocolType')
+    if (readingType && readingType === '1') {
+      this.protocol = true
+    }
+    let that = this
+    // {{switchFlag.Time?pageVariable.msg:pageVariable.number}}
+    that.timeOut()
+    document.title = '指定保单生效日说明'
+    // Notify({
+    //   type: 'warning',
+    //   message: `提示：阅读时长需在${this.Time ? this.time : this.number}秒以上`,
+    //   duration: 10000,
+    //   background: '#999999',
+    //   className: 'notify'
+    // })
+
+    document.body.style.backgroundColor = '#fff'
+    that.signVal = window.localStorage.getItem('sign-val')
+    if (JSON.parse(window.localStorage.getItem('sign-insured'))) {
+      that.insuredSign = JSON.parse(window.localStorage.getItem('sign-insured'))
+    }
+    if (JSON.parse(window.localStorage.getItem('sign-appnt'))) {
+      that.appntSign = JSON.parse(window.localStorage.getItem('sign-appnt'))
+    }
+  },
+  methods: {
+    timeOut() {
+      let that = this
+      let time = that.time
+      that.Time = false
+      that.number = `${time}`
+      let timer = setInterval(() => {
+        time--
+        if (time <= 0) {
+          time = 0
+          clearInterval(timer)
+
+          that.Time = true
+          that.isOver = true
+          // window.localStorage.setItem('step', '1')
+        }
+        that.number = `${time}`
+      }, 1000)
+    },
+    // 点击阅读时
+    click() {
+      let that = this
+      if (that.isOver == false) {
+        Dialog.confirm({
+          title: '提示',
+          message: '该内容涉及您的重大权益，请您仔细阅读',
+          showCancelButton: false
+        }).then(() => {
+          that.radio = ''
+        })
+      }
+    },
+    // 下一步
+    goNext() {
+      if (this.isWeixin) {
+        console.log('````````````````````')
+        console.log('进入微信')
+        this.$toast.loading({
+          duration: 0, // 持续展示 toast
+          forbidClick: true, // 禁用背景点击
+          loadingType: 'spinner',
+          message: '加载中……'
+        })
+        let that = this
+
+        if (that.signVal == '0' || that.signVal == '2') {
+          that.appntSign.map(item => {
+            if (item.documentCode == '8') {
+              that.appntSign.signId = item.signId
+              that.appntSign.documentCode = item.documentCode
+              that.appntSign.documentType = item.documentType
+            }
+          })
+          let data = {
+            orderType: 'SIGN_ORDER',
+            orderDTO: {
+              orderInfoDTO: {
+                orderNo: window.localStorage.getItem('orderNo')
+              },
+              ebizSignDTOS: [
+                {
+                  signOrRead: 'read',
+                  signId: that.appntSign.signId,
+                  orderNo: window.localStorage.getItem('orderNo'),
+                  documentCode: that.appntSign.documentCode,
+                  documentStatus: '1',
+                  documentType: that.appntSign.documentType,
+                  signType: that.signVal
+                }
+              ]
+            }
+          }
+          saveInformation(data).then(res => {
+            // console.log(res)
+            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'
+              this.$jump({
+                flag: 'h5',
+                extra: {
+                  url: location.origin + '/#/sale/' + url
+                },
+                routerInfo: {
+                  path: '/sale/' + url
+                }
+              })
+            } else {
+              that.$toast(res.resultMessage)
+            }
+          })
+        } else {
+          this.$toast.loading({
+            duration: 0, // 持续展示 toast
+            forbidClick: true, // 禁用背景点击
+            loadingType: 'spinner',
+            message: '加载中……'
+          })
+          that.insuredSign.map(item => {
+            if (item.documentCode == '8') {
+              that.insuredSign.signId = item.signId
+              that.insuredSign.documentCode = item.documentCode
+              that.insuredSign.documentType = item.documentType
+            }
+          })
+          let data = {
+            orderType: 'SIGN_ORDER',
+            orderDTO: {
+              orderInfoDTO: {
+                orderNo: window.localStorage.getItem('orderNo')
+              },
+              ebizSignDTOS: [
+                {
+                  signOrRead: 'read',
+                  signId: that.insuredSign.signId,
+                  orderNo: window.localStorage.getItem('orderNo'),
+                  documentCode: that.insuredSign.documentCode,
+                  documentStatus: '1',
+                  documentType: that.insuredSign.documentType,
+                  signType: that.signVal
+                }
+              ]
+            }
+          }
+          saveInformation(data).then(res => {
+            if (res.result == '0') {
+              this.$toast.clear()
+              window.localStorage.setItem('detailJump', '')
+              this.$jump({
+                flag: 'h5',
+                extra: {
+                  url: location.origin + '/#/sale/SignatureOfElectronic'
+                },
+                routerInfo: {
+                  path: '/sale/SignatureOfElectronic'
+                }
+              })
+            } else {
+              that.$toast(res.resultMessage)
+            }
+          })
+        }
+      } else {
+        let that = this
+        this.$toast.loading({
+          duration: 0, // 持续展示 toast
+          forbidClick: true, // 禁用背景点击
+          loadingType: 'spinner',
+          message: '加载中……'
+        })
+        // console.log('that.appntSign.signId',that.appntSign,that.appntSign.signId,that.appntSign.documentCode,that.appntSign.documentType)
+        if (that.signVal == '0' || that.signVal == '2') {
+          that.appntSign.map(item => {
+            if (item.documentCode == '8') {
+              that.appntSign.signId = item.signId
+              that.appntSign.documentCode = item.documentCode
+              that.appntSign.documentType = item.documentType
+            }
+          })
+          let data = {
+            orderType: 'SIGN_ORDER',
+            orderDTO: {
+              orderInfoDTO: {
+                orderNo: window.localStorage.getItem('orderNo')
+              },
+              ebizSignDTOS: [
+                {
+                  signOrRead: 'read',
+                  signId: that.appntSign.signId,
+                  orderNo: window.localStorage.getItem('orderNo'),
+                  documentCode: that.appntSign.documentCode,
+                  documentStatus: '1',
+                  documentType: that.appntSign.documentType,
+                  signType: that.signVal
+                }
+              ]
+            }
+          }
+          saveInformation(data).then(res => {
+            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'
+              this.$jump({
+                flag: 'h5',
+                extra: {
+                  url: location.origin + '/#/sale/' + url,
+                  forbidSwipeBack: '1'
+                },
+                routerInfo: {
+                  path: '/sale/' + url
+                }
+              })
+            } else {
+              that.$toast(res.resultMessage)
+            }
+          })
+        } else {
+          that.insuredSign.map(item => {
+            if (item.documentCode == '8') {
+              that.insuredSign.signId = item.signId
+              that.insuredSign.documentCode = item.documentCode
+              that.insuredSign.documentType = item.documentType
+            }
+          })
+          let data = {
+            orderType: 'SIGN_ORDER',
+            orderDTO: {
+              orderInfoDTO: {
+                orderNo: window.localStorage.getItem('orderNo')
+              },
+              ebizSignDTOS: [
+                {
+                  signOrRead: 'read',
+                  signId: that.insuredSign.signId,
+                  orderNo: window.localStorage.getItem('orderNo'),
+                  documentCode: that.insuredSign.documentCode,
+                  documentStatus: '1',
+                  documentType: that.insuredSign.documentType,
+                  signType: that.signVal
+                }
+              ]
+            }
+          }
+          saveInformation(data).then(res => {
+            if (res.result == '0') {
+              this.$toast.clear()
+              window.localStorage.setItem('detailJump', '')
+              this.$jump({
+                flag: 'h5',
+                extra: {
+                  url: location.origin + '/#/sale/SignatureOfElectronic',
+                  forbidSwipeBack: '1'
+                },
+                routerInfo: {
+                  path: '/sale/SignatureOfElectronic'
+                }
+              })
+            } else {
+              that.$toast(res.resultMessage)
+            }
+          })
+        }
+      }
+    }
+  },
+  computed: {
+    listenChange() {
+      const { isOver, radio } = this
+      return { isOver, radio }
+    }
+  },
+  watch: {
+    listenChange(val) {
+      let that = this
+      // console.log('listenChange :', val)
+      if (val.isOver == true && val.radio !== '') {
+        that.isDisable = false
+      } else {
+        that.isDisable = true
+      }
+    }
+  },
+
+  beforeRouteLeave(to, from, next) {
+    document.body.style.backgroundColor = ''
+    next()
+  }
+}
+</script>
+<style lang="scss" scoped>
+p {
+  text-align: justify;
+}
+.notice {
+  width: 100%;
+  position: fixed;
+  top: 0;
+  z-index: 20;
+}
+</style>

From d6eaf1ea2ff1a7de1cdf8fda8967ae3bc82700fd Mon Sep 17 00:00:00 2001
From: "yang.huaxiang" <yang.huaxiang@ebiz-fooge.com>
Date: Wed, 11 Nov 2020 10:49:57 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=BC=80=E9=97=A8=E7=BA=A2=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82-=E7=94=B5=E6=8A=95=E6=8F=90=E7=A4=BA=EF=BC=9A?=
 =?UTF-8?q?=E7=94=B5=E6=8A=95=E6=8F=90=E7=A4=BA=E5=A4=84=E7=90=86=E5=88=9D?=
 =?UTF-8?q?=E7=89=88=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20--=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=BA=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/SelectedProduct.vue | 57 ++++++++++++++---------
 1 file changed, 34 insertions(+), 23 deletions(-)

diff --git a/src/views/ebiz/common/SelectedProduct.vue b/src/views/ebiz/common/SelectedProduct.vue
index d07cb6c96..da77965f1 100644
--- a/src/views/ebiz/common/SelectedProduct.vue
+++ b/src/views/ebiz/common/SelectedProduct.vue
@@ -375,7 +375,6 @@ export default {
         let resultData = await getOrderActiveInfo(param)
         if (resultData.result == 0) {
           if (resultData.content.activeFlag != '1') {
-            // todo 弹框 显示
             this.active_show = true
             return
           }
@@ -396,31 +395,43 @@ export default {
       })
     },
     comfirmCheckActive() {
-      let param = {
-        orderDTO: {
-          orderInfoDTO: {
-            orderNo: localStorage.orderNo,
-            activeType: 'KMH'
+      if (this.active_radio == '1') {
+        let param = {
+          orderDTO: {
+            orderInfoDTO: {
+              orderNo: localStorage.orderNo,
+              activeType: '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', '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岁

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 3/5] =?UTF-8?q?=E5=BC=80=E9=97=A8=E7=BA=A2=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82-=E7=94=B5=E6=8A=95=E6=8F=90=E7=A4=BA=EF=BC=9A?=
 =?UTF-8?q?=E7=94=B5=E6=8A=95=E6=8F=90=E7=A4=BA=E5=A4=84=E7=90=86=E5=88=9D?=
 =?UTF-8?q?=E7=89=88=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20--=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=BA=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: {

From fba510b83ff88b194d1703a155a22489c2ca6e18 Mon Sep 17 00:00:00 2001
From: "yang.huaxiang" <yang.huaxiang@ebiz-fooge.com>
Date: Thu, 12 Nov 2020 16:57:38 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=BC=80=E9=97=A8=E7=BA=A2=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82-=E7=94=B5=E6=8A=95=E6=8F=90=E7=A4=BA=EF=BC=9A?=
 =?UTF-8?q?=E7=94=B5=E6=8A=95=E6=8F=90=E7=A4=BA=E5=A4=84=E7=90=86=E5=88=9D?=
 =?UTF-8?q?=E7=89=88=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20--=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E4=BA=BA=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/CalculatePremium.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue
index 451edf603..7b91151e3 100644
--- a/src/views/ebiz/common/CalculatePremium.vue
+++ b/src/views/ebiz/common/CalculatePremium.vue
@@ -270,8 +270,12 @@
         <span style="font-weight:bold" v-else>保额（元）：</span>
         <span class="fee red" v-if="trialList && trialList.length > 0">{{ trialList[index].showPrem | moneyFormat }}</span>
       </div>
-      <div class="flex justify-content-s pv10 border-bottom prem" v-if="item.isMainRisk == 0 && activeType == 'KMH'">
-        <span>指定保单生效日:2021年1月1日</span>
+      <div class="flex justify-content-fs pv10 border-bottom prem align-items-c" v-if="item.isMainRisk == 0 && activeType == 'KMH'">
+        <span>指定保单生效日</span>
+        <van-radio-group v-model="activeRadio" class="pl20">
+          <van-radio name="1" icon-size="1rem"></van-radio>
+        </van-radio-group>
+        <span class="pl5">2021年1月1日</span>
       </div>
     </div>
     <div class="bottom-btn bg-white">
@@ -284,7 +288,7 @@
   </div>
 </template>
 <script>
-import { Tag, Icon, Dialog, ActionSheet, Popup, Picker, Stepper, Field, Checkbox } from 'vant'
+import { Tag, Icon, Dialog, ActionSheet, Popup, Picker, Stepper, Field, Checkbox ,RadioGroup, Radio,} from 'vant'
 import { trial } from '@/api/ebiz/common/common'
 import { saveOrUpdateOrderInfo, getOrderDetail } from '@/api/ebiz/sale/sale'
 import { saveProposal } from '@/api/ebiz/proposal/proposal.js'
@@ -341,6 +345,8 @@ const DUTY_DEFAULT_MIN = 10000
 export default {
   name: 'calculatePremium',
   components: {
+    [RadioGroup.name]: RadioGroup,
+    [Radio.name]: Radio,
     [Tag.name]: Tag,
     [Icon.name]: Icon,
     [ActionSheet.name]: ActionSheet,
@@ -353,6 +359,7 @@ export default {
   },
   data() {
     return {
+      activeRadio: '1',
       activeType: localStorage.getItem('active_type'),
       chooseProducts: [],
       productIndex: '',

From 86f72aa58ac2559dae6929cf4dbdfb1be366033a Mon Sep 17 00:00:00 2001
From: "yang.huaxiang" <yang.huaxiang@ebiz-fooge.com>
Date: Fri, 13 Nov 2020 11:24:00 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=BC=80=E9=97=A8=E7=BA=A2=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82-=E7=94=B5=E6=8A=95=E6=8F=90=E7=A4=BA=EF=BC=9AUI?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4=20--=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E4=BA=BA=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/assets/sass/utils.scss                |   4 +
 src/components/ebiz/sale/IndexBar.vue     | 121 ++++++++++++++++++----
 src/views/ebiz/common/SelectedProduct.vue |  61 +++++++----
 3 files changed, 150 insertions(+), 36 deletions(-)

diff --git a/src/assets/sass/utils.scss b/src/assets/sass/utils.scss
index b7fff83d3..53961e73f 100644
--- a/src/assets/sass/utils.scss
+++ b/src/assets/sass/utils.scss
@@ -44,6 +44,10 @@
   font-size: $font-size-xll;
 }
 
+.fw400 {
+  font-weight: 400 !important;
+}
+
 .fw500 {
   font-weight: 500 !important;
 }
diff --git a/src/components/ebiz/sale/IndexBar.vue b/src/components/ebiz/sale/IndexBar.vue
index 50987068a..c377d4604 100644
--- a/src/components/ebiz/sale/IndexBar.vue
+++ b/src/components/ebiz/sale/IndexBar.vue
@@ -1,17 +1,28 @@
 <template>
-  <div class="ml6 mr6 pt5 pb5">
+  <div class="own_content">
     <ul class="index-bar">
       <li @click="changePage(Number(index) + 1)" v-for="(item, index) in pageTitle" :key="index" :class="item.tabClass" :id="item.tabClass">
-        <div :class="[{ activeline: item.tabClass }, { 'bg-gray': !item.tabClass }, 'w15', 'h2', 'mr8']" v-if="index != 0"></div>
-        <span>{{ item.pageNo }}.{{ item.pageItem }}</span>
-        <div :class="[{ activeline: item.tabClass }, { 'bg-gray': !item.tabClass }, 'w15', 'h2', 'ml8']" v-if="index != 7"></div>
-        <van-icon name="arrow" size="12" v-if="index != 7" />
+        <!-- 选中 -->
+        <div v-if="item.tabClass" class="flex justify-content-fs align-items-c">
+          <div class="flex flex-direction-colunm align-items-c">
+            <van-image :src="item.imgCheckedUrl" class="image_head" />
+            <span class="fs12 mt12">{{ item.pageItem }}</span>
+          </div>
+          <van-image :src="doneUrl" v-if="index !== 7" class="image_done" />
+        </div>
+        <div v-if="!item.tabClass" class="flex justify-content-fs align-items-c">
+          <div class="flex flex-direction-colunm align-items-c">
+            <van-image :src="item.imgNoCheckedUrl" class="image_head" />
+            <span class="fs12 mt12" style="color: #999999">{{ item.pageItem }}</span>
+          </div>
+          <van-image :src="doneNurl" v-if="index !== 7" class="image_done" />
+        </div>
       </li>
     </ul>
   </div>
 </template>
 <script>
-import { Icon } from 'vant'
+import { Icon, Image as VanImage } from 'vant'
 export default {
   name: 'IndexBar',
   props: {
@@ -34,19 +45,78 @@ export default {
     }
   },
   components: {
-    [Icon.name]: Icon
+    [Icon.name]: Icon,
+    [VanImage.name]: VanImage
   },
   data() {
     return {
+      doneUrl: this.$assetsUrl + 'images/kmh/done.png',
+      doneNurl: this.$assetsUrl + 'images/kmh/done_n.png',
       pageTitle: [
-        { pageNo: 1, pageItem: '投保人信息', urlStr: '/sale/insuredInfo', tabClass: '' },
-        { pageNo: 2, pageItem: '被保险人信息', urlStr: '/sale/insuredPerson', tabClass: '' },
-        { pageNo: 3, pageItem: '选择产品', urlStr: '/common/selectedProduct', tabClass: '' },
-        { pageNo: 4, pageItem: '受益人信息', urlStr: '/sale/beneficiary', tabClass: '' },
-        { pageNo: 5, pageItem: '告知信息', urlStr: '/sale/notifyingMessage', tabClass: '' },
-        { pageNo: 6, pageItem: '账户信息', urlStr: '/sale/accountInformation', tabClass: '' },
-        { pageNo: 7, pageItem: '附件上传', urlStr: '/sale/attachmentManagement', tabClass: '' },
-        { pageNo: 8, pageItem: '签名确认', urlStr: '/sale/signatureConfirmation', tabClass: '' }
+        {
+          pageNo: 1,
+          pageItem: '投保人信息',
+          urlStr: '/sale/insuredInfo',
+          tabClass: '',
+          imgCheckedUrl: this.$assetsUrl + 'images/kmh/tbrxx.png',
+          imgNoCheckedUrl: this.$assetsUrl + 'images/kmh/tbrxx_n.png'
+        },
+        {
+          pageNo: 2,
+          pageItem: '被保险人信息',
+          urlStr: '/sale/insuredPerson',
+          tabClass: '',
+          imgCheckedUrl: this.$assetsUrl + 'images/kmh/bbrxx.png',
+          imgNoCheckedUrl: this.$assetsUrl + 'images/kmh/bbrxx_n.png'
+        },
+        {
+          pageNo: 3,
+          pageItem: '选择产品',
+          urlStr: '/common/selectedProduct',
+          tabClass: '',
+          imgCheckedUrl: this.$assetsUrl + 'images/kmh/xzcp.png',
+          imgNoCheckedUrl: this.$assetsUrl + 'images/kmh/xzcp_n.png'
+        },
+        {
+          pageNo: 4,
+          pageItem: '受益人信息',
+          urlStr: '/sale/beneficiary',
+          tabClass: '',
+          imgCheckedUrl: this.$assetsUrl + 'images/kmh/syrxx.png',
+          imgNoCheckedUrl: this.$assetsUrl + 'images/kmh/syrxx_n.png'
+        },
+        {
+          pageNo: 5,
+          pageItem: '告知信息',
+          urlStr: '/sale/notifyingMessage',
+          tabClass: '',
+          imgCheckedUrl: this.$assetsUrl + 'images/kmh/gzxx.png',
+          imgNoCheckedUrl: this.$assetsUrl + 'images/kmh/gzxx_n.png'
+        },
+        {
+          pageNo: 6,
+          pageItem: '账户信息',
+          urlStr: '/sale/accountInformation',
+          tabClass: '',
+          imgCheckedUrl: this.$assetsUrl + 'images/kmh/zhxx.png',
+          imgNoCheckedUrl: this.$assetsUrl + 'images/kmh/zhxx_n.png'
+        },
+        {
+          pageNo: 7,
+          pageItem: '附件上传',
+          urlStr: '/sale/attachmentManagement',
+          tabClass: '',
+          imgCheckedUrl: this.$assetsUrl + 'images/kmh/fjsc.png',
+          imgNoCheckedUrl: this.$assetsUrl + 'images/kmh/fjsc_n.png'
+        },
+        {
+          pageNo: 8,
+          pageItem: '签名确认',
+          urlStr: '/sale/signatureConfirmation',
+          tabClass: '',
+          imgCheckedUrl: this.$assetsUrl + 'images/kmh/qmqr.png',
+          imgNoCheckedUrl: this.$assetsUrl + 'images/kmh/qmqr_n.png'
+        }
       ],
       //localStorage.salePageFlag:控制导航是否可以直接跳转页面  1-投保人信息 2-被保人信息 3-选择产品 4-受益人信息 5-告知信息 6-账户信息 7-附件上传 8-签名确认
       salePageFlag: Number(localStorage.salePageFlag)
@@ -147,8 +217,7 @@ export default {
   overflow-x: auto;
   overflow-y: hidden;
   white-space: nowrap;
-  font-size: 15px;
-  margin-top: 8px;
+  font-size: 12px;
 }
 
 .index-bar li {
@@ -164,7 +233,7 @@ li {
 }
 .index-bar span,
 .index-bar van-icon {
-  align-items: flex-center;
+  align-items: center;
 }
 .active {
   color: #e9332e;
@@ -172,4 +241,20 @@ li {
 .activeline {
   background: #e9332e;
 }
+.image_head {
+  width: 16px;
+  height: 16px;
+}
+.image_done {
+  width: 8px;
+  height: 14px;
+  padding-left: 20px;
+  padding-right: 20px;
+}
+.own_content {
+  padding-top: 19px;
+  padding-bottom: 15px;
+  margin-left: 10px;
+  margin-right: 10px;
+}
 </style>
diff --git a/src/views/ebiz/common/SelectedProduct.vue b/src/views/ebiz/common/SelectedProduct.vue
index bbed03c07..4af30a61f 100644
--- a/src/views/ebiz/common/SelectedProduct.vue
+++ b/src/views/ebiz/common/SelectedProduct.vue
@@ -33,25 +33,32 @@
       </div>
     </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="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>
+    <van-dialog v-model="active_show" :show-confirm-button="false" class="dialog_class">
+      <div class="flex justify-content-fe">
+        <van-image :src="this.$assetsUrl + 'images/kmh/cancel.png'" class="fr mt15 mr15 icon_image" @click="active_show = false"></van-image>
+      </div>
+      <div class="pl20 pr20 mt30">
+        <p class="fs16 black fw400">请选择：</p>
+        <van-radio-group v-model="active_radio" style="align-items: center;">
+          <van-radio name="1" class="radio_class ml60">
+            <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">
+              <div class="fs16 fw400">开门红产品</div>
             </div>
           </van-radio>
-          <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>
+          <van-radio name="2" class="radio_class ml60">
+            <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">
+              <div class="fs16 fw400">普通产品</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 class="flex justify-content-c bg-white mt20 mb40 align-items-c">
+          <van-button type="danger" class="dialog-comfirm-button" @click="comfirmCheckActive" v-no-more-click="1000">确认</van-button>
         </div>
       </div>
     </van-dialog>
@@ -89,7 +96,9 @@ export default {
       isFrom: localStorage.isFrom,
       salePageFlag: '3',
       active_show: false,
-      active_radio: ''
+      active_radio: '1',
+      checkedUrl: this.$assetsUrl + 'images/kmh/kmhCheked.png',
+      noCheckedUrl: this.$assetsUrl + 'images/kmh/kmhNoCheked.png'
     }
   },
   components: {
@@ -459,6 +468,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+@import '@/assets/sass/variables.scss';
 .select-product-container {
   .border-dotted {
     border: 1px dashed #999;
@@ -477,12 +487,27 @@ export default {
     font-size: 15px;
   }
   .radio_class {
-    height: 80px;
-    border-bottom: 1px solid #8e8d8d;
+    height: 60px;
   }
   .dialog-comfirm-button {
-    width: 50%;
+    width: 167px;
+    height: 36px;
+    line-height: 36px;
     border-radius: 6px;
+    text-align: center;
+    vertical-align: center;
+  }
+  .icon_image {
+    width: 12px;
+    height: 12px;
+  }
+  .radio_icon_image {
+    width: 16px;
+    height: 16px;
+    padding-top: 3px;
+  }
+  .dialog_class {
+    width: 290px;
   }
 }
 </style>