Merge remote-tracking branch 'origin/dev' into dev

2025-12-09 12:16:43 +08:00 · 2021-04-06 14:07:50 +08:00
parent 35bd62eb18 1de4b0f212
commit a851764d4d
6 changed files with 130 additions and 93 deletions
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -766,8 +766,8 @@ export default {
        console.log(this.$validator)
        return this.$toast(this.$validator.errors.all()[0])
      }
-      let shareName = this.underWriteData.name
-      localStorage.name = this.underWriteData.name
+      let shareName = this.underWriteData.appntName
+      localStorage.name = this.underWriteData.appntName
      localStorage.bankName = this.underWriteData.bankName
      localStorage.bankCode = this.underWriteData.bankCode
      localStorage.bankListName = this.bankListName      
--- a/src/views/ebiz/cardList/ShowPDF.vue
+++ b/src/views/ebiz/cardList/ShowPDF.vue
@@ -1,7 +1,7 @@
 <!--
 * @Author: PangXingYue
 * @Date: 2021-04-01 11:00:21
- * @LastEditTime: 2021-04-02 18:16:27
+ * @LastEditTime: 2021-04-06 11:34:36
 * @LastEditors: PangXingYue
 * @Description: 
 * @FilePath: \ebiz-h5\src\views\ebiz\cardList\ShowPDF.vue
@@ -18,7 +18,7 @@

 <script>
 import { Button, NoticeBar } from 'vant'
