diff --git a/src/api/cms/mpAd/model/index.ts b/src/api/cms/mpAd/model/index.ts
index 5ef6a62..dcf5801 100644
--- a/src/api/cms/mpAd/model/index.ts
+++ b/src/api/cms/mpAd/model/index.ts
@@ -8,6 +8,8 @@ export interface MpAd {
   adId?: number;
   // 页面ID
   pageId?: number;
+  // 页面名称
+  pageName?: string;
   // 广告类型
   adType?: string;
   // 广告位名称
diff --git a/src/components/SelectMpAd/components/select-data.vue b/src/components/SelectMpAd/components/select-data.vue
new file mode 100644
index 0000000..1f4c432
--- /dev/null
+++ b/src/components/SelectMpAd/components/select-data.vue
@@ -0,0 +1,144 @@
+<template>
+  <ele-modal
+    :width="750"
+    :visible="visible"
+    :maskClosable="false"
+    :title="title"
+    :footer="null"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+  >
+    <ele-pro-table
+      ref="tableRef"
+      row-key="id"
+      :datasource="datasource"
+      :columns="columns"
+      :customRow="customRow"
+      :pagination="false"
+    >
+      <template #toolbar>
+        <a-input-search
+          allow-clear
+          v-model:value="searchText"
+          placeholder="请输入搜索关键词"
+          style="width: 200px"
+          @search="reload"
+          @pressEnter="reload"
+        />
+      </template>
+      <template #bodyCell="{ column, record }">
+        <template v-if="column.key === 'action'">
+          <template v-if="pageId == record.id">
+            <a-radio v-model:checked="checked" @click="onRadio(record)" />
+          </template>
+          <template v-else>
+            <lebal>
+              <a-radio @click="onRadio(record)" />
+              <span class="ele-text-secondary">选择</span>
+            </lebal>
+          </template>
+        </template>
+      </template>
+    </ele-pro-table>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref } from 'vue';
+  import {
+    ColumnItem,
+    DatasourceFunction
+  } from 'ele-admin-pro/es/ele-pro-table/types';
+  import { pageMpPages } from '@/api/cms/mpPages';
+  import { EleProTable } from 'ele-admin-pro';
+  import type { MpPages, MpPagesParam } from '@/api/cms/mpPages/model';
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 标题
+    title?: string;
+    // 修改回显的数据
+    data?: MpPages | null;
+  }>();
+
+  const emit = defineEmits<{
+    (e: 'done', data: MpPages): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 搜索内容
+  const searchText = ref(null);
+  const pageId = ref<number>(0);
+  const checked = ref<boolean>(true);
+
+  // 表格实例
+  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+  // 表格配置
+  const columns = ref<ColumnItem[]>([
+    {
+      title: '页面名称',
+      dataIndex: 'title',
+      key: 'title'
+    },
+    {
+      title: '路径',
+      dataIndex: 'path',
+      key: 'path'
+    },
+    {
+      title: '操作',
+      key: 'action',
+      align: 'center'
+    }
+  ]);
+
+  // 表格数据源
+  const datasource: DatasourceFunction = ({ page, limit, where, orders }) => {
+    where = {};
+    // 搜索条件
+    if (searchText.value) {
+      where.keywords = searchText.value;
+    }
+    return pageMpPages({
+      ...where,
+      ...orders,
+      page,
+      limit
+    });
+  };
+
+  /* 搜索 */
+  const reload = (where?: MpPagesParam) => {
+    tableRef?.value?.reload({ page: 1, where });
+  };
+
+  const onRadio = (record: MpPages) => {
+    pageId.value = Number(record.id);
+    updateVisible(false);
+    emit('done', record);
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: MpPages) => {
+    return {
+      // 行点击事件
+      // onClick: () => {
+      //   updateVisible(false);
+      //   emit('done', record);
+      // },
+      // 行双击事件
+      onDblclick: () => {
+        updateVisible(false);
+        emit('done', record);
+      }
+    };
+  };
+</script>
+<style lang="less"></style>
diff --git a/src/components/SelectMpAd/index.vue b/src/components/SelectMpAd/index.vue
new file mode 100644
index 0000000..657ba9f
--- /dev/null
+++ b/src/components/SelectMpAd/index.vue
@@ -0,0 +1,59 @@
+<template>
+  <div>
+    <a-input-group compact>
+      <a-input
+        disabled
+        style="width: calc(100% - 32px)"
+        v-model:value="value"
+        :placeholder="placeholder"
+      />
+      <a-button @click="openEdit">
+        <template #icon><BulbOutlined class="ele-text-warning" /></template>
+      </a-button>
+    </a-input-group>
+    <!-- 选择弹窗 -->
+    <SelectData
+      v-model:visible="showEdit"
+      :data="current"
+      :title="placeholder"
+      @done="onChange"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+  import { BulbOutlined } from '@ant-design/icons-vue';
+  import { ref } from 'vue';
+  import SelectData from './components/select-data.vue';
+  import { MpPages } from '@/api/cms/mpPages/model';
+
+  withDefaults(
+    defineProps<{
+      value?: any;
+      placeholder?: string;
+    }>(),
+    {
+      placeholder: '请选择数据'
+    }
+  );
+
+  const emit = defineEmits<{
+    (e: 'done', MpPages): void;
+    (e: 'clear'): void;
+  }>();
+
+  // 是否显示编辑弹窗
+  const showEdit = ref(false);
+  // 当前编辑数据
+  const current = ref<MpPages | null>(null);
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: MpPages) => {
+    current.value = row ?? null;
+    showEdit.value = true;
+  };
+
+  const onChange = (row) => {
+    emit('done', row);
+  };
+</script>
diff --git a/src/views/cms/ad/index.vue b/src/views/cms/ad/index.vue
index 9e9d7ff..54f2731 100644
--- a/src/views/cms/ad/index.vue
+++ b/src/views/cms/ad/index.vue
@@ -119,7 +119,7 @@
       title: '类型',
       dataIndex: 'adType',
       key: 'adType',
