Merge branch 'feature/GFRS-2301【需求】健康险渠道国富无忧卡金掌桂开发的需求' into dev

src/views/ebiz/cardList/Pay.vue

@@ -766,6 +766,7 @@ export default {
         console.log(this.$validator)
         return this.$toast(this.$validator.errors.all()[0])
       }
+      let shareName = this.underWriteData.name
       localStorage.name = this.underWriteData.name
       localStorage.bankName = this.underWriteData.bankName
       localStorage.bankCode = this.underWriteData.bankCode

src/views/ebiz/cardList/cardDetail.vue

@@ -8,7 +8,7 @@
       <van-field :value="appntInfo.mobile" label="手机号码" name="手机号码" readonly />
       <van-field :value="appntInfo.email" label="电子邮箱" name="电子邮箱" readonly />
       <van-field :value="appntInfo.homeName" label="联系地址" name="联系地址" readonly />
-      <van-field :value="appntInfo.homeAddress" label name="详细地址" readonly />
+      <van-field :value="appntInfo.homeAddress" label="详细地址" name="详细地址" readonly />
     </van-cell-group>
     <van-cell-group class="mt10">
       <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">被保人信息</p>
@@ -18,7 +18,7 @@
       <van-field :value="insuredInfo.mobile" label="手机号码" name="手机号码" readonly />
       <van-field :value="insuredInfo.email" label="电子邮箱" name="电子邮箱" readonly />
       <van-field :value="insuredInfo.homeName" label="联系地址" name="联系地址" readonly />
-      <van-field :value="insuredInfo.homeAddress" label name="详细地址" readonly />
+      <van-field :value="insuredInfo.homeAddress" label="详细地址" name="详细地址" readonly />
     </van-cell-group>
     <van-cell-group class="mt10">
       <p style="border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">受益人信息</p>
@@ -31,12 +31,10 @@
       <van-field :value="riskDTO.prem" label="保费" name="保费" readonly />
       <van-field :value="'1年'" label="保险期间" name="保险期间" readonly />
     </van-cell-group>
-    <div class="tips">注：2020年04月03日0时至2021年04月02日24时止。</div>
+    <div class="tips">注：{{productDate}}</div>
     <van-goods-action style="z-index: 99">
-      <van-button type="default" style="width: 50%; font-size: 14px; height: 40px; background: white"
+      <van-button type="default" style="width: 50%; font-size: 14px; height: 40px; background: white">总保费:<span style="color: red; font-weight: bold; font-size: 18px; font-weight: 400">{{
-        >总保费:<span style="color: red; font-weight: bold; font-size: 18px; font-weight: 400">{{ riskDTO.prem }}</span
+          riskDTO.prem }}</span>元</van-button>
-        >元</van-button
-      >
       <van-goods-action-button type="danger" text="确认" @click="nextStep" v-no-more-click="1000" style="border-radius: 0em; width: 50%; height: 40px" />
     </van-goods-action>
   </div>
@@ -53,14 +51,14 @@ export default {
     [GoodsAction.name]: GoodsAction,
     [GoodsActionIcon.name]: GoodsActionIcon,
     [GoodsActionButton.name]: GoodsActionButton,
-    [Icon.name]: Icon,
+    [Icon.name]: Icon
   },
   computed: {
     orderDTO: {
       get() {
         return JSON.parse(sessionStorage.orderDetail)
-      },
+      }
-    },
+    }
   },
   data() {
     return {
@@ -69,29 +67,55 @@ export default {
       insuredInfo: {},
       bnfTypeVal: '法定受益人', //受益人类型文字展示
       riskDTO: {},
+      productDate: ''
     }
   },
   created() {    
-    console.log(this.orderDTO)
     this.appntInfo = this.orderDTO.appntDTO
     this.appntInfo.homeName = getAreaName([{ code: this.appntInfo.homeProvince }, { code: this.appntInfo.homeCity }, { code: this.appntInfo.homeArea }])
     this.insuredInfo = this.orderDTO.insuredDTOs[0]
     this.insuredInfo.homeName = getAreaName([{ code: this.insuredInfo.homeProvince }, { code: this.insuredInfo.homeCity }, { code: this.insuredInfo.homeArea }])
-    this.riskDTO = this.orderDTO.insuredDTOs[0].riskDTOLst[0]
+    
+    let insuYear = (this.riskDTO = this.orderDTO.insuredDTOs[0].riskDTOLst[0])    
+    let currentDataArr = insuYear.cvaliDate.split('-')
+    let currentData = currentDataArr[0] + '年' + currentDataArr[1] + '月' + currentDataArr[2] + '日'    
+    let insuYearM, productDate, productDateTime,insuYearD;    
+    
+    switch (insuYear.insuYearFlag) {
+      case 'D':
+        let hoDate = Date.parse(insuYear.cvaliDate) / 1000 + insuYear['insuYear'] * 24 * 3600
+        productDate = new Date(parseInt(hoDate) * 1000)
+        insuYearM = productDate.getMonth() + 1 < 10 ? '0' + (productDate.getMonth() + 1) : productDate.getMonth() + 1
+        insuYearD = productDate.getDate() < 10 ? '0' + productDate.getDate() : productDate.getDate()
+        productDateTime = productDate.getFullYear() + '年' + insuYearM + '月' + insuYearD + '日'
+        this.productDate = currentData + '0时至' + productDateTime + '24时止'
+        break
+      case 'Y':
+        productDate = new Date(insuYear.cvaliDate)
+        insuYearM = productDate.getMonth() + 1 < 10 ? '0' + (productDate.getMonth() + 1) : productDate.getMonth() + 1
+        insuYearD = productDate.getDate() < 10 ? '0' + productDate.getDate() : productDate.getDate()
+        productDateTime = parseInt(productDate.getFullYear()) + parseInt(insuYear['insuYear']) + '年' + insuYearM + '月' + insuYearD + '日'
+        this.productDate = currentData + '0时至' + productDateTime + '24时止'
+        break
+      case 'M':
+        productDateTime = this.GetNextMonthDay(insuYear.cvaliDate, insuYear['insuYear'])
+        this.productDate = currentData + '0时至' + productDateTime + '24时止'
+        break
+    }
   },
   methods: {
     nextStep() {
       this.$jump({
         flag: 'h5',
         extra: {
-          url: location.origin + `/#/cardList/SignatureConfirmation`,
+          url: location.origin + `/#/cardList/SignatureConfirmation`
         },
         routerInfo: {
-          path: `/cardList/SignatureConfirmation`,
+          path: `/cardList/SignatureConfirmation`
-        },
+        }
       })
-    },
+    }
-  },
+  }
 }
 </script>
 

src/views/ebiz/cardList/phoneCode.vue

@@ -7,7 +7,6 @@
     />
     <van-field
       :value="userInfo.mobile | filterMobile"      
-      clearable
       label="投保人手机号"
       name="投保人手机号"
       placeholder="请输入手机号"