From 32c5382687e390c10951b972853fc98e7083aec5 Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Tue, 21 Apr 2020 16:01:23 +0800
Subject: [PATCH 01/14] =?UTF-8?q?[NEW]=20=E6=96=B0=E5=A2=9E=E6=8A=95?=
 =?UTF-8?q?=E4=BF=9D=E5=88=86=E4=BA=AB=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/PayMent.vue | 78 +++++++++++++++++++++++++--------
 1 file changed, 59 insertions(+), 19 deletions(-)

diff --git a/src/views/ebiz/sale/PayMent.vue b/src/views/ebiz/sale/PayMent.vue
index 27e6eece2..245d4c0df 100644
--- a/src/views/ebiz/sale/PayMent.vue
+++ b/src/views/ebiz/sale/PayMent.vue
@@ -9,13 +9,22 @@
           <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="1"></van-radio>
+              <van-radio name=""></van-radio>
             </van-radio-group>
           </van-cell>
         </van-cell-group>
-        <van-cell title="姓名" :value="underWriteData.accountName" />
-        <van-cell title="卡号" :value="underWriteData.cardBookCode" />
-        <van-cell title="银行">
+        <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="3"></van-radio>
+            </van-radio-group>
+          </van-cell>
+        </van-cell-group>
+        <van-cell title="姓名" :value="underWriteData.accountName" v-if="radio == '' && !isWeixin" />
+        <van-cell title="卡号" :value="underWriteData.cardBookCode" v-if="radio == '' && !isWeixin" />
+        <van-cell title="银行" v-if="radio == '' && !isWeixin">
           <!-- <van-icon slot="right-icon" name="search" style="line-height: inherit;" /> -->
           <div class="flex align-items-c justify-content-fe">
             <img :src="srcImg" class="imgItem mr10" />
@@ -63,12 +72,18 @@
     </div>
     <!-- <van-button class="m-btn fr" type="danger" @click="submit">确定</van-button>
     <van-button class="m-btn fr green" @click="reset">重置</van-button>-->
-    <div class="bg-white bottom-btn">
+    <div class="bg-white bottom-btn" v-if="radio == '' && !isWeixin">
       <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" :disabled="payStatus == '1' || payStatus == '2' || payStatus == '8'"
         >去支付</van-button
       >
     </div>
+    <div class="bg-white bottom-btn" v-if="radio == '3' && !isWeixin">
+      <van-button type="danger" style="width: 50vw" @click="payMent" v-no-more-click="1000" :disabled="payStatus == '1' || payStatus == '2' || payStatus == '8'"
+        >去支付</van-button
+      >
+      <van-button type="danger" style="width: 50vw" @click="share" v-no-more-click="1000">分享</van-button>
+    </div>
   </div>
 </template>
 <script>
