From 8d094747c2bf9051f0f13f639c53abaa8f0d7580 Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Wed, 29 Apr 2020 09:24:08 +0800
Subject: [PATCH 01/19] =?UTF-8?q?[NEW]=20=E6=B7=BB=E5=8A=A0=E5=8D=A1?=
 =?UTF-8?q?=E5=8D=95=E6=94=AF=E4=BB=98=E5=BE=AE=E4=BF=A1=E5=88=86=E4=BA=AB?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/Pay.vue | 183 +++++++++++++++++++++++---------
 1 file changed, 133 insertions(+), 50 deletions(-)

diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue
index be6b66fdf..5fad03e09 100644
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -6,7 +6,7 @@
         <van-field :value="underWriteData.orderAmount == undefined ? '' : `${underWriteData.orderAmount} 元`" readonly label="支付金额" />
       </van-cell-group>
       <!-- 银行卡支付开始 -->
-      <div class="money">
+      <!-- <div class="money">
         <div>
           <img src="../../../assets/images/u10280.png" alt style="margin-top:-5px;margin-right:10px;" />
           <span class="oi">银行卡支付</span>
@@ -14,9 +14,26 @@
         <div class="i mr20">
           <van-radio-group v-model="radio" class="flex justify-content-fe"><van-radio name="1"></van-radio></van-radio-group>
         </div>
-      </div>
+      </div> -->
+      <van-cell-group class="flex align-items-c">
+        <img :src="src" class="pl10" />
+        <van-cell title="银行卡支付" clickable>
+          <!-- <van-checkbox v-model="checked" class="flex justify-content-fe"></van-checkbox> -->
+          <van-radio-group v-model="radio" class="flex justify-content-fe">
+            <van-radio name=""></van-radio>
+          </van-radio-group>
+        </van-cell>
+      </van-cell-group>
+      <van-cell-group class="flex align-items-c">
+        <img :src="vxSrc" class="vximg" />
+        <van-cell title="微信支付" clickable>
+          <van-radio-group v-model="radio" class="flex justify-content-fe">
+            <van-radio name="3" @click="vxVerify"></van-radio>
+          </van-radio-group>
+        </van-cell>
+      </van-cell-group>
       <!-- 银行卡支付结束 -->
-      <van-cell-group>
+      <van-cell-group v-if="radio == '' && !isWeixin">
         <van-field
           v-model="underWriteData.name"
           label="姓名"
@@ -94,6 +111,10 @@
         <input name="S3Sign" type="hidden" v-model="payParam.S3Sign" />
       </form>
       <div class="bg-white bottom-btn"><van-button type="danger" size="large" @click="pay" v-no-more-click="1000">支付</van-button></div>
+      <div class="bg-white bottom-btn" v-if="radio == '3' && !isWeixin">
+        <van-button type="danger" style="width: 50vw;height: 13vw" @click="pay" v-no-more-click="1000">支付</van-button>
+        <van-button type="danger" style="width: 50vw;height: 13vw" @click="share" v-no-more-click="1000">分享</van-button>
+      </div>
     </div>
     <!-- 银行卡扫描按钮 -->
     <van-popup v-model="isScan" style="height:100vh" position="bottom">
@@ -131,7 +152,12 @@ export default {
     [Radio.name]: Radio
   },
   data() {
+    let isWeixin = this.$utils.device().isWeixin //判断环境
     return {
+      // 银行卡支付图片地址
+      src: this.$assetsUrl + 'images/cardImg.png',
+      // 微信支付图片地址
+      vxSrc: this.$assetsUrl + 'images/vxImg.png',
       // trialList: JSON.parse(localStorage.trialList),
       // 核保数据
       orderStatus: '',
@@ -142,7 +168,7 @@ export default {
         bankCode: '', //银行卡号
         bankName: '' //开户银行
       },
-      radio: '1',
+      radio: '',
       result: [],
       isScan: false, //是否显示证件扫描组件
       isClear: false, //是否清空
@@ -188,10 +214,17 @@ export default {
         tradeState: '' // 状态
       },
       gotPayParam: false, // 是否已正确获取支付参数,
-      payStatus: '' // 接口返回的支付状态
+      payStatus: '', // 接口返回的支付状态
+      isWeixin, // 是否为微信环境
+      isLoading: false // 分享到微信后的页面loading
+    }
+  },
+  created() {
+    if (this.isWeixin) {
+      this.radio = '3'
+      this.isLoading = true
     }
   },