-      width: 120,
+      width: 120
     },
     {
       title: '广告图片',
@@ -145,7 +145,7 @@
       dataIndex: 'status',
       key: 'status',
       align: 'center',
-      width: 120,
+      width: 120
     },
     {
       title: '操作',
diff --git a/src/views/cms/mpAd/components/mpAdEdit.vue b/src/views/cms/mpAd/components/mpAdEdit.vue
index d7fc550..fc0ca49 100644
--- a/src/views/cms/mpAd/components/mpAdEdit.vue
+++ b/src/views/cms/mpAd/components/mpAdEdit.vue
@@ -5,7 +5,7 @@
     :visible="visible"
     :maskClosable="false"
     :maxable="maxable"
-    :title="isUpdate ? '编辑小程序广告位' : '添加小程序广告位'"
+    :title="isUpdate ? '编辑广告' : '添加广告'"
     :body-style="{ paddingBottom: '28px' }"
     @update:visible="updateVisible"
     @ok="save"
@@ -19,63 +19,98 @@
         styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
       "
     >
-      <a-form-item label="页面ID" name="pageId">
-        <a-input
-          allow-clear
-          placeholder="请输入页面ID"
-          v-model:value="form.pageId"
-        />
-      </a-form-item>
-      <a-form-item label="广告类型" name="adType">
-        <a-input
-          allow-clear
-          placeholder="请输入广告类型"
+      <a-form-item label="类型" name="adType">
+        <a-select
+          ref="select"
+          :disabled="isUpdate"
           v-model:value="form.adType"
-        />
+          style="width: 120px"
+        >
+          <a-select-option value="图片广告">图片广告</a-select-option>
+          <a-select-option value="幻灯片">幻灯片</a-select-option>
+          <a-select-option value="视频广告">视频广告</a-select-option>
+        </a-select>
       </a-form-item>
-      <a-form-item label="广告位名称" name="name">
-        <a-input
-          allow-clear
-          placeholder="请输入广告位名称"
-          v-model:value="form.name"
-        />
-      </a-form-item>
-      <a-form-item label="宽" name="width">
-        <a-input
-          allow-clear
-          placeholder="请输入宽"
-          v-model:value="form.width"
-        />
-      </a-form-item>
-      <a-form-item label="高" name="height">
-        <a-input
-          allow-clear
-          placeholder="请输入高"
-          v-model:value="form.height"
-        />
-      </a-form-item>
-      <a-form-item label="广告图片" name="images">
-        <a-input
-          allow-clear
-          placeholder="请输入广告图片"
-          v-model:value="form.images"
+      <template v-if="form.adType == '幻灯片'">
+        <a-form-item label="图片" name="images">
+          <SelectFile
+            :placeholder="`请选择图片`"
+            :limit="9"
+            :data="images"
+            @done="chooseFile"
+            @del="onDeleteItem"
+          />
+        </a-form-item>
+      </template>
+      <template v-if="form.adType == '图片广告'">
+        <a-form-item label="图片" name="images">
+          <SelectFile
+            :limit="1"
+            :data="images"
+            @done="chooseFile"
+            @del="onDeleteItem"
+          />
+        </a-form-item>
+      </template>
+      <template v-if="form.adType == '视频广告'">
+        <a-form-item
+          label="上传视频"
+          name="images"
+          extra="请上传视频文件，仅支持mp4格式，大小200M以内"
+        >
+          <SelectFile
+            :placeholder="`请选择视频文件`"
+            :limit="1"
+            :data="images"
+            @done="chooseFile"
+            @del="onDeleteItem"
+          />
+        </a-form-item>
+      </template>
+      <a-form-item label="位置" name="pageId">
+        <SelectMpAd
+          :placeholder="`请选择页面`"
+          v-model:value="form.pageName"
+          @done="choosePageId"
         />
       </a-form-item>
       <a-form-item label="路由/链接地址" name="path">
+        <template v-if="form.adType == '幻灯片' && images.length > 0">
+          <template v-for="(item, index) in images" :key="index">
+            <a-input
+              allow-clear
+              :maxlength="100"
+              :placeholder="`请输入地址${index + 1}`"
+              v-model:value="pathList[index]"
+            />
+          </template>
+        </template>
+        <template v-else>
+          <a-input
+            allow-clear
+            :maxlength="100"
+            placeholder="请输入路由/链接地址"
+            v-model:value="form.path"
+          />
+        </template>
+      </a-form-item>
+      <a-form-item label="标题" name="name">
         <a-input
           allow-clear
-          placeholder="请输入路由/链接地址"
-          v-model:value="form.path"
+          :maxlength="100"
+          placeholder="请输入广告标题"
+          v-model:value="form.name"
         />
       </a-form-item>
-      <a-form-item label="用户ID" name="userId">
-        <a-input
-          allow-clear
-          placeholder="请输入用户ID"
-          v-model:value="form.userId"
+      <a-form-item label="广告描述" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入广告描述"
+          v-model:value="form.comments"
         />
       </a-form-item>
-      <a-form-item label="排序(数字越小越靠前)" name="sortNumber">
+      <a-form-item label="排序号" name="sortNumber">
         <a-input-number
           :min="0"
           :max="9999"
@@ -84,27 +119,12 @@
           v-model:value="form.sortNumber"
         />
       </a-form-item>
-      <a-form-item label="备注" name="comments">
-        <a-textarea
-          :rows="4"
-          :maxlength="200"
-          placeholder="请输入描述"
-          v-model:value="form.comments"
-        />
-      </a-form-item>
-      <a-form-item label="状态, 0正常, 1冻结" name="status">
+      <a-form-item label="状态" name="status">
         <a-radio-group v-model:value="form.status">
-          <a-radio :value="0">显示</a-radio>
-          <a-radio :value="1">隐藏</a-radio>
+          <a-radio :value="0">开启</a-radio>
+          <a-radio :value="1">关闭</a-radio>
         </a-radio-group>
       </a-form-item>
-      <a-form-item label="是否删除, 0否, 1是" name="deleted">
-        <a-input
-          allow-clear
-          placeholder="请输入是否删除, 0否, 1是"
-          v-model:value="form.deleted"
-        />
-      </a-form-item>
     </a-form>
   </ele-modal>
 </template>
@@ -112,14 +132,15 @@
 <script lang="ts" setup>
   import { ref, reactive, watch } from 'vue';
   import { Form, message } from 'ant-design-vue';
-  import { assignObject, uuid } from 'ele-admin-pro';
+  import { assignObject } from 'ele-admin-pro';
   import { addMpAd, updateMpAd } from '@/api/cms/mpAd';
   import { MpAd } from '@/api/cms/mpAd/model';
   import { useThemeStore } from '@/store/modules/theme';
   import { storeToRefs } from 'pinia';
+  import { FormInstance, type Rule, RuleObject } from 'ant-design-vue/es/form';
   import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
-  import { FormInstance } from 'ant-design-vue/es/form';
   import { FileRecord } from '@/api/system/file/model';
+  import { MpPages } from '@/api/cms/mpPages/model';
 
   // 是否是修改
   const isUpdate = ref(false);
@@ -142,31 +163,25 @@
 
   // 提交状态
   const loading = ref(false);
+  // 已上传数据
+  const images = ref<ItemType[]>([]);
+  const pathList = ref<any[]>([]);
   // 是否显示最大化切换按钮
   const maxable = ref(true);
   // 表格选中数据
   const formRef = ref<FormInstance | null>(null);
-  const images = ref<ItemType[]>([]);
 
   // 用户信息
   const form = reactive<MpAd>({
     adId: undefined,
-    pageId: undefined,
-    adType: undefined,
-    name: undefined,
-    width: undefined,
-    height: undefined,
-    images: undefined,
-    path: undefined,
-    userId: undefined,
-    sortNumber: undefined,
-    comments: undefined,
-    status: undefined,
-    deleted: undefined,
-    tenantId: undefined,
-    createTime: undefined,
-    mpAdId: undefined,
-    mpAdName: '',
+    pageId: 0,
+    pageName: '',
+    name: '',
+    adType: '图片广告',
+    images: '',
+    width: '',
+    height: '',
+    path: '',
     status: 0,
     comments: '',
     sortNumber: 100
@@ -179,31 +194,52 @@
 
   // 表单验证规则
   const rules = reactive({
-    mpAdName: [
+    adType: [
       {
         required: true,
         type: 'string',
-        message: '请填写小程序广告位名称',
+        message: '请选择广告类型',
         trigger: 'blur'
       }
+    ],
+    images: [
+      {
+        required: true,
+        type: 'string',
+        message: '请上传图片或视频',
+        trigger: 'blur',
+        validator: (_rule: Rule, value: string) => {
+          return new Promise<void>((resolve, reject) => {
+            if (images.value.length == 0) {
+              return reject('请上传图片或视频文件');
+            }
+            return resolve();
+          });
+        }
+      }
     ]
   });
 
-  const chooseImage = (data: FileRecord) => {
+  const { resetFields } = useForm(form, rules);
+
+  const chooseFile = (data: FileRecord) => {
     images.value.push({
       uid: data.id,
-      url: data.path,
+      url: data.downloadUrl,
       status: 'done'
     });
-    form.image = data.path;
+    form.images = data.downloadUrl;
   };
 
   const onDeleteItem = (index: number) => {
     images.value.splice(index, 1);
-    form.image = '';
+    form.images = '';
   };
 
-  const { resetFields } = useForm(form, rules);
+  const choosePageId = (data: MpPages) => {
+    form.pageName = data.title;
+    form.pageId = data.id;
+  };
 
   /* 保存编辑 */
   const save = () => {
@@ -215,7 +251,10 @@
       .then(() => {
         loading.value = true;
         const formData = {
-          ...form
+          ...form,
+          images: JSON.stringify(images.value),
+          path:
+            form.adType == '幻灯片' ? JSON.stringify(pathList.value) : form.path
         };
         const saveOrUpdate = isUpdate.value ? updateMpAd : addMpAd;
         saveOrUpdate(formData)
@@ -237,18 +276,29 @@
     () => props.visible,
     (visible) => {
       if (visible) {
-        images.value = [];
         if (props.data) {
           assignObject(form, props.data);
-          if(props.data.image){
-            images.value.push({
-              uid: uuid(),
-              url: props.data.image,
-              status: 'done'
-            })
+          images.value = [];
+          pathList.value = [];
+          if (props.data.images) {
+            const arr = JSON.parse(props.data.images);
+            arr.map((d) => {
+              images.value.push({
+                uid: d.uid,
+                url: d.url,
+                status: 'done'
+              });
+            });
+          }
+          if (props.data.adType == '幻灯片') {
+            const arr = JSON.parse(props.data.path);
+            arr.map((d) => {
+              pathList.value.push(d);
+            });
           }
           isUpdate.value = true;
         } else {
+          images.value = [];
           isUpdate.value = false;
         }
       } else {
@@ -258,3 +308,21 @@
     { immediate: true }
   );
 </script>
+<style lang="less">
+  .tab-pane {
+    min-height: 300px;
+  }
+  .ml-10 {
+    margin-left: 5px;
+  }
+  .upload-text {
+    margin-right: 70px;
+  }
+  .icon-bg {
+    width: 50px;
+    height: 50px;
+    display: block;
+    border-radius: 50px;
+    background: url('data:image/svg+xml;charset=utf8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20xmlns%3Axlink%3D%22http%3A%2F%2Fwww.w3.org%2F1999%2Fxlink%22%20version%3D%221.1%22%3E%3Cdefs%3E%3ClinearGradient%20id%3D%221%22%20x1%3D%220%22%20x2%3D%221%22%20y1%3D%220%22%20y2%3D%220%22%20gradientTransform%3D%22matrix(6.123233995736766e-17%2C%201%2C%20-0.024693877551020406%2C%206.123233995736766e-17%2C%200.5%2C%200)%22%3E%3Cstop%20stop-color%3D%22%230a060d%22%20stop-opacity%3D%221%22%20offset%3D%220%22%3E%3C%2Fstop%3E%3Cstop%20stop-color%3D%22%23660061%22%20stop-opacity%3D%221%22%20offset%3D%220.95%22%3E%3C%2Fstop%3E%3C%2FlinearGradient%3E%3C%2Fdefs%3E%3Crect%20width%3D%22100%25%22%20height%3D%22100%25%22%20fill%3D%22url(%231)%22%3E%3C%2Frect%3E%3C%2Fsvg%3E');
+  }
+</style>
diff --git a/src/views/cms/mpAd/index.vue b/src/views/cms/mpAd/index.vue
index 0358270..3c4f88e 100644
--- a/src/views/cms/mpAd/index.vue
+++ b/src/views/cms/mpAd/index.vue
@@ -4,7 +4,7 @@
       <a-card :bordered="false" :body-style="{ padding: '16px' }">
         <ele-pro-table
           ref="tableRef"
-          row-key="mpAdId"
+          row-key="adId"
           :columns="columns"
           :datasource="datasource"
           :customRow="customRow"
@@ -132,6 +132,12 @@
       width: 280,
       ellipsis: true
     },
+    {
+      title: '位置',
+      dataIndex: 'pageName',
+      key: 'pageName',
+      width: 120
+    },
     {
       title: '描述',
       dataIndex: 'comments',
@@ -176,7 +182,7 @@
   /* 删除单个 */
   const remove = (row: MpAd) => {
     const hide = message.loading('请求中..', 0);
-    removeMpAd(row.mpAdId)
+    removeMpAd(row.adId)
       .then((msg) => {
         hide();
         message.success(msg);
@@ -201,7 +207,7 @@
       maskClosable: true,
       onOk: () => {
         const hide = message.loading('请求中..', 0);
-        removeBatchMpAd(selection.value.map((d) => d.mpAdId))
+        removeBatchMpAd(selection.value.map((d) => d.adId))
           .then((msg) => {
             hide();
             message.success(msg);