diff --git a/src/views/marchant/order/index.vue b/src/views/marchant/order/index.vue index c2f1e23..0de790d 100644 --- a/src/views/marchant/order/index.vue +++ b/src/views/marchant/order/index.vue @@ -12,7 +12,7 @@ {{ scope.row.paymentMethod || '-' }} - {{ scope.row.orderStatusText || '-' }} + {{ scope.row.orderStatusText || '-' }} {{ scope.row.orderStatus == 3 ? ':' + scope.row.refundAmount + '元' : '' }} {{ formatAmount(scope.row.actualAmount) }} @@ -80,7 +80,7 @@ const columns = ref([ { prop: 'eventName', label: '所属赛事', search: { el: 'input', }, minWidth: 150 }, { prop: 'paymentMethod', label: '支付方式', search: { el: 'select', }, enum: [{ label: '全部', value: 0 }, { label: '线上', value: 2 }, { label: '线下', value: 1 },], minWidth: 100 }, { prop: 'actualAmount', label: '实付金额', minWidth: 120 }, - { prop: 'orderStatus', label: '订单状态', search: { el: 'select', }, enum: [{ label: '全部', value: '' }, { label: '待支付', value: 0 }, { label: '已支付', value: 1 }, { label: '已取消', value: 2 }, { label: '已退款', value: 3 }, { label: '已发货', value: 4 }, { label: '已完成', value: 5 },], minWidth: 100 }, + { width: 130, prop: 'orderStatus', label: '订单状态', search: { el: 'select', }, enum: [{ label: '全部', value: '' }, { label: '待支付', value: 0 }, { label: '已支付', value: 1 }, { label: '已取消', value: 2 }, { label: '已退款', value: 3 }, { label: '已发货', value: 4 }, { label: '已完成', value: 5 },], minWidth: 100 }, { prop: 'createdTime', label: '生成时间', search: { el: 'date-picker', props: { type: 'daterange' } }, minWidth: 160 }, { prop: 'action', label: '操作', align: 'center', fixed: 'right', width: 120, }, ]); diff --git a/src/views/match/coupon/index.vue b/src/views/match/coupon/index.vue index 770dfc9..08ebcea 100644 --- a/src/views/match/coupon/index.vue +++ b/src/views/match/coupon/index.vue @@ -218,7 +218,7 @@ const columns = ref([ { prop: 'startTime', label: '有效期' }, { prop: 'eventNames', label: '可用赛事' }, - { prop: 'action', label: '操作', align: 'center', fixed: 'right', isShow: auths(['coupon:delete', 'coupon:edit']) }, + { prop: 'action', label: '操作', width: 260, align: 'center', fixed: 'right', isShow: auths(['coupon:delete', 'coupon:edit']) }, ]); const isShowDialog = ref(false); diff --git a/src/views/match/order/index.vue b/src/views/match/order/index.vue index f2510b2..e6625d6 100644 --- a/src/views/match/order/index.vue +++ b/src/views/match/order/index.vue @@ -23,7 +23,7 @@ {{ scope.row.registrationMode || '-' }} - {{ scope.row.orderStatusText || '-' }} + {{ scope.row.orderStatusText || '-' }} {{ scope.row.orderStatus == 3 ? ':' + scope.row.refundAmount : '' }} - {{ validatedCoupon.couponName }},优惠 -{{ validatedCoupon.discountAmount }} 元 + {{ validatedCoupon.couponName }},{{validatedCoupon.discountType == 0 ? `优惠价${validatedCoupon.discountValue / 10}折` : `优惠 ${validatedCoupon.discountAmount}元`}}