diff --git a/src/layouts/BasicLayout.vue b/src/layouts/BasicLayout.vue index 4760ea3..99f1bfc 100644 --- a/src/layouts/BasicLayout.vue +++ b/src/layouts/BasicLayout.vue @@ -99,6 +99,9 @@ 优惠券活动 + + 发放优惠券 + @@ -371,6 +374,11 @@ export default defineComponent({ key: 'coupon-activity', title: '优惠券活动', path: '/coupon/activity/list' + }, + { + key: 'coupon-issue', + title: '发放优惠券', + path: '/coupon/issue/list' } ] }, diff --git a/src/router/index.js b/src/router/index.js index d474d02..43e91d6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -52,6 +52,12 @@ const routes = [ component: () => import('../views/coupon/ActivityList.vue'), meta: { title: '优惠券活动' } }, + { + path: '/coupon/issue/list', + name: 'CouponIssueList', + component: () => import('../views/coupon/IssueList.vue'), + meta: { title: '发放优惠券' } + }, { path: '/community/building', name: 'BuildingList', diff --git a/src/views/coupon/IssueList.vue b/src/views/coupon/IssueList.vue new file mode 100644 index 0000000..bec1167 --- /dev/null +++ b/src/views/coupon/IssueList.vue @@ -0,0 +1,568 @@ + + + + + \ No newline at end of file diff --git a/src/views/coupon/TemplateList.vue b/src/views/coupon/TemplateList.vue index 2e93dca..cc411da 100644 --- a/src/views/coupon/TemplateList.vue +++ b/src/views/coupon/TemplateList.vue @@ -211,8 +211,8 @@ export default defineComponent({ const res = await request.get('/api/coupon/list', { params }) if (res.code === 200) { - tableData.value = res.data - pagination.value.total = res.data.length + tableData.value = res.data.items + pagination.value.total = res.data.total } else { message.error(res.message || '获取数据失败') } diff --git a/src/views/order/DeliveryList.vue b/src/views/order/DeliveryList.vue index 80e2f37..81e40d6 100644 --- a/src/views/order/DeliveryList.vue +++ b/src/views/order/DeliveryList.vue @@ -88,7 +88,7 @@ type="primary" size="small" @click="showRefundModal(record)" - :disabled="record.status === 'CANCELLED' || record.refund_amount > 0" + :disabled="record.status === 'CANCELLED' || record.status === 'UNPAID' || record.refund_amount > 0" > 退款