-  created() {},
   mounted() {
     setTimeout(() => {
       // eslint-disable-next-line no-undef
@@ -205,20 +238,30 @@ export default {
     // this.underWrite.orderAmount = this.trialList[0].prem
     document.body.style.backgroundColor = '#fff'
     window.appCallBack = this.appCallBack
-    // 获取银行卡
-    this.getBankList()
-    // this.getOrderDetail()
-    // console.log('----保融form.action', config.payUrl)
-    // if (localStorage.salelist == '1') {
-    // 第一次支付 调核保获取
-    // this.underWrite()
-    // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
-    // } else {
     // 再次支付 调详情 获取信息
     this.getOrderDetail()
-    // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
-    // }
-    // console.log('--自核结果--支付信息：', JSON.stringify(this.underWriteData))
+    // 不在微信环境下
+    if (!this.isWeixin) {
+      // 获取银行卡
+      this.getBankList()
+      // this.getOrderDetail()
+      // console.log('----保融form.action', config.payUrl)
+      // if (localStorage.salelist == '1') {
+      // 第一次支付 调核保获取
+      // this.underWrite()
+      // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
+      // } else {
+
+      // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
+      // }
+      // console.log('--自核结果--支付信息：', JSON.stringify(this.underWriteData))
+    } else {
+      let token = this.$route.query.token
+      let orderNo = this.$route.query.orderNo
+      localStorage.token = token
+      localStorage.orderNo = orderNo
+      this.pay()
+    }
   },
   beforeRouteLeave(to, from, next) {
     document.body.style.backgroundColor = ''
@@ -356,6 +399,7 @@ export default {
           this.underWriteData = {
             appntName: res.orderDTO.insuredDTOs[0].riskDTOLst[0].riskName,
             name: res.orderDTO.appntDTO.name,
+            idType: res.orderDTO.appntDTO.idType,
             bankCode: res.orderDTO.orderAccountDTO.cardBookCode,
             bankName: res.orderDTO.orderAccountDTO.bankCode,
             cardBookCode: res.orderDTO.orderAccountDTO.cardBookCode,
@@ -371,6 +415,7 @@ export default {
           this.underWriteData = {
             accountName: '',
             appntName: '',
+            idType: '',
             bankCode: '',
             bankName: '',
             cardBookCode: '',
@@ -438,7 +483,8 @@ export default {
     acceptInsurance() {
       let data = {
         orderNo: window.localStorage.getItem('orderNo'),
-        cardOrder: 'cardOrder'
+        cardOrder: 'cardOrder',
+        payType: this.radio
       }
       acceptInsurance(data).then(res => {
         console.log('----取支付参数结果：', JSON.stringify(res))
@@ -481,7 +527,11 @@ export default {
             }, 100)
           })
         } else {
-          this.$toast.clear()
+          if (!this.isWeixin) {
+            this.$toast.clear()
+          } else {
+            this.isLoading = false
+          }
           this.$toast(res.resultMessage)
         }
       })
@@ -542,6 +592,31 @@ export default {
         this.$toast(res.resultMessage)
       }
       // })
+    },
+    // 选择微信支付校验身份证类型
+    vxVerify() {
+      if (this.underWriteData.idType != '1') {
+        this.$dialog
+          .confirm({
+            message: '证件类型不是身份证，无法使用微信支付',
+            showCancelButton: false
+          })
+          .then(() => {
+            this.radio = ''
+          })
+      }
+    },
+    share() {
+      let shareName = this.underWriteData.name
+      EWebBridge.webCallAppInJs('bridge', {
+        flag: 'share',
+        extra: {
+          title: `国富人寿卡单投保（${shareName}）付款`,
+          content: '付款进行',
+          url: location.origin + '/#/cardList/pay?orderNo=' + localStorage.orderNo + '&token=' + localStorage.token,
+          img: this.$assetsUrl + 'images/logo.png'
+        }
+      })
     }
   }
 }
@@ -552,36 +627,44 @@ export default {
 * {
   box-sizing: border-box;
 }
-.oi {
-  font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';
-  font-weight: 700;
-  font-style: normal;
-  color: #666666;
-}
-.money {
-  display: flex;
-  width: 100%;
-  align-items: center;
-  justify-content: space-between;
-  z-index: 100;
-  background: white;
-  height: 40px;
-  overflow: hidden;
-  > div:nth-of-type(1) {
-    display: flex;
-    align-items: center;
+// .oi {
+//   font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';
+//   font-weight: 700;
+//   font-style: normal;
+//   color: #666666;
+// }
+// .money {
+//   display: flex;
+//   width: 100%;
+//   align-items: center;
+//   justify-content: space-between;
+//   z-index: 100;
+//   background: white;
+//   height: 40px;
+//   overflow: hidden;
+//   > div:nth-of-type(1) {
+//     display: flex;
+//     align-items: center;
 
-    img {
-      width: 33px;
-      height: 32px;
-    }
-    span {
-      font-size: 14px;
-    }
-  }
-  > div:nth-of-type(2) {
-    display: flex;
-    align-items: center;
-  }
+//     img {
+//       width: 33px;
+//       height: 32px;
+//     }
+//     span {
+//       font-size: 14px;
+//     }
+//   }
+//   > div:nth-of-type(2) {
+//     display: flex;
+//     align-items: center;
+//   }
+// }
+
+.vximg {
+  width: 25px;
+  height: 25px;
+  padding-left: 13px;
+  padding-right: 2px;
+  box-sizing: content-box;
 }
 </style>

From ace8fd7a9bddec19626c7ab754a9ffa958ba3601 Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Wed, 29 Apr 2020 09:51:23 +0800
Subject: [PATCH 02/19] =?UTF-8?q?[NEW]=20=E4=BF=AE=E6=94=B9=E5=8D=A1?=
 =?UTF-8?q?=E5=8D=95=E6=94=AF=E4=BB=98=E9=A1=B5=E9=9D=A2=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=EF=BC=8Capp=E7=AB=AF=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E4=B8=8D=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E9=93=B6=E8=A1=8C=E5=8D=A1=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/Pay.vue | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue
index 5fad03e09..7edf6e9ff 100644
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -221,6 +221,7 @@ export default {
   },
   created() {
     if (this.isWeixin) {
+      this.getOrderDetail()
       this.radio = '3'
       this.isLoading = true
     }
@@ -238,8 +239,7 @@ export default {
     // this.underWrite.orderAmount = this.trialList[0].prem
     document.body.style.backgroundColor = '#fff'
     window.appCallBack = this.appCallBack
-    // 再次支付 调详情 获取信息
-    this.getOrderDetail()
+
     // 不在微信环境下
     if (!this.isWeixin) {
       // 获取银行卡
@@ -251,7 +251,8 @@ export default {
       // this.underWrite()
       // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
       // } else {
-
+      // 再次支付 调详情 获取信息
+      this.getOrderDetail()
       // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
       // }
       // console.log('--自核结果--支付信息：', JSON.stringify(this.underWriteData))
@@ -461,11 +462,13 @@ export default {
       // })
     },
     async pay() {
-      let valid = await this.$validator.validate()
-      console.log(valid)
-      if (true !== valid) {
-        console.log(this.$validator)
-        return this.$toast(this.$validator.errors.all()[0])
+      if (this.radio !== '3') {
+        let valid = await this.$validator.validate()
+        console.log(valid)
+        if (true !== valid) {
+          console.log(this.$validator)
+          return this.$toast(this.$validator.errors.all()[0])
+        }
       }
 
       switch (this.orderStatus) {
@@ -661,10 +664,10 @@ export default {
 // }
 
 .vximg {
-  width: 25px;
-  height: 25px;
+  width: 23px;
+  height: 23px;
   padding-left: 13px;
-  padding-right: 2px;
+  padding-right: 4px;
   box-sizing: content-box;
 }
 </style>

From 3d8c09fa5e309746a6797035a2db88a630ed6749 Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Wed, 29 Apr 2020 10:14:18 +0800
Subject: [PATCH 03/19] =?UTF-8?q?[NEW]=20=20=E5=B0=9D=E8=AF=95=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=BE=AE=E4=BF=A1=E7=AB=AF=E6=89=93=E5=BC=80=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E9=A1=B5=E8=87=AA=E5=8A=A8=E8=B0=83=E8=B5=B7=E6=94=B6?=
 =?UTF-8?q?=E9=93=B6=E5=8F=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/Pay.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue
index 7edf6e9ff..d1608a73b 100644
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -221,12 +221,13 @@ export default {
   },
   created() {
     if (this.isWeixin) {
-      this.getOrderDetail()
       this.radio = '3'
       this.isLoading = true
     }
   },
   mounted() {
+    // 再次支付 调详情 获取信息
+    this.getOrderDetail()
     setTimeout(() => {
       // eslint-disable-next-line no-undef
       EWebBridge.webCallAppInJs('webview_left_button', {
@@ -251,8 +252,7 @@ export default {
       // this.underWrite()
       // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
       // } else {
-      // 再次支付 调详情 获取信息
-      this.getOrderDetail()
+
       // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
       // }
       // console.log('--自核结果--支付信息：', JSON.stringify(this.underWriteData))
@@ -470,8 +470,8 @@ export default {
           return this.$toast(this.$validator.errors.all()[0])
         }
       }
-
-      switch (this.orderStatus) {
+      let Status = await this.orderStatus
+      switch (Status) {
         case '56':
           this.payMent()
           break
@@ -667,7 +667,7 @@ export default {
   width: 23px;
   height: 23px;
   padding-left: 13px;
-  padding-right: 4px;
+  padding-right: 3px;
   box-sizing: content-box;
 }
 </style>

From dfcfa6ec57952dd90d98e2de07114f18380713e1 Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Wed, 29 Apr 2020 10:42:47 +0800
Subject: [PATCH 04/19] =?UTF-8?q?[NEW]=20=E5=B0=9D=E8=AF=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=8D=A1=E5=8D=95=E6=94=AF=E4=BB=98=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E7=9B=B4=E6=8E=A5=E8=B0=83=E8=B5=B7=E6=94=B6?=
 =?UTF-8?q?=E9=93=B6=E5=8F=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/Pay.vue | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue
index d1608a73b..cafd05eac 100644
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -222,12 +222,16 @@ export default {
   created() {
     if (this.isWeixin) {
       this.radio = '3'
+      let token = this.$route.query.token
+      let orderNo = this.$route.query.orderNo
+      localStorage.token = token
+      localStorage.orderNo = orderNo
       this.isLoading = true
+      // 再次支付 调详情 获取信息
+      this.getOrderDetail()
     }
   },
   mounted() {
-    // 再次支付 调详情 获取信息
-    this.getOrderDetail()
     setTimeout(() => {
       // eslint-disable-next-line no-undef
       EWebBridge.webCallAppInJs('webview_left_button', {
@@ -252,16 +256,11 @@ export default {
       // this.underWrite()
       // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
       // } else {
-
+      // 再次支付 调详情 获取信息
+      this.getOrderDetail()
       // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
       // }
       // console.log('--自核结果--支付信息：', JSON.stringify(this.underWriteData))
-    } else {
-      let token = this.$route.query.token
-      let orderNo = this.$route.query.orderNo
-      localStorage.token = token
-      localStorage.orderNo = orderNo
-      this.pay()
     }
   },
   beforeRouteLeave(to, from, next) {
@@ -411,7 +410,9 @@ export default {
             uwResult: '02'
           }
           this.bankListName = res.orderDTO.orderAccountDTO.bankName
-          // window.localStorage.setItem('underWriteData', JSON.stringify(underWriteData))
+          if (this.isWeixin) {
+            this.pay()
+          }
         } else {
           this.underWriteData = {
             accountName: '',
@@ -470,8 +471,7 @@ export default {
           return this.$toast(this.$validator.errors.all()[0])
         }
       }
-      let Status = await this.orderStatus
-      switch (Status) {
+      switch (this.orderStatus) {
         case '56':
           this.payMent()
           break

From 7e5137f58aa116f211bcf5238f3ab75bd261cb94 Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Wed, 29 Apr 2020 11:40:39 +0800
Subject: [PATCH 05/19] =?UTF-8?q?[NEW]=20=E6=94=BE=E5=BC=80=E5=8D=A1?=
 =?UTF-8?q?=E5=8D=95=E6=94=AF=E4=BB=98=E9=A1=B5=E9=9D=A2=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E6=97=B6=E9=93=B6=E8=A1=8C?=
 =?UTF-8?q?=E5=8D=A1=E4=BF=A1=E6=81=AF=E7=9A=84=E9=9A=90=E8=97=8F=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BE=AE=E4=BF=A1=E7=AB=AF=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=81=AE=E7=BD=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ebiz/Loading.vue | 30 ++++++++++++++++++++++++++++++
 src/views/ebiz/cardList/Pay.vue | 28 ++++++++++++++++++----------
 2 files changed, 48 insertions(+), 10 deletions(-)
 create mode 100644 src/components/ebiz/Loading.vue

diff --git a/src/components/ebiz/Loading.vue b/src/components/ebiz/Loading.vue
new file mode 100644
index 000000000..554f650f0
--- /dev/null
+++ b/src/components/ebiz/Loading.vue
@@ -0,0 +1,30 @@
+<template>
+  <div class="loading-container">
+    <van-overlay :show="isLoading" z-index="999"> </van-overlay>
+  </div>
+</template>
+
+<script>
+import { Overlay } from 'vant'
+export default {
+  name: 'Loading',
+  props: {
+    isLoading: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {}
+  },
+  components: {
+    [Overlay.name]: Overlay
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+/deep/.van-overlay {
+  background: white;
+}
+</style>
diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue
index cafd05eac..ba837d9e7 100644
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -33,7 +33,7 @@
         </van-cell>
       </van-cell-group>
       <!-- 银行卡支付结束 -->
-      <van-cell-group v-if="radio == '' && !isWeixin">
+      <van-cell-group>
         <van-field
           v-model="underWriteData.name"
           label="姓名"
@@ -126,6 +126,8 @@
         <van-cell v-for="item in bankList" :key="item.code" :title="item.bankName" class="text-center" @click="clickList(item.bankName, item.code)" />
       </van-list>
     </van-popup>
+    <!-- 分享到微信的页面loading -->
+    <Loading :isLoading="isLoading"></Loading>
   </div>
 </template>
 
@@ -138,6 +140,7 @@ Vue.use(Button)
 import { acceptInsurance, getBankList, underWrite, getOrderDetail } from '@/api/ebiz/sale/sale'
 import { saveOrUpdateAccount } from '@/api/ebiz/cardList/cardList.js'
 import BankCardScan from '@/components/ebiz/sale/BankCardScan'
+import Loading from '@/components/ebiz/Loading'
 import config from '@/config'
 export default {
   name: 'pay',
@@ -149,7 +152,8 @@ export default {
     [List.name]: List,
     [Cell.name]: Cell,
     [RadioGroup.name]: RadioGroup,
-    [Radio.name]: Radio
+    [Radio.name]: Radio,
+    Loading
   },
   data() {
     let isWeixin = this.$utils.device().isWeixin //判断环境
@@ -463,13 +467,11 @@ export default {
       // })
     },
     async pay() {
-      if (this.radio !== '3') {
-        let valid = await this.$validator.validate()
-        console.log(valid)
-        if (true !== valid) {
-          console.log(this.$validator)
-          return this.$toast(this.$validator.errors.all()[0])
-        }
+      let valid = await this.$validator.validate()
+      console.log(valid)
+      if (true !== valid) {
+        console.log(this.$validator)
+        return this.$toast(this.$validator.errors.all()[0])
       }
       switch (this.orderStatus) {
         case '56':
@@ -609,7 +611,13 @@ export default {
           })
       }
     },
-    share() {
+    async share() {
+      let valid = await this.$validator.validate()
+      console.log(valid)
+      if (true !== valid) {
+        console.log(this.$validator)
+        return this.$toast(this.$validator.errors.all()[0])
+      }
       let shareName = this.underWriteData.name
       EWebBridge.webCallAppInJs('bridge', {
         flag: 'share',

From 3013c8b7f6a9f707c663fed1774b19f58b1c0ee8 Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Wed, 29 Apr 2020 11:57:58 +0800
Subject: [PATCH 06/19] =?UTF-8?q?[NEW]=20=E5=8D=A1=E5=8D=95=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E9=A1=B5=E9=9D=A2=E5=B0=86=E9=93=B6=E8=A1=8C=E5=8D=A1?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=80=9A=E8=BF=87=E8=B7=AF=E7=94=B1=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=82=E4=BC=A0=E9=80=92=E5=BD=93=E5=BE=AE=E4=BF=A1=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/Pay.vue | 56 +++++++++++++--------------------
 1 file changed, 21 insertions(+), 35 deletions(-)

diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue
index ba837d9e7..49c39c011 100644
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -38,7 +38,7 @@
           v-model="underWriteData.name"
           label="姓名"
           name="姓名"
-          :readonly="orderStatus != '56'"
+          readonly
           placeholder="请输入"
           v-validate="'required|name'"
           maxlength="6"
@@ -228,6 +228,10 @@ export default {
       this.radio = '3'
       let token = this.$route.query.token
       let orderNo = this.$route.query.orderNo
+      this.bankListName = this.$route.query.bankListName
+      this.underWriteData.name = this.$route.query.name
+      this.underWriteData.bankName = this.$route.query.bankName
+      this.underWriteData.bankCode = this.$route.query.bankCode
       localStorage.token = token
       localStorage.orderNo = orderNo
       this.isLoading = true
@@ -475,6 +479,7 @@ export default {
       }
       switch (this.orderStatus) {
         case '56':
+        case '57':
           this.payMent()
           break
         case '02':
@@ -482,7 +487,6 @@ export default {
           break
         default:
           return this.$toast('当前不可支付')
-          break
       }
     },
     acceptInsurance() {
@@ -595,6 +599,7 @@ export default {
         }
       } else {
         this.$toast(res.resultMessage)
+        this.isLoading = false
       }
       // })
     },
@@ -624,7 +629,20 @@ export default {
         extra: {
           title: `国富人寿卡单投保（${shareName}）付款`,
           content: '付款进行',
-          url: location.origin + '/#/cardList/pay?orderNo=' + localStorage.orderNo + '&token=' + localStorage.token,
+          url:
+            location.origin +
+            '/#/cardList/pay?orderNo=' +
+            localStorage.orderNo +
+            '&token=' +
+            localStorage.token +
+            '&name=' +
+            this.underWriteData.name +
+            '&bankName=' +
+            this.underWriteData.bankName +
+            '&bankCode=' +
+            this.underWriteData.bankCode +
+            '&bankListName=' +
+            this.bankListName,
           img: this.$assetsUrl + 'images/logo.png'
         }
       })
@@ -638,38 +656,6 @@ export default {
 * {
   box-sizing: border-box;
 }
-// .oi {
-//   font-family: '微软雅黑 Bold', '微软雅黑 Regular', '微软雅黑';
-//   font-weight: 700;
-//   font-style: normal;
-//   color: #666666;
-// }
-// .money {
-//   display: flex;
-//   width: 100%;
-//   align-items: center;
-//   justify-content: space-between;
-//   z-index: 100;
-//   background: white;
-//   height: 40px;
-//   overflow: hidden;
-//   > div:nth-of-type(1) {
-//     display: flex;
-//     align-items: center;
-
-//     img {
-//       width: 33px;
-//       height: 32px;
-//     }
-//     span {
-//       font-size: 14px;
-//     }
-//   }
-//   > div:nth-of-type(2) {
-//     display: flex;
-//     align-items: center;
-//   }
-// }
 
 .vximg {
   width: 23px;

From 386c6e4bdb7e4d61b9aa31b460c672abab6acf76 Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Wed, 29 Apr 2020 12:18:29 +0800
Subject: [PATCH 07/19] =?UTF-8?q?[NEW]=20=E4=BF=AE=E6=94=B9=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E4=BC=A0=E5=8F=82=E6=96=B9=E5=BC=8F=E4=B8=BAlocalStor?=
 =?UTF-8?q?age?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/Pay.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue
index 49c39c011..61be431ae 100644
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -624,6 +624,10 @@ export default {
         return this.$toast(this.$validator.errors.all()[0])
       }
       let shareName = this.underWriteData.name
+      localStorage.name = this.underWriteData.name
+      localStorage.bankName = this.underWriteData.bankName
+      localStorage.bankName = this.underWriteData.bankName
+      localStorage.bankListName = this.bankListName
       EWebBridge.webCallAppInJs('bridge', {
         flag: 'share',
         extra: {
@@ -636,13 +640,13 @@ export default {
             '&token=' +
             localStorage.token +
             '&name=' +
-            this.underWriteData.name +
+            localStorage.name +
             '&bankName=' +
-            this.underWriteData.bankName +
+            localStorage.bankName +
             '&bankCode=' +
-            this.underWriteData.bankCode +
+            localStorage.bankCode +
             '&bankListName=' +
-            this.bankListName,
+            localStorage.bankListName,
           img: this.$assetsUrl + 'images/logo.png'
         }
       })

From 586144ddf39ef25ae9228cde720cffee4f8951d4 Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Wed, 29 Apr 2020 13:46:55 +0800
Subject: [PATCH 08/19] =?UTF-8?q?[NEW]=20=E4=BF=AE=E6=94=B9=E5=8D=A1?=
 =?UTF-8?q?=E5=8D=95=E6=8A=95=E4=BF=9D=E6=94=AF=E4=BB=98=E9=A1=B5=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB=E4=BC=A0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/Pay.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue
index 61be431ae..16b6c2a6b 100644
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -234,7 +234,7 @@ export default {
       this.underWriteData.bankCode = this.$route.query.bankCode
       localStorage.token = token
       localStorage.orderNo = orderNo
-      this.isLoading = true
+      // this.isLoading = true
       // 再次支付 调详情 获取信息
       this.getOrderDetail()
     }
@@ -626,8 +626,9 @@ export default {
       let shareName = this.underWriteData.name
       localStorage.name = this.underWriteData.name
       localStorage.bankName = this.underWriteData.bankName
-      localStorage.bankName = this.underWriteData.bankName
+      localStorage.bankCode = this.underWriteData.bankCode
       localStorage.bankListName = this.bankListName
+      console.log(this.underWriteData.bankName, this.underWriteData.bankCode, this.bankListName, this.underWriteData.name)
       EWebBridge.webCallAppInJs('bridge', {
         flag: 'share',
         extra: {

From b2baee0a28b16dc23500dec62902bd455f8c5725 Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Wed, 29 Apr 2020 14:04:51 +0800
Subject: [PATCH 09/19] =?UTF-8?q?[NEW]=20=E4=BF=AE=E6=94=B9=E5=8D=A1?=
 =?UTF-8?q?=E5=8D=95=E6=94=AF=E4=BB=98=E4=BC=A0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/Pay.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue
index 16b6c2a6b..ade40277a 100644
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -408,16 +408,19 @@ export default {
             appntName: res.orderDTO.insuredDTOs[0].riskDTOLst[0].riskName,
             name: res.orderDTO.appntDTO.name,
             idType: res.orderDTO.appntDTO.idType,
-            bankCode: res.orderDTO.orderAccountDTO.cardBookCode,
-            bankName: res.orderDTO.orderAccountDTO.bankCode,
-            cardBookCode: res.orderDTO.orderAccountDTO.cardBookCode,
             orderAmount: res.orderDTO.orderInfoDTO.orderAmount,
             orderNo: res.orderDTO.orderAccountDTO.orderNo,
             result: '',
             resultMessage: '交易处理成功',
             uwResult: '02'
           }
-          this.bankListName = res.orderDTO.orderAccountDTO.bankName
+          this.underWriteData.bankCode =
+            res.orderDTO.orderAccountDTO.cardBookCode !== null ? res.orderDTO.orderAccountDTO.cardBookCode : this.$route.query.bankCode
+          this.underWriteData.bankName = res.orderDTO.orderAccountDTO.bankCode !== null ? res.orderDTO.orderAccountDTO.bankCode : this.$route.query.bankName
+          this.underWriteData.cardBookCode =
+            res.orderDTO.orderAccountDTO.cardBookCode !== null ? res.orderDTO.orderAccountDTO.cardBookCode : this.$route.query.bankCode
+          this.bankListName = res.orderDTO.orderAccountDTO.bankName !== null ? res.orderDTO.orderAccountDTO.bankName : this.$route.query.bankListName
+
           if (this.isWeixin) {
             this.pay()
           }

From 4288ad7b520930815f6ff758c68f13c7341d9140 Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Wed, 29 Apr 2020 14:18:01 +0800
Subject: [PATCH 10/19] =?UTF-8?q?[NEW]=20=E6=94=BE=E5=BC=80=E5=8D=A1?=
 =?UTF-8?q?=E5=8D=95=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?loading=EF=BC=8C=E6=B5=8B=E8=AF=95=E5=AE=8C=E6=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/Pay.vue | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue
index ade40277a..84a43c2e7 100644
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -228,13 +228,9 @@ export default {
       this.radio = '3'
       let token = this.$route.query.token
       let orderNo = this.$route.query.orderNo
-      this.bankListName = this.$route.query.bankListName
-      this.underWriteData.name = this.$route.query.name
-      this.underWriteData.bankName = this.$route.query.bankName
-      this.underWriteData.bankCode = this.$route.query.bankCode
       localStorage.token = token
       localStorage.orderNo = orderNo
-      // this.isLoading = true
+      this.isLoading = true
       // 再次支付 调详情 获取信息
       this.getOrderDetail()
     }
@@ -407,6 +403,9 @@ export default {
           this.underWriteData = {
             appntName: res.orderDTO.insuredDTOs[0].riskDTOLst[0].riskName,
             name: res.orderDTO.appntDTO.name,
+            bankName: res.orderDTO.orderAccountDTO.bankCode,
+            bankCode: res.orderDTO.orderAccountDTO.cardBookCode,
+            cardBookCode: res.orderDTO.orderAccountDTO.cardBookCode,
             idType: res.orderDTO.appntDTO.idType,
             orderAmount: res.orderDTO.orderInfoDTO.orderAmount,
             orderNo: res.orderDTO.orderAccountDTO.orderNo,
@@ -414,12 +413,15 @@ export default {
             resultMessage: '交易处理成功',
             uwResult: '02'
           }
-          this.underWriteData.bankCode =
-            res.orderDTO.orderAccountDTO.cardBookCode !== null ? res.orderDTO.orderAccountDTO.cardBookCode : this.$route.query.bankCode
-          this.underWriteData.bankName = res.orderDTO.orderAccountDTO.bankCode !== null ? res.orderDTO.orderAccountDTO.bankCode : this.$route.query.bankName
-          this.underWriteData.cardBookCode =
-            res.orderDTO.orderAccountDTO.cardBookCode !== null ? res.orderDTO.orderAccountDTO.cardBookCode : this.$route.query.bankCode
-          this.bankListName = res.orderDTO.orderAccountDTO.bankName !== null ? res.orderDTO.orderAccountDTO.bankName : this.$route.query.bankListName
+          this.bankListName = res.orderDTO.orderAccountDTO.bankName
+          if (this.isWeixin) {
+            this.underWriteData.bankCode =
+              res.orderDTO.orderAccountDTO.cardBookCode !== null ? res.orderDTO.orderAccountDTO.cardBookCode : this.$route.query.bankCode
+            this.underWriteData.bankName = res.orderDTO.orderAccountDTO.bankCode !== null ? res.orderDTO.orderAccountDTO.bankCode : this.$route.query.bankName
+            this.underWriteData.cardBookCode =
+              res.orderDTO.orderAccountDTO.cardBookCode !== null ? res.orderDTO.orderAccountDTO.cardBookCode : this.$route.query.bankCode
+            this.bankListName = res.orderDTO.orderAccountDTO.bankName !== null ? res.orderDTO.orderAccountDTO.bankName : this.$route.query.bankListName
+          }
 
           if (this.isWeixin) {
             this.pay()

From 2bea1654a852f2c410d644956b519ca5d098c0e0 Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Wed, 29 Apr 2020 14:29:18 +0800
Subject: [PATCH 11/19] =?UTF-8?q?[NEW]=20=E4=BC=98=E5=8C=96=E5=8D=A1?=
 =?UTF-8?q?=E5=8D=95=E6=94=AF=E4=BB=98=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/Pay.vue | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue
index 84a43c2e7..2fc85fa22 100644
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -228,6 +228,10 @@ export default {
       this.radio = '3'
       let token = this.$route.query.token
       let orderNo = this.$route.query.orderNo
+      this.bankListName = this.$route.query.bankListName
+      this.underWriteData.name = this.$route.query.name
+      this.underWriteData.bankName = this.$route.query.bankName
+      this.underWriteData.bankCode = this.$route.query.bankCode
       localStorage.token = token
       localStorage.orderNo = orderNo
       this.isLoading = true
@@ -403,9 +407,9 @@ export default {
           this.underWriteData = {
             appntName: res.orderDTO.insuredDTOs[0].riskDTOLst[0].riskName,
             name: res.orderDTO.appntDTO.name,
-            bankName: res.orderDTO.orderAccountDTO.bankCode,
-            bankCode: res.orderDTO.orderAccountDTO.cardBookCode,
-            cardBookCode: res.orderDTO.orderAccountDTO.cardBookCode,
+            // bankName: res.orderDTO.orderAccountDTO.bankCode,
+            // bankCode: res.orderDTO.orderAccountDTO.cardBookCode,
+            // cardBookCode: res.orderDTO.orderAccountDTO.cardBookCode,
             idType: res.orderDTO.appntDTO.idType,
             orderAmount: res.orderDTO.orderInfoDTO.orderAmount,
             orderNo: res.orderDTO.orderAccountDTO.orderNo,
@@ -413,15 +417,13 @@ export default {
             resultMessage: '交易处理成功',
             uwResult: '02'
           }
-          this.bankListName = res.orderDTO.orderAccountDTO.bankName
-          if (this.isWeixin) {
-            this.underWriteData.bankCode =
-              res.orderDTO.orderAccountDTO.cardBookCode !== null ? res.orderDTO.orderAccountDTO.cardBookCode : this.$route.query.bankCode
-            this.underWriteData.bankName = res.orderDTO.orderAccountDTO.bankCode !== null ? res.orderDTO.orderAccountDTO.bankCode : this.$route.query.bankName
-            this.underWriteData.cardBookCode =
-              res.orderDTO.orderAccountDTO.cardBookCode !== null ? res.orderDTO.orderAccountDTO.cardBookCode : this.$route.query.bankCode
-            this.bankListName = res.orderDTO.orderAccountDTO.bankName !== null ? res.orderDTO.orderAccountDTO.bankName : this.$route.query.bankListName
-          }
+          // this.bankListName = res.orderDTO.orderAccountDTO.bankName
+          this.underWriteData.bankCode =
+            res.orderDTO.orderAccountDTO.cardBookCode !== null ? res.orderDTO.orderAccountDTO.cardBookCode : this.$route.query.bankCode
+          this.underWriteData.bankName = res.orderDTO.orderAccountDTO.bankCode !== null ? res.orderDTO.orderAccountDTO.bankCode : this.$route.query.bankName
+          this.underWriteData.cardBookCode =
+            res.orderDTO.orderAccountDTO.cardBookCode !== null ? res.orderDTO.orderAccountDTO.cardBookCode : this.$route.query.bankCode
+          this.bankListName = res.orderDTO.orderAccountDTO.bankName !== null ? res.orderDTO.orderAccountDTO.bankName : this.$route.query.bankListName
 
           if (this.isWeixin) {
             this.pay()

From 753d63f6139eecffd0dafdd47d5ef6cd6be1d7b4 Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Wed, 6 May 2020 11:08:15 +0800
Subject: [PATCH 12/19] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/Pay.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue
index fe59f5b70..68b6f7a94 100644
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -248,7 +248,7 @@ export default {
       },
       gotPayParam: false, // 是否已正确获取支付参数,
       payStatus: '', // 接口返回的支付状态
-      noEdit: true,
+      noEdit: true, //是否为编辑
       isWeixin, // 是否为微信环境
       isLoading: false // 分享到微信后的页面loading
     }

From 904468f9b63b6a30e6c8b22055838ce8eb08b398 Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Wed, 6 May 2020 11:52:50 +0800
Subject: [PATCH 13/19] =?UTF-8?q?=E3=80=90fix=E3=80=91=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E5=88=86=E4=BA=AB=E5=AD=98?=
 =?UTF-8?q?=E5=9C=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/Pay.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue
index 68b6f7a94..51192f096 100644
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -265,9 +265,9 @@ export default {
       localStorage.token = token
       localStorage.orderNo = orderNo
       this.isLoading = true
+    }
       // 再次支付 调详情 获取信息
       this.getOrderDetail()
-    }
   },
   mounted() {
     setTimeout(() => {
@@ -284,7 +284,7 @@ export default {
     window.appCallBack = this.appCallBack
 
     // 不在微信环境下
-    if (!this.isWeixin) {
+    // if (!this.isWeixin) {
       // 获取银行卡
       this.getBankList()
       // this.getOrderDetail()
@@ -300,7 +300,7 @@ export default {
       // }
       // console.log('--自核结果--支付信息：', JSON.stringify(this.underWriteData))
       this.getPayTemp()
-    }
+    // }
   },
   beforeRouteLeave(to, from, next) {
     document.body.style.backgroundColor = ''
@@ -697,13 +697,13 @@ export default {
             '&token=' +
             localStorage.token +
             '&name=' +
-            localStorage.name +
+            this.underWriteData.name +
             '&bankName=' +
-            localStorage.bankName +
+            this.underWriteData.bankName +
             '&bankCode=' +
-            localStorage.bankCode +
+            this.underWriteData.bankCode +
             '&bankListName=' +
-            localStorage.bankListName,
+            this.bankListName,
           img: this.$assetsUrl + 'images/logo.png'
         }
       })

From 4db2742ae180295ab4201252aadf0fa2f8ab9159 Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Fri, 8 May 2020 15:44:26 +0800
Subject: [PATCH 14/19] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=9C=A8=E9=9C=80=E8=A6=81=E8=BE=93=E5=85=A5=E9=93=B6?=
 =?UTF-8?q?=E8=A1=8C=E5=8D=A1=E5=8F=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/Pay.vue | 117 +++++++++++++++++++-------------
 1 file changed, 71 insertions(+), 46 deletions(-)

diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue
index 51192f096..d3494219d 100644
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -33,7 +33,7 @@
         </van-cell>
       </van-cell-group>
       <!-- 银行卡支付结束 -->
-      <van-cell-group>
+      <van-cell-group v-if="radio != '3'">
         <van-field
           v-model="underWriteData.name"
           label="姓名"
@@ -601,63 +601,87 @@ export default {
     },
     // 点击支付
     async payMent(flag) {
-      let data = {
-        orderDTO: {
-          orderInfoDTO: {
-            orderNo: window.localStorage.getItem('orderNo')
-          },
-          orderAccountDTO: {
-            accountType: '0',
-            accountName: this.underWriteData.name,
-            bankName: this.bankListName,
-            bankCode: this.underWriteData.bankName,
-            cardBookType: '1',
-            cardBookCode: this.underWriteData.bankCode,
-            isAutoPay: '0',
-            isAutoRenewal: '1'
+      if(this.radio == ''){
+        let data = {
+          orderDTO: {
+            orderInfoDTO: {
+              orderNo: window.localStorage.getItem('orderNo')
+            },
+            orderAccountDTO: {
+              accountType: '0',
+              accountName: this.underWriteData.name,
+              bankName: this.bankListName,
+              bankCode: this.underWriteData.bankName,
+              cardBookType: '1',
+              cardBookCode: this.underWriteData.bankCode,
+              isAutoPay: '0',
+              isAutoRenewal: '1'
+            }
           }
         }
-      }
-      this.$toast.loading({
-        duration: 0, // 持续展示 toast
-        forbidClick: true, // 禁用背景点击
-        loadingType: 'spinner',
-        message: '加载中……'
-      })
-      /*
-        支付之前要先保存银行账户信息
-      */
-      let res = await saveOrUpdateAccount(data)
-      // .then(res => {
-      console.log('res', res)
-      this.$toast.clear()
-      if (res.result == '0') {
         this.$toast.loading({
           duration: 0, // 持续展示 toast
           forbidClick: true, // 禁用背景点击
           loadingType: 'spinner',
           message: '加载中……'
         })
-
+        /*
+          支付之前要先保存银行账户信息
+        */
+        let res = await saveOrUpdateAccount(data)
+        // .then(res => {
+        console.log('res', res)
+        this.$toast.clear()
+        if (res.result == '0') {
+          this.$toast.loading({
+            duration: 0, // 持续展示 toast
+            forbidClick: true, // 禁用背景点击
+            loadingType: 'spinner',
+            message: '加载中……'
+          })
+        
+          if (!flag) {
+            let rs = await this.underWrite()
+        
+            if (rs.result != '0') {
+              this.$toast.clear()
+              return this.$toast(rs.resultMessage)
+            }
+        
+            if (rs.uwResult != '02') {
+              return this.$toast(rs.message)
+            }
+          }
+        
+          this.acceptInsurance()
+        } else {
+          this.$toast(res.resultMessage)
+          this.isLoading = false
+        }
+        // })
+      }else{
+        this.$toast.loading({
+          duration: 0, // 持续展示 toast
+          forbidClick: true, // 禁用背景点击
+          loadingType: 'spinner',
+          message: '加载中……'
+        })
+                
         if (!flag) {
           let rs = await this.underWrite()
-
+                
           if (rs.result != '0') {
             this.$toast.clear()
             return this.$toast(rs.resultMessage)
           }
-
+                
           if (rs.uwResult != '02') {
             return this.$toast(rs.message)
           }
         }
-
+                
         this.acceptInsurance()
-      } else {
-        this.$toast(res.resultMessage)
-        this.isLoading = false
       }
-      // })
     },
     // 选择微信支付校验身份证类型
     vxVerify() {
@@ -685,13 +709,7 @@ export default {
       localStorage.bankCode = this.underWriteData.bankCode
       localStorage.bankListName = this.bankListName
       console.log(this.underWriteData.bankName, this.underWriteData.bankCode, this.bankListName, this.underWriteData.name)
-      EWebBridge.webCallAppInJs('bridge', {
-        flag: 'share',
-        extra: {
-          title: `国富人寿卡单投保（${shareName}）付款`,
-          content: '付款进行',
-          url:
-            location.origin +
+      let url = location.origin +
             '/#/cardList/pay?orderNo=' +
             localStorage.orderNo +
             '&token=' +
@@ -703,7 +721,14 @@ export default {
             '&bankCode=' +
             this.underWriteData.bankCode +
             '&bankListName=' +
-            this.bankListName,
+            this.bankListName
+      console.log(url);
+      EWebBridge.webCallAppInJs('bridge', {
+        flag: 'share',
+        extra: {
+          title: `国富人寿卡单投保（${shareName}）付款`,
+          content: '付款进行',
+          url: url,
           img: this.$assetsUrl + 'images/logo.png'
         }
       })

From 5f323bdc622ac68f69bff14b62fa05bfda27858e Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Fri, 8 May 2020 15:57:53 +0800
Subject: [PATCH 15/19] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=8D=A1=E5=8D=95=EF=BC=8C=E5=BE=AE=E4=BF=A1=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E8=BF=87=E7=A8=8B=E4=B8=AD=EF=BC=8C=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E4=B8=A4=E6=AC=A1=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/Pay.vue | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue
index d3494219d..ffeb1a8b6 100644
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -713,15 +713,7 @@ export default {
             '/#/cardList/pay?orderNo=' +
             localStorage.orderNo +
             '&token=' +
-            localStorage.token +
-            '&name=' +
-            this.underWriteData.name +
-            '&bankName=' +
-            this.underWriteData.bankName +
-            '&bankCode=' +
-            this.underWriteData.bankCode +
-            '&bankListName=' +
-            this.bankListName
+            localStorage.token
       console.log(url);
       EWebBridge.webCallAppInJs('bridge', {
         flag: 'share',

From 8d807c97cb72eb8740abdfc9a921aadffcd00fdd Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Fri, 8 May 2020 19:57:02 +0800
Subject: [PATCH 16/19] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=8D=A1=E5=8D=95-=E5=BE=AE=E4=BF=A1=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=EF=BC=8C=E5=8E=BB=E9=99=A4=E9=93=B6=E8=A1=8C=E5=8D=A1?=
 =?UTF-8?q?=E5=8F=B7=E5=90=8E=EF=BC=8C=E9=80=BB=E8=BE=91=E5=8F=91=E7=94=9F?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/Pay.vue       | 15 +++++++++++--
 src/views/ebiz/cardList/PayResult.vue | 32 ++++++++++++++++++++-------
 2 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue
index ffeb1a8b6..1cf41ae19 100644
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -19,7 +19,7 @@
         <img :src="src" class="pl10" />
         <van-cell title="银行卡支付" clickable>
           <!-- <van-checkbox v-model="checked" class="flex justify-content-fe"></van-checkbox> -->
-          <van-radio-group v-model="radio" class="flex justify-content-fe">
+          <van-radio-group v-model="radio" :disabled="noEdit" class="flex justify-content-fe">
             <van-radio name=""></van-radio>
           </van-radio-group>
         </van-cell>
@@ -27,7 +27,7 @@
       <van-cell-group class="flex align-items-c">
         <img :src="vxSrc" class="vximg" />
         <van-cell title="微信支付" clickable>
-          <van-radio-group v-model="radio" class="flex justify-content-fe">
+          <van-radio-group v-model="radio" :disabled="noEdit" class="flex justify-content-fe">
             <van-radio name="3" @click="vxVerify"></van-radio>
           </van-radio-group>
         </van-cell>
@@ -444,6 +444,17 @@ export default {
         console.log('getOrderDetail', res)
         if (res.result == '0') {
           this.orderStatus = res.orderDTO.orderInfoDTO.orderStatus
+          try{
+            if( this.noEdit ){
+              if( res.orderDTO.paymentDTO.cardBookType == '3'){
+                this.radio = '3'
+              }else{
+                this.radio = ''
+              }
+            }
+          }catch(e){
+            //TODO handle the exception
+          }
           this.$toast.clear()
           console.log(res.orderDTO.orderAccountDTO.bankCode)
           this.underWriteData = {
diff --git a/src/views/ebiz/cardList/PayResult.vue b/src/views/ebiz/cardList/PayResult.vue
index 26e9f0381..26e0dd0eb 100644
--- a/src/views/ebiz/cardList/PayResult.vue
+++ b/src/views/ebiz/cardList/PayResult.vue
@@ -14,7 +14,7 @@
     <van-cell-group v-if="payStatus == 1">
       <van-cell title="产品名称" :value="card.appntName" />
       <van-cell title="支付金额" :value="`${payInfo.amnt}元` | moneyFormat" v-if="payInfo.amnt != ''" />
-      <van-cell title="卡号" :value="card.bankCode" />
+      <van-cell v-if="card.bankCode" title="卡号" :value="card.bankCode" />
     </van-cell-group>
     <!-- <div v-if="payStatus != '2' && payStatus != '1'" class=" p10 pb250  bg-white">
       <span class="pt150 fs14"> 如有相关问题，请联系信息技术部运维人员</span>
@@ -32,13 +32,24 @@
     <!-- <div class="bottom-btn bg-white" v-if="payStatus == '1' || payStatus == '4' || payStatus == '8'">
       <van-button type="danger" size="large" @click="next" v-no-more-click="1000">返回首页</van-button>
     </div> -->
-    <div class="bottom-btn bg-white" v-if="payStatus == '1' || payStatus == '4' || payStatus == '8'">
-      <van-button type="danger" size="large" @click="next" v-no-more-click="1000">返回首页</van-button>
-    </div>
-    <div class="bottom-area bottom-btn flex" v-if="payStatus == '2' || payStatus == '9'">
-      <van-button class="m-btn w250" type="danger" size="normal" @click="rePayMent">重新支付</van-button>
-      <van-button class="m-btn w250" type="danger" size="normal" @click="next">返回首页</van-button>
-    </div>
+    <template v-if="!isWeixin">
+      <div class="bottom-btn bg-white" v-if="payStatus == '1' || payStatus == '4' || payStatus == '8'">
+        <van-button type="danger" size="large" @click="next" v-no-more-click="1000">返回首页</van-button>
+      </div>
+      <div class="bottom-area bottom-btn flex" v-if="payStatus == '2' || payStatus == '9'">
+        <van-button class="m-btn w250" type="danger" size="normal" @click="rePayMent">重新支付</van-button>
+        <van-button class="m-btn w250" type="danger" size="normal" @click="next">返回首页</van-button>
+      </div>
+    </template>
+    <template v-else>
+      <div class="bottom-btn bg-white" v-if="payStatus == '1' || payStatus == '4' || payStatus == '8'">
+        <van-button type="danger" size="large" @click="close" v-no-more-click="1000">返回</van-button>
+      </div>
+      <div class="bottom-area bottom-btn flex" v-if="payStatus == '2' || payStatus == '9'">
+        <van-button class="m-btn w250" type="danger" size="normal" @click="rePayMent">重新支付</van-button>
+        <van-button class="m-btn w250" type="danger" size="normal" @click="next">返回</van-button>
+      </div>
+    </template>
     <!--    <div class="bottom-area bottom-btn flex" v-if="payStatus == '9'">
       <van-button class="m-btn w250" type="danger" size="normal" @click="rePayMent">重新支付</van-button>
       <van-button class="m-btn w250" type="danger" size="normal" @click="changeCard">换卡支付</van-button>
@@ -56,7 +67,9 @@ import { Cell, CellGroup } from 'vant'
 import { getPayState } from '@/api/ebiz/sale/sale'
 export default {
   data() {
+    let isWeixin = this.$utils.device().isWeixin //判断环境
     return {
+      isWeixin,
       // 保融收银台返回的支付流水号
       paySeqNo: '',
       // 接口返回数据前，不做页面渲染
@@ -158,6 +171,9 @@ export default {
           path: '/cardList/pay'
         }
       })
+    },
+    close(){
+      WeixinJSBridge.call("closeWindow");
     }
   },
   created() {

From 3038b8221c94738588600c5668b4495883538b48 Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Sat, 9 May 2020 10:13:15 +0800
Subject: [PATCH 17/19] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=8D=A1=E5=8D=95=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/Pay.vue | 92 ++++++++++++++++-----------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue
index 1cf41ae19..32da7b80d 100644
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -201,7 +201,7 @@ export default {
         bankCode: '', //银行卡号
         bankName: '' //开户银行
       },
-      radio: '',
+      radio: '3',
       result: [],
       isScan: false, //是否显示证件扫描组件
       isClear: false, //是否清空
@@ -258,16 +258,15 @@ export default {
       this.radio = '3'
       let token = this.$route.query.token
       let orderNo = this.$route.query.orderNo
-      this.bankListName = this.$route.query.bankListName
-      this.underWriteData.name = this.$route.query.name
-      this.underWriteData.bankName = this.$route.query.bankName
-      this.underWriteData.bankCode = this.$route.query.bankCode
       localStorage.token = token
       localStorage.orderNo = orderNo
       this.isLoading = true
+      setTimeout(() => {
+        this.pay()
+      }, 1000)
     }
-      // 再次支付 调详情 获取信息
-      this.getOrderDetail()
+    // 再次支付 调详情 获取信息
+    this.getOrderDetail()
   },
   mounted() {
     setTimeout(() => {
@@ -285,21 +284,23 @@ export default {
 
     // 不在微信环境下
     // if (!this.isWeixin) {
-      // 获取银行卡
-      this.getBankList()
-      // this.getOrderDetail()
-      // console.log('----保融form.action', config.payUrl)
-      // if (localStorage.salelist == '1') {
-      // 第一次支付 调核保获取
-      // this.underWrite()
-      // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
-      // } else {
-      // 再次支付 调详情 获取信息
-      this.getOrderDetail()
-      // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
-      // }
-      // console.log('--自核结果--支付信息：', JSON.stringify(this.underWriteData))
-      this.getPayTemp()
+    // 获取银行卡
+    this.getBankList()
+    // this.getOrderDetail()
+    // console.log('----保融form.action', config.payUrl)
+    // if (localStorage.salelist == '1') {
+    // 第一次支付 调核保获取
+    // this.underWrite()
+    // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
+    // } else {
+    // 再次支付 调详情 获取信息
+    this.getOrderDetail()
+    // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
+    // }
+    // console.log('--自核结果--支付信息：', JSON.stringify(this.underWriteData))
+    this.getPayTemp()
+    
+    
     // }
   },
   beforeRouteLeave(to, from, next) {
@@ -444,15 +445,15 @@ export default {
         console.log('getOrderDetail', res)
         if (res.result == '0') {
           this.orderStatus = res.orderDTO.orderInfoDTO.orderStatus
-          try{
-            if( this.noEdit ){
-              if( res.orderDTO.paymentDTO.cardBookType == '3'){
+          try {
+            if (this.noEdit) {
+              if (res.orderDTO.paymentDTO.cardBookType == '3') {
                 this.radio = '3'
-              }else{
+              } else {
                 this.radio = ''
               }
             }
-          }catch(e){
+          } catch (e) {
             //TODO handle the exception
           }
           this.$toast.clear()
@@ -478,9 +479,9 @@ export default {
             res.orderDTO.orderAccountDTO.cardBookCode !== null ? res.orderDTO.orderAccountDTO.cardBookCode : this.$route.query.bankCode
           this.bankListName = res.orderDTO.orderAccountDTO.bankName !== null ? res.orderDTO.orderAccountDTO.bankName : this.$route.query.bankListName
 
-          if (this.isWeixin) {
-            this.pay()
-          }
+          // if (this.isWeixin) {
+          //   this.pay()
+          // }
         } else {
           this.underWriteData = {
             accountName: '',
@@ -589,6 +590,9 @@ export default {
           window.localStorage.setItem('payStatus', res.payStatus)
           window.localStorage.setItem('payInfo', JSON.stringify(res))
           this.underWriteData.bankListName = this.bankListName
+          if(this.radio == '3'){
+            this.underWriteData.bankCode = ''
+          }
           localStorage['cardList-detail'] = JSON.stringify(this.underWriteData)
           let thisRef = this
           this.$nextTick(() => {
@@ -612,7 +616,7 @@ export default {
     },
     // 点击支付
     async payMent(flag) {
-      if(this.radio == ''){
+      if (this.radio == '') {
         let data = {
           orderDTO: {
             orderInfoDTO: {
@@ -650,47 +654,47 @@ export default {
             loadingType: 'spinner',
             message: '加载中……'
           })
-        
+
           if (!flag) {
             let rs = await this.underWrite()
-        
+
             if (rs.result != '0') {
               this.$toast.clear()
               return this.$toast(rs.resultMessage)
             }
-        
+
             if (rs.uwResult != '02') {
               return this.$toast(rs.message)
             }
           }
-        
+
           this.acceptInsurance()
         } else {
           this.$toast(res.resultMessage)
           this.isLoading = false
         }
         // })
-      }else{
+      } else {
         this.$toast.loading({
           duration: 0, // 持续展示 toast
           forbidClick: true, // 禁用背景点击
           loadingType: 'spinner',
           message: '加载中……'
         })
-                
+
         if (!flag) {
           let rs = await this.underWrite()
-                
+
           if (rs.result != '0') {
             this.$toast.clear()
             return this.$toast(rs.resultMessage)
           }
-                
+
           if (rs.uwResult != '02') {
             return this.$toast(rs.message)
           }
         }
-                
+
         this.acceptInsurance()
       }
     },
@@ -720,12 +724,8 @@ export default {
       localStorage.bankCode = this.underWriteData.bankCode
       localStorage.bankListName = this.bankListName
       console.log(this.underWriteData.bankName, this.underWriteData.bankCode, this.bankListName, this.underWriteData.name)
-      let url = location.origin +
-            '/#/cardList/pay?orderNo=' +
-            localStorage.orderNo +
-            '&token=' +
-            localStorage.token
-      console.log(url);
+      let url = location.origin + '/#/cardList/pay?orderNo=' + localStorage.orderNo + '&token=' + localStorage.token
+      console.log(url)
       EWebBridge.webCallAppInJs('bridge', {
         flag: 'share',
         extra: {

From 88622372a6d301d0163dfcc51b7c6005242cd532 Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Sat, 9 May 2020 13:24:57 +0800
Subject: [PATCH 18/19] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=A0=B8=E4=BF=9D=E6=8E=A5=E5=8F=A3=E7=9A=84=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/Pay.vue         | 98 ++++++++++++-------------
 src/views/ebiz/cardList/information.vue | 57 +++++++++++---
 2 files changed, 94 insertions(+), 61 deletions(-)

diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue
index 32da7b80d..6acbd6baa 100644
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -502,35 +502,35 @@ export default {
       })
     },
     // 获取支付信息
-    async underWrite() {
-      let data = {
-        platform: 'app',
-        type: '1',
-        orderDTO: {
-          orderInfoDTO: {
-            orderNo: window.localStorage.getItem('orderNo')
-          }
-        }
-      }
-      return underWrite(data)
-      // .then(res => {
-      //   console.log(res);
-      //   if (res.result == '0') {
-      //     this.$toast.clear()
-      //     if (res.uwResult == '33') {
-      //       window.localStorage.setItem('uwResult', res.uwResult)
-      //       window.localStorage.setItem('resultMessage', res.message)
-      //     } else {
-      //       window.localStorage.setItem('uwResult', res.uwResult)
-      //     }
-      //     this.underWriteData = res
-      //     return true
-      //   } else {
-      //     return false
-      //     this.$toast(res.resultMessage)
-      //   }
-      // })
-    },
+    // async underWrite() {
+    //   let data = {
+    //     platform: 'app',
+    //     type: '1',
+    //     orderDTO: {
+    //       orderInfoDTO: {
+    //         orderNo: window.localStorage.getItem('orderNo')
+    //       }
+    //     }
+    //   }
+    //   return underWrite(data)
+    //   // .then(res => {
+    //   //   console.log(res);
+    //   //   if (res.result == '0') {
+    //   //     this.$toast.clear()
+    //   //     if (res.uwResult == '33') {
+    //   //       window.localStorage.setItem('uwResult', res.uwResult)
+    //   //       window.localStorage.setItem('resultMessage', res.message)
+    //   //     } else {
+    //   //       window.localStorage.setItem('uwResult', res.uwResult)
+    //   //     }
+    //   //     this.underWriteData = res
+    //   //     return true
+    //   //   } else {
+    //   //     return false
+    //   //     this.$toast(res.resultMessage)
+    //   //   }
+    //   // })
+    // },
     async pay() {
       let valid = await this.$validator.validate()
       console.log(valid)
@@ -655,18 +655,18 @@ export default {
             message: '加载中……'
           })
 
-          if (!flag) {
-            let rs = await this.underWrite()
+          // if (!flag) {
+          //   let rs = await this.underWrite()
 
-            if (rs.result != '0') {
-              this.$toast.clear()
-              return this.$toast(rs.resultMessage)
-            }
+          //   if (rs.result != '0') {
+          //     this.$toast.clear()
+          //     return this.$toast(rs.resultMessage)
+          //   }
 
-            if (rs.uwResult != '02') {
-              return this.$toast(rs.message)
-            }
-          }
+          //   if (rs.uwResult != '02') {
+          //     return this.$toast(rs.message)
+          //   }
+          // }
 
           this.acceptInsurance()
         } else {
@@ -682,18 +682,18 @@ export default {
           message: '加载中……'
         })
 
-        if (!flag) {
-          let rs = await this.underWrite()
+        // if (!flag) {
+        //   let rs = await this.underWrite()
 
-          if (rs.result != '0') {
-            this.$toast.clear()
-            return this.$toast(rs.resultMessage)
-          }
+        //   if (rs.result != '0') {
+        //     this.$toast.clear()
+        //     return this.$toast(rs.resultMessage)
+        //   }
 
-          if (rs.uwResult != '02') {
-            return this.$toast(rs.message)
-          }
-        }
+        //   if (rs.uwResult != '02') {
+        //     return this.$toast(rs.message)
+        //   }
+        // }
 
         this.acceptInsurance()
       }
diff --git a/src/views/ebiz/cardList/information.vue b/src/views/ebiz/cardList/information.vue
index 6c58cc9f4..19b50e869 100644
--- a/src/views/ebiz/cardList/information.vue
+++ b/src/views/ebiz/cardList/information.vue
@@ -270,6 +270,7 @@ import CustomerPicker from '@/components/ebiz/customer/CustomerPicker'
 import DataDictionary from '@/assets/js/utils/data-dictionary'
 import areaList from '@/assets/js/utils/area'
 import { saveOrUpdateCard } from '@/api/ebiz/cardList/cardList.js'
+import { underWrite } from '@/api/ebiz/sale/sale'
 import utilsAge from '@/assets/js/utils/age'
 import getAreaName from '@/assets/js/utils/get-area-name'
 import IdentityCardScan from '@/components/ebiz/sale/IdentityCardScan'
@@ -410,6 +411,45 @@ export default {
     this.allPrice = this.trialList[0].prem
   },
   methods: {
+    underWrite(orderNo) {
+      let data = {
+        platform: 'app',
+        type: '1',
+        orderDTO: {
+          orderInfoDTO: {
+            orderNo: orderNo
+          }
+        }
+      }
+      underWrite(data)
+      .then(res => {
+        console.log(res);
+        if (res.result == '0') {
+          this.$toast.clear()
+          if (res.uwResult == '33') {
+            window.localStorage.setItem('uwResult', res.uwResult)
+            window.localStorage.setItem('resultMessage', res.message)
+          } else {
+            window.localStorage.setItem('uwResult', res.uwResult)
+          }
+          this.underWriteData = res
+          this.$jump({
+            flag: 'h5',
+            extra: {
+              url: location.origin + `/#/cardList/pay`,
+              forbidSwipeBack: 1
+            },
+            routerInfo: {
+              path: `/cardList/pay`
+            }
+          })
+          return true
+        } else {
+          return false
+          this.$toast(res.resultMessage)
+        }
+      })
+    },
     goDocu(url, name) {
       // let pdfUrl = //encodeURIComponent(url)
       localStorage.setItem('cardListPDF', JSON.stringify({ documentUrl: url, title: name }))
@@ -1016,7 +1056,7 @@ export default {
 
       let resultData = await saveOrUpdateCard(params)
       if (resultData.result == 0) {
-        console.log(' resultData.orderNo', resultData.content.object)
+        console.log('resultData.orderNo', resultData.content.object)
         //存储被保人信息
         // let age = utilsAge.getAge(this.userInfo.birthday, new Date())
         // localStorage.saleInsuredInfo = JSON.stringify({
@@ -1030,17 +1070,10 @@ export default {
         // localStorage.saleInsuredInfo = JSON.stringify(this.userInfo)
         // console.log(this.userInfo)
 
-        localStorage.orderNo = resultData.content.object
-        this.$jump({
-          flag: 'h5',
-          extra: {
-            url: location.origin + `/#/cardList/pay`,
-            forbidSwipeBack: 1
-          },
-          routerInfo: {
-            path: `/cardList/pay`
-          }
-        })
+        let orderNo = localStorage.orderNo = resultData.content.object
+        
+        this.underWrite(orderNo)
+        
       } else {
         console.error(resultData.resultMessage)
         this.$toast(resultData.resultMessage)

From 6fb92657176aab1745450133e2b0a25d8c311bee Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Sat, 9 May 2020 13:27:36 +0800
Subject: [PATCH 19/19] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0loading=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/cardList/Pay.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/ebiz/cardList/Pay.vue b/src/views/ebiz/cardList/Pay.vue
index 6acbd6baa..d6f0cfa47 100644
--- a/src/views/ebiz/cardList/Pay.vue
+++ b/src/views/ebiz/cardList/Pay.vue
@@ -261,9 +261,15 @@ export default {
       localStorage.token = token
       localStorage.orderNo = orderNo
       this.isLoading = true
+      this.$toast.loading({
+        duration: 0, // 持续展示 toast
+        forbidClick: true, // 禁用背景点击
+        loadingType: 'spinner',
+        message: '加载中……'
+      })
       setTimeout(() => {
         this.pay()
-      }, 1000)
+      }, 500)
     }
     // 再次支付 调详情 获取信息
     this.getOrderDetail()