From 1298c3dd522f218237c651d50de8d59a8df1c6fc Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Tue, 24 Oct 2023 16:10:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=20banner=20=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit a7439ee08b59d47ef1162e0b1db93e94d2f3cb45)
---
 src/api/mall/market/banner/index.ts            | 11 ++++++-----
 src/utils/dict.ts                              |  1 +
 src/views/mall/promotion/banner/BannerForm.vue | 15 +++++++++++++++
 src/views/mall/promotion/banner/index.vue      | 11 ++++++++---
 4 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/src/api/mall/market/banner/index.ts b/src/api/mall/market/banner/index.ts
index af96b8f9..ee65024c 100644
--- a/src/api/mall/market/banner/index.ts
+++ b/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 })
 }
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index f6d5e434..041d5ba3 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -185,6 +185,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',
diff --git a/src/views/mall/promotion/banner/BannerForm.vue b/src/views/mall/promotion/banner/BannerForm.vue
index 42405d41..d794d2bf 100644
--- a/src/views/mall/promotion/banner/BannerForm.vue
+++ b/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
diff --git a/src/views/mall/promotion/banner/index.vue b/src/views/mall/promotion/banner/index.vue
index 6050abb5..bcf6d80d 100644
--- a/src/views/mall/promotion/banner/index.vue
+++ b/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,7 +92,7 @@
       <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)"
@@ -95,7 +100,7 @@
             编辑
           </el-button>
           <el-button
-            v-hasPermi="['market:banner:delete']"
+            v-hasPermi="['promotion:banner:delete']"
             link
             type="danger"
             @click="handleDelete(scope.row.id)"