diff --git a/apps/web-antd/src/views/mall/promotion/coupon/data.ts b/apps/web-antd/src/views/mall/promotion/coupon/data.ts index 3d104b51c..6f30c5597 100644 --- a/apps/web-antd/src/views/mall/promotion/coupon/data.ts +++ b/apps/web-antd/src/views/mall/promotion/coupon/data.ts @@ -101,6 +101,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { formatter: 'formatDateTime', }, { + field: 'actions', title: '操作', width: 100, fixed: 'right', diff --git a/apps/web-antd/src/views/mall/promotion/coupon/index.vue b/apps/web-antd/src/views/mall/promotion/coupon/index.vue index 110dd01ba..5a442b1de 100644 --- a/apps/web-antd/src/views/mall/promotion/coupon/index.vue +++ b/apps/web-antd/src/views/mall/promotion/coupon/index.vue @@ -7,7 +7,6 @@ import { ref } from 'vue'; import { DocAlert, Page } from '@vben/common-ui'; import { DICT_TYPE } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; -import { $t } from '@vben/locales'; import { message, TabPane, Tabs } from 'ant-design-vue'; @@ -32,7 +31,7 @@ function handleRefresh() { /** 删除优惠券 */ async function handleDelete(row: MallCouponApi.Coupon) { const hideLoading = message.loading({ - content: $t('ui.actionMessage.deleting', [row.name]), + content: '回收中...', duration: 0, }); try { diff --git a/apps/web-antd/src/views/member/user/detail/index.vue b/apps/web-antd/src/views/member/user/detail/index.vue index d6bd73a0b..3ca8a3924 100644 --- a/apps/web-antd/src/views/member/user/detail/index.vue +++ b/apps/web-antd/src/views/member/user/detail/index.vue @@ -20,6 +20,7 @@ import AddressList from './modules/address-list.vue'; import AfterSaleList from './modules/after-sale-list.vue'; import BalanceList from './modules/balance-list.vue'; import BasicInfo from './modules/basic-info.vue'; +import CouponList from './modules/coupon-list.vue'; import ExperienceRecordList from './modules/experience-record-list.vue'; import OrderList from './modules/order-list.vue'; import PointList from './modules/point-list.vue'; @@ -114,10 +115,7 @@ onMounted(async () => { - -
-

优惠劵

-
+
diff --git a/apps/web-antd/src/views/member/user/detail/modules/coupon-list.vue b/apps/web-antd/src/views/member/user/detail/modules/coupon-list.vue new file mode 100644 index 000000000..5d64482fa --- /dev/null +++ b/apps/web-antd/src/views/member/user/detail/modules/coupon-list.vue @@ -0,0 +1,148 @@ + + + diff --git a/apps/web-ele/src/views/mall/promotion/coupon/data.ts b/apps/web-ele/src/views/mall/promotion/coupon/data.ts index c16369b58..2c5dc8b40 100644 --- a/apps/web-ele/src/views/mall/promotion/coupon/data.ts +++ b/apps/web-ele/src/views/mall/promotion/coupon/data.ts @@ -101,6 +101,7 @@ export function useGridColumns(): VxeTableGridOptions['columns'] { formatter: 'formatDateTime', }, { + field: 'actions', title: '操作', width: 100, fixed: 'right', diff --git a/apps/web-ele/src/views/mall/promotion/coupon/index.vue b/apps/web-ele/src/views/mall/promotion/coupon/index.vue index 9e626dff6..17580fcfd 100644 --- a/apps/web-ele/src/views/mall/promotion/coupon/index.vue +++ b/apps/web-ele/src/views/mall/promotion/coupon/index.vue @@ -7,7 +7,6 @@ import { ref } from 'vue'; import { DocAlert, Page } from '@vben/common-ui'; import { DICT_TYPE } from '@vben/constants'; import { getDictOptions } from '@vben/hooks'; -import { $t } from '@vben/locales'; import { ElLoading, ElMessage, ElTabPane, ElTabs } from 'element-plus'; @@ -32,7 +31,7 @@ function handleRefresh() { /** 删除优惠券 */ async function handleDelete(row: MallCouponApi.Coupon) { const loadingInstance = ElLoading.service({ - text: $t('ui.actionMessage.deleting', [row.name]), + text: '回收中...', }); try { await deleteCoupon(row.id!); diff --git a/apps/web-ele/src/views/member/user/detail/index.vue b/apps/web-ele/src/views/member/user/detail/index.vue index 498b23bc1..2e53412f2 100644 --- a/apps/web-ele/src/views/member/user/detail/index.vue +++ b/apps/web-ele/src/views/member/user/detail/index.vue @@ -19,13 +19,13 @@ import AccountInfo from './modules/account-info.vue'; import AfterSaleList from './modules/after-sale-list.vue'; import BalanceList from './modules/balance-list.vue'; import BasicInfo from './modules/basic-info.vue'; +import CouponList from './modules/coupon-list.vue'; import ExperienceRecordList from './modules/experience-record-list.vue'; import OrderList from './modules/order-list.vue'; import PointList from './modules/point-list.vue'; import SignList from './modules/sign-list.vue'; import UserAddressList from './modules/user-address-list.vue'; import UserBrokerageList from './modules/user-brokerage-list.vue'; -import UserCouponList from './modules/user-coupon-list.vue'; import UserFavoriteList from './modules/user-favorite-list.vue'; const route = useRoute(); @@ -119,10 +119,7 @@ onMounted(async () => { - -
- -
+
diff --git a/apps/web-ele/src/views/member/user/detail/modules/coupon-list.vue b/apps/web-ele/src/views/member/user/detail/modules/coupon-list.vue new file mode 100644 index 000000000..51b908f7a --- /dev/null +++ b/apps/web-ele/src/views/member/user/detail/modules/coupon-list.vue @@ -0,0 +1,156 @@ + + + diff --git a/apps/web-ele/src/views/member/user/detail/modules/user-coupon-list.vue b/apps/web-ele/src/views/member/user/detail/modules/user-coupon-list.vue deleted file mode 100644 index 8d644e7f4..000000000 --- a/apps/web-ele/src/views/member/user/detail/modules/user-coupon-list.vue +++ /dev/null @@ -1,183 +0,0 @@ - - -