diff --git a/src/api/mall/product/spu.ts b/src/api/mall/product/spu.ts
index 0d0d5b00..8ccd02a5 100644
--- a/src/api/mall/product/spu.ts
+++ b/src/api/mall/product/spu.ts
@@ -61,7 +61,6 @@ export interface Spu {
createTime?: Date // 商品创建时间
status?: number // 商品状态
activityOrders: number[] // 活动排序
- giveCouponTemplates: GiveCouponTemplate[] // 优惠卷
}
// 获得 Spu 列表
diff --git a/src/views/mall/product/spu/form/ActivityOrdersSort.vue b/src/views/mall/product/spu/form/ActivityOrdersSort.vue
index eb524860..3a41b3c5 100644
--- a/src/views/mall/product/spu/form/ActivityOrdersSort.vue
+++ b/src/views/mall/product/spu/form/ActivityOrdersSort.vue
@@ -54,6 +54,13 @@ const initSortable = () => {
}
onMounted(async () => {
await nextTick()
+ // 如果活动排序为空也就是新增的时候加入活动
+ if (props.activityOrders && props.activityOrders.length === 0) {
+ emit(
+ 'update:activityOrders',
+ props.promotionTypes.map((item) => item.value as number)
+ )
+ }
initSortable()
})
</script>
diff --git a/src/views/mall/product/spu/form/OtherSettingsForm.vue b/src/views/mall/product/spu/form/OtherSettingsForm.vue
index 42e61ba1..d574ae78 100644
--- a/src/views/mall/product/spu/form/OtherSettingsForm.vue
+++ b/src/views/mall/product/spu/form/OtherSettingsForm.vue
@@ -42,25 +42,12 @@
</el-col>
<el-col :span="24">
<el-form-item label="活动优先级">
- <!-- TODO @puhui999：这个目前先写死；主要是，这个优惠类型不好用 promotion_type_enum；因为优惠劵、会员折扣都算。 -->
<ActivityOrdersSort
v-model:activity-orders="formData.activityOrders"
:promotion-types="promotionTypes"
/>
</el-form-item>
</el-col>
- <el-col :span="24">
- <el-form-item label="赠送优惠劵">
- <el-tag
- v-for="coupon in formData.giveCouponTemplates"
- :key="coupon.id as number"
- class="mr-[10px]"
- >
- {{ coupon.name }}
- </el-tag>
- <el-button @click="openCouponSelect">选择优惠券</el-button>
- </el-form-item>
- </el-col>
</el-row>
</el-form>
@@ -91,17 +78,7 @@
{{ promotionTypes.find((item) => item.value === activityType)?.label }}
</el-tag>
</template>
- <template #giveCouponTemplates="{ row }">
- <el-tag
- v-for="coupon in row.giveCouponTemplates"
- :key="coupon.id as number"
- class="mr-[10px]"
- >
- {{ coupon.name }}
- </el-tag>
- </template>
</Descriptions>
- <CouponSelect ref="couponSelectRef" v-model:multiple-selection="formData.giveCouponTemplates" />
</template>
<script lang="ts" setup>
import type { Spu } from '@/api/mall/product/spu'
@@ -109,8 +86,7 @@ import { PropType } from 'vue'
import { propTypes } from '@/utils/propTypes'
import { copyValueToTarget } from '@/utils'
import { otherSettingsSchema } from './spu.data'
-import { DICT_TYPE, DictDataType, getIntDictOptions } from '@/utils/dict'
-import CouponSelect from './CouponSelect.vue'
+import { DICT_TYPE, DictDataType } from '@/utils/dict'
import ActivityOrdersSort from './ActivityOrdersSort.vue'
defineOptions({ name: 'OtherSettingsForm' })
@@ -128,14 +104,66 @@ const props = defineProps({
isDetail: propTypes.bool.def(false) // 是否作为详情组件
})
-// 优惠卷
-const couponSelectRef = ref() // 优惠卷模版选择 Ref
-const openCouponSelect = () => {
- couponSelectRef.value?.open()
-}
-
+// TODO @puhui999：这个目前先写死；主要是，这个优惠类型不好用 promotion_type_enum；因为优惠劵、会员折扣都算
// 活动优先级处理
-const promotionTypes = ref<DictDataType[]>(getIntDictOptions(DICT_TYPE.PROMOTION_TYPE_ENUM))
+const promotionTypes = ref<DictDataType[]>([
+ {
+ dictType: 'promotionTypes',
+ label: '秒杀活动',
+ value: 1,
+ colorType: 'warning',
+ cssClass: ''
+ },
+ {
+ dictType: 'promotionTypes',
+ label: '砍价活动',
+ value: 2,
+ colorType: 'warning',
+ cssClass: ''
+ },
+ {
+ dictType: 'promotionTypes',
+ label: '拼团活动',
+ value: 3,
+ colorType: 'warning',
+ cssClass: ''
+ },
+ {
+ dictType: 'promotionTypes',
+ label: '限时折扣',
+ value: 4,
+ colorType: 'warning',
+ cssClass: ''
+ },
+ {
+ dictType: 'promotionTypes',
+ label: '满减送',
+ value: 5,
+ colorType: 'warning',
+ cssClass: ''
+ },
+ {
+ dictType: 'promotionTypes',
+ label: '会员折扣',
+ value: 6,
+ colorType: 'warning',
+ cssClass: ''
+ },
+ {
+ dictType: 'promotionTypes',
+ label: '优惠劵',
+ value: 7,
+ colorType: 'warning',
+ cssClass: ''
+ },
+ {
+ dictType: 'promotionTypes',
+ label: '积分',
+ value: 8,
+ colorType: 'warning',
+ cssClass: ''
+ }
+])
const otherSettingsFormRef = ref() // 表单Ref
// 表单数据
@@ -148,8 +176,7 @@ const formData = ref<Spu>({
recommendBest: false, // 是否精品
recommendNew: false, // 是否新品
recommendGood: false, // 是否优品
- activityOrders: [], // 活动排序
- giveCouponTemplates: [] // 赠送的优惠券
+ activityOrders: [] // 活动排序
})
// 表单规则
const rules = reactive({
diff --git a/src/views/mall/product/spu/form/index.vue b/src/views/mall/product/spu/form/index.vue
index 4b122a36..9d69923a 100644
--- a/src/views/mall/product/spu/form/index.vue
+++ b/src/views/mall/product/spu/form/index.vue
@@ -95,8 +95,7 @@ const formData = ref<ProductSpuApi.Spu>({
recommendBest: false, // 是否精品
recommendNew: false, // 是否新品
recommendGood: false, // 是否优品
- activityOrders: [], // 活动排序
- giveCouponTemplates: [] // 赠送的优惠券
+ activityOrders: [] // 活动排序
})
/** 获得详情 */
diff --git a/src/views/mall/product/spu/form/spu.data.ts b/src/views/mall/product/spu/form/spu.data.ts
index 8900efde..9d88f433 100644
--- a/src/views/mall/product/spu/form/spu.data.ts
+++ b/src/views/mall/product/spu/form/spu.data.ts
@@ -94,10 +94,6 @@ export const otherSettingsSchema = reactive<CrudSchema[]>([
label: '是否优品推荐',
field: 'recommendGood'
},
- {
- label: '赠送的优惠劵',
- field: 'giveCouponTemplates'
- },
{
label: '活动显示排序',
field: 'activityOrders'
diff --git a/src/views/mall/product/spu/form/CouponSelect.vue b/src/views/mall/promotion/coupon/components/CouponSelect.vue
similarity index 100%
rename from src/views/mall/product/spu/form/CouponSelect.vue
rename to src/views/mall/promotion/coupon/components/CouponSelect.vue
diff --git a/src/views/mall/promotion/coupon/components/index.ts b/src/views/mall/promotion/coupon/components/index.ts
new file mode 100644
index 00000000..6a0e56fa
--- /dev/null
+++ b/src/views/mall/promotion/coupon/components/index.ts
@@ -0,0 +1,4 @@
+import CouponSendForm from './CouponSendForm.vue'
+import CouponSelect from './CouponSelect.vue'
+
+export { CouponSendForm, CouponSelect }
diff --git a/src/views/member/user/index.vue b/src/views/member/user/index.vue
index 34ff230d..de52c6a3 100644
--- a/src/views/member/user/index.vue
+++ b/src/views/member/user/index.vue
@@ -2,50 +2,50 @@
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
- class="-mb-15px"
- :model="queryParams"
ref="queryFormRef"
:inline="true"
+ :model="queryParams"
+ class="-mb-15px"
label-width="68px"
>
<el-form-item label="用户昵称" prop="nickname">
<el-input
v-model="queryParams.nickname"
- placeholder="请输入用户昵称"
- clearable
- @keyup.enter="handleQuery"
class="!w-240px"
+ clearable
+ placeholder="请输入用户昵称"
+ @keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="手机号" prop="mobile">
<el-input
v-model="queryParams.mobile"
- placeholder="请输入手机号"
- clearable
- @keyup.enter="handleQuery"
class="!w-240px"
+ clearable
+ placeholder="请输入手机号"
+ @keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="注册时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
- value-format="YYYY-MM-DD HH:mm:ss"
- type="daterange"
- start-placeholder="开始日期"
- end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
+ end-placeholder="结束日期"
+ start-placeholder="开始日期"
+ type="daterange"
+ value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
<el-form-item label="登录时间" prop="loginDate">
<el-date-picker
v-model="queryParams.loginDate"
- value-format="YYYY-MM-DD HH:mm:ss"
- type="daterange"
- start-placeholder="开始日期"
- end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
+ end-placeholder="结束日期"
+ start-placeholder="开始日期"
+ type="daterange"
+ value-format="YYYY-MM-DD HH:mm:ss"
/>
</el-form-item>
<el-form-item label="用户标签" prop="tagIds">
@@ -58,9 +58,15 @@
<MemberGroupSelect v-model="queryParams.groupId" />
</el-form-item>
<el-form-item>
- <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
- <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
- <el-button @click="openCoupon" v-hasPermi="['promotion:coupon:send']">发送优惠券</el-button>
+ <el-button @click="handleQuery">
+ <Icon class="mr-5px" icon="ep:search" />
+ 搜索
+ </el-button>
+ <el-button @click="resetQuery">
+ <Icon class="mr-5px" icon="ep:refresh" />
+ 重置
+ </el-button>
+ <el-button v-hasPermi="['promotion:coupon:send']" @click="openCoupon">发送优惠券</el-button>
</el-form-item>
</el-form>
</ContentWrap>
@@ -70,26 +76,26 @@
<el-table
v-loading="loading"
:data="list"
- :stripe="true"
:show-overflow-tooltip="true"
+ :stripe="true"
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" />
- <el-table-column label="用户编号" align="center" prop="id" width="120px" />
- <el-table-column label="头像" align="center" prop="avatar" width="80px">
+ <el-table-column align="center" label="用户编号" prop="id" width="120px" />
+ <el-table-column align="center" label="头像" prop="avatar" width="80px">
<template #default="scope">
<img :src="scope.row.avatar" style="width: 40px" />
</template>
</el-table-column>
- <el-table-column label="手机号" align="center" prop="mobile" width="120px" />
- <el-table-column label="昵称" align="center" prop="nickname" width="80px" />
- <el-table-column label="等级" align="center" prop="levelName" width="100px" />
- <el-table-column label="分组" align="center" prop="groupName" width="100px" />
+ <el-table-column align="center" label="手机号" prop="mobile" width="120px" />
+ <el-table-column align="center" label="昵称" prop="nickname" width="80px" />
+ <el-table-column align="center" label="等级" prop="levelName" width="100px" />
+ <el-table-column align="center" label="分组" prop="groupName" width="100px" />
<el-table-column
- label="用户标签"
- align="center"
- prop="tagNames"
:show-overflow-tooltip="false"
+ align="center"
+ label="用户标签"
+ prop="tagNames"
>
<template #default="scope">
<el-tag v-for="(tagName, index) in scope.row.tagNames" :key="index" class="mr-5px">
@@ -97,69 +103,72 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column label="积分" align="center" prop="point" width="100px" />
- <el-table-column label="状态" align="center" prop="status" width="100px">
+ <el-table-column align="center" label="积分" prop="point" width="100px" />
+ <el-table-column align="center" label="状态" prop="status" width="100px">
<template #default="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column
+ :formatter="dateFormatter"
+ align="center"
label="登录时间"
- align="center"
prop="loginDate"
- :formatter="dateFormatter"
width="180px"
/>
<el-table-column
+ :formatter="dateFormatter"
+ align="center"
label="注册时间"
- align="center"
prop="createTime"
- :formatter="dateFormatter"
width="180px"
/>
<el-table-column
- label="操作"
- align="center"
- width="100px"
- fixed="right"
:show-overflow-tooltip="false"
+ align="center"
+ fixed="right"
+ label="操作"
+ width="100px"
>
<template #default="scope">
<div class="flex items-center justify-center">
<el-button link type="primary" @click="openDetail(scope.row.id)">详情</el-button>
<el-dropdown
- @command="(command) => handleCommand(command, scope.row)"
v-hasPermi="[
'member:user:update',
'member:user:update-level',
'member:user:update-point',
'member:user:update-balance'
]"
+ @command="(command) => handleCommand(command, scope.row)"
>
- <el-button type="primary" link><Icon icon="ep:d-arrow-right" /> 更多</el-button>
+ <el-button link type="primary">
+ <Icon icon="ep:d-arrow-right" />
+ 更多
+ </el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item
- command="handleUpdate"
v-if="checkPermi(['member:user:update'])"
+ command="handleUpdate"
>
编辑
</el-dropdown-item>
<el-dropdown-item
- command="handleUpdateLevel"
v-if="checkPermi(['member:user:update-level'])"
+ command="handleUpdateLevel"
>
修改等级
</el-dropdown-item>
<el-dropdown-item
- command="handleUpdatePoint"
v-if="checkPermi(['member:user:update-point'])"
+ command="handleUpdatePoint"
>
修改积分
</el-dropdown-item>
<el-dropdown-item
- command="handleUpdateBlance"
v-if="checkPermi(['member:user:update-balance'])"
+ command="handleUpdateBlance"
>
修改余额(WIP)
</el-dropdown-item>
@@ -172,9 +181,9 @@
</el-table>
<!-- 分页 -->
<Pagination
- :total="total"
- v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
+ v-model:page="queryParams.pageNo"
+ :total="total"
@pagination="getList"
/>
</ContentWrap>
@@ -188,7 +197,7 @@
<!-- 发送优惠券弹窗 -->
<CouponSendForm ref="couponSendFormRef" />
</template>
-<script setup lang="ts">
+<script lang="ts" setup>
import { dateFormatter } from '@/utils/formatTime'
import * as UserApi from '@/api/member/user'
import { DICT_TYPE } from '@/utils/dict'
@@ -198,7 +207,7 @@ import MemberLevelSelect from '@/views/member/level/components/MemberLevelSelect
import MemberGroupSelect from '@/views/member/group/components/MemberGroupSelect.vue'
import UserLevelUpdateForm from './UserLevelUpdateForm.vue'
import UserPointUpdateForm from './UserPointUpdateForm.vue'
-import CouponSendForm from '@/views/mall/promotion/coupon/components/CouponSendForm.vue'
+import { CouponSendForm } from '@/views/mall/promotion/coupon/components'
import { checkPermi } from '@/utils/permission'
defineOptions({ name: 'MemberUser' })