From cc1e093086168ae8049461acf050e23d6b17a52a Mon Sep 17 00:00:00 2001
From: "na.guo" <guona@ebiz-fooge.com>
Date: Fri, 14 Aug 2020 13:26:31 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E5=8F=AF=E6=94=AF=E4=BB=98=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ebiz/sale/sale.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/api/ebiz/sale/sale.js b/src/api/ebiz/sale/sale.js
index 01a247ea4..fb2b3647c 100644
--- a/src/api/ebiz/sale/sale.js
+++ b/src/api/ebiz/sale/sale.js
@@ -1,6 +1,5 @@
 import request from '@/assets/js/utils/request'
 import getUrl from '@/assets/js/utils/get-url'
-
 // 保费计算
 export function saveOrUpdateOrderInfo(data) {
   return request({
@@ -9,6 +8,14 @@ export function saveOrUpdateOrderInfo(data) {
     data
   })
 }
+//人核转线上支付判断是否可进行支付操作
+export function payFlag(data) {
+  return request({
+    url: getUrl('/sale/insure/payFlag', 1),
+    method: 'post',
+    data
+  })
+}
 // 订单列表
 export function orderList(data) {
   return request({

From 567bf5a507b466f630a7dc0c23eddbaf854354a7 Mon Sep 17 00:00:00 2001
From: "na.guo" <guona@ebiz-fooge.com>
Date: Fri, 14 Aug 2020 13:27:17 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/List.vue | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/views/ebiz/sale/List.vue b/src/views/ebiz/sale/List.vue
index fe6d91425..8dfbf88fd 100644
--- a/src/views/ebiz/sale/List.vue
+++ b/src/views/ebiz/sale/List.vue
@@ -77,6 +77,7 @@
               <div v-if="!!order.orderInfoDTO.doubleFlag && order.orderInfoDTO.doubleFlag == '0'" class="fs12 mt15">
                 温馨提示：本投保单满足双录条件，需要双录质检通过后才能承保。
               </div>
+
               <div class="text-right mt15 ">
                 <van-button v-if="active == 'uncommit'" round @click="goDetail(order)" size="small" class="mr5" type="danger" v-no-more-click="1000"
                   >编辑</van-button
@@ -114,16 +115,9 @@
                   <van-button @click="changeCard(order)" size="small" class="mr5" type="danger" round>修改卡号</van-button>
                   <van-button @click="againPay(order)" size="small" class="mr5" type="danger" round>重新支付</van-button>
                 </template>
-
-                <van-button
-                  @click="goPay(order)"
-                  v-if="active == 'commit' && order.orderInfoDTO.orderStatus == '02'"
-                  size="small"
-                  class="mr5"
-                  type="danger"
-                  round
-                  >去支付</van-button
-                >
+                <template v-if="active == 'commit' && order.orderInfoDTO.orderStatus == '02'">
+                  <van-button v-if="getStuats(order.orderInfoDTO.orderNo)" size="small" class="mr5" type="danger" round>去支付</van-button>
+                </template>
 
                 <!-- <van-button
                   @click="goNucleus(order)"
@@ -153,7 +147,7 @@
 
 <script>
 import { Search, Tabs, Tab, List, Tag, Sticky, Toast, Dialog } from 'vant'
-import { orderList, deleteOrderInfo, revokeOrder } from '@/api/ebiz/sale/sale'
+import { orderList, deleteOrderInfo, revokeOrder, payFlag } from '@/api/ebiz/sale/sale'
 import { formatRiskList } from '@/assets/js/utils/formatRiskList.js'
 import dataDictionary from '@/assets/js/utils/data-dictionary' //根据数据字典找到用户等级
 
@@ -201,6 +195,10 @@ export default {
     this.loadMore()
   },
   methods: {
+    async getStuats(val) {
+      const res = await payFlag({ orderNo: val })
+      console.log(res, 'val')
+    },
     appCallBack(data) {
       if (data.trigger == 'left_button_click') {
         this.$jump({

From 983292438f07c5c71cfb0ab0f0152b0040c102dd Mon Sep 17 00:00:00 2001
From: "na.guo" <guona@ebiz-fooge.com>
Date: Wed, 19 Aug 2020 14:56:25 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E5=8E=BB=E6=94=AF=E4=BB=98=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/List.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/ebiz/sale/List.vue b/src/views/ebiz/sale/List.vue
index 8dfbf88fd..d16ae9033 100644
--- a/src/views/ebiz/sale/List.vue
+++ b/src/views/ebiz/sale/List.vue
@@ -115,8 +115,13 @@
                   <van-button @click="changeCard(order)" size="small" class="mr5" type="danger" round>修改卡号</van-button>
                   <van-button @click="againPay(order)" size="small" class="mr5" type="danger" round>重新支付</van-button>
                 </template>
-                <template v-if="active == 'commit' && order.orderInfoDTO.orderStatus == '02'">
-                  <van-button v-if="getStuats(order.orderInfoDTO.orderNo)" size="small" class="mr5" type="danger" round>去支付</van-button>
+                <template
+                  v-if="
+                    active == 'commit' &&
+                      (order.orderInfoDTO.orderStatus == '02' || order.orderInfoDTO.orderStatus == '58' || getStuats(order.orderInfoDTO.orderNo))
+                  "
+                >
+                  <van-button size="small" class="mr5" type="danger" round>去支付</van-button>
                 </template>
 
                 <!-- <van-button

From 2f09a087bfa604982b05badf85613a17527498c6 Mon Sep 17 00:00:00 2001
From: "na.guo" <guona@ebiz-fooge.com>
Date: Thu, 20 Aug 2020 16:04:29 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=8F=AF=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/List.vue | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/views/ebiz/sale/List.vue b/src/views/ebiz/sale/List.vue
index d16ae9033..00a52cf75 100644
--- a/src/views/ebiz/sale/List.vue
+++ b/src/views/ebiz/sale/List.vue
@@ -115,13 +115,8 @@
                   <van-button @click="changeCard(order)" size="small" class="mr5" type="danger" round>修改卡号</van-button>
                   <van-button @click="againPay(order)" size="small" class="mr5" type="danger" round>重新支付</van-button>
                 </template>
-                <template
-                  v-if="
-                    active == 'commit' &&
-                      (order.orderInfoDTO.orderStatus == '02' || order.orderInfoDTO.orderStatus == '58' || getStuats(order.orderInfoDTO.orderNo))
-                  "
-                >
-                  <van-button size="small" class="mr5" type="danger" round>去支付</van-button>
+                <template v-if="active == 'commit' && (order.orderInfoDTO.orderStatus == '02' || order.orderInfoDTO.orderStatus == '58')">
+                  <van-button @click="goPay(order)" size="small" class="mr5" type="danger" round>去支付</van-button>
                 </template>
 
                 <!-- <van-button
@@ -152,7 +147,7 @@
 
 <script>
 import { Search, Tabs, Tab, List, Tag, Sticky, Toast, Dialog } from 'vant'
-import { orderList, deleteOrderInfo, revokeOrder, payFlag } from '@/api/ebiz/sale/sale'
+import { orderList, deleteOrderInfo, revokeOrder } from '@/api/ebiz/sale/sale'
 import { formatRiskList } from '@/assets/js/utils/formatRiskList.js'
 import dataDictionary from '@/assets/js/utils/data-dictionary' //根据数据字典找到用户等级
 
@@ -200,10 +195,6 @@ export default {
     this.loadMore()
   },
   methods: {
-    async getStuats(val) {
-      const res = await payFlag({ orderNo: val })
-      console.log(res, 'val')
-    },
     appCallBack(data) {
       if (data.trigger == 'left_button_click') {
         this.$jump({

From 7d4399efb7ee2861e29ac7d2eb1bc26bd4ae0be1 Mon Sep 17 00:00:00 2001
From: "na.guo" <guona@ebiz-fooge.com>
Date: Thu, 20 Aug 2020 18:09:30 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=98=E6=AC=BE?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/ebiz/sale.js               | 10 +++-
 src/views/ebiz/sale/PayResultFail.vue | 75 +++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 src/views/ebiz/sale/PayResultFail.vue

diff --git a/src/router/ebiz/sale.js b/src/router/ebiz/sale.js
index 0ef64aaea..8f2e7ae98 100644
--- a/src/router/ebiz/sale.js
+++ b/src/router/ebiz/sale.js
@@ -24,7 +24,7 @@ const detail = () => import('@/views/ebiz/sale/Detail')
 const productTip = () => import('@/views/ebiz/sale/productTip')
 const avoidDutyTip = () => import('@/views/ebiz/sale/AvoidDutyTip')
 const doubleRecordTip = () => import('@/views/ebiz/sale/DoubleRecordTip')
-
+const PayResultFail = () => import('@/views/ebiz/sale/PayResultFail')
 let riskName = localStorage.riskName
 console.log('sale/riskName==', riskName)
 export default [
@@ -212,5 +212,13 @@ export default [
   {
     path: '/sale/test',
     component: Test
+  },
+  {
+    path: '/sale/payResultFail',
+    name: 'payResultFail',
+    component: PayResultFail,
+    meta: {
+      title: '支付结果'
+    }
   }
 ]
diff --git a/src/views/ebiz/sale/PayResultFail.vue b/src/views/ebiz/sale/PayResultFail.vue
new file mode 100644
index 000000000..a9101b8a5
--- /dev/null
+++ b/src/views/ebiz/sale/PayResultFail.vue
@@ -0,0 +1,75 @@
+<template>
+  <div class="payResult-container" >
+    <div class="payResult-header flex justify-content-c align-items-c m15 bg-white flex-direction-colunm">
+      <img :src="srcFail" class="payResult-img mb15 pt15" />
+
+      <h3>支付失败</h3>
+         <div class="bottom-btn bg-white" >
+  <van-button type="danger" size="large" @click="next" v-no-more-click="1000"> 返回</van-button>
+
+         </div>
+    
+    </div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+     
+      // 图片
+      srcSuccess: this.$assetsUrl + 'images/success.png',
+      srcPending: this.$assetsUrl + 'images/pending.png',
+      srcFail: this.$assetsUrl + 'images/fail.png'
+    }
+  },
+ 
+  methods: {
+    // 返回列表页
+    next() {
+     
+        this.$jump({
+          flag: 'h5',
+          extra: {
+            url: location.origin + '/#/sale/list'
+          },
+          routerInfo: {
+            path: '/sale/list'
+          }
+        })
+      
+    }
+  },
+  created() {
+    EWebBridge.webCallAppInJs('webview_left_button', {
+      intercept: '1' //是否拦截原生返回事件 1是 其他否
+    })
+  },
+
+  beforeRouteLeave(to, from, next) {
+    document.body.style.backgroundColor = ''
+    next()
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  h3{
+    padding:20px 0px;
+  }
+.payResult-container {
+  .payResult-header {
+    width: 345px;
+    // height: 143px;
+    .payResult-img {
+      width: 70px;
+      height: 70px;
+    }
+  }
+}
+// /deep/ .van-cell__value {
+//   text-align: left;
+// }
+</style>

From ded6a795ef64fea8f84751fb2974dfea054e6ecd Mon Sep 17 00:00:00 2001
From: "na.guo" <guona@ebiz-fooge.com>
Date: Thu, 20 Aug 2020 18:10:10 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/utils/data-dictionary.js | 18 ++++++++++++++++--
 src/views/ebiz/sale/List.vue           |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/assets/js/utils/data-dictionary.js b/src/assets/js/utils/data-dictionary.js
index 7e9bf26e1..0c1a224c0 100644
--- a/src/assets/js/utils/data-dictionary.js
+++ b/src/assets/js/utils/data-dictionary.js
@@ -840,6 +840,10 @@ export default {
     {
       id: '57',
       text: '卡单保存账户信息成功'
+    },
+    {
+      id: '58',
+      text: '待客户付款'
     }
   ],
   // 产品编码
@@ -1476,8 +1480,18 @@ export default {
     { id: 'EAM', text: '资深部经理' },
     { id: 'AD', text: '营业总监' }
   ],
-  relationType: [{ id: '0', text: '配偶' }, { id: '1', text: '子女' }, { id: '2', text: '父母' }, { id: '3', text: '无' }],
-  guarantRelationType: [{ id: '0', text: '亲属' }, { id: '1', text: '朋友' }, { id: '2', text: '同事' }, { id: '3', text: '其他' }],
+  relationType: [
+    { id: '0', text: '配偶' },
+    { id: '1', text: '子女' },
+    { id: '2', text: '父母' },
+    { id: '3', text: '无' }
+  ],
+  guarantRelationType: [
+    { id: '0', text: '亲属' },
+    { id: '1', text: '朋友' },
+    { id: '2', text: '同事' },
+    { id: '3', text: '其他' }
+  ],
   classification: [{ id: '1', text: '司外' }],
   //入司国籍/地区
   rsnativeplace: [
diff --git a/src/views/ebiz/sale/List.vue b/src/views/ebiz/sale/List.vue
index 00a52cf75..903229e7f 100644
--- a/src/views/ebiz/sale/List.vue
+++ b/src/views/ebiz/sale/List.vue
@@ -173,7 +173,7 @@ export default {
       currentPage: 1, //当前页数
       error: false,
       finishedText: '没有更多了',
-      pageSize: 5, //每页数据条数
+      pageSize: 50, //每页数据条数
       isSuccess: false,
       canRevoke: {
         '02': true,

From 8968f16bbbd6ebed0b9e99f433e9425310670865 Mon Sep 17 00:00:00 2001
From: "na.guo" <guona@ebiz-fooge.com>
Date: Thu, 20 Aug 2020 18:11:45 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E4=BA=BA=E6=A0=B8=E8=BD=AC=E7=BA=BF?=
 =?UTF-8?q?=E4=B8=8A=E6=94=AF=E4=BB=98=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=8F=AF=E8=BF=9B=E8=A1=8C=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/PayMent.vue | 40 +++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/views/ebiz/sale/PayMent.vue b/src/views/ebiz/sale/PayMent.vue
index ee2171258..7cbf732f0 100644
--- a/src/views/ebiz/sale/PayMent.vue
+++ b/src/views/ebiz/sale/PayMent.vue
@@ -90,13 +90,14 @@
 <script>
 import { Cell, CellGroup, RadioGroup, Radio, Dialog } from 'vant'
 import { acceptInsurance } from '@/api/ebiz/sale/sale'
-import { underWrite, getOrderDetail } from '@/api/ebiz/sale/sale'
+import { payFlag, underWrite, getOrderDetail } from '@/api/ebiz/sale/sale'
 import Loading from '@/components/ebiz/Loading'
 import config from '@/config'
 export default {
   data() {
     let isWeixin = this.$utils.device().isWeixin //判断环境
     return {
+      orderNo: '', //订单号
       // 支付表单
       formActionUrl: config.payUrl,
       // 单选
@@ -158,6 +159,7 @@ export default {
     }
   },
   mounted() {
+    this.orderNo = window.localStorage.getItem('orderNo')
     console.log('----保融form.action', config.payUrl)
     document.body.style.backgroundColor = '#fff'
     // 不在微信环境下
@@ -185,19 +187,10 @@ export default {
     }
   },
   methods: {
-    // 点击支付
-    payMent() {
-      if (!this.isWeixin) {
-        this.$toast.loading({
-          duration: 0, // 持续展示 toast
-          forbidClick: true, // 禁用背景点击
-          loadingType: 'spinner',
-          message: '加载中……'
-        })
-      }
+    getAcceptInsurance() {
       let that = this
       let data = {
-        orderNo: window.localStorage.getItem('orderNo'),
+        orderNo: this.orderNo,
         payType: this.radio
       }
       acceptInsurance(data).then(res => {
@@ -246,6 +239,29 @@ export default {
         }
       })
     },
+    // 点击支付
+    async payMent() {
+      if (!this.isWeixin) {
+        this.$toast.loading({
+          duration: 0, // 持续展示 toast
+          forbidClick: true, // 禁用背景点击
+          loadingType: 'spinner',
+          message: '加载中……'
+        })
+      }
+
+      const res = await payFlag({ orderNo: this.orderNo })
+
+      if (res.content == 'Y') {
+        this.getAcceptInsurance()
+      } else {
+        this.$toast(res.resultMessage)
+
+        setTimeout(() => {
+          this.$router.push({ path: '/sale/payResultFail' })
+        }, 2000)
+      }
+    },
     // 取消支付
     cancel() {
       this.$toast.clear()

From ad8ad30caf74001d4e1bd9917e096d31e9123f53 Mon Sep 17 00:00:00 2001
From: "na.guo" <guona@ebiz-fooge.com>
Date: Thu, 20 Aug 2020 18:26:41 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/ebiz/sale/List.vue b/src/views/ebiz/sale/List.vue
index 903229e7f..00a52cf75 100644
--- a/src/views/ebiz/sale/List.vue
+++ b/src/views/ebiz/sale/List.vue
@@ -173,7 +173,7 @@ export default {
       currentPage: 1, //当前页数
       error: false,
       finishedText: '没有更多了',
-      pageSize: 50, //每页数据条数
+      pageSize: 5, //每页数据条数
       isSuccess: false,
       canRevoke: {
         '02': true,

From 501f383871cbf4b4d8e469c7e9ff8eeabcbf0722 Mon Sep 17 00:00:00 2001
From: "na.guo" <guona@ebiz-fooge.com>
Date: Thu, 20 Aug 2020 18:39:39 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/PayResultFail.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/views/ebiz/sale/PayResultFail.vue b/src/views/ebiz/sale/PayResultFail.vue
index a9101b8a5..e5144699f 100644
--- a/src/views/ebiz/sale/PayResultFail.vue
+++ b/src/views/ebiz/sale/PayResultFail.vue
@@ -40,12 +40,19 @@ export default {
           }
         })
       
+    },
+        
+    appCallBack(data) {
+      if (data.trigger == 'left_button_click') {
+       this.next()
+      }
     }
   },
   created() {
     EWebBridge.webCallAppInJs('webview_left_button', {
       intercept: '1' //是否拦截原生返回事件 1是 其他否
     })
+    window.appCallBack = that.appCallBac
   },
 
   beforeRouteLeave(to, from, next) {

From b63da4a1e587bfafc9bcda0ace598031253ba67b Mon Sep 17 00:00:00 2001
From: "na.guo" <guona@ebiz-fooge.com>
Date: Thu, 20 Aug 2020 18:47:01 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/ebiz/sale/PayResultFail.vue b/src/views/ebiz/sale/PayResultFail.vue
index e5144699f..8c33114b0 100644
--- a/src/views/ebiz/sale/PayResultFail.vue
+++ b/src/views/ebiz/sale/PayResultFail.vue
@@ -52,7 +52,7 @@ export default {
     EWebBridge.webCallAppInJs('webview_left_button', {
       intercept: '1' //是否拦截原生返回事件 1是 其他否
     })
-    window.appCallBack = that.appCallBac
+    window.appCallBack = this.appCallBac
   },
 
   beforeRouteLeave(to, from, next) {

From dfdf6db8458d7d711d6bdf0c94bd866236d05520 Mon Sep 17 00:00:00 2001
From: "na.guo" <guona@ebiz-fooge.com>
Date: Thu, 20 Aug 2020 18:53:00 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/ebiz/sale/PayResultFail.vue b/src/views/ebiz/sale/PayResultFail.vue
index 8c33114b0..2c6594d2e 100644
--- a/src/views/ebiz/sale/PayResultFail.vue
+++ b/src/views/ebiz/sale/PayResultFail.vue
@@ -52,7 +52,7 @@ export default {
     EWebBridge.webCallAppInJs('webview_left_button', {
       intercept: '1' //是否拦截原生返回事件 1是 其他否
     })
-    window.appCallBack = this.appCallBac
+    window.appCallBack = this.appCallBack
   },
 
   beforeRouteLeave(to, from, next) {

From 1fa31d1c204ffe57c263a613254209674b996a00 Mon Sep 17 00:00:00 2001
From: heweijie <he.weijie@ebiz-interactive.com>
Date: Fri, 21 Aug 2020 10:47:40 +0800
Subject: [PATCH 12/13] =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=8F=96=E9=94=99?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/ebiz/sale/PayMent.vue b/src/views/ebiz/sale/PayMent.vue
index 7cbf732f0..38bb6695a 100644
--- a/src/views/ebiz/sale/PayMent.vue
+++ b/src/views/ebiz/sale/PayMent.vue
@@ -252,7 +252,7 @@ export default {
 
       const res = await payFlag({ orderNo: this.orderNo })
 
-      if (res.content == 'Y') {
+      if (res.content.content.payFlag == 'Y') {
         this.getAcceptInsurance()
       } else {
         this.$toast(res.resultMessage)

From bbf397872e02c791643a1e04d5d34ec1d4cf79c5 Mon Sep 17 00:00:00 2001
From: heweijie <he.weijie@ebiz-interactive.com>
Date: Fri, 21 Aug 2020 10:52:29 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E8=8A=82=E7=82=B9=E5=8F=96=E9=94=99?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/PayMent.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/ebiz/sale/PayMent.vue b/src/views/ebiz/sale/PayMent.vue
index 38bb6695a..640b3d34b 100644
--- a/src/views/ebiz/sale/PayMent.vue
+++ b/src/views/ebiz/sale/PayMent.vue
@@ -251,8 +251,8 @@ export default {
       }
 
       const res = await payFlag({ orderNo: this.orderNo })
-
-      if (res.content.content.payFlag == 'Y') {
+      console.dir(res)
+      if (res.content.payFlag == 'Y') {
         this.getAcceptInsurance()
       } else {
         this.$toast(res.resultMessage)