Merge branch 'zhouna' into dev_1220

This commit is contained in:
zhouna
2019-12-26 11:00:26 +08:00

View File

@@ -98,14 +98,14 @@
>
<van-button
@click="changeCard(order)"
v-if="active == 'commit' && order.orderInfoDTO.orderStatus == '48'"
v-if="active == 'commit' && order.orderInfoDTO.orderStatus == '48' || active == 'commit' && order.orderInfoDTO.orderStatus == '49'"
size="small"
class="mr5"
type="danger"
round
>修改卡号</van-button
>
<template v-if="(active == 'commit' && order.orderInfoDTO.orderStatus == '49') || (active == 'commit' && order.orderInfoDTO.orderStatus == '55')">
<template v-if="active == 'commit' && order.orderInfoDTO.orderStatus == '55'">
<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>