diff --git a/apps/web-ele/src/views/mall/promotion/rewardActivity/index.vue b/apps/web-ele/src/views/mall/promotion/rewardActivity/index.vue
index 084f538b0..1b5d52a8e 100644
--- a/apps/web-ele/src/views/mall/promotion/rewardActivity/index.vue
+++ b/apps/web-ele/src/views/mall/promotion/rewardActivity/index.vue
@@ -54,6 +54,7 @@ async function handleClose(row: MallRewardActivityApi.RewardActivity) {
}
}
+/** 删除满减送活动 */
async function handleDelete(row: MallRewardActivityApi.RewardActivity) {
const loadingInstance = ElLoading.service({
text: $t('ui.actionMessage.deleting', [row.name]),
@@ -120,16 +121,16 @@ const [Grid, gridApi] = useVbenVxeGrid({
:actions="[
{
label: $t('common.edit'),
- type: 'link',
+ type: 'primary',
+ link: true,
icon: ACTION_ICON.EDIT,
auth: ['promotion:reward-activity:update'],
onClick: handleEdit.bind(null, row),
},
- // TODO @puhui999:下面两个按钮,type、danger 属性无效,应该是 el 不是这个哈。
{
label: '关闭',
- type: 'link',
- danger: true,
+ type: 'danger',
+ link: true,
icon: ACTION_ICON.CLOSE,
auth: ['promotion:reward-activity:close'],
ifShow: row.status === CommonStatusEnum.ENABLE,
@@ -140,8 +141,8 @@ const [Grid, gridApi] = useVbenVxeGrid({
},
{
label: $t('common.delete'),
- type: 'link',
- danger: true,
+ type: 'danger',
+ link: true,
icon: ACTION_ICON.DELETE,
auth: ['promotion:reward-activity:delete'],
popConfirm: {
diff --git a/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue b/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue
index f3cdb9ee8..4db34f085 100644
--- a/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue
+++ b/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/form.vue
@@ -72,22 +72,7 @@ const [Modal, modalApi] = useVbenModal({
item.limit = convertToInteger(item.limit || 0);
}
});
- switch (data.productScope) {
- // TODO @puhui999:是不是也可以类似优惠劵的处理策略哈;
- case PromotionProductScopeEnum.CATEGORY.scope: {
- const categoryIds = data.productCategoryIds;
- data.productScopeValues = Array.isArray(categoryIds)
- ? categoryIds
- : categoryIds
- ? [categoryIds]
- : [];
- break;
- }
- case PromotionProductScopeEnum.SPU.scope: {
- data.productScopeValues = data.productSpuIds;
- break;
- }
- }
+ // productScopeValues 已通过 data.ts 中的 dependencies.trigger 自动同步到表单值中
await (data.id
? updateRewardActivity(data as MallRewardActivityApi.RewardActivity)
: createRewardActivity(data as MallRewardActivityApi.RewardActivity));
diff --git a/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/reward-rule-coupon-select.vue b/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/reward-rule-coupon-select.vue
index 94a7a9781..ae400c2a8 100644
--- a/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/reward-rule-coupon-select.vue
+++ b/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/reward-rule-coupon-select.vue
@@ -130,7 +130,7 @@ onMounted(async () => {
送
diff --git a/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/reward-rule.vue b/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/reward-rule.vue
index 294a648c3..b039d0719 100644
--- a/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/reward-rule.vue
+++ b/apps/web-ele/src/views/mall/promotion/rewardActivity/modules/reward-rule.vue
@@ -58,8 +58,7 @@ function handleDelete(ruleIndex: number) {
-
-
+
@@ -174,9 +173,9 @@ function handleDelete(ruleIndex: number) {
-
-
-
+
+ + 添加优惠规则
+