!293 完善 banner 管理。商品 spu 剔除优惠卷相关逻辑

Merge pull request !293 from puhui999/dev-to-dev

Author: YunaiV

src/api/mall/market/banner/index.ts

@@ -6,31 +6,32 @@ export interface BannerVO {
   picUrl: string
   status: number
   url: string
+  position: number
   sort: number
   memo: string
 }
 
 // 查询Banner管理列表
 export const getBannerPage = async (params) => {
-  return await request.get({ url: `/market/banner/page`, params })
+  return await request.get({ url: `/promotion/banner/page`, params })
 }
 
 // 查询Banner管理详情
 export const getBanner = async (id: number) => {
-  return await request.get({ url: `/market/banner/get?id=` + id })
+  return await request.get({ url: `/promotion/banner/get?id=` + id })
 }
 
 // 新增Banner管理
 export const createBanner = async (data: BannerVO) => {
-  return await request.post({ url: `/market/banner/create`, data })
+  return await request.post({ url: `/promotion/banner/create`, data })
 }
 
 // 修改Banner管理
 export const updateBanner = async (data: BannerVO) => {
-  return await request.put({ url: `/market/banner/update`, data })
+  return await request.put({ url: `/promotion/banner/update`, data })
 }
 
 // 删除Banner管理
 export const deleteBanner = async (id: number) => {
-  return await request.delete({ url: `/market/banner/delete?id=` + id })
+  return await request.delete({ url: `/promotion/banner/delete?id=` + id })
 }

src/api/mall/product/spu.ts

@@ -61,7 +61,6 @@ export interface Spu {
   createTime?: Date // 商品创建时间
   status?: number // 商品状态
   activityOrders: number[] // 活动排序
-  giveCouponTemplates: GiveCouponTemplate[] // 优惠卷
 }
 
 // 获得 Spu 列表

src/utils/dict.ts

@@ -184,6 +184,7 @@ export enum DICT_TYPE {
   PROMOTION_CONDITION_TYPE = 'promotion_condition_type', // 营销的条件类型枚举
   PROMOTION_BARGAIN_RECORD_STATUS = 'promotion_bargain_record_status', // 砍价记录的状态
   PROMOTION_COMBINATION_RECORD_STATUS = 'promotion_combination_record_status', // 拼团记录的状态
+  BANNER_POSITION = 'banner_position', // banner 定位
 
   // ========== CRM - 客户管理模块 ==========
   CRM_RECEIVABLE_CHECK_STATUS = 'crm_receivable_check_status',

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>

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,26 +78,15 @@
         {{ 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'
 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({

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: [] // 活动排序
 })
 
 /** 获得详情 */

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'

src/views/mall/promotion/banner/BannerForm.vue

@@ -41,6 +41,19 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
+        <el-col :span="24">
+          <el-form-item label="定位" prop="position">
+            <el-radio-group v-model="formData.position">
+              <el-radio
+                v-for="dict in getIntDictOptions(DICT_TYPE.BANNER_POSITION)"
+                :key="dict.value"
+                :label="dict.value"
+              >
+                {{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
         <el-col :span="24">
           <el-form-item label="描述" prop="memo">
             <el-input v-model="formData.memo" placeholder="请输入描述" type="textarea" />
@@ -70,6 +83,7 @@ const formData = ref({
   title: undefined,
   picUrl: undefined,
   status: 0,
+  position: 1,
   url: undefined,
   sort: 0,
   memo: undefined
@@ -133,6 +147,7 @@ const resetForm = () => {
     title: undefined,
     picUrl: undefined,
     status: 0,
+    position: 1,
     url: undefined,
     sort: 0,
     memo: undefined

src/views/mall/promotion/banner/index.vue

@@ -48,7 +48,7 @@
           重置
         </el-button>
         <el-button
-          v-hasPermi="['market:banner:create']"
+          v-hasPermi="['promotion:banner:create']"
           plain
           type="primary"
           @click="openForm('create')"
@@ -74,6 +74,11 @@
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
+      <el-table-column align="center" label="定位" prop="position">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.BANNER_POSITION" :value="scope.row.position" />
+        </template>
+      </el-table-column>
       <el-table-column align="center" label="跳转地址" prop="url" />
       <el-table-column
         :formatter="dateFormatter"
@@ -87,15 +92,15 @@
       <el-table-column align="center" label="操作">
         <template #default="scope">
           <el-button
-            v-hasPermi="['market:banner:update']"
+            v-hasPermi="['promotion:banner:update']"
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
           >
             编辑
           </el-button>
           <el-button
-            v-hasPermi="['market:banner:delete']"
+            v-hasPermi="['promotion:banner:delete']"
             link
             type="danger"
             @click="handleDelete(scope.row.id)"