Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev

src/views/ebiz/sale/NotifyingMessage.vue

@@ -165,12 +165,13 @@ export default {
             item.impartItemDTOS.map(im => {
               // debugger
               im.impartAnswer = ''
-
-              if (im.questions.length == '0') {
-                let obj = {
-                  answer: ''
+              if (im.questions) {
+                if (im.questions.length == '0') {
+                  let obj = {
+                    answer: ''
+                  }
+                  im.questions.push(obj)
                 }
-                im.questions.push(obj)
               }
             })
           })

src/views/ebiz/sale/PayMent.vue

@@ -67,7 +67,7 @@
         <van-button class="m-btn fr green" @click="reset">重置</van-button> -->
     <div class="bg-white bottom-btn">
       <van-button type="danger" style="width: 50vw" @click="cancel" v-no-more-click="1000">返回投保单列表</van-button>
-      <van-button type="danger" style="width: 50vw" @click="payMent" v-no-more-click="1000">去支付</van-button>
+      <van-button type="danger" style="width: 50vw" @click="payMent" v-no-more-click="1000" :disabled="payStatus == '1' || payStatus == '2' || payStatus == '8'">去支付</van-button>
     </div>
   </div>
 </template>
@@ -130,19 +130,18 @@ export default {
   mounted() {
     document.body.style.backgroundColor = '#fff'
     // todo: remark
-    // if (localStorage.salelist == '1') {
-    //   this.underWrite()
-    //   this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
-    //   this.srcImg = this.$assetsUrl + `images/bank/bank_${JSON.parse(window.localStorage.getItem('underWriteData')).bankCode}.png`
-    // } else {
-    //   this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
-    //   this.srcImg = this.$assetsUrl + `images/bank/bank_${JSON.parse(window.localStorage.getItem('underWriteData')).bankCode}.png`
-    // }
+    if (localStorage.salelist == '1') {
+      this.underWrite()
+      this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
+      this.srcImg = this.$assetsUrl + `images/bank/bank_${JSON.parse(window.localStorage.getItem('underWriteData')).bankCode}.png`
+    } else {
+      this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
+      this.srcImg = this.$assetsUrl + `images/bank/bank_${JSON.parse(window.localStorage.getItem('underWriteData')).bankCode}.png`
+    }
     // todo: remark
 
     // todo: for debug need to delete.
-    this.underWriteData = {appntName:'测试',orderAmount:'123',accountName:'姓名',cardBookCode:'6228481200290317812',bankCode:'ABC',bankName:'银行名称'}
-
+    // this.underWriteData = {appntName:'测试',orderAmount:'123',accountName:'姓名',cardBookCode:'6228481200290317812',bankCode:'ABC',bankName:'银行名称'}
   },
   methods: {
     // 点击支付
@@ -161,9 +160,13 @@ export default {
         console.log('----取支付参数结果：', JSON.stringify(res))
         // res = {'result':'0','resultMessage':'','content':null,'prtNo':'8186270000000008','payStatus':'4','amnt':'63700.00','appntName':'投保人','message':null,'brPayReturnData':{'result':'','resultMessage':'','content':null,'businessId':'1569125393518','businessNo':'8186270000000008','tradeSubType':'COMM','businessType':'SALE','systemType':'GF','money':63700,'businessSubType':'XDCB','thirdType':'0002','thirdName':null,'bankCode':'ABC','epayOrderNo':'1909221209536259999900','companyAccount':null,'tradeState':'TRADING','standardCode':'DEALING','standardMsg':null,'thirdOrderNo':null,'respRemark':null,'tradeTime':'2019-09-22T04:09:53.518+0000','description':'','version':'1','sourceNotecode':'8186270000000008','payType':'MIT01','expireDate':'20191010101010','transSeq':'20190922120953782','transSource':'MIT','applyEntity':'11860000','paymentCode':'8186270000000008','transDate':'20190922','rdSeq':'1909221209536259999900','settleMode':null,'cur':'CNY','transTime':'120953','ourAmount':63700,'fixUser':'1','insurer':'投保人','certType':'0','certNum':'110101199009210011','oppBank':'ABC','oppAct':'6228481200290317812','oppActName':'投保人','cellPhone':null,'purpose':null,'memo':null,'returnURL':'http://139.199.50.151/#/sale/payResult','notifyURL':'http://139.199.50.151:7000/api/v1/epay/epay/payResult','s3Sign':'e3f0581ec6b751337e8eca360a0746bc'}}
         if (res.result == '0') {
-          // 1成 4支付中 2支付失败 8转批扣(无所情况）
+          // 1成 4支付中 2支付失败 8转批扣(无此情况）
           this.payStatus = res.payStatus
 
+          if(this.payStatus == '1'){
+            // this.$toast({message:''}) // todo
+          }
+
           // 支付参数大小写转换
           let keyMap = {}
           for (let key in this.payParam) {

src/views/ebiz/sale/PayResult.vue

@@ -62,8 +62,6 @@ export default {
         prtNo:'', // 投保单号
         amnt:''// 支付金额
       },
-      // 支付查询参数
-      payParam:{},
       // 图片
       srcSuccess: this.$assetsUrl + 'images/success.png',
       srcPending: this.$assetsUrl + 'images/pending.png',
@@ -75,16 +73,6 @@ export default {
     [CellGroup.name]: CellGroup
   },
   methods: {
-    // 返回列表页 原来的2019-09-25
-    // next() {
-    //   this.$jump({
-    //     flag: 'goBack',
-    //
-    //     routerInfo: {
-    //       path: '/sale/list'
-    //     }
-    //   })
-    // },
     // 返回列表页
     next() {
       this.$jump({
@@ -149,16 +137,11 @@ export default {
     }
 
     this.paySeqNo = this.$route.query.RdSeq
-    console.log('----paySeqNo:',this.paySeqNo)
-    console.log('--支付结果页查询参数：', this.payParam)
-    if(true) { // todo: 参数校验
-      // 两秒后去查询支付结果
-      setTimeout(()=>{
-        this.queryPayState()
-      }, 0)// 立即执行
+    if(!this.paySeqNo){
+      this.$toast({message:'参数错误，缺少支付流水号‘RdSeq’查询参数',duration:5000})
+    }else{
+      this.queryPayState()
     }
-
-    // console.log(that.resultMessage)
   },
   beforeRouteLeave(to, from, next) {
     document.body.style.backgroundColor = ''