Merge branch 'feature/GFRS-1858-【人核保单支持线上支付】' into dev

This commit is contained in:
na.guo
2020-08-20 16:06:37 +08:00

View File

@@ -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
@@ -161,7 +156,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' //根据数据字典找到用户等级
@@ -209,10 +204,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({