-import { saveOrUpdateCard } from '@/api/ebiz/cardList/cardList.js'
+import { saveOrUpdateDocument } from '@/api/ebiz/cardList/cardList.js'
 export default {
  data() {
    return {
@@ -27,7 +27,8 @@ export default {
      index: this.$route.query.index || 0, //阅读文件指针
      timer: null,
      time: 5,
-      cardListPDF: []
+      cardListPDF: [],
+      orderDTO: []
    }
  },
  components: {
@@ -35,12 +36,13 @@ export default {
    [Button.name]: Button
  },
  created() {
+    this.orderDTO = JSON.parse(sessionStorage.orderDetail)
    this.init()
  },
  mounted() {},
  methods: {
-    init() {      
-      this.cardListPDF = JSON.parse(localStorage.cardListPDF)      
+    init() {            
+      this.cardListPDF = this.orderDTO.ebizSignDTOS
      this.pdfUrl = this.cardListPDF[this.index].originalUrl
      document.title = this.cardListPDF[this.index].documentName
      this.interval()
@@ -56,37 +58,40 @@ export default {
      // 调用阅读接口
      if (this.time !== 0) {
        return false
-      }
-      if (this.index >= this.cardListPDF.length - 1) {
-        this.$jump({
-          flag: 'h5',
-          extra: {
-            url: location.origin + '/#/cardList/SignatureConfirmation'
-          },
-          routerInfo: {
-            path: '/cardList/SignatureConfirmation'
-          }
-        })
-      } else {
-        this.saveOrUpdateCard()        
-      }
+      }      
+      this.saveOrUpdateDocument()
    },
    //更新险种文档阅读状态
-    saveOrUpdateCard() {   
-        this.index++
-          this.init()
-          return false;
-      //todo
+    saveOrUpdateDocument() {            
      this.cardListPDF[this.index]['documentStatus'] = '1'
      let data = {
-            'ebizSignDTOS': [this.cardListPDF[this.index]]
+        ebizSignDTOS: [this.cardListPDF[this.index]]
      }
-      saveOrUpdateCard(data).then(res => {        
-        if (res.result == '0') {
-          this.$toast.clear()
-          this.index++
-          this.init()
-        } else {          
+      saveOrUpdateDocument(data).then(res => {
+        if (res.result == '0') {            
+          this.$toast.clear()        
+          sessionStorage.orderDetail = JSON.stringify(this.orderDTO)          
+          if (this.index >= this.cardListPDF.length - 1) {
+            this.$jump({
+              flag: 'h5',
+              extra: {
+                url: location.origin + '/#/cardList/SignatureConfirmation'
+              },
+              routerInfo: {
+                path: '/cardList/SignatureConfirmation'
+              }
+            })
+          } else {
+             this.index = this.cardListPDF.findIndex((item, key) => {                    
+              return item.documentStatus != 1
+             })
+             if (this.index != -1) {
+               this.init()
+             }            
+            console.log(this.index, '==============this.index===============')    
+          }                                             
+        } else {
+          this.cardListPDF[this.index]['documentStatus'] = '0'
          this.$toast(res.resultMessage)
          return false
        }
--- a/src/views/ebiz/cardList/SignatureConfirmation.vue
+++ b/src/views/ebiz/cardList/SignatureConfirmation.vue
@@ -66,21 +66,7 @@ export default {
      appntInfo: {},
      // 投保人签名阅读信息
      appntSign: [
-        {
-          documentName: '短期交通卡投保须知',
-          documentUrl: this.$assetsUrl + 'product/GFRS_M0022/M0022Notice.pdf',
-          documentStatus: '1',
-        },
-        {
-          documentName: '短期交通卡投保声明',
-          documentUrl: this.$assetsUrl + 'product/GFRS_M0022/M0022Explain.pdf',
-          documentStatus: '1',
-        },
-        {
-          documentName: '国富人寿综合交通意外保险2020',
-          documentUrl: this.$assetsUrl + 'product/GFRS_M0022/M0022.pdf',
-          documentStatus: '2',
-        },
+       
      ],
      // 折叠面板
      activeNames: ['1'],
@@ -99,12 +85,13 @@ export default {
  },
  methods: {
    // 初始化
-    async init() {
-      console.log(this.orderDTO, '=================this.orderDTO===================')
+    async init() {      
      this.recmd = this.orderDTO.recmdDTO
      this.orderInfo = this.orderDTO.orderInfoDTO
      this.appntInfo = this.orderDTO.appntDTO
+      // localStorage.setItem('cardListPDF', JSON.stringify(this.orderDTO.ebizSignDTOS))
      this.appntSign = this.orderDTO.ebizSignDTOS
+      
      // if (this.isWeixin) {
      //   await this.getOrderDetail()
      //   // weixinShare({
@@ -125,8 +112,7 @@ export default {
        return item.documentStatus != 1
      })
      if (is_sign) {
-        // 有未阅读的文件
-        localStorage.setItem('cardListPDF', JSON.stringify(this.appntSign))
+        // 有未阅读的文件        
        this.$jump({
          flag: 'h5',
          extra: {
--- a/src/views/ebiz/cardList/information.vue
+++ b/src/views/ebiz/cardList/information.vue
@@ -107,7 +107,7 @@
      <van-field required readonly v-model="bnfTypeVal" clearable label="受益人类型" v-validate="'required'" style="border-bottom: 1px solid #ebedf0" />
    </van-cell-group>
    <p style="background: white; border-bottom: 1px solid #ebedf0" class="fs15 fwb pl10 pv12">产品信息</p>
-    <van-field :value="schemeName" readonly required label="保障方案" name="保障方案" v-validate="'required'" right-icon="arrow"
+    <van-field :value="proScheme" readonly required label="保障方案" name="保障方案" v-validate="'required'" right-icon="arrow"
      placeholder="请选择" @click="toSelect('10')" />
    <FieldDatePicter v-validate="'required'" label="指定生效日期" name="指定生效日期" required :minDate="now" :value.sync="cvaliDate"
      type="date" :flag="true" @confirm="onDateConfirm($event, '6')" ref="effectiveDate" input-align:right>
@@ -215,8 +215,8 @@ export default {
  },
  data() {
    return {
-      schemeName: '', //保障方案
-      schemeCode: '',
+      proScheme: '', //保障方案
+      proSchemeCode: '',
      productDate: '', //保险期间
      now: afterDate.getAfterDays(1), //指定生效日期最小值
      insuredSex: '男',
@@ -317,7 +317,9 @@ export default {
      pdf: ['', '', ''],
      insureType: '',
      pickerIndex: 0,
-      areaCode: '110101'
+      areaCode: '110101',
+      occupationCode: '',
+      occupationName: '',
    }
  },
  created() {
@@ -544,7 +546,7 @@ export default {
        this.columns = DataDictionary.nativeplace
        this.pickerIndex = this.insuredInfo.nativeplace - 1 > 0 ? this.insuredInfo.nativeplace - 1 : 0
      } else if (pickerType == '10') {
-        this.trialList = `{
+  /*      this.trialList = `{
    "code": 0,
    "message": "成功",
    "content": {
@@ -563,8 +565,8 @@ export default {
                "duty": null,
                "showPrem": 100,
                "trialType": null,
-                "schemeName": "国富无忧卡A",
-                "schemeCode": "M0041A",
+                "proScheme": "国富无忧卡A",
+                "proSchemeCode": "M0041A",
                "timeliness": 3
            },
            {
@@ -578,8 +580,8 @@ export default {
                "duty": null,
                "showPrem": 200,
                "trialType": null,
-                "schemeName": "国富无忧卡B",
-                "schemeCode": "M0041B",
+                "proScheme": "国富无忧卡B",
+                "proSchemeCode": "M0041B",
                "timeliness": 3
            },
            {
@@ -593,21 +595,23 @@ export default {
                "duty": null,
                "showPrem": 300,
                "trialType": null,
-                "schemeName": "国富无忧卡C",
-                "schemeCode": "M0041C",
+                "proScheme": "国富无忧卡C",
+                "proSchemeCode": "M0041C",
                "timeliness": 3
            }
        ],
        "flag": "0"
    }
 }`
+*/
+
        this.columns = []
-        this.trialList = JSON.parse(this.trialList).content.trialList
+        // this.trialList = JSON.parse(this.trialList).content.trialList
        console.log(this.trialList, '================this.trialList================')
        this.trialList.forEach(item => {
          this.columns.push({
-            id: item.schemeCode,
-            text: item.schemeName
+            id: item.proSchemeCode ,
+            text: item.proScheme
          })
        })
      }
@@ -647,11 +651,11 @@ export default {
      } else if (this.pickerType == '11') {
        this.insuredInfo.nativeplace = value.id
      } else if (this.pickerType == '10') {
-        this.schemeName = value.text
-        this.schemeCode = value.id
-        for (let item of this.trialList) {
-          if (item.schemeCode === this.schemeCode) {
-            this.allPrice = item.prem
+        this.proScheme = value.text
+        this.proSchemeCode = value.id        
+        for (let item of this.trialList) {          
+          if (item.proSchemeCode === this.proSchemeCode) {
+            this.allPrice = item.prem            
            break
          }
        }
@@ -1161,8 +1165,8 @@ export default {
          predictTransferPrem: item.predictTransferPrem,
          thirdInsuraceNo: this.policyNo,
          mult: this.mult,
-          proScheme: this.schemeName,
-          proSchemeCode: this.schemeCode,
+          proScheme: this.proScheme,
+          proSchemeCode: this.proSchemeCode,
          insuYear: insuYearDate.insuYear,
          insuYearFlag: insuYearDate.insuYearFlag,
        }
--- a/src/views/ebiz/cardList/phoneCode.vue
+++ b/src/views/ebiz/cardList/phoneCode.vue
@@ -6,7 +6,8 @@
      text="特别提示：国富人寿为保证您的投保安全，请您点击发送验证码至投保人手机号，输入正确的验证码后点击下一步进入投保流程。"
    />
    <van-field
-      :value="userInfo.mobile | filterMobile"      
+      v-model="userInfo.mobile"          
+      clearable 
      label="投保人手机号"
      name="投保人手机号"
      placeholder="请输入手机号"
@@ -36,17 +37,19 @@ export default {
    return {
      orderNo: this.$route.query.orderNo,
      isWeixin: this.$utils.device().isWeixin,
-      userInfo: {},
+      userInfo: {
+        mobile: '',
+        authCode: ''
+      },
      codeDisabled: false,
      countDown: 60,
      timeId: null,
      sessionId: '',
    }
  },
-  created() {
-    console.log(this.$route.query)
+  created() {    
    // if(isWeixin){
-         let testData = `{
+         /*let testData = `{
            "appntOrInsured": null,
            "deleteFlag": null,
            "productDTO": {
@@ -664,6 +667,50 @@ export default {
                    "isSigned": null
                },
                {
+                    "signId": 20917,
+                    "signOrRead": null,
+                    "baseEncryp": null,
+                    "orderNo": "8186270000012555",
+                    "riskCode": "GFRS_M0022",
+                    "documentName": "转账授权声明",
+                    "documentCode": null,
+                    "policyUrl": null,
+                    "originalUrl": "http://139.199.50.151:8000/app/product/GFRS_M0041/DOC/M0041ZZSQSM.pdf",
+                    "documentType": "0",
+                    "documentStatus": "1",
+                    "signType": null,
+                    "relationId": null,
+                    "signDate": null,
+                    "createdDate": "2021-04-01T09:43:15.000+0000",
+                    "modifiedDate": null,
+                    "createdUser": null,
+                    "modifiedUser": null,
+                    "isDelete": 0,
+                    "isSigned": null
+                },
+                 {
+                    "signId": 20917,
+                    "signOrRead": null,
+                    "baseEncryp": null,
+                    "orderNo": "8186270000012555",
+                    "riskCode": "GFRS_M0022",
+                    "documentName": "转账授权声明",
+                    "documentCode": null,
+                    "policyUrl": null,
+                    "originalUrl": "http://139.199.50.151:8000/app/product/GFRS_M0041/DOC/M0041ZZSQSM.pdf",
+                    "documentType": "0",
+                    "documentStatus": "0",
+                    "signType": null,
+                    "relationId": null,
+                    "signDate": null,
+                    "createdDate": "2021-04-01T09:43:15.000+0000",
+                    "modifiedDate": null,
+                    "createdUser": null,
+                    "modifiedUser": null,
+                    "isDelete": 0,
+                    "isSigned": null
+                },
+                 {
                    "signId": 20917,
                    "signOrRead": null,
                    "baseEncryp": null,
@@ -690,8 +737,8 @@ export default {
            "xqPayDTO": null,
            "prtType": "0",
            "reason": "未查到详情！"
-        }`
-          sessionStorage.orderDetail = testData;
+        }`*/
+    // sessionStorage.orderDetail = testData;
    // }
    if (this.$route.query.token) {
      localStorage.token = this.$route.query.token
@@ -703,16 +750,7 @@ export default {
      localStorage.orderNo = this.$route.query.orderNo;
      this.getOrderDetail()
    },
-    nextStep() {
-        this.$jump({
-            flag: 'h5',
-            extra: {
-              url: location.origin + `/#/cardList/cardDetail`,
-            },
-            routerInfo: {
-              path: `/cardList/cardDetail`,
-            },
-          })
+    nextStep() {    
      autchCodeCheck({
        smsId: this.sessionId,
        code: this.userInfo.authCode,
@@ -730,8 +768,8 @@ export default {
        }
      })
    },
-    getCode() {
-      if (this.userInfo.mobile == '') {
+    getCode() {            
+      if (!this.userInfo.mobile) {
        return this.$toast('请填写移动电话')
      }
      let data = {
--- a/src/views/ebiz/product/ProductDetail.vue
+++ b/src/views/ebiz/product/ProductDetail.vue
@@ -102,10 +102,14 @@ export default {
      localStorage.chooseProductCodes = '' //置空所选险种
      let path = `/sale/insuredInfo`
      let flagPermission = true
-      if (this.$route.params.productDetailCode == 'GFRSPRO_M0024' || this.$route.params.productDetailCode == 'GFRSPRO_M0040') {
+      if (this.$route.params.productDetailCode == 'GFRSPRO_M0024') {
        flagPermission = await riskRules.getProductSellPermissionList('GFRS_M0024', this)
        let specilFlag = '1'
        path = `${path}?specilFlag=${specilFlag}`
+      } else if(this.$route.params.productDetailCode == 'GFRSPRO_M0040'){
+        flagPermission = await riskRules.getProductSellPermissionList('GFRS_M0040', this)
+        let specilFlag = '1'
+        path = `${path}?specilFlag=${specilFlag}`
      } else {
        flagPermission = false
      }