Merge branch 'feature/GFRS-2350【前端-待完成】修改卡单支付分享时效' into dev

src/api/ebiz/cardList/cardList.js

@@ -1,7 +1,7 @@
 /*
  * @Author: PangXingYue
  * @Date: 2021-03-26 10:38:37
- * @LastEditTime: 2021-03-26 16:47:16
+ * @LastEditTime: 2021-03-29 18:42:28
  * @LastEditors: PangXingYue
  * @Description: 
  * @FilePath: \ebiz-h5\src\api\ebiz\cardList\cardList.js
@@ -93,9 +93,9 @@ export function getPayTemp(data) {
 }
 
 // 获取订单支付状态
-export function getShareEffective(data) {
+export function getShareParam(data) {
   return request({
-    url: getUrl('/customer/account/getShareEffective', 1),
+    url: getUrl('/customer/account/getShareParam', 1),
     method: 'post',
     data
   })

src/views/ebiz/cardList/Pay.vue

@@ -167,7 +167,7 @@ Vue.use(Checkbox).use(CheckboxGroup)
 Vue.use(Field)
 Vue.use(Button)
 import { acceptInsurance, getBankList, underWrite, getOrderDetail } from '@/api/ebiz/sale/sale'
-import { saveOrUpdateAccount, getPayTemp, getShareEffective } from '@/api/ebiz/cardList/cardList.js'
+import { saveOrUpdateAccount, getPayTemp, getShareParam } from '@/api/ebiz/cardList/cardList.js'
 import BankCardScan from '@/components/ebiz/sale/BankCardScan'
 import Loading from '@/components/ebiz/Loading'
 import config from '@/config'
@@ -261,7 +261,6 @@ export default {
       let orderNo = this.$route.query.orderNo
       let shareToken = this.$route.query.shareToken
       localStorage.token = token     
-      localStorage.shareToken = shareToken
       localStorage.orderNo = orderNo
       this.isLoading = true
       this.$toast.loading({
@@ -451,19 +450,7 @@ export default {
     // 再次支付
     getOrderDetail() {
       var orderParms        
-      let shareToken = window.localStorage.getItem('shareToken')
+      getOrderDetail({orderNo: window.localStorage.getItem('orderNo')}).then(res => {             
-      if (shareToken) {
-        orderParms = {
-          orderNo: window.localStorage.getItem('orderNo'),
-          shareToken: shareToken,
-          orderInfoType: "102"
-        }  
-      } else {
-        orderParms = {
-          orderNo: window.localStorage.getItem('orderNo'),  
-        }  
-      }      
-      getOrderDetail(orderParms).then(res => {             
         if (res.result == '0') {
           this.orderStatus = res.orderDTO.orderInfoDTO.orderStatus
           try {
@@ -757,15 +744,15 @@ export default {
       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 res = await getShareParam({ shareType: 'card_pay' })
-      let res = await getShareEffective({ shareType: 'card' })
+      localStorage.token = res.content
       if (res.result == '0') {
         EWebBridge.webCallAppInJs('bridge', {
           flag: 'share',
           extra: {
             title: `国富人寿卡单投保（${shareName}）付款`,
             content: '付款进行',
-            url: url + '&shareToken=' + encodeURI(res.content),
+            url: url,
             img: this.$assetsUrl + 'images/logo.png'
           }
         })