@@ -78,11 +93,12 @@ import { underWrite, getOrderDetail } from '@/api/ebiz/sale/sale'
 import config from '@/config'
 export default {
   data() {
+    let isWeixin = this.$utils.device().isWeixin //判断环境
     return {
       // 支付表单
       formActionUrl: config.payUrl,
       // 单选
-      radio: '1',
+      radio: '',
       // 图片地址
       src: this.$assetsUrl + 'images/cardImg.png',
       // 核保数据
@@ -144,29 +160,41 @@ export default {
         CITIC: '302',
         PSBC: '7008',
         CIB: '309'
-      }
+      },
+      isWeixin // 是否为微信环境
     }
   },
   mounted() {
     console.log('----保融form.action', config.payUrl)
     document.body.style.backgroundColor = '#fff'
-    if (localStorage.salelist == '1') {
-      // 第一次支付 调核保获取
-      this.underWrite().then(() => {
-        this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
-        this.srcImg = this.$assetsUrl + `images/bank/bank_${JSON.parse(window.localStorage.getItem('underWriteData')).bankCode}.png`
-      })
+    // 不在微信环境下
+    if (!this.isWeixin) {
+      if (localStorage.salelist == '1') {
+        // 第一次支付 调核保获取
+        this.underWrite().then(() => {
+          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.twounderWrite()
+        // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
+        // this.srcImg = this.$assetsUrl + `images/bank/bank_${JSON.parse(window.localStorage.getItem('underWriteData')).bankCode}.png`
+      }
+      console.log('--自核结果--支付信息：', JSON.stringify(this.underWriteData))
     } else {
-      // 再次支付 调详情 获取信息
-      this.twounderWrite()
-      // this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
-      // this.srcImg = this.$assetsUrl + `images/bank/bank_${JSON.parse(window.localStorage.getItem('underWriteData')).bankCode}.png`
+      this.radio = '3'
+      let token = this.$route.query.token
+      let orderNo = this.$route.query.orderNo
+      localStorage.token = token
+      localStorage.token = orderNo
+      this.payMent()
     }
-    console.log('--自核结果--支付信息：', JSON.stringify(this.underWriteData))
   },
   methods: {
     // 点击支付
     payMent() {
+      console.log(this.radio)
       this.$toast.loading({
         duration: 0, // 持续展示 toast
         forbidClick: true, // 禁用背景点击
@@ -175,7 +203,8 @@ export default {
       })
       let that = this
       let data = {
-        orderNo: window.localStorage.getItem('orderNo')
+        orderNo: window.localStorage.getItem('orderNo'),
+        payType: this.radio
       }
       acceptInsurance(data).then(res => {
         console.log('----取支付参数结果：', JSON.stringify(res))
@@ -307,6 +336,17 @@ export default {
           this.$toast(res.resultMessage)
         }
       })
+    },
+    share() {
+      EWebBridge.webCallAppInJs('bridge', {
+        flag: 'share',
+        extra: {
+          title: '测试',
+          content: '测试微信支付分享',
+          url: location.origin + '/#/sale/payMent?orderNo=' + localStorage.orderNo + '&token=' + localStorage.token,
+          img: this.$assetsUrl + 'images/logo.png'
+        }
+      })
     }
   },
   components: {

From a7b8abfef1e6bea5db88f363749b5b86f7b34a5f Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Tue, 21 Apr 2020 16:19:32 +0800
Subject: [PATCH 02/14] =?UTF-8?q?[NEW]=20=E4=BF=AE=E6=94=B9=E6=8A=95?=
 =?UTF-8?q?=E4=BF=9D=E6=94=AF=E4=BB=98=E5=BE=AE=E4=BF=A1=E5=88=86=E4=BA=AB?=
 =?UTF-8?q?=E5=90=8E=E5=82=A8=E5=AD=98token?=
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 245d4c0df..5b9205a73 100644
--- a/src/views/ebiz/sale/PayMent.vue
+++ b/src/views/ebiz/sale/PayMent.vue
@@ -187,7 +187,7 @@ export default {
       let token = this.$route.query.token
       let orderNo = this.$route.query.orderNo
       localStorage.token = token
-      localStorage.token = orderNo
+      localStorage.orderNo = orderNo
       this.payMent()
     }
   },

From 9bdeabbf57cdb1fc7fa0a2fae81e1409cdeaa26c Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Tue, 21 Apr 2020 18:28:37 +0800
Subject: [PATCH 03/14] =?UTF-8?q?[NEW]=20=E4=BF=AE=E6=94=B9=E6=8A=95?=
 =?UTF-8?q?=E4=BF=9D=E6=94=AF=E4=BB=98=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/PayMent.vue | 43 +++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/views/ebiz/sale/PayMent.vue b/src/views/ebiz/sale/PayMent.vue
index 5b9205a73..214820b08 100644
--- a/src/views/ebiz/sale/PayMent.vue
+++ b/src/views/ebiz/sale/PayMent.vue
@@ -14,11 +14,11 @@
           </van-cell>
         </van-cell-group>
         <van-cell-group class="flex align-items-c">
-          <img :src="src" class="pl10" />
+          <img :src="vxSrc" class="vximg" />
           <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="3"></van-radio>
+              <van-radio name="3" @click="vxVerify"></van-radio>
             </van-radio-group>
           </van-cell>
         </van-cell-group>
@@ -87,7 +87,7 @@
   </div>
 </template>
 <script>
-import { Cell, CellGroup, RadioGroup, Radio } from 'vant'
+import { Cell, CellGroup, RadioGroup, Radio, Dialog } from 'vant'
 import { acceptInsurance } from '@/api/ebiz/sale/sale'
 import { underWrite, getOrderDetail } from '@/api/ebiz/sale/sale'
 import config from '@/config'
@@ -99,8 +99,10 @@ export default {
       formActionUrl: config.payUrl,
       // 单选
       radio: '',
-      // 图片地址
+      // 银行卡支付图片地址
       src: this.$assetsUrl + 'images/cardImg.png',
+      // 微信支付图片地址
+      vxSrc: this.$assetsUrl + 'images/vxImg.png',
       // 核保数据
       underWriteData: {},
       srcImg: '',
@@ -164,6 +166,11 @@ export default {
       isWeixin // 是否为微信环境
     }
   },
+  created() {
+    if (this.isWeixin) {
+      this.radio = '3'
+    }
+  },
   mounted() {
     console.log('----保融form.action', config.payUrl)
     document.body.style.backgroundColor = '#fff'
@@ -183,7 +190,6 @@ export default {
       }
       console.log('--自核结果--支付信息：', JSON.stringify(this.underWriteData))
     } else {
-      this.radio = '3'
       let token = this.$route.query.token
       let orderNo = this.$route.query.orderNo
       localStorage.token = token
@@ -273,6 +279,7 @@ export default {
           let underWriteData = {
             accountName: res.orderDTO.orderAccountDTO.accountName,
             appntName: res.orderDTO.appntDTO.name,
+            idType: res.orderDTO.appntDTO.idType,
             bankCode: _this.typebank[res.orderDTO.orderAccountDTO.bankCode],
             bankName: res.orderDTO.orderAccountDTO.bankName,
             cardBookCode: res.orderDTO.orderAccountDTO.cardBookCode,
@@ -289,6 +296,7 @@ export default {
           let underWriteData = {
             accountName: '',
             appntName: '',
+            idType: '',
             bankCode: '',
             bankName: '',
             cardBookCode: '',
@@ -337,12 +345,24 @@ export default {
         }
       })
     },
+    // 选择微信支付校验身份证类型
+    vxVerify() {
+      if (this.underWriteData.idType != '1') {
+        Dialog.confirm({
+          message: '证件类型不是身份证，无法使用微信支付',
+          showCancelButton: false
+        }).then(() => {
+          this.radio = ''
+        })
+      }
+    },
     share() {
+      let shareName = this.underWriteData.appntName
       EWebBridge.webCallAppInJs('bridge', {
         flag: 'share',
         extra: {
-          title: '测试',
-          content: '测试微信支付分享',
+          title: `国富人寿电子投保单（${shareName}）付款`,
+          content: '付款进行',
           url: location.origin + '/#/sale/payMent?orderNo=' + localStorage.orderNo + '&token=' + localStorage.token,
           img: this.$assetsUrl + 'images/logo.png'
         }
@@ -353,7 +373,8 @@ export default {
     [Cell.name]: Cell,
     [CellGroup.name]: CellGroup,
     [RadioGroup.name]: RadioGroup,
-    [Radio.name]: Radio
+    [Radio.name]: Radio,
+    [Dialog.name]: Dialog
   },
   beforeRouteLeave(to, from, next) {
     document.body.style.backgroundColor = ''
@@ -375,4 +396,10 @@ export default {
   width: 20px;
   height: 20px;
 }
+.vximg {
+  width: 25px;
+  height: 25px;
+  padding-left: 13px;
+  padding-right: 3px;
+}
 </style>

From 28aeeaf2ef623a8fc70ae2be7ef6fe4bde512500 Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Wed, 22 Apr 2020 10:57:20 +0800
Subject: [PATCH 04/14] =?UTF-8?q?[NEW]=20=E6=8A=95=E4=BF=9D=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E9=A1=B5=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AF=81=E4=BB=B6=E7=B1=BB=E5=9E=8B=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/ebiz/sale/PayMent.vue b/src/views/ebiz/sale/PayMent.vue
index 214820b08..59082f135 100644
--- a/src/views/ebiz/sale/PayMent.vue
+++ b/src/views/ebiz/sale/PayMent.vue
@@ -180,6 +180,7 @@ export default {
         // 第一次支付 调核保获取
         this.underWrite().then(() => {
           this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
+          this.underWriteData.idType = JSON.parse(localStorage.saleInsuredInfo).idType
           this.srcImg = this.$assetsUrl + `images/bank/bank_${JSON.parse(window.localStorage.getItem('underWriteData')).bankCode}.png`
         })
       } else {

From 12119e6d56dc3efa9a1736cc5ac2491096ac06c5 Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Wed, 22 Apr 2020 11:27:42 +0800
Subject: [PATCH 05/14] =?UTF-8?q?[NEW]=20=E4=BF=AE=E6=94=B9=E6=8A=95?=
 =?UTF-8?q?=E4=BF=9D=E5=88=97=E8=A1=A8=E7=82=B9=E5=87=BB=E5=8E=BB=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E6=97=B6=EF=BC=8C=E5=82=A8=E5=AD=98=E6=8A=95=E4=BF=9D?=
 =?UTF-8?q?=E4=BA=BA=E8=AF=81=E4=BB=B6=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/List.vue                  | 1 +
 src/views/ebiz/sale/PayMent.vue               | 2 +-
 src/views/ebiz/sale/SignatureConfirmation.vue | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/ebiz/sale/List.vue b/src/views/ebiz/sale/List.vue
index 21d90a38a..4f01402d4 100644
--- a/src/views/ebiz/sale/List.vue
+++ b/src/views/ebiz/sale/List.vue
@@ -290,6 +290,7 @@ export default {
     //去支付
     goPay(order) {
       localStorage.orderNo = order.orderInfoDTO.orderNo
+      localStorage.setItem('AppntidType', order.appntDTO.idType)
       localStorage.salelist = '1'
       localStorage.removeItem('changeCard')
       this.$jump({
diff --git a/src/views/ebiz/sale/PayMent.vue b/src/views/ebiz/sale/PayMent.vue
index 59082f135..c4f02eacc 100644
--- a/src/views/ebiz/sale/PayMent.vue
+++ b/src/views/ebiz/sale/PayMent.vue
@@ -180,7 +180,7 @@ export default {
         // 第一次支付 调核保获取
         this.underWrite().then(() => {
           this.underWriteData = JSON.parse(window.localStorage.getItem('underWriteData'))
-          this.underWriteData.idType = JSON.parse(localStorage.saleInsuredInfo).idType
+          this.underWriteData.idType = window.localStorage.getItem('AppntidType')
           this.srcImg = this.$assetsUrl + `images/bank/bank_${JSON.parse(window.localStorage.getItem('underWriteData')).bankCode}.png`
         })
       } else {
diff --git a/src/views/ebiz/sale/SignatureConfirmation.vue b/src/views/ebiz/sale/SignatureConfirmation.vue
index f7d7c3dc5..46310802d 100644
--- a/src/views/ebiz/sale/SignatureConfirmation.vue
+++ b/src/views/ebiz/sale/SignatureConfirmation.vue
@@ -961,7 +961,7 @@ export default {
               }
             }*/
             localStorage.setItem('lastOrderNo', data.orderNo)
-
+            localStorage.setItem('AppntidType', res.orderDTO.appntDTO.idType)
             this.$toast.clear()
             this.$utils.intLocalStorage(res)
             // 获取被保险人信息recmd

From 06aa5373251d461e17314736144abd79003c3dd6 Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Wed, 22 Apr 2020 16:56:56 +0800
Subject: [PATCH 06/14] =?UTF-8?q?[NEW]=20=E9=9A=90=E8=97=8F=E6=8A=95?=
 =?UTF-8?q?=E4=BF=9D=E6=94=AF=E4=BB=98=E9=A1=B5=E9=9D=A2=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/ebiz/sale/PayMent.vue b/src/views/ebiz/sale/PayMent.vue
index c4f02eacc..92fe5710b 100644
--- a/src/views/ebiz/sale/PayMent.vue
+++ b/src/views/ebiz/sale/PayMent.vue
@@ -13,15 +13,14 @@
             </van-radio-group>
           </van-cell>
         </van-cell-group>
-        <van-cell-group class="flex align-items-c">
+        <!-- <van-cell-group class="flex align-items-c">
           <img :src="vxSrc" class="vximg" />
           <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="3" @click="vxVerify"></van-radio>
             </van-radio-group>
           </van-cell>
-        </van-cell-group>
+        </van-cell-group> -->
         <van-cell title="姓名" :value="underWriteData.accountName" v-if="radio == '' && !isWeixin" />
         <van-cell title="卡号" :value="underWriteData.cardBookCode" v-if="radio == '' && !isWeixin" />
         <van-cell title="银行" v-if="radio == '' && !isWeixin">
@@ -201,7 +200,6 @@ export default {
   methods: {
     // 点击支付
     payMent() {
-      console.log(this.radio)
       this.$toast.loading({
         duration: 0, // 持续展示 toast
         forbidClick: true, // 禁用背景点击

From 7d3f1ff1765a6ebc79ec882a4069038f1aeddadf Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Thu, 23 Apr 2020 10:49:51 +0800
Subject: [PATCH 07/14] =?UTF-8?q?[NEW]=20=E6=94=BE=E5=BC=80=E6=8A=95?=
 =?UTF-8?q?=E4=BF=9D=E6=94=AF=E4=BB=98=E9=A1=B5=E9=9D=A2=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=80=89=E9=A1=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 92fe5710b..986fe7382 100644
--- a/src/views/ebiz/sale/PayMent.vue
+++ b/src/views/ebiz/sale/PayMent.vue
@@ -13,14 +13,14 @@
             </van-radio-group>
           </van-cell>
         </van-cell-group>
-        <!-- <van-cell-group class="flex align-items-c">
+        <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 title="姓名" :value="underWriteData.accountName" v-if="radio == '' && !isWeixin" />
         <van-cell title="卡号" :value="underWriteData.cardBookCode" v-if="radio == '' && !isWeixin" />
         <van-cell title="银行" v-if="radio == '' && !isWeixin">

From 1e253d8372c97b76e828a077164876c3fad16ed3 Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Sun, 26 Apr 2020 10:54:09 +0800
Subject: [PATCH 08/14] =?UTF-8?q?[NEW]=20=E6=B5=8B=E8=AF=95=E6=8A=95?=
 =?UTF-8?q?=E4=BF=9D=E6=94=AF=E4=BB=98=E9=A1=B5=E9=9D=A2=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E5=88=86=E4=BA=AB=E9=A1=B5=E9=9D=A2loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ebiz/LoadingOpcity.vue | 39 +++++++++++++++++++++++++++
 src/views/ebiz/sale/PayMent.vue       | 19 ++++++++++---
 2 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 src/components/ebiz/LoadingOpcity.vue

diff --git a/src/components/ebiz/LoadingOpcity.vue b/src/components/ebiz/LoadingOpcity.vue
new file mode 100644
index 000000000..fe17b014c
--- /dev/null
+++ b/src/components/ebiz/LoadingOpcity.vue
@@ -0,0 +1,39 @@
+<template>
+  <div class="loading-container">
+    <van-overlay :show="isLoading" z-index="999">
+      <!-- <div class="flex align-items-c justify-content-c wrapper">
+        <img :src="src" width="80" height="80" />
+      </div> -->
+      <van-loading type="spinner" color="#E9332E" />
+    </van-overlay>
+  </div>
+</template>
+
+<script>
+import { Overlay, Loading } from 'vant'
+export default {
+  name: 'LoadingOpcity',
+  props: {
+    isLoading: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      // src: this.$assetsUrl + '/images/loading.gif'
+    }
+  },
+  components: {
+    [Overlay.name]: Overlay,
+    [Loading.name]: Loading
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.wrapper {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/views/ebiz/sale/PayMent.vue b/src/views/ebiz/sale/PayMent.vue
index 986fe7382..f9b89d3a1 100644
--- a/src/views/ebiz/sale/PayMent.vue
+++ b/src/views/ebiz/sale/PayMent.vue
@@ -83,12 +83,15 @@
       >
       <van-button type="danger" style="width: 50vw" @click="share" v-no-more-click="1000">分享</van-button>
     </div>
+    <!-- 分享到微信的页面loading -->
+    <LoadingOpcity :isLoading="isLoading"></LoadingOpcity>
   </div>
 </template>
 <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 LoadingOpcity from '@/components/ebiz/LoadingOpcity'
 import config from '@/config'
 export default {
   data() {
@@ -162,12 +165,14 @@ export default {
         PSBC: '7008',
         CIB: '309'
       },
-      isWeixin // 是否为微信环境
+      isWeixin, // 是否为微信环境
+      isLoading: false // 分享到微信后的页面loading
     }
   },
   created() {
     if (this.isWeixin) {
       this.radio = '3'
+      this.isLoading = true
     }
   },
   mounted() {
@@ -247,8 +252,15 @@ export default {
 
           window.localStorage.setItem('payStatus', res.payStatus)
           window.localStorage.setItem('payInfo', JSON.stringify(res))
+          if (!this.isWeixin) {
+            this.isLoading = false
+          }
         } else {
-          that.$toast.clear()
+          if (!this.isWeixin) {
+            that.$toast.clear()
+          } else {
+            this.isLoading = false
+          }
           that.$toast(res.resultMessage)
         }
       })
@@ -373,7 +385,8 @@ export default {
     [CellGroup.name]: CellGroup,
     [RadioGroup.name]: RadioGroup,
     [Radio.name]: Radio,
-    [Dialog.name]: Dialog
+    [Dialog.name]: Dialog,
+    [LoadingOpcity.name]: LoadingOpcity
   },
   beforeRouteLeave(to, from, next) {
     document.body.style.backgroundColor = ''

From 3ff77f1942d82f47a048f43adac3b99e1c5e12d8 Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Sun, 26 Apr 2020 11:16:05 +0800
Subject: [PATCH 09/14] =?UTF-8?q?[NEW]=20=E4=BF=AE=E6=94=B9=E6=8A=95?=
 =?UTF-8?q?=E4=BF=9D=E6=94=AF=E4=BB=98=E5=88=86=E4=BA=AB=E5=88=B0=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=89=93=E5=BC=80loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebiz/{LoadingOpcity.vue => Loading.vue}          | 12 +++++++-----
 src/views/ebiz/sale/PayMent.vue                      |  7 ++++---
 2 files changed, 11 insertions(+), 8 deletions(-)
 rename src/components/ebiz/{LoadingOpcity.vue => Loading.vue} (71%)

diff --git a/src/components/ebiz/LoadingOpcity.vue b/src/components/ebiz/Loading.vue
similarity index 71%
rename from src/components/ebiz/LoadingOpcity.vue
rename to src/components/ebiz/Loading.vue
index fe17b014c..13fbc8ebf 100644
--- a/src/components/ebiz/LoadingOpcity.vue
+++ b/src/components/ebiz/Loading.vue
@@ -1,10 +1,9 @@
 <template>
   <div class="loading-container">
     <van-overlay :show="isLoading" z-index="999">
-      <!-- <div class="flex align-items-c justify-content-c wrapper">
-        <img :src="src" width="80" height="80" />
-      </div> -->
-      <van-loading type="spinner" color="#E9332E" />
+      <div class="flex align-items-c justify-content-c wrapper">
+        <van-loading type="spinner" color="#E9332E" />
+      </div>
     </van-overlay>
   </div>
 </template>
@@ -12,7 +11,7 @@
 <script>
 import { Overlay, Loading } from 'vant'
 export default {
-  name: 'LoadingOpcity',
+  name: 'Loading',
   props: {
     isLoading: {
       type: Boolean,
@@ -36,4 +35,7 @@ export default {
   width: 100%;
   height: 100%;
 }
+/deep/.van-overlay {
+  background: white;
+}
 </style>
diff --git a/src/views/ebiz/sale/PayMent.vue b/src/views/ebiz/sale/PayMent.vue
index f9b89d3a1..d1e876f96 100644
--- a/src/views/ebiz/sale/PayMent.vue
+++ b/src/views/ebiz/sale/PayMent.vue
@@ -84,14 +84,14 @@
       <van-button type="danger" style="width: 50vw" @click="share" v-no-more-click="1000">分享</van-button>
     </div>
     <!-- 分享到微信的页面loading -->
-    <LoadingOpcity :isLoading="isLoading"></LoadingOpcity>
+    <Loading :isLoading="isLoading"></Loading>
   </div>
 </template>
 <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 LoadingOpcity from '@/components/ebiz/LoadingOpcity'
+import Loading from '@/components/ebiz/Loading'
 import config from '@/config'
 export default {
   data() {
@@ -254,6 +254,7 @@ export default {
           window.localStorage.setItem('payInfo', JSON.stringify(res))
           if (!this.isWeixin) {
             this.isLoading = false
+            console.log('隐藏')
           }
         } else {
           if (!this.isWeixin) {
@@ -386,7 +387,7 @@ export default {
     [RadioGroup.name]: RadioGroup,
     [Radio.name]: Radio,
     [Dialog.name]: Dialog,
-    [LoadingOpcity.name]: LoadingOpcity
+    [Loading.name]: Loading
   },
   beforeRouteLeave(to, from, next) {
     document.body.style.backgroundColor = ''

From cf8021554981025dc78e66b6b89c12fbdb5b6fa0 Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Sun, 26 Apr 2020 11:35:19 +0800
Subject: [PATCH 10/14] =?UTF-8?q?[NEW]=20=E5=B0=86vantLoading=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=94=B9=E4=B8=BA=E8=87=AA=E5=AE=9A=E4=B9=89gif?=
 =?UTF-8?q?=E5=8A=A8=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ebiz/Loading.vue |  9 ++++-----
 src/views/ebiz/sale/PayMent.vue | 17 +++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/components/ebiz/Loading.vue b/src/components/ebiz/Loading.vue
index 13fbc8ebf..95da45919 100644
--- a/src/components/ebiz/Loading.vue
+++ b/src/components/ebiz/Loading.vue
@@ -2,14 +2,14 @@
   <div class="loading-container">
     <van-overlay :show="isLoading" z-index="999">
       <div class="flex align-items-c justify-content-c wrapper">
-        <van-loading type="spinner" color="#E9332E" />
+        <img :src="src" width="80" height="80" />
       </div>
     </van-overlay>
   </div>
 </template>
 
 <script>
-import { Overlay, Loading } from 'vant'
+import { Overlay } from 'vant'
 export default {
   name: 'Loading',
   props: {
@@ -20,12 +20,11 @@ export default {
   },
   data() {
     return {
-      // src: this.$assetsUrl + '/images/loading.gif'
+      src: this.$assetsUrl + 'images/loading.gif'
     }
   },
   components: {
-    [Overlay.name]: Overlay,
-    [Loading.name]: Loading
+    [Overlay.name]: Overlay
   }
 }
 </script>
diff --git a/src/views/ebiz/sale/PayMent.vue b/src/views/ebiz/sale/PayMent.vue
index d1e876f96..09a480e1d 100644
--- a/src/views/ebiz/sale/PayMent.vue
+++ b/src/views/ebiz/sale/PayMent.vue
@@ -205,12 +205,14 @@ export default {
   methods: {
     // 点击支付
     payMent() {
-      this.$toast.loading({
-        duration: 0, // 持续展示 toast
-        forbidClick: true, // 禁用背景点击
-        loadingType: 'spinner',
-        message: '加载中……'
-      })
+      if (!this.isWeixin) {
+        this.$toast.loading({
+          duration: 0, // 持续展示 toast
+          forbidClick: true, // 禁用背景点击
+          loadingType: 'spinner',
+          message: '加载中……'
+        })
+      }
       let that = this
       let data = {
         orderNo: window.localStorage.getItem('orderNo'),
@@ -252,9 +254,8 @@ export default {
 
           window.localStorage.setItem('payStatus', res.payStatus)
           window.localStorage.setItem('payInfo', JSON.stringify(res))
-          if (!this.isWeixin) {
+          if (this.isWeixin) {
             this.isLoading = false
-            console.log('隐藏')
           }
         } else {
           if (!this.isWeixin) {

From 417090ff5f398857e312a2863e2bb0658ae5dfbd Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Sun, 26 Apr 2020 16:44:27 +0800
Subject: [PATCH 11/14] =?UTF-8?q?[NEW]=20=E4=BF=AE=E6=94=B9=E5=88=86?=
 =?UTF-8?q?=E4=BA=AB=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?loading=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ebiz/Loading.vue | 14 ++------------
 src/views/ebiz/sale/PayMent.vue |  3 ---
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/components/ebiz/Loading.vue b/src/components/ebiz/Loading.vue
index 95da45919..554f650f0 100644
--- a/src/components/ebiz/Loading.vue
+++ b/src/components/ebiz/Loading.vue
@@ -1,10 +1,6 @@
 <template>
   <div class="loading-container">
-    <van-overlay :show="isLoading" z-index="999">
-      <div class="flex align-items-c justify-content-c wrapper">
-        <img :src="src" width="80" height="80" />
-      </div>
-    </van-overlay>
+    <van-overlay :show="isLoading" z-index="999"> </van-overlay>
   </div>
 </template>
 
@@ -19,9 +15,7 @@ export default {
     }
   },
   data() {
-    return {
-      src: this.$assetsUrl + 'images/loading.gif'
-    }
+    return {}
   },
   components: {
     [Overlay.name]: Overlay
@@ -30,10 +24,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.wrapper {
-  width: 100%;
-  height: 100%;
-}
 /deep/.van-overlay {
   background: white;
 }
diff --git a/src/views/ebiz/sale/PayMent.vue b/src/views/ebiz/sale/PayMent.vue
index 09a480e1d..45c9cd1ae 100644
--- a/src/views/ebiz/sale/PayMent.vue
+++ b/src/views/ebiz/sale/PayMent.vue
@@ -254,9 +254,6 @@ export default {
 
           window.localStorage.setItem('payStatus', res.payStatus)
           window.localStorage.setItem('payInfo', JSON.stringify(res))
-          if (this.isWeixin) {
-            this.isLoading = false
-          }
         } else {
           if (!this.isWeixin) {
             that.$toast.clear()

From b1e20c02edec250765556649ffda1dd0fb5a2807 Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Fri, 8 May 2020 14:14:59 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20bug=20GFRS-1185=20=E3=80=90=E5=AF=B9=E6=8E=A5?=
 =?UTF-8?q?=E5=8C=85=E5=AE=B9=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E3=80=91?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2-=E9=80=89=E6=8B=A9=E5=BE=AE=E4=BF=A1=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=EF=BC=8C=E9=A1=B5=E9=9D=A2=E7=BC=BA=E5=B0=91=E6=B8=A9?=
 =?UTF-8?q?=E9=A6=A8=E6=8F=90=E7=A4=BA=20GFRS-1188=20=E3=80=90=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E6=94=AF=E4=BB=98=E3=80=91=E6=89=AB=E7=A0=81=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=82=B9=E5=87=BB=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=20=E7=94=B5=E6=8A=95=E6=B5=81=E7=A8=8B=EF=BC=88?=
 =?UTF-8?q?=E8=87=AA=E6=B5=8B=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/views/ebiz/sale/PayMent.vue b/src/views/ebiz/sale/PayMent.vue
index 45c9cd1ae..38bb2b7bd 100644
--- a/src/views/ebiz/sale/PayMent.vue
+++ b/src/views/ebiz/sale/PayMent.vue
@@ -30,6 +30,7 @@
             <span>{{ underWriteData.bankName }}</span>
           </div>
         </van-cell>
+        <van-cell title="温馨提示：以上账号仅为本次扣款使用" title-class="redDanger fs12" />
       </van-cell-group>
       <!-- 第三方支付所需表单 -->
       <form ref="payForm" :action="formActionUrl" method="post">
@@ -162,8 +163,7 @@ export default {
         SDPB: '310',
         SHB: '7006',
         CITIC: '302',
-        PSBC: '7008',
-        CIB: '309'
+        PSBC: '7008'
       },
       isWeixin, // 是否为微信环境
       isLoading: false // 分享到微信后的页面loading
@@ -247,6 +247,11 @@ export default {
           this.$forceUpdate()
           let thisRef = this
           this.$nextTick(() => {
+            // eslint-disable-next-line
+            EWebBridge.webCallAppInJs("goBack", {
+              refresh: '1',
+              index: '-2'
+            })
             thisRef.$refs.payForm.submit() // 表单提交，发起支付，跳至收银台
           })
 
@@ -368,6 +373,7 @@ export default {
     },
     share() {
       let shareName = this.underWriteData.appntName
+      // eslint-disable-next-line
       EWebBridge.webCallAppInJs('bridge', {
         flag: 'share',
         extra: {
@@ -413,4 +419,7 @@ export default {
   padding-left: 13px;
   padding-right: 3px;
 }
+.redDanger {
+  color: #E9332E !important;
+}
 </style>

From 8e6a98ba2667bc94af91cc30fa28fd39689be640 Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Fri, 8 May 2020 15:17:14 +0800
Subject: [PATCH 13/14] =?UTF-8?q?Revert=20"=E3=80=90fix=E3=80=91=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20bug=20GFRS-1185=20=E3=80=90=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E5=8C=85=E5=AE=B9=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E3=80=91=E9=80=89=E6=8B=A9=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2-=E9=80=89=E6=8B=A9=E5=BE=AE=E4=BF=A1?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=EF=BC=8C=E9=A1=B5=E9=9D=A2=E7=BC=BA=E5=B0=91?=
 =?UTF-8?q?=E6=B8=A9=E9=A6=A8=E6=8F=90=E7=A4=BA"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b1e20c02edec250765556649ffda1dd0fb5a2807.
---
 src/views/ebiz/sale/PayMent.vue | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/views/ebiz/sale/PayMent.vue b/src/views/ebiz/sale/PayMent.vue
index 38bb2b7bd..45c9cd1ae 100644
--- a/src/views/ebiz/sale/PayMent.vue
+++ b/src/views/ebiz/sale/PayMent.vue
@@ -30,7 +30,6 @@
             <span>{{ underWriteData.bankName }}</span>
           </div>
         </van-cell>
-        <van-cell title="温馨提示：以上账号仅为本次扣款使用" title-class="redDanger fs12" />
       </van-cell-group>
       <!-- 第三方支付所需表单 -->
       <form ref="payForm" :action="formActionUrl" method="post">
@@ -163,7 +162,8 @@ export default {
         SDPB: '310',
         SHB: '7006',
         CITIC: '302',
-        PSBC: '7008'
+        PSBC: '7008',
+        CIB: '309'
       },
       isWeixin, // 是否为微信环境
       isLoading: false // 分享到微信后的页面loading
@@ -247,11 +247,6 @@ export default {
           this.$forceUpdate()
           let thisRef = this
           this.$nextTick(() => {
-            // eslint-disable-next-line
-            EWebBridge.webCallAppInJs("goBack", {
-              refresh: '1',
-              index: '-2'
-            })
             thisRef.$refs.payForm.submit() // 表单提交，发起支付，跳至收银台
           })
 
@@ -373,7 +368,6 @@ export default {
     },
     share() {
       let shareName = this.underWriteData.appntName
-      // eslint-disable-next-line
       EWebBridge.webCallAppInJs('bridge', {
         flag: 'share',
         extra: {
@@ -419,7 +413,4 @@ export default {
   padding-left: 13px;
   padding-right: 3px;
 }
-.redDanger {
-  color: #E9332E !important;
-}
 </style>

From 9416cb1099c7215140c8973af9241a3f3720a1f5 Mon Sep 17 00:00:00 2001
From: "tian.guangyuan" <tian.guangyuan@ebiz-fooge.com>
Date: Fri, 8 May 2020 20:06:09 +0800
Subject: [PATCH 14/14] =?UTF-8?q?=E3=80=90fix=E3=80=91=20=E5=BE=AE?=
 =?UTF-8?q?=E4=BF=A1=E4=B8=AD=E5=9B=9E=E8=B0=83=E5=88=B0=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E9=A1=B5=E9=9D=A2=E6=97=B6=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E9=83=A8=E5=88=86=E9=80=BB=E8=BE=91=EF=BC=8C=E5=B0=86?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ebiz/sale/PayResult.vue | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/views/ebiz/sale/PayResult.vue b/src/views/ebiz/sale/PayResult.vue
index bdeacd3fc..8d4abdc8f 100644
--- a/src/views/ebiz/sale/PayResult.vue
+++ b/src/views/ebiz/sale/PayResult.vue
@@ -32,11 +32,11 @@
     </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>
+      <van-button type="danger" size="large" @click="next" v-no-more-click="1000"> {{isWeixin ? '返回' :'返回列表页'}}</van-button>
     </div>
     <div class="bottom-area bottom-btn flex" v-if="payStatus == '2'">
       <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>
+      <van-button class="m-btn w250" type="danger" size="normal" @click="next">{{isWeixin ? '返回' :'返回列表页'}}</van-button>
     </div>
     <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>
@@ -50,7 +50,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: '',
       // 接口返回数据前，不做页面渲染
@@ -80,16 +82,19 @@ export default {
   methods: {
     // 返回列表页
     next() {
-      this.$jump({
-        flag: 'h5',
-        extra: {
-          url: location.origin + '/#/sale/list'
-        },
-
-        routerInfo: {
-          path: '/sale/list'
-        }
-      })
+      if(this.isWeixin){
+        WeixinJSBridge.call("closeWindow");
+      }else{
+        this.$jump({
+          flag: 'h5',
+          extra: {
+            url: location.origin + '/#/sale/list'
+          },
+          routerInfo: {
+            path: '/sale/list'
+          }
+        })
+      }
     },
     // 查询支付状态
     queryPayState() {