Merge remote-tracking branch 'origin/dev' into dev

c1534bf1 · jason · 55a961e8 · 0c81a0d9 · c1534bf1 · c1534bf1
Commit c1534bf1 authored Oct 29, 2023 by jason
55 changed files
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -8,7 +8,6 @@ module.exports = defineConfig({
    es6: true
  },
  parser: 'vue-eslint-parser',
-  plugins: ['vue'],
  parserOptions: {
    parser: '@typescript-eslint/parser',
    ecmaVersion: 2020,
@@ -26,9 +25,9 @@ module.exports = defineConfig({
    '@unocss'
  ],
  rules: {
+    'vue/no-setup-props-destructure': 'off',
    'vue/script-setup-uses-vars': 'error',
    'vue/no-reserved-component-names': 'off',
-    'vue/no-setup-props-destructure': 'off',
    '@typescript-eslint/ban-ts-ignore': 'off',
    '@typescript-eslint/explicit-function-return-type': 'off',
    '@typescript-eslint/no-explicit-any': 'off',
@@ -54,6 +53,7 @@ module.exports = defineConfig({
    'vue/attribute-hyphenation': 'off',
    'vue/require-default-prop': 'off',
    'vue/require-explicit-emits': 'off',
+    'vue/require-toggle-inside-transition': 'off',
    'vue/html-self-closing': [
      'error',
      {

--- a/.vscode/settings.json
+++ b/.vscode/settings.json
 {
-  "typescript.tsdk": "./node_modules/typescript/lib",
+  "typescript.tsdk": "node_modules/typescript/lib",
  "npm.packageManager": "pnpm",
  "editor.tabSize": 2,
  "prettier.printWidth": 100, // 超过最大值换行
@@ -86,15 +86,12 @@
    "source.fixAll.eslint": true
  },
  "[vue]": {
-    "editor.codeActionsOnSave": {
+    "editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
-      "source.fixAll.eslint": true,
-      "source.fixAll.stylelint": true
-    }
  },
  "i18n-ally.localesPaths": ["src/locales"],
  "i18n-ally.keystyle": "nested",
  "i18n-ally.sortKeys": true,
-  "i18n-ally.namespace": true,
+  "i18n-ally.namespace": false,
  "i18n-ally.enabledParsers": ["ts"],
  "i18n-ally.sourceLanguage": "en",
  "i18n-ally.displayLanguage": "zh-CN",

--- a/package.json
+++ b/package.json
 {
  "name": "yudao-ui-admin-vue3",
-  "version": "1.8.2-snapshot",
+  "version": "1.8.3-snapshot",
  "description": "基于vue3、vite4、element-plus、typesScript",
  "author": "xingyu",
  "private": false,
@@ -41,12 +41,12 @@
    "bpmn-js-token-simulation": "^0.10.0",
    "camunda-bpmn-moddle": "^7.0.1",
    "cropperjs": "^1.6.1",
-    "crypto-js": "^4.1.1",
+    "crypto-js": "^4.2.0",
    "dayjs": "^1.11.10",
-    "diagram-js": "^12.4.0",
+    "diagram-js": "^12.5.0",
    "echarts": "^5.4.3",
    "echarts-wordcloud": "^2.1.0",
-    "element-plus": "2.4.0",
+    "element-plus": "2.4.1",
    "fast-xml-parser": "^4.3.2",
    "highlight.js": "^11.9.0",
    "intro.js": "^7.2.0",
@@ -62,7 +62,7 @@
    "steady-xml": "^0.1.0",
    "url": "^0.11.3",
    "video.js": "^7.21.5",
-    "vue": "^3.3.4",
+    "vue": "^3.3.7",
    "vue-dompurify-html": "^4.1.4",
    "vue-i18n": "^9.5.0",
    "vue-router": "^4.2.5",
@@ -72,55 +72,54 @@
    "xml-js": "^1.6.11"
  },
  "devDependencies": {
-    "@commitlint/cli": "^17.8.0",
+    "@commitlint/cli": "^18.0.0",
-    "@commitlint/config-conventional": "^17.8.0",
+    "@commitlint/config-conventional": "^18.0.0",
-    "@iconify/json": "^2.2.129",
+    "@iconify/json": "^2.2.132",
    "@intlify/unplugin-vue-i18n": "^1.4.0",
    "@purge-icons/generated": "^0.9.0",
-    "@types/intro.js": "^5.1.2",
+    "@types/intro.js": "^5.1.3",
-    "@types/lodash-es": "^4.17.9",
+    "@types/lodash-es": "^4.17.10",
-    "@types/node": "^20.8.6",
+    "@types/node": "^20.8.8",
-    "@types/nprogress": "^0.2.1",
+    "@types/nprogress": "^0.2.2",
-    "@types/qrcode": "^1.5.2",
+    "@types/qrcode": "^1.5.4",
-    "@types/qs": "^6.9.8",
+    "@types/qs": "^6.9.9",
    "@types/sortablejs": "^1.15.4",
-    "@typescript-eslint/eslint-plugin": "^6.7.5",
+    "@typescript-eslint/eslint-plugin": "^6.9.0",
-    "@typescript-eslint/parser": "^6.7.5",
+    "@typescript-eslint/parser": "^6.9.0",
-    "@unocss/transformer-variant-group": "^0.56.5",
+    "@unocss/transformer-variant-group": "^0.57.1",
-    "@unocss/eslint-config": "^0.56.5",
+    "@unocss/eslint-config": "^0.57.1",
    "@vitejs/plugin-legacy": "^4.1.1",
    "@vitejs/plugin-vue": "^4.4.0",
    "@vitejs/plugin-vue-jsx": "^3.0.2",
-    "@vue-macros/volar": "^0.17.0",
    "autoprefixer": "^10.4.16",
    "bpmn-js": "8.9.0",
    "bpmn-js-properties-panel": "0.46.0",
    "consola": "^3.2.3",
-    "eslint": "^8.51.0",
+    "eslint": "^8.52.0",
    "eslint-config-prettier": "^9.0.0",
    "eslint-define-config": "^1.24.1",
    "eslint-plugin-prettier": "^5.0.1",
-    "eslint-plugin-vue": "^9.17.0",
+    "eslint-plugin-vue": "^9.18.0",
-    "lint-staged": "^15.0.1",
+    "lint-staged": "^15.0.2",
    "postcss": "^8.4.31",
    "postcss-html": "^1.5.0",
    "postcss-scss": "^4.0.9",
    "prettier": "^3.0.3",
    "rimraf": "^5.0.5",
    "rollup": "^4.1.4",
-    "sass": "^1.69.3",
+    "sass": "^1.69.4",
-    "stylelint": "^15.10.3",
+    "stylelint": "^15.11.0",
    "stylelint-config-html": "^1.1.0",
    "stylelint-config-recommended": "^13.0.0",
    "stylelint-config-standard": "^34.0.0",
    "stylelint-order": "^6.0.3",
-    "terser": "^5.21.0",
+    "terser": "^5.22.0",
    "typescript": "5.2.2",
-    "unocss": "^0.56.5",
+    "unocss": "^0.57.1",
    "unplugin-auto-import": "^0.16.6",
    "unplugin-element-plus": "^0.8.0",
    "unplugin-vue-components": "^0.25.2",
-    "vite": "4.4.11",
+    "vite": "4.5.0",
    "vite-plugin-compression": "^0.5.1",
    "vite-plugin-ejs": "^1.6.4",
    "vite-plugin-eslint": "^1.8.1",
@@ -129,7 +128,7 @@
    "vite-plugin-svg-icons": "^2.0.1",
    "vite-plugin-top-level-await": "^1.3.1",
    "vue-eslint-parser": "^9.3.2",
-    "vue-tsc": "^1.8.19"
+    "vue-tsc": "^1.8.20"
  },
  "license": "MIT",
  "repository": {

--- a/src/api/crm/customer/index.ts
+++ b/src/api/crm/customer/index.ts
+import request from '@/config/axios'
+export interface CustomerVO {
+  id: number
+  name: string
+  industryId: number
+  level: number
+  source: number
+  followUpStatus: boolean
+  lockStatus: boolean
+  mobile: string
+  telephone: string
+  website: string
+  qq: string
+  wechat: string
+  email: string
+  description: string
+  remark: string
+  ownerUserId: number
+  roUserIds: string
+  rwUserIds: string
+  areaId: number
+  detailAddress: string
+  contactLastTime: Date
+  contactNextTime: Date
+}
+// 查询客户列表
+export const getCustomerPage = async (params) => {
+  return await request.get({ url: `/crm/customer/page`, params })
+}
+// 查询客户详情
+export const getCustomer = async (id: number) => {
+  return await request.get({ url: `/crm/customer/get?id=` + id })
+}
+// 新增客户
+export const createCustomer = async (data: CustomerVO) => {
+  return await request.post({ url: `/crm/customer/create`, data })
+}
+// 修改客户
+export const updateCustomer = async (data: CustomerVO) => {
+  return await request.put({ url: `/crm/customer/update`, data })
+}
+// 删除客户
+export const deleteCustomer = async (id: number) => {
+  return await request.delete({ url: `/crm/customer/delete?id=` + id })
+}
+// 导出客户 Excel
+export const exportCustomer = async (params) => {
+  return await request.download({ url: `/crm/customer/export-excel`, params })
+}
--- a/src/api/mall/promotion/diy/page.ts
+++ b/src/api/mall/promotion/diy/page.ts
+import request from '@/config/axios'
+export interface DiyPageVO {
+  id?: number
+  templateId?: number
+  name: string
+  remark: string
+  previewImageUrls: string[]
+  property: string
+}
+// 查询装修页面列表
+export const getDiyPagePage = async (params: any) => {
+  return await request.get({ url: `/promotion/diy-page/page`, params })
+}
+// 查询装修页面详情
+export const getDiyPage = async (id: number) => {
+  return await request.get({ url: `/promotion/diy-page/get?id=` + id })
+}
+// 新增装修页面
+export const createDiyPage = async (data: DiyPageVO) => {
+  return await request.post({ url: `/promotion/diy-page/create`, data })
+}
+// 修改装修页面
+export const updateDiyPage = async (data: DiyPageVO) => {
+  return await request.put({ url: `/promotion/diy-page/update`, data })
+}
+// 删除装修页面
+export const deleteDiyPage = async (id: number) => {
+  return await request.delete({ url: `/promotion/diy-page/delete?id=` + id })
+}
--- a/src/api/mall/promotion/diy/template.ts
+++ b/src/api/mall/promotion/diy/template.ts
+import request from '@/config/axios'
+export interface DiyTemplateVO {
+  id?: number
+  name: string
+  used: boolean
+  usedTime?: Date
+  remark: string
+  previewImageUrls: string[]
+  property: string
+}
+// 查询装修模板列表
+export const getDiyTemplatePage = async (params: any) => {
+  return await request.get({ url: `/promotion/diy-template/page`, params })
+}
+// 查询装修模板详情
+export const getDiyTemplate = async (id: number) => {
+  return await request.get({ url: `/promotion/diy-template/get?id=` + id })
+}
+// 新增装修模板
+export const createDiyTemplate = async (data: DiyTemplateVO) => {
+  return await request.post({ url: `/promotion/diy-template/create`, data })
+}
+// 修改装修模板
+export const updateDiyTemplate = async (data: DiyTemplateVO) => {
+  return await request.put({ url: `/promotion/diy-template/update`, data })
+}
+// 删除装修模板
+export const deleteDiyTemplate = async (id: number) => {
+  return await request.delete({ url: `/promotion/diy-template/delete?id=` + id })
+}
+// 使用装修模板
+export const useDiyTemplate = async (id: number) => {
+  return await request.put({ url: `/promotion/diy-template/use?id=` + id })
+}
--- a/src/assets/imgs/diy/statusBar.png
+++ b/src/assets/imgs/diy/statusBar.png
--- a/src/components/ColorInput/index.vue
+++ b/src/components/ColorInput/index.vue
+<template>
+  <el-input v-model="color">
+    <template #prepend>
+      <el-color-picker v-model="color" :predefine="COLORS" />
+    </template>
+  </el-input>
+</template>
+<script setup lang="ts">
+import { propTypes } from '@/utils/propTypes'
+// 颜色输入框
+defineOptions({ name: 'ColorInput' })
+// 预设颜色
+const COLORS = [
+  '#ff4500',
+  '#ff8c00',
+  '#ffd700',
+  '#90ee90',
+  '#00ced1',
+  '#1e90ff',
+  '#c71585',
+  '#409EFF',
+  '#909399',
+  '#C0C4CC',
+  '#b7390b',
+  '#ff7800',
+  '#fad400',
+  '#5b8c5f',
+  '#00babd',
+  '#1f73c3',
+  '#711f57'
+]
+const props = defineProps({
+  modelValue: propTypes.string.def('')
+})
+const emit = defineEmits(['update:modelValue'])
+const color = computed({
+  get: () => {
+    return props.modelValue
+  },
+  set: (val: string) => {
+    emit('update:modelValue', val)
+  }
+})
+</script>
+<style scoped lang="scss">
+:deep(.el-input-group__prepend) {
+  padding: 0;
+}
+</style>
--- a/src/components/DiyEditor/components/ComponentLibrary.vue
+++ b/src/components/DiyEditor/components/ComponentLibrary.vue
+<template>
+  <el-aside class="editor-left" width="260px">
+    <el-scrollbar>
+      <el-collapse v-model="extendGroups">
+        <el-collapse-item
+          v-for="group in groups"
+          :key="group.name"
+          :name="group.name"
+          :title="group.name"
+        >
+          <draggable
+            class="component-container"
+            ghost-class="draggable-ghost"
+            :list="group.components"
+            :sort="false"
+            :group="{ name: 'component', pull: 'clone', put: false }"
+            :clone="handleCloneComponent"
+            :animation="200"
+            :force-fallback="true"
+          >
+            <template #item="{ element }">
+              <div>
+                <div class="drag-placement">组件放置区域</div>
+                <div class="component">
+                  <Icon :icon="element.icon" :size="32" />
+                  <span class="mt-4px text-12px">{{ element.name }}</span>
+                </div>
+              </div>
+            </template>
+          </draggable>
+        </el-collapse-item>
+      </el-collapse>
+    </el-scrollbar>
+  </el-aside>
+</template>
+<script setup lang="ts">
+import draggable from 'vuedraggable'
+import { componentConfigs } from '../components/mobile/index'
+import { cloneDeep } from 'lodash-es'
+import { DiyComponent, DiyComponentLibrary } from '@/components/DiyEditor/util'
+/** 组件库 */
+defineOptions({ name: 'ComponentLibrary' })
+// 组件列表
+const props = defineProps<{
+  list: DiyComponentLibrary[]
+}>()
+const groups = reactive<any[]>([])
+// 展开的折叠面板
+const extendGroups = reactive<string[]>([])
+watch(
+  () => props.list,
+  () => {
+    // 清除旧数据
+    extendGroups.length = 0
+    groups.length = 0
+    // 重新生成数据
+    props.list.forEach((group) => {
+      // 是否展开分组
+      if (group.extended) {
+        extendGroups.push(group.name)
+      }
+      // 查找组件
+      const components = group.components
+        .map((name) => componentConfigs[name] as DiyComponent<any>)
+        .filter((component) => component)
+      if (components.length > 0) {
+        groups.push({
+          name: group.name,
+          components
+        })
+      }
+    })
+  },
+  {
+    immediate: true
+  }
+)
+// 克隆组件
+const handleCloneComponent = (component: DiyComponent<any>) => {
+  return cloneDeep(component)
+}
+</script>
+<style scoped lang="scss">
+.editor-left {
+  z-index: 1;
+  flex-shrink: 0;
+  box-shadow: 8px 0 8px -8px rgba(0, 0, 0, 0.12);
+  :deep(.el-collapse) {
+    border-top: none;
+  }
+  :deep(.el-collapse-item__wrap) {
+    border-bottom: none;
+  }
+  :deep(.el-collapse-item__content) {
+    padding-bottom: 0;
+  }
+  :deep(.el-collapse-item__header) {
+    border-bottom: none;
+    background-color: var(--el-bg-color-page);
+    padding: 0 24px;
+    height: 32px;
+    line-height: 32px;
+  }
+  .component-container {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+  }
+  .component {
+    width: 86px;
+    height: 86px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    border-right: 1px solid var(--el-border-color-lighter);
+    border-bottom: 1px solid var(--el-border-color-lighter);
+    cursor: move;
+    .el-icon {
+      margin-bottom: 4px;
+      color: gray;
+    }
+  }
+  .component.active,
+  .component:hover {
+    background: var(--el-color-primary);
+    color: var(--el-color-white);
+    .el-icon {
+      color: var(--el-color-white);
+    }
+  }
+  .component:nth-of-type(3n) {
+    border-right: none;
+  }
+}
+/* 拖拽占位提示，默认不显示 */
+.drag-placement {
+  display: none;
+  color: #fff;
+}
+.drag-area {
+  /* 拖拽到手机区域时的样式 */
+  .draggable-ghost {
+    width: 100%;
+    height: 40px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    /* 条纹背景 */
+    background: linear-gradient(
+      45deg,
+      #91a8d5 0,
+      #91a8d5 10%,
+      #94b4eb 10%,
+      #94b4eb 50%,
+      #91a8d5 50%,
+      #91a8d5 60%,
+      #94b4eb 60%,
+      #94b4eb
+    );
+    background-size: 1rem 1rem;
+    transition: all 0.5s;
+    span {
+      color: #fff;
+      display: inline-block;
+      width: 140px;
+      height: 25px;
+      font-size: 12px;
+      text-align: center;
+      line-height: 25px;
+      background: #5487df;
+    }
+    /* 拖拽时隐藏组件 */
+    .component {
+      display: none;
+    }
+    /* 拖拽时显示占位提示 */
+    .drag-placement {
+      display: block;
+    }
+  }
+}
+</style>
--- a/src/components/DiyEditor/components/mobile/Carousel/config.ts
+++ b/src/components/DiyEditor/components/mobile/Carousel/config.ts
+import { DiyComponent } from '@/components/DiyEditor/util'
+/** 轮播图属性 */
+export interface CarouselProperty {
+  // 选择模板
+  swiperType: number
+  // 图片圆角
+  borderRadius: number
+  // 页面边距
+  pageMargin: number
+  // 图片边距
+  imageMargin: number
+  // 分页类型
+  pagingType: 'bullets' | 'fraction' | 'progressbar'
+  // 一行个数
+  rowIndividual: number
+  // 添加图片
+  items: CarouselItemProperty[]
+}
+export interface CarouselItemProperty {
+  title: string
+  imgUrl: string
+  link: string
+}
+// 定义组件
+export const component = {
+  id: 'Carousel',
+  name: '轮播图',
+  icon: 'system-uicons:carousel',
+  property: {
+    swiperType: 0, // 选择模板
+    borderRadius: 0, // 图片圆角
+    pageMargin: 0, // 页面边距
+    imageMargin: 0, // 图片边距
+    pagingType: 'bullets', // 分页类型
+    rowIndividual: 2, // 一行个数
+    items: [
+      { imgUrl: 'https://static.iocoder.cn/mall/banner-01.jpg' },
+      { imgUrl: 'https://static.iocoder.cn/mall/banner-02.jpg' }
+    ] as CarouselItemProperty[]
+  }
+} as DiyComponent<CarouselProperty>
--- a/src/components/DiyEditor/components/mobile/Carousel/index.vue
+++ b/src/components/DiyEditor/components/mobile/Carousel/index.vue
+<template>
+  <!-- 无图片 -->
+  <div
+    class="h-250px flex items-center justify-center bg-gray-3"
+    v-if="property.items.length === 0"
+  >
+    <Icon icon="tdesign:image" class="text-gray-8 text-120px!" />
+  </div>
+  <!-- 一行一个 -->
+  <div
+    v-if="property.swiperType === 0"
+    class="flex flex-col"
+    :style="{
+      paddingLeft: property.pageMargin + 'px',
+      paddingRight: property.pageMargin + 'px'
+    }"
+  >
+    <div v-for="(item, index) in property.items" :key="index">
+      <div
+        class="img-item"
+        :style="{
+          marginBottom: property.imageMargin + 'px',
+          borderRadius: property.borderRadius + 'px'
+        }"
+      >
+        <img alt="" :src="item.imgUrl" />
+        <div v-if="item.title" class="title">{{ item.title }}</div>
+      </div>
+    </div>
+  </div>
+  <el-carousel height="174px" v-else :type="property.swiperType === 3 ? 'card' : ''">
+    <el-carousel-item v-for="(item, index) in property.items" :key="index">
+      <div class="img-item" :style="{ borderRadius: property.borderRadius + 'px' }">
+        <img alt="" :src="item.imgUrl" />
+        <div v-if="item.title" class="title">{{ item.title }}</div>
+      </div>
+    </el-carousel-item>
+  </el-carousel>
+</template>
+<script setup lang="ts">
+import { CarouselProperty } from './config'
+/** 页面顶部导航栏 */
+defineOptions({ name: 'NavigationBar' })
+const props = defineProps<{ property: CarouselProperty }>()
+</script>
+<style scoped lang="scss">
+.img-item {
+  width: 100%;
+  position: relative;
+  overflow: hidden;
+  &:last-child {
+    margin: 0 !important;
+  }
+  /* 图片 */
+  img {
+    width: 100%;
+    height: 100%;
+    display: block;
+  }
+  .title {
+    height: 36px;
+    width: 100%;
+    background-color: rgba(51, 51, 51, 0.8);
+    text-align: center;
+    line-height: 36px;
+    color: #fff;
+    position: absolute;
+    bottom: 0;
+    left: 0;
+  }
+}
+</style>
--- a/src/components/DiyEditor/components/mobile/Carousel/property.vue
+++ b/src/components/DiyEditor/components/mobile/Carousel/property.vue
+<template>
+  <el-form label-width="80px" :model="formData">
+    <el-form-item label="选择模板" prop="swiperType">
+      <el-radio-group v-model="formData.swiperType">
+        <el-tooltip class="item" content="一行一个" placement="bottom">
+          <el-radio-button :label="0">
+            <Icon icon="icon-park-twotone:multi-picture-carousel" />
+          </el-radio-button>
+        </el-tooltip>
+        <el-tooltip class="item" content="轮播海报" placement="bottom">
+          <el-radio-button :label="1">
+            <Icon icon="system-uicons:carousel" />
+          </el-radio-button>
+        </el-tooltip>
+        <el-tooltip class="item" content="多图单行" placement="bottom">
+          <el-radio-button :label="2">
+            <Icon icon="icon-park-twotone:carousel" />
+          </el-radio-button>
+        </el-tooltip>
+        <el-tooltip class="item" content="立体轮播" placement="bottom">
+          <el-radio-button :label="3">
+            <Icon icon="ic:round-view-carousel" />
+          </el-radio-button>
+        </el-tooltip>
+      </el-radio-group>
+    </el-form-item>
+    <el-text tag="p">添加图片</el-text>
+    <el-text type="info" size="small"> 拖动左上角的小圆点可对其排序 </el-text>
+    <!-- 图片广告 -->
+    <div v-if="formData.items[0]">
+      <draggable
+        :list="formData.items"
+        :force-fallback="true"
+        :animation="200"
+        handle=".drag-icon"
+        class="m-t-8px"
+      >
+        <template #item="{ element, index }">
+          <div class="mb-4px flex flex-row gap-4px rounded bg-gray-100 p-8px">
+            <div class="flex flex-col items-start justify-between">
+              <Icon icon="ic:round-drag-indicator" class="drag-icon cursor-move" />
+              <Icon
+                icon="ep:delete"
+                class="cursor-pointer text-red-5"
+                @click="handleDeleteImage(index)"
+                v-if="formData.items.length > 1"
+              />
+            </div>
+            <div class="flex flex-1 flex-col items-center justify-between gap-8px">
+              <UploadImg
+                v-model="element.imgUrl"
+                draggable="false"
+                height="80px"
+                width="100%"
+                class="min-w-80px"
+              />
+              <!-- 标题 -->
+              <el-input v-model="element.title" placeholder="标题，选填" />
+              <!-- 输入链接 -->
+              <el-input placeholder="链接，选填" v-model="element.link" />
+            </div>
+          </div>
+        </template>
+      </draggable>
+    </div>
+    <el-button @click="handleAddImage" type="primary" plain class="w-full"> 添加图片 </el-button>
+    <el-form-item label="一行个数" prop="rowIndividual" v-show="formData.swiperType === 2">
+      <!-- 单选框 -->
+      <el-radio-group v-model="formData.rowIndividual">
+        <el-radio :label="2">2个</el-radio>
+        <el-radio :label="3">3个</el-radio>
+        <el-radio :label="4">4个</el-radio>
+        <el-radio :label="5">5个</el-radio>
+        <el-radio :label="6">6个</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item label="分页类型" prop="pagingType">
+      <el-radio-group v-model="formData.pagingType">
+        <el-radio :label="0">不显示</el-radio>
+        <el-radio label="bullets">样式一</el-radio>
+        <el-radio label="fraction">样式二</el-radio>
+        <el-radio label="progressbar">样式三</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item label="图片圆角" prop="borderRadius">
+      <el-slider v-model="formData.borderRadius" :max="30" />
+    </el-form-item>
+    <el-form-item label="页面边距" prop="pageMargin" v-show="formData.swiperType === 0">
+      <el-slider v-model="formData.pageMargin" :max="20" />
+    </el-form-item>
+    <el-form-item
+      label="图片边距"
+      prop="imageMargin"
+      v-show="formData.swiperType === 0 || formData.swiperType === 2"
+    >
+      <el-slider v-model="formData.imageMargin" :max="20" />
+    </el-form-item>
+  </el-form>
+</template>
+<script setup lang="ts">
+import draggable from 'vuedraggable' //拖拽组件
+import { CarouselItemProperty, CarouselProperty } from './config'
+import { usePropertyForm } from '@/components/DiyEditor/util'
+// 轮播图属性面板
+defineOptions({ name: 'CarouselProperty' })
+const props = defineProps<{ modelValue: CarouselProperty }>()
+const emit = defineEmits(['update:modelValue'])
+const { formData } = usePropertyForm(props.modelValue, emit)
+// 添加图片
+const handleAddImage = () => {
+  formData.value.items.push({} as CarouselItemProperty)
+}
+// 删除图片
+const handleDeleteImage = (index) => {
+  formData.value.items.splice(index, 1)
+}
+</script>
+<style scoped lang="scss"></style>
--- a/src/components/DiyEditor/components/mobile/Divider/config.ts
+++ b/src/components/DiyEditor/components/mobile/Divider/config.ts
+import { DiyComponent } from '@/components/DiyEditor/util'
+/** 分割线属性 */
+export interface DividerProperty {
+  // 高度
+  height: number
+  // 线宽
+  lineWidth: number
+  // 边距类型
+  paddingType: 'none' | 'horizontal'
+  // 颜色
+  lineColor: string
+  // 类型
+  borderType: 'solid' | 'dashed' | 'dotted' | 'none'
+}
+// 定义组件
+export const component = {
+  id: 'Divider',
+  name: '分割线',
+  icon: 'tdesign:component-divider-vertical',
+  property: {
+    height: 30,
+    lineWidth: 1,
+    paddingType: 'none',
+    lineColor: '#dcdfe6',
+    borderType: 'solid'
+  }
+} as DiyComponent<DividerProperty>
--- a/src/components/DiyEditor/components/mobile/Divider/index.vue
+++ b/src/components/DiyEditor/components/mobile/Divider/index.vue
+<template>
+  <div
+    class="flex items-center"
+    :style="{
+      height: property.height + 'px'
+    }"
+  >
+    <div
+      class="w-full"
+      :style="{
+        borderTopStyle: property.borderType,
+        borderTopColor: property.lineColor,
+        borderTopWidth: `${property.lineWidth}px`,
+        margin: property.paddingType === 'none' ? '0' : '0px 16px'
+      }"
+    ></div>
+  </div>
+</template>
+<script setup lang="ts">
+import { DividerProperty } from './config'
+/** 页面顶部导航栏 */
+defineOptions({ name: 'Divider' })
+defineProps<{ property: DividerProperty }>()
+</script>
+<style scoped lang="scss"></style>
--- a/src/components/DiyEditor/components/mobile/Divider/property.vue
+++ b/src/components/DiyEditor/components/mobile/Divider/property.vue
+<template>
+  <el-form label-width="80px" :model="formData">
+    <el-form-item label="高度" prop="height">
+      <el-slider v-model="formData.height" :min="1" :max="100" show-input input-size="small" />
+    </el-form-item>
+    <el-form-item label="选择样式" prop="borderType">
+      <el-radio-group v-model="formData!.borderType">
+        <el-tooltip
+          placement="top"
+          v-for="(item, index) in BORDER_TYPES"
+          :key="index"
+          :content="item.text"
+        >
+          <el-radio-button :label="item.type">
+            <Icon :icon="item.icon" />
+          </el-radio-button>
+        </el-tooltip>
+      </el-radio-group>
+    </el-form-item>
+    <template v-if="formData.borderType !== 'none'">
+      <el-form-item label="线宽" prop="lineWidth">
+        <el-slider v-model="formData.lineWidth" :min="1" :max="30" show-input input-size="small" />
+      </el-form-item>
+      <el-form-item label="左右边距" prop="paddingType">
+        <el-radio-group v-model="formData!.paddingType">
+          <el-tooltip content="无边距" placement="top">
+            <el-radio-button label="none">
+              <Icon icon="tabler:box-padding" />
+            </el-radio-button>
+          </el-tooltip>
+          <el-tooltip content="左右留边" placement="top">
+            <el-radio-button label="horizontal">
+              <Icon icon="vaadin:padding" />
+            </el-radio-button>
+          </el-tooltip>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="颜色">
+        <!-- 分割线颜色 -->
+        <ColorInput v-model="formData.lineColor" />
+      </el-form-item>
+    </template>
+  </el-form>
+</template>
+<script setup lang="ts">
+import { DividerProperty } from './config'
+import { usePropertyForm } from '@/components/DiyEditor/util'
+// 导航栏属性面板
+defineOptions({ name: 'DividerProperty' })
+const props = defineProps<{ modelValue: DividerProperty }>()
+const emit = defineEmits(['update:modelValue'])
+const { formData } = usePropertyForm(props.modelValue, emit)
+//线类型
+const BORDER_TYPES = [
+  {
+    icon: 'vaadin:line-h',
+    text: '实线',
+    type: 'solid'
+  },
+  {
+    icon: 'tabler:line-dashed',
+    text: '虚线',
+    type: 'dashed'
+  },
+  {
+    icon: 'tabler:line-dotted',
+    text: '点线',
+    type: 'dotted'
+  },
+  {
+    icon: 'entypo:progress-empty',
+    text: '无',
+    type: 'none'
+  }
+]
+</script>
+<style scoped lang="scss"></style>
--- a/src/components/DiyEditor/components/mobile/NavigationBar/config.ts
+++ b/src/components/DiyEditor/components/mobile/NavigationBar/config.ts
+import { DiyComponent } from '@/components/DiyEditor/util'
+/** 顶部导航栏属性 */
+export interface NavigationBarProperty {
+  // 页面标题
+  title: string
+  // 页面描述
+  description: string
+  // 顶部导航高度
+  navBarHeight: number
+  // 页面背景颜色
+  backgroundColor: string
+  // 页面背景图片
+  backgroundImage: string
+  // 样式类型：默认 | 沉浸式
+  styleType: 'default' | 'immersion'
+  // 常驻显示
+  alwaysShow: boolean
+  // 是否显示返回按钮
+  showGoBack: boolean
+}
+// 定义组件
+export const component = {
+  id: 'NavigationBar',
+  name: '顶部导航栏',
+  icon: 'tabler:layout-navbar',
+  property: {
+    title: '页面标题',
+    description: '',
+    navBarHeight: 35,
+    backgroundColor: '#f5f5f5',
+    backgroundImage: '',
+    styleType: 'default',
+    alwaysShow: true,
+    showGoBack: true
+  }
+} as DiyComponent<NavigationBarProperty>
--- a/src/components/DiyEditor/components/mobile/NavigationBar/index.vue
+++ b/src/components/DiyEditor/components/mobile/NavigationBar/index.vue
+<template>
+  <div
+    class="navigation-bar"
+    :style="{
+      height: `${property.navBarHeight}px`,
+      backgroundColor: property.backgroundColor,
+      backgroundImage: `url(${property.backgroundImage})`
+    }"
+  >
+    <!-- 左侧 -->
+    <div class="left">
+      <Icon icon="ep:arrow-left" v-show="property.showGoBack" />
+    </div>
+    <!-- 中间 -->
+    <div
+      class="center"
+      :style="{
+        height: `${property.navBarHeight}px`,
+        lineHeight: `${property.navBarHeight}px`
+      }"
+    >
+      {{ property.title }}
+    </div>
+    <!-- 右侧 -->
+    <div class="right"></div>
+  </div>
+</template>
+<script setup lang="ts">
+import { NavigationBarProperty } from './config'
+/** 页面顶部导航栏 */
+defineOptions({ name: 'NavigationBar' })
+defineProps<{ property: NavigationBarProperty }>()
+</script>
+<style lang="scss" scoped>
+.navigation-bar {
+  height: 35px;
+  background: #fff;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  cursor: pointer;
+  /* 左边 */
+  .left {
+    margin-left: 8px;
+  }
+  .center {
+    flex: 1;
+    text-align: center;
+    font-size: 14px;
+    line-height: 35px;
+    color: #333333;
+  }
+  /* 右边 */
+  .right {
+    margin-right: 8px;
+  }
+}
+</style>
--- a/src/components/DiyEditor/components/mobile/NavigationBar/property.vue
+++ b/src/components/DiyEditor/components/mobile/NavigationBar/property.vue
+<template>
+  <el-form label-width="80px" :model="formData" :rules="rules">
+    <el-form-item label="页面标题" prop="title">
+      <el-input v-model="formData!.title" placeholder="页面标题" maxlength="25" show-word-limit />
+    </el-form-item>
+    <el-form-item label="页面描述" prop="description">
+      <el-input
+        type="textarea"
+        v-model="formData!.description"
+        placeholder="用户通过微信分享给朋友时，会自动显示页面描述"
+      />
+    </el-form-item>
+    <el-form-item label="样式" prop="styleType">
+      <el-radio-group v-model="formData!.styleType">
+        <el-radio label="default">默认</el-radio>
+        <el-radio label="immersion">沉浸式</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item label="常驻显示" prop="alwaysShow" v-if="formData.styleType === 'immersion'">
+      <el-radio-group v-model="formData!.alwaysShow">
+        <el-radio :label="false">关闭</el-radio>
+        <el-radio :label="true">开启</el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item label="高度" prop="navBarHeight">
+      <el-slider
+        v-model="formData!.navBarHeight"
+        :max="100"
+        :min="35"
+        show-input
+        input-size="small"
+      />
+    </el-form-item>
+    <el-form-item label="返回按钮" prop="showGoBack">
+      <el-switch v-model="formData!.showGoBack" />
+    </el-form-item>
+    <el-form-item label="背景颜色" prop="backgroundColor">
+      <ColorInput v-model="formData!.backgroundColor" />
+    </el-form-item>
+    <el-form-item label="背景图片" prop="backgroundImage">
+      <UploadImg v-model="formData!.backgroundImage" :limit="1">
+        <template #tip>建议宽度 750px</template>
+      </UploadImg>
+    </el-form-item>
+  </el-form>
+</template>
+<script setup lang="ts">
+import { NavigationBarProperty } from './config'
+import { usePropertyForm } from '@/components/DiyEditor/util'
+// 导航栏属性面板
+defineOptions({ name: 'NavigationBarProperty' })
+// 表单校验
+const rules = {
+  name: [{ required: true, message: '请输入页面名称', trigger: 'blur' }]
+}
+const props = defineProps<{ modelValue: NavigationBarProperty }>()
+const emit = defineEmits(['update:modelValue'])
+const { formData } = usePropertyForm(props.modelValue, emit)
+</script>
+<style scoped lang="scss"></style>
--- a/src/components/DiyEditor/components/mobile/NoticeBar/config.ts
+++ b/src/components/DiyEditor/components/mobile/NoticeBar/config.ts
+import { DiyComponent } from '@/components/DiyEditor/util'
+/** 公告栏属性 */
+export interface NoticeBarProperty {
+  // 图标地址
+  iconUrl: string
+  // 公告内容列表
+  contents: NoticeContentProperty[]
+  // 背景颜色
+  backgroundColor: string
+  // 文字颜色
+  textColor: string
+}
+/** 内容属性 */
+export interface NoticeContentProperty {
+  // 内容文字
+  text: string
+  // 链接地址
+  url: string
+}
+// 定义组件
+export const component = {
+  id: 'NoticeBar',
+  name: '公告栏',
+  icon: 'ep:bell',
+  property: {
+    iconUrl: 'http://mall.yudao.iocoder.cn/static/images/xinjian.png',
+    contents: [
+      {
+        text: '',
+        url: ''
+      }
+    ],
+    backgroundColor: '#fff',
+    textColor: '#333'
+  }
+} as DiyComponent<NoticeBarProperty>
--- a/src/components/DiyEditor/components/mobile/NoticeBar/index.vue
+++ b/src/components/DiyEditor/components/mobile/NoticeBar/index.vue
+<template>
+  <div
+    class="flex items-center text-12px"
+    :style="{ backgroundColor: property.backgroundColor, color: property.textColor }"
+  >
+    <el-image :src="property.iconUrl" class="h-18px" />
+    <el-divider direction="vertical" />
+    <el-carousel height="24px" direction="vertical" :autoplay="true" class="flex-1 p-r-8px">
+      <el-carousel-item v-for="(item, index) in property.contents" :key="index">
+        <div class="h-24px truncate leading-24px">{{ item.text }}</div>
+      </el-carousel-item>
+    </el-carousel>
+    <Icon icon="ep:arrow-right" />
+  </div>
+</template>
+<script setup lang="ts">
+import { NoticeBarProperty } from './config'
+/** 公告栏 */
+defineOptions({ name: 'NoticeBar' })
+defineProps<{ property: NoticeBarProperty }>()
+</script>
+<style scoped lang="scss"></style>
--- a/src/components/DiyEditor/components/mobile/NoticeBar/property.vue
+++ b/src/components/DiyEditor/components/mobile/NoticeBar/property.vue
+<template>
+  <el-form label-width="80px" :model="formData" :rules="rules">
+    <el-form-item label="公告图标" prop="iconUrl">
+      <UploadImg v-model="formData.iconUrl" height="48px">
+        <template #tip>建议尺寸：24 * 24</template>
+      </UploadImg>
+    </el-form-item>
+    <el-form-item label="背景颜色" prop="backgroundColor">
+      <ColorInput v-model="formData.backgroundColor" />
+    </el-form-item>
+    <el-form-item label="文字颜色" prop="文字颜色">
+      <ColorInput v-model="formData.textColor" />
+    </el-form-item>
+    <el-text tag="p"> 公告内容 </el-text>
+    <el-text type="info" size="small"> 拖动左上角的小圆点可以调整热词顺序 </el-text>
+    <template v-if="formData.contents.length">
+      <VueDraggable
+        :list="formData.contents"
+        item-key="index"
+        handle=".drag-icon"
+        :forceFallback="true"
+        :animation="200"
+        class="m-t-8px"
+      >
+        <template #item="{ element, index }">
+          <div class="mb-4px flex flex-row gap-4px rounded bg-gray-100 p-8px">
+            <div class="flex flex-col items-start justify-between">
+              <Icon icon="ic:round-drag-indicator" class="drag-icon cursor-move" />
+              <Icon
+                icon="ep:delete"
+                class="cursor-pointer text-red-5"
+                @click="handleDeleteContent(index)"
+                v-if="formData.contents.length > 1"
+              />
+            </div>
+            <div class="w-full flex flex-col gap-8px">
+              <el-input v-model="element.text" placeholder="请输入公告" />
+              <el-input v-model="element.url" placeholder="请输入链接" />
+            </div>
+          </div>
+        </template>
+      </VueDraggable>
+    </template>
+    <el-form-item label-width="0">
+      <el-button @click="handleAddContent" type="primary" plain class="m-t-8px w-full">
+        添加内容
+      </el-button>
+    </el-form-item>
+  </el-form>
+</template>
+<script setup lang="ts">
+import { NoticeBarProperty, NoticeContentProperty } from './config'
+import { usePropertyForm } from '@/components/DiyEditor/util'
+import VueDraggable from 'vuedraggable'
+// 通知栏属性面板
+defineOptions({ name: 'NoticeBarProperty' })
+// 表单校验
+const rules = {
+  content: [{ required: true, message: '请输入公告', trigger: 'blur' }]
+}
+const props = defineProps<{ modelValue: NoticeBarProperty }>()
+const emit = defineEmits(['update:modelValue'])
+const { formData } = usePropertyForm(props.modelValue, emit)
+/* 添加公告 */
+const handleAddContent = () => {
+  formData.value.contents.push({} as NoticeContentProperty)
+}
+/* 删除公告 */
+const handleDeleteContent = (index: number) => {
+  formData.value.contents.splice(index, 1)
+}
+</script>
+<style scoped lang="scss"></style>
--- a/src/components/DiyEditor/components/mobile/PageConfig/config.ts
+++ b/src/components/DiyEditor/components/mobile/PageConfig/config.ts
+import { DiyComponent } from '@/components/DiyEditor/util'
+/** 页面设置属性 */
+export interface PageConfigProperty {
+  // 页面描述
+  description: string
+  // 页面背景颜色
+  backgroundColor: string
+  // 页面背景图片
+  backgroundImage: string
+}
+// 定义页面组件
+export const component = {
+  id: 'PageConfig',
+  name: '页面设置',
+  icon: 'ep:document',
+  property: {
+    description: '',
+    backgroundColor: '#f5f5f5',
+    backgroundImage: ''
+  }
+} as DiyComponent<PageConfigProperty>
--- a/src/components/DiyEditor/components/mobile/PageConfig/property.vue
+++ b/src/components/DiyEditor/components/mobile/PageConfig/property.vue
+<template>
+  <el-form label-width="80px" :model="formData" :rules="rules">
+    <el-form-item label="页面描述" prop="description">
+      <el-input
+        type="textarea"
+        v-model="formData!.description"
+        placeholder="用户通过微信分享给朋友时，会自动显示页面描述"
+      />
+    </el-form-item>
+    <el-form-item label="背景颜色" prop="backgroundColor">
+      <ColorInput v-model="formData!.backgroundColor" />
+    </el-form-item>
+    <el-form-item label="背景图片" prop="backgroundImage">
+      <UploadImg v-model="formData!.backgroundImage" :limit="1">
+        <template #tip>建议宽度 750px</template>
+      </UploadImg>
+    </el-form-item>
+  </el-form>
+</template>
+<script setup lang="ts">
+import { PageConfigProperty } from './config'
+import { usePropertyForm } from '@/components/DiyEditor/util'
+// 导航栏属性面板
+defineOptions({ name: 'PageConfigProperty' })
+// 表单校验
+const rules = {}
+const props = defineProps<{ modelValue: PageConfigProperty }>()
+const emit = defineEmits(['update:modelValue'])
+const { formData } = usePropertyForm(props.modelValue, emit)
+</script>
+<style scoped lang="scss"></style>
--- a/src/components/DiyEditor/components/mobile/SearchBar/config.ts
+++ b/src/components/DiyEditor/components/mobile/SearchBar/config.ts
+import { DiyComponent } from '@/components/DiyEditor/util'
+/** 搜索框属性 */
+export interface SearchProperty {
+  height: number // 搜索栏高度
+  showScan: boolean // 显示扫一扫
+  borderRadius: number // 框体样式
+  placeholder: string // 占位文字
+  placeholderPosition: PlaceholderPosition // 占位文字位置
+  backgroundColor: string // 背景颜色
+  borderColor: string // 框体颜色
+  textColor: string // 字体颜色
+  hotKeywords: string[] // 热词
+}
+// 文字位置
+export type PlaceholderPosition = 'left' | 'center'
+// 定义组件
+export const component = {
+  id: 'SearchBar',
+  name: '搜索框',
+  icon: 'ep:search',
+  property: {
+    height: 28,
+    showScan: false,
+    borderRadius: 0,
+    placeholder: '搜索商品',
+    placeholderPosition: 'left',
+    backgroundColor: 'rgb(249, 249, 249)',
+    borderColor: 'rgb(255, 255, 255)',
+    textColor: 'rgb(150, 151, 153)',
+    hotKeywords: []
+  }
+} as DiyComponent<SearchProperty>
--- a/src/components/DiyEditor/components/mobile/SearchBar/index.vue
+++ b/src/components/DiyEditor/components/mobile/SearchBar/index.vue
+<template>
+  <div
+    class="search-bar"
+    :style="{
+      background: property.backgroundColor,
+      border: `1px solid ${property.backgroundColor}`,
+      color: property.textColor
+    }"
+  >
+    <!-- 搜索框 -->
+    <div
+      class="inner"
+      :style="{
+        height: `${property.height}px`,
+        background: property.borderColor,
+        borderRadius: `${property.borderRadius}px`
+      }"
+    >
+      <div
+        class="placeholder"
+        :style="{
+          justifyContent: property.placeholderPosition
+        }"
+      >
+        <Icon icon="ep:search" />
+        <span>{{ property.placeholder || '搜索商品' }}</span>
+      </div>
+      <div class="right">
+        <!-- 搜索热词 -->
+        <span v-for="(keyword, index) in property.hotKeywords" :key="index">{{ keyword }}</span>
+        <!-- 扫一扫 -->
+        <Icon icon="ant-design:scan-outlined" v-show="property.showScan" />
+      </div>
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import { SearchProperty } from './config'
+/** 搜索框 */
+defineOptions({ name: 'SearchBar' })
+defineProps<{ property: SearchProperty }>()
+</script>
+<style scoped lang="scss">
+.search-bar {
+  position: relative;
+  /* 搜索框 */
+  .inner {
+    position: relative;
+    width: calc(100% - 16px);
+    min-height: 28px;
+    margin: 5px auto;
+    display: flex;
+    align-items: center;
+    font-size: 14px;
+    .placeholder {
+      display: flex;
+      align-items: center;
+      width: 100%;
+      padding: 0 8px;
+      gap: 2px;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      word-break: break-all;
+      white-space: nowrap;
+    }
+    .right {
+      position: absolute;
+      right: 8px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 8px;
+    }
+  }
+}
+</style>
--- a/src/components/DiyEditor/components/mobile/SearchBar/property.vue
+++ b/src/components/DiyEditor/components/mobile/SearchBar/property.vue
+<template>
+  <el-text tag="p"> 搜索热词 </el-text>
+  <el-text type="info" size="small"> 拖动左侧的小圆点可以调整热词顺序 </el-text>
+  <!-- 表单 -->
+  <el-form label-width="80px" :model="formData" class="m-t-8px">
+    <div v-if="formData.hotKeywords.length">
+      <VueDraggable
+        :list="formData.hotKeywords"
+        item-key="index"
+        handle=".drag-icon"
+        :forceFallback="true"
+        :animation="200"
+      >
+        <template #item="{ index }">
+          <div class="mb-4px flex flex-row items-center gap-4px rounded bg-gray-100 p-8px">
+            <Icon icon="ic:round-drag-indicator" class="drag-icon cursor-move" />
+            <el-input v-model="formData.hotKeywords[index]" placeholder="请输入热词" />
+            <Icon icon="ep:delete" class="text-red-500" @click="deleteHotWord(index)" />
+          </div>
+        </template>
+      </VueDraggable>
+    </div>
+    <el-form-item label-width="0">
+      <el-button @click="handleAddHotWord" type="primary" plain class="m-t-8px w-full">
+        添加热词
+      </el-button>
+    </el-form-item>
+    <el-form-item label="框体样式">
+      <el-radio-group v-model="formData!.borderRadius">
+        <el-tooltip content="方形" placement="top">
+          <el-radio-button :label="0">
+            <Icon icon="tabler:input-search" />
+          </el-radio-button>
+        </el-tooltip>
+        <el-tooltip content="圆形" placement="top">
+          <el-radio-button :label="10">
+            <Icon icon="iconoir:input-search" />
+          </el-radio-button>
+        </el-tooltip>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item label="提示文字" prop="placeholder">
+      <el-input v-model="formData.placeholder" />
+    </el-form-item>
+    <el-form-item label="文本位置" prop="placeholderPosition">
+      <el-radio-group v-model="formData!.placeholderPosition">
+        <el-tooltip content="居左" placement="top">
+          <el-radio-button label="left">
+            <Icon icon="ant-design:align-left-outlined" />
+          </el-radio-button>
+        </el-tooltip>
+        <el-tooltip content="居中" placement="top">
+          <el-radio-button label="center">
+            <Icon icon="ant-design:align-center-outlined" />
+          </el-radio-button>
+        </el-tooltip>
+      </el-radio-group>
+    </el-form-item>
+    <el-form-item label="扫一扫" prop="showScan">
+      <el-switch v-model="formData!.showScan" />
+    </el-form-item>
+    <el-form-item label="框体高度" prop="height">
+      <el-slider v-model="formData!.height" :max="50" :min="28" show-input input-size="small" />
+    </el-form-item>
+    <el-form-item label="背景颜色" prop="backgroundColor">
+      <ColorInput v-model="formData.backgroundColor" />
+    </el-form-item>
+    <el-form-item label="框体颜色" prop="borderColor">
+      <ColorInput v-model="formData.borderColor" />
+    </el-form-item>
+    <el-form-item class="lef" label="文本颜色" prop="textColor">
+      <ColorInput v-model="formData.textColor" />
+    </el-form-item>
+  </el-form>
+</template>
+<script setup lang="ts">
+import VueDraggable from 'vuedraggable'
+import { usePropertyForm } from '@/components/DiyEditor/util'
+import { SearchProperty } from '@/components/DiyEditor/components/mobile/SearchBar/config'
+/** 搜索框属性面板 */
+defineOptions({ name: 'SearchProperty' })
+const props = defineProps<{ modelValue: SearchProperty }>()
+const emit = defineEmits(['update:modelValue'])
+const { formData } = usePropertyForm(props.modelValue, emit)
+/* 添加热词 */
+const handleAddHotWord = () => {
+  formData.value.hotKeywords.push('')
+}
+/* 删除热词 */
+const deleteHotWord = (index: number) => {
+  formData.value.hotKeywords.splice(index, 1)
+}
+</script>
+<style scoped lang="scss"></style>
--- a/src/components/DiyEditor/components/mobile/TabBar/config.ts
+++ b/src/components/DiyEditor/components/mobile/TabBar/config.ts
+import { DiyComponent } from '@/components/DiyEditor/util'
+/** 底部导航菜单属性 */
+export interface TabBarProperty {
+  // 选项列表
+  items: TabBarItemProperty[]
+  // 主题
+  theme: string
+  // 样式
+  style: TabBarStyle
+}
+// 选项属性
+export interface TabBarItemProperty {
+  name: string // 标签名称
+  link: string // 链接
+  iconUrl: string // 默认图标链接
+  activeIconUrl: string // 选中的图标链接
+}
+// 样式
+export interface TabBarStyle {
+  // 背景类型
+  backgroundType: 'color' | 'img'
+  // 背景颜色 或 图片链接
+  background: string
+  // 默认颜色
+  color: string
+  // 选中的颜色
+  activeColor: string
+}
+// 定义组件
+export const component = {
+  id: 'TabBar',
+  name: '底部导航',
+  icon: 'fluent:table-bottom-row-16-filled',
+  property: {
+    theme: 'red',
+    style: {
+      backgroundType: 'color',
+      background: '#fff',
+      color: '#282828',
+      activeColor: '#fc4141'
+    },
+    items: [
+      {
+        name: '首页',
+        link: '/',
+        iconUrl: 'http://mall.yudao.iocoder.cn/static/images/1-001.png',
+        activeIconUrl: 'http://mall.yudao.iocoder.cn/static/images/1-002.png'
+      },
+      {
+        name: '分类',
+        link: '/pages/goods_cate/goods_cate',
+        iconUrl: 'http://mall.yudao.iocoder.cn/static/images/2-001.png',
+        activeIconUrl: 'http://mall.yudao.iocoder.cn/static/images/2-002.png'
+      },
+      {
+        name: '购物车',
+        link: '/pages/order_addcart/order_addcart',
+        iconUrl: 'http://mall.yudao.iocoder.cn/static/images/3-001.png',
+        activeIconUrl: 'http://mall.yudao.iocoder.cn/static/images/3-002.png'
+      },
+      {
+        name: '我的',
+        link: '/pages/user/index',
+        iconUrl: 'http://mall.yudao.iocoder.cn/static/images/4-001.png',
+        activeIconUrl: 'http://mall.yudao.iocoder.cn/static/images/4-002.png'
+      }
+    ]
+  }
+} as DiyComponent<TabBarProperty>
+export const THEME_LIST = [
+  { id: 'red', name: '中国红', icon: 'icon-park-twotone:theme', color: '#d10019' },
+  { id: 'orange', name: '桔橙', icon: 'icon-park-twotone:theme', color: '#f37b1d' },
+  { id: 'gold', name: '明黄', icon: 'icon-park-twotone:theme', color: '#fbbd08' },
+  { id: 'green', name: '橄榄绿', icon: 'icon-park-twotone:theme', color: '#8dc63f' },
+  { id: 'cyan', name: '天青', icon: 'icon-park-twotone:theme', color: '#1cbbb4' },
+  { id: 'blue', name: '海蓝', icon: 'icon-park-twotone:theme', color: '#0081ff' },
+  { id: 'purple', name: '姹紫', icon: 'icon-park-twotone:theme', color: '#6739b6' },
+  { id: 'brightRed', name: '嫣红', icon: 'icon-park-twotone:theme', color: '#e54d42' },
+  { id: 'forestGreen', name: '森绿', icon: 'icon-park-twotone:theme', color: '#39b54a' },
+  { id: 'mauve', name: '木槿', icon: 'icon-park-twotone:theme', color: '#9c26b0' },
+  { id: 'pink', name: '桃粉', icon: 'icon-park-twotone:theme', color: '#e03997' },
+  { id: 'brown', name: '棕褐', icon: 'icon-park-twotone:theme', color: '#a5673f' },
+  { id: 'grey', name: '玄灰', icon: 'icon-park-twotone:theme', color: '#8799a3' },
+  { id: 'gray', name: '草灰', icon: 'icon-park-twotone:theme', color: '#aaaaaa' },
+  { id: 'black', name: '墨黑', icon: 'icon-park-twotone:theme', color: '#333333' }
+]
--- a/src/components/DiyEditor/components/mobile/TabBar/index.vue
+++ b/src/components/DiyEditor/components/mobile/TabBar/index.vue
+<template>
+  <div class="tab-bar">
+    <div
+      class="tab-bar-bg"
+      :style="{
+        background:
+          property.style.backgroundType === 'color'
+            ? property.style.background
+            : `url(${property.style.background})`,
+        backgroundSize: '100% 100%',
+        backgroundRepeat: 'no-repeat'
+      }"
+    >
+      <div v-for="(item, index) in property.items" :key="index" class="tab-bar-item">
+        <img :src="index === 0 ? item.activeIconUrl : item.iconUrl" alt="" />
+        <span :style="{ color: index === 0 ? property.style.activeColor : property.style.color }">
+          {{ item.name }}
+        </span>
+      </div>
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import { TabBarProperty } from './config'
+/** 页面底部导航栏 */
+defineOptions({ name: 'TabBar' })
+defineProps<{ property: TabBarProperty }>()
+</script>
+<style lang="scss" scoped>
+.tab-bar {
+  width: 100%;
+  z-index: 2;
+  .tab-bar-bg {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: space-around;
+    padding: 8px 0;
+    .tab-bar-item {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      font-size: 12px;
+      width: 100%;
+      img {
+        width: 26px;
+        height: 26px;
+        border-radius: 4px;
+      }
+    }
+  }
+}
+</style>
--- a/src/components/DiyEditor/components/mobile/TabBar/property.vue
+++ b/src/components/DiyEditor/components/mobile/TabBar/property.vue
+<template>
+  <div class="tab-bar">
+    <!-- 表单 -->
+    <el-form :model="formData" label-width="80px">
+      <el-form-item label="主题">
+        <el-select v-model="formData!.theme" @change="handleThemeChange">
+          <el-option
+            v-for="(theme, index) in THEME_LIST"
+            :key="index"
+            :label="theme.name"
+            :value="theme.id"
+          >
+            <template #default>
+              <div class="flex items-center justify-between">
+                <Icon :icon="theme.icon" :color="theme.color" />
+                <span>{{ theme.name }}</span>
+              </div>
+            </template>
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="默认颜色">
+        <ColorInput v-model="formData!.style.color" />
+      </el-form-item>
+      <el-form-item label="选中颜色">
+        <ColorInput v-model="formData!.style.activeColor" />
+      </el-form-item>
+      <el-form-item label="导航背景">
+        <el-radio-group
+          v-model="formData!.style.backgroundType"
+          @change="handleBackgroundTypeChange"
+        >
+          <el-radio-button label="color">纯色</el-radio-button>
+          <el-radio-button label="img">图片</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="选择颜色" v-if="formData!.style.backgroundType === 'color'">
+        <ColorInput v-model="formData!.style.background" />
+      </el-form-item>
+      <el-form-item label="选择图片" v-if="formData!.style.backgroundType === 'img'">
+        <UploadImg
+          v-model="formData!.style.background"
+          width="100%"
+          height="50px"
+          class="min-w-200px"
+        >
+          <template #tip> 建议尺寸 375 * 50 </template>
+        </UploadImg>
+      </el-form-item>
+      <el-text tag="p">图标设置</el-text>
+      <el-text type="info" size="small"> 拖动左上角的小圆点可对其排序, 图标建议尺寸 44*44 </el-text>
+      <draggable
+        :list="formData!.items"
+        item-key="index"
+        :forceFallback="true"
+        :animation="200"
+        handle=".drag-icon"
+        class="m-t-8px"
+      >
+        <template #item="{ element, index }">
+          <div class="mb-4px flex flex-row gap-4px rounded bg-gray-100 p-8px">
+            <div class="flex flex-col items-start justify-between">
+              <Icon icon="ic:round-drag-indicator" class="drag-icon cursor-move" />
+              <Icon
+                icon="ep:delete"
+                class="cursor-pointer text-red-5"
+                @click="handleDeleteItem(index)"
+                v-if="formData.items.length > 1"
+              />
+            </div>
+            <div class="w-full flex flex-col">
+              <div class="m-b-8px flex items-center justify-around">
+                <div class="flex flex-col items-center justify-between">
+                  <UploadImg
+                    v-model="element.iconUrl"
+                    width="40px"
+                    height="40px"
+                    :show-delete="false"
+                    :show-btn-text="false"
+                  />
+                  <el-text size="small">默认图片</el-text>
+                </div>
+                <div>
+                  <UploadImg
+                    v-model="element.activeIconUrl"
+                    width="40px"
+                    height="40px"
+                    :show-delete="false"
+                    :show-btn-text="false"
+                  />
+                  <el-text>选中图片</el-text>
+                </div>
+              </div>
+              <el-form-item draggable="false" label-width="0" class="m-b-8px!">
+                <el-input v-model="element.name" placeholder="请输入文字" />
+              </el-form-item>
+              <el-form-item draggable="false" label-width="0" class="m-b-0!">
+                <el-input v-model="element.link" placeholder="请选择链接" />
+              </el-form-item>
+            </div>
+          </div>
+        </template>
+      </draggable>
+      <el-form-item label-width="0">
+        <!-- 添加导航按钮 -->
+        <el-tooltip content="最多添加5个">
+          <el-button
+            @click="handleAddItem"
+            class="m-b-16px w-full"
+            type="primary"
+            plain
+            :disabled="formData!.items.length >= 5"
+          >
+            添加导航
+          </el-button>
+        </el-tooltip>
+      </el-form-item>
+    </el-form>
+  </div>
+</template>
+<script setup lang="ts">
+import draggable from 'vuedraggable' //拖拽组件
+import { TabBarItemProperty, TabBarProperty, THEME_LIST } from './config'
+import { usePropertyForm } from '@/components/DiyEditor/util'
+// 底部导航栏
+defineOptions({ name: 'TabBarProperty' })
+const props = defineProps<{ modelValue: TabBarProperty }>()
+const emit = defineEmits(['update:modelValue'])
+const { formData } = usePropertyForm(props.modelValue, emit)
+// 缓存背景：当背景类型切换时，防止参数丢失
+const backgroundCache = ref('')
+const handleBackgroundTypeChange = () => {
+  const background = formData.value!.style.background
+  formData.value!.style.background = backgroundCache.value
+  backgroundCache.value = background
+}
+/** 添加导航项 */
+const handleAddItem = () => {
+  formData?.value?.items?.push({} as TabBarItemProperty)
+}
+/** 删除导航项 */
+const handleDeleteItem = (index: number) => {
+  formData?.value?.items?.splice(index, 1)
+}
+// 要的主题
+const handleThemeChange = () => {
+  const theme = THEME_LIST.find((theme) => theme.id === formData.value.theme)
+  if (theme?.color) {
+    formData.value.style.activeColor = theme.color
+  }
+}
+</script>
+<style lang="scss" scoped></style>
--- a/src/components/DiyEditor/components/mobile/TitleBar/config.ts
+++ b/src/components/DiyEditor/components/mobile/TitleBar/config.ts
+import { DiyComponent } from '@/components/DiyEditor/util'
+/** 标题栏属性 */
+export interface TitleBarProperty {
+  // 主标题
+  title: string
+  // 副标题
+  description: string
+  // 标题大小
+  titleSize: number
+  // 描述大小
+  descriptionSize: number
+  // 标题粗细
+  titleWeight: number
+  // 显示位置
+  position: 'left' | 'center'
+  // 描述粗细
+  descriptionWeight: number
+  // 标题颜色
+  titleColor: string
+  // 描述颜色
+  descriptionColor: string
+  // 背景颜色
+  backgroundColor: string
+  // 底部分割线
+  showBottomBorder: false
+  // 查看更多
+  more: {
+    // 是否显示查看更多
+    show: false
+    // 样式选择
+    type: 'text' | 'icon' | 'all'
+    // 自定义文字
+    text: string
+    // 链接
+    url: string
+  }
+}
+// 定义组件
+export const component = {
+  id: 'TitleBar',
+  name: '标题栏',
+  icon: 'material-symbols:line-start',
+  property: {
+    title: '主标题',
+    description: '副标题',
+    titleSize: 16,
+    descriptionSize: 12,
+    titleWeight: 400,
+    position: 'left',
+    descriptionWeight: 200,
+    titleColor: 'rgba(50, 50, 51, 10)',
+    descriptionColor: 'rgba(150, 151, 153, 10)',
+    backgroundColor: 'rgba(255, 255, 255, 10)',
+    showBottomBorder: false,
+    more: {
+      //查看更多
+      show: false,
+      type: 'icon',
+      text: '查看更多',
+      url: ''
+    }
+  }
+} as DiyComponent<TitleBarProperty>
--- a/src/components/DiyEditor/components/mobile/TitleBar/index.vue
+++ b/src/components/DiyEditor/components/mobile/TitleBar/index.vue
+<template>
+  <div
+    class="title-bar"
+    :style="{
+      background: property.backgroundColor,
+      borderBottom: property.showBottomBorder ? '1px solid #F9F9F9' : '1px solid #fff'
+    }"
+  >
+    <div>
+      <!-- 标题 -->
+      <div
+        :style="{
+          fontSize: `${property.titleSize}px`,
+          fontWeight: property.titleWeight,
+          color: property.titleColor,
+          textAlign: property.position
+        }"
+        v-if="property.title"
+      >
+        {{ property.title }}
+      </div>
+      <!-- 副标题 -->
+      <div
+        :style="{
+          fontSize: `${property.descriptionSize}px`,
+          fontWeight: property.descriptionWeight,
+          color: property.descriptionColor,
+          textAlign: property.position
+        }"
+        class="m-t-8px"
+        v-if="property.description"
+      >
+        {{ property.description }}
+      </div>
+    </div>
+    <!-- 更多 -->
+    <div
+      class="more"
+      v-show="property.more.show"
+      :style="{
+        color: property.more.type === 'text' ? '#38f' : ''
+      }"
+    >
+      {{ property.more.type === 'icon' ? '' : property.more.text }}
+      <Icon icon="ep:arrow-right" v-if="property.more.type !== 'text'" />
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import { TitleBarProperty } from './config'
+/** 标题栏 */
+defineOptions({ name: 'TitleBar' })
+defineProps<{ property: TitleBarProperty }>()
+</script>
+<style scoped lang="scss">
+.title-bar {
+  border: 2px solid #fff;
+  box-sizing: border-box;
+  width: 100%;
+  padding: 8px 16px;
+  min-height: 20px;
+  position: relative;
+  /* 更多 */
+  .more {
+    position: absolute;
+    right: 8px;
+    top: 0;
+    bottom: 0;
+    margin: auto;
+    font-size: 10px;
+    color: #969799;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+}
+</style>
--- a/src/components/DiyEditor/components/mobile/TitleBar/property.vue
+++ b/src/components/DiyEditor/components/mobile/TitleBar/property.vue
+<template>
+  <section class="title-bar">
+    <el-form label-width="85px" :model="formData" :rules="rules">
+      <el-form-item label="主标题" prop="title">
+        <el-input
+          v-model="formData.title"
+          placeholder="请输入主标题"
+          show-word-limit
+          maxlength="20"
+        />
+      </el-form-item>
+      <el-form-item label="副标题" prop="description">
+        <el-input
+          type="textarea"
+          v-model="formData.description"
+          placeholder="请输入副标题"
+          maxlength="50"
+          show-word-limit
+        />
+      </el-form-item>
+      <el-form-item label="显示位置" prop="position">
+        <el-radio-group v-model="formData!.position">
+          <el-tooltip content="居左" placement="top">
+            <el-radio-button label="left">
+              <Icon icon="ant-design:align-left-outlined" />
+            </el-radio-button>
+          </el-tooltip>
+          <el-tooltip content="居中" placement="top">
+            <el-radio-button label="center">
+              <Icon icon="ant-design:align-center-outlined" />
+            </el-radio-button>
+          </el-tooltip>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="标题大小" prop="titleSize">
+        <el-slider v-model="formData.titleSize" :max="60" :min="10" show-input input-size="small" />
+      </el-form-item>
+      <el-form-item label="副标题大小" prop="descriptionSize">
+        <el-slider
+          v-model="formData.descriptionSize"
+          :max="60"
+          :min="10"
+          show-input
+          input-size="small"
+        />
+      </el-form-item>
+      <el-form-item label="标题粗细" prop="titleWeight">
+        <el-slider
+          v-model="formData.titleWeight"
+          :min="100"
+          :max="900"
+          :step="100"
+          show-input
+          input-size="small"
+        />
+      </el-form-item>
+      <el-form-item label="副标题粗细" prop="descriptionWeight">
+        <el-slider
+          v-model="formData.descriptionWeight"
+          :min="100"
+          :max="900"
+          :step="100"
+          show-input
+          input-size="small"
+        />
+      </el-form-item>
+      <el-form-item label="标题颜色" prop="titleColor">
+        <ColorInput v-model="formData.titleColor" />
+      </el-form-item>
+      <el-form-item label="副标题颜色" prop="descriptionColor">
+        <ColorInput v-model="formData.descriptionColor" />
+      </el-form-item>
+      <el-form-item label="背景颜色" prop="backgroundColor">
+        <ColorInput v-model="formData.backgroundColor" />
+      </el-form-item>
+      <el-form-item label="底部分割线" prop="showBottomBorder">
+        <el-switch v-model="formData!.showBottomBorder" />
+      </el-form-item>
+      <el-form-item label="查看更多" prop="more.show">
+        <el-checkbox v-model="formData.more.show" />
+      </el-form-item>
+      <!-- 更多样式选择 -->
+      <template v-if="formData.more.show">
+        <el-form-item label="样式" prop="more.type">
+          <el-radio-group v-model="formData.more.type">
+            <el-radio label="text">文字</el-radio>
+            <el-radio label="icon">图标</el-radio>
+            <el-radio label="all">文字+图标</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="更多文字" prop="more.text" v-show="formData.more.type !== 'icon'">
+          <el-input v-model="formData.more.text" />
+        </el-form-item>
+        <el-form-item label="跳转链接" prop="more.url">
+          <el-input v-model="formData.more.url" placeholder="请输入跳转链接" />
+        </el-form-item>
+      </template>
+    </el-form>
+  </section>
+</template>
+<script setup lang="ts">
+import { TitleBarProperty } from './config'
+import { usePropertyForm } from '@/components/DiyEditor/util'
+// 导航栏属性面板
+defineOptions({ name: 'TitleBarProperty' })
+const props = defineProps<{ modelValue: TitleBarProperty }>()
+const emit = defineEmits(['update:modelValue'])
+const { formData } = usePropertyForm(props.modelValue, emit)
+// 表单校验
+const rules = {}
+</script>
+<style scoped lang="scss"></style>
--- a/src/components/DiyEditor/components/mobile/index.ts
+++ b/src/components/DiyEditor/components/mobile/index.ts
+/*
+ * 组件注册
+ *
+ * 组件规范：
+ * 1. 每个子目录就是一个独立的组件，每个目录包括以下三个文件：
+ * 2. config.ts：组件配置，必选，用于定义组件、组件默认的属性、定义属性的类型
+ * 3. index.vue：组件展示，用于展示组件的渲染效果。可以不提供，如 Page（页面设置），只需要属性配置表单即可
+ * 4. property.vue：组件属性表单，用于配置组件，必选，
+ *
+ * 注：
+ * 组件ID以config.ts中配置的id为准，与组件目录的名称无关，但还是建议组件目录的名称与组件ID保持一致
+ */
+// 导入组件界面模块
+const viewModules: Record<string, any> = import.meta.glob('./*/*.vue')
+// 导入配置模块
+const configModules: Record<string, any> = import.meta.glob('./*/config.ts', { eager: true })
+// 界面模块
+const components = {}
+// 组件配置模块
+const componentConfigs = {}
+// 组件界面的类型
+type ViewType = 'index' | 'property'
+/**
+ * 注册组件的界面模块
+ *
+ * @param componentId 组件ID
+ * @param configPath 配置模块的文件路径
+ * @param viewType 组件界面的类型
+ */
+const registerComponentViewModule = (
+  componentId: string,
+  configPath: string,
+  viewType: ViewType
+) => {
+  const viewPath = configPath.replace('config.ts', `${viewType}.vue`)
+  const viewModule = viewModules[viewPath]
+  if (viewModule) {
+    // 定义异步组件
+    components[componentId] = defineAsyncComponent(viewModule)
+  }
+}
+// 注册
+Object.keys(configModules).forEach((modulePath: string) => {
+  const component = configModules[modulePath].component
+  const componentId = component?.id
+  if (componentId) {
+    // 注册组件
+    componentConfigs[componentId] = component
+    // 注册预览界面
+    registerComponentViewModule(componentId, modulePath, 'index')
+    // 注册属性配置表单
+    registerComponentViewModule(`${componentId}Property`, modulePath, 'property')
+  }
+})
+export { components, componentConfigs }
--- a/src/components/DiyEditor/index.vue
+++ b/src/components/DiyEditor/index.vue
--- a/src/components/DiyEditor/util.ts
+++ b/src/components/DiyEditor/util.ts
+import { ref, Ref } from 'vue'
+import { PageConfigProperty } from '@/components/DiyEditor/components/mobile/PageConfig/config'
+import { NavigationBarProperty } from '@/components/DiyEditor/components/mobile/NavigationBar/config'
+import { TabBarProperty } from '@/components/DiyEditor/components/mobile/TabBar/config'
+export interface DiyComponent<T> {
+  id: string
+  name: string
+  icon: string
+  property: T
+}
+export interface DiyComponentLibrary {
+  name: string
+  extended: boolean
+  components: string[]
+}
+// 页面配置
+export interface PageConfig {
+  // 页面属性
+  page: PageConfigProperty
+  // 顶部导航栏属性
+  navigationBar: NavigationBarProperty
+  // 底部导航菜单属性
+  tabBar: TabBarProperty
+  // 页面组件列表
+  components: PageComponent[]
+}
+// 页面组件，只保留组件ID，组件属性
+export interface PageComponent extends Pick<DiyComponent<any>, 'id' | 'property'> {}
+// 属性表单监听
+export function usePropertyForm<T>(modelValue: T, emit: Function): { formData: Ref<T> } {
+  const formData = ref<T>()
+  // 监听属性数据变动
+  watch(
+    () => modelValue,
+    () => {
+      formData.value = modelValue
+    },
+    {
+      deep: true,
+      immediate: true
+    }
+  )
+  // 监听表单数据变动
+  watch(
+    () => formData.value,
+    () => {
+      emit('update:modelValue', formData.value)
+    },
+    {
+      deep: true
+    }
+  )
+  return { formData }
+}
--- a/src/components/UploadFile/src/UploadImg.vue
+++ b/src/components/UploadFile/src/UploadImg.vue
@@ -18,15 +18,15 @@
        <div class="upload-handle" @click.stop>
          <div class="handle-icon" @click="editImg">
            <Icon icon="ep:edit" />
-            <span>{{ t('action.edit') }}</span>
+            <span v-if="showBtnText">{{ t('action.edit') }}</span>
          </div>
          <div class="handle-icon" @click="imgViewVisible = true">
            <Icon icon="ep:zoom-in" />
-            <span>{{ t('action.detail') }}</span>
+            <span v-if="showBtnText">{{ t('action.detail') }}</span>
          </div>
-          <div class="handle-icon" @click="deleteImg">
+          <div class="handle-icon" @click="deleteImg" v-if="showDelete">
            <Icon icon="ep:delete" />
-            <span>{{ t('action.del') }}</span>
+            <span v-if="showBtnText">{{ t('action.del') }}</span>
          </div>
        </div>
      </template>
@@ -81,7 +81,11 @@ const props = defineProps({
  fileType: propTypes.array.def(['image/jpeg', 'image/png', 'image/gif']), // 图片类型限制 ==> 非必传（默认为 ["image/jpeg", "image/png", "image/gif"]）
  height: propTypes.string.def('150px'), // 组件高度 ==> 非必传（默认为 150px）
  width: propTypes.string.def('150px'), // 组件宽度 ==> 非必传（默认为 150px）
-  borderradius: propTypes.string.def('8px') // 组件边框圆角 ==> 非必传（默认为 8px）
+  borderradius: propTypes.string.def('8px'), // 组件边框圆角 ==> 非必传（默认为 8px）
+  // 是否显示删除按钮
+  showDelete: propTypes.bool.def(true),
+  // 是否显示按钮文字
+  showBtnText: propTypes.bool.def(true)
 })
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗

--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -459,6 +459,34 @@ const remainingRouter: AppRouteRecordRaw[] = [
        component: () => import('@/views/pay/cashier/index.vue')
      }
    ]
+  },
+  {
+    path: '/diy',
+    name: 'DiyCenter',
+    meta: { hidden: true },
+    component: Layout,
+    children: [
+      {
+        path: 'template/decorate/:id',
+        name: 'DiyTemplateDecorate',
+        meta: {
+          title: '模板装修',
+          noCache: true,
+          hidden: true
+        },
+        component: () => import('@/views/mall/promotion/diy/template/decorate.vue')
+      },
+      {
+        path: 'page/decorate/:id',
+        name: 'DiyPageDecorate',
+        meta: {
+          title: '页面装修',
+          noCache: true,
+          hidden: true
+        },
+        component: () => import('@/views/mall/promotion/diy/page/decorate.vue')
+      }
+    ]
  }
 ]

--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -190,5 +190,8 @@ export enum DICT_TYPE {
  // ========== CRM - 客户管理模块 ==========
  CRM_RECEIVABLE_CHECK_STATUS = 'crm_receivable_check_status',
-  CRM_RETURN_TYPE = 'crm_return_type'
+  CRM_RETURN_TYPE = 'crm_return_type',
+  CRM_CUSTOMER_INDUSTRY = 'crm_customer_industry',
+  CRM_CUSTOMER_LEVEL = 'crm_customer_level',
+  CRM_CUSTOMER_SOURCE = 'crm_customer_source'
 }
--- a/src/views/Login/components/MobileForm.vue
+++ b/src/views/Login/components/MobileForm.vue
@@ -102,6 +102,7 @@ import { usePermissionStore } from '@/store/modules/permission'
 import { getTenantIdByName, sendSmsCode, smsLogin } from '@/api/login'
 import LoginFormTitle from './LoginFormTitle.vue'
 import { LoginStateEnum, useFormValid, useLoginState } from './useLogin'
+import { ElLoading } from 'element-plus'
 defineOptions({ name: 'MobileForm' })

--- a/src/views/crm/clue/ClueForm.vue
+++ b/src/views/crm/clue/ClueForm.vue
@@ -7,28 +7,6 @@
      label-width="100px"
      v-loading="formLoading"
    >
-      <el-form-item label="转化状态" prop="transformStatus">
-        <el-radio-group v-model="formData.transformStatus">
-          <el-radio
-            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-            :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="跟进状态" prop="followUpStatus">
-        <el-radio-group v-model="formData.followUpStatus">
-          <el-radio
-            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-            :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
      <el-form-item label="线索名称" prop="name">
        <el-input v-model="formData.name" placeholder="请输入线索名称" />
      </el-form-item>
@@ -80,8 +58,6 @@ const formLoading = ref(false) // 表单的加载中：1）修改时的数据加
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
  id: undefined,
-  transformStatus: undefined,
-  followUpStatus: undefined,
  name: undefined,
  customerId: undefined,
  contactNextTime: undefined,
@@ -93,10 +69,8 @@ const formData = ref({
  remark: undefined
 })
 const formRules = reactive({
-  transformStatus: [{ required: true, message: '转化状态不能为空', trigger: 'blur' }],
-  followUpStatus: [{ required: true, message: '跟进状态不能为空', trigger: 'blur' }],
  name: [{ required: true, message: '线索名称不能为空', trigger: 'blur' }],
-  customerId: [{ required: true, message: '客户id不能为空', trigger: 'blur' }]
+  customerId: [{ required: true, message: '客户不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
@@ -148,8 +122,6 @@ const submitForm = async () => {
 const resetForm = () => {
  formData.value = {
    id: undefined,
-    transformStatus: undefined,
-    followUpStatus: undefined,
    name: undefined,
    customerId: undefined,
    contactNextTime: undefined,

--- a/src/views/crm/clue/index.vue
+++ b/src/views/crm/clue/index.vue
@@ -8,36 +8,6 @@
      :inline="true"
      label-width="68px"
    >
-      <el-form-item label="转化状态" prop="transformStatus">
-        <el-select
-          v-model="queryParams.transformStatus"
-          placeholder="请选择转化状态"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="跟进状态" prop="followUpStatus">
-        <el-select
-          v-model="queryParams.followUpStatus"
-          placeholder="请选择跟进状态"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
      <el-form-item label="线索名称" prop="name">
        <el-input
          v-model="queryParams.name"
@@ -47,26 +17,6 @@
          class="!w-240px"
        />
      </el-form-item>
-      <el-form-item label="客户id" prop="customerId">
-        <el-input
-          v-model="queryParams.customerId"
-          placeholder="请输入客户id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="下次联系时间" prop="contactNextTime">
-        <el-date-picker
-          v-model="queryParams.contactNextTime"
-          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"
-        />
-      </el-form-item>
      <el-form-item label="电话" prop="telephone">
        <el-input
          v-model="queryParams.telephone"
@@ -85,46 +35,6 @@
          class="!w-240px"
        />
      </el-form-item>
-      <el-form-item label="地址" prop="address">
-        <el-input
-          v-model="queryParams.address"
-          placeholder="请输入地址"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="负责人" prop="ownerUserId">
-        <el-input
-          v-model="queryParams.ownerUserId"
-          placeholder="请输入负责人"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="最后跟进时间" prop="contactLastTime">
-        <el-date-picker
-          v-model="queryParams.contactLastTime"
-          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"
-        />
-      </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"
-        />
-      </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>
@@ -238,17 +148,9 @@ const list = ref([]) // 列表的数据
 const queryParams = reactive({
  pageNo: 1,
  pageSize: 10,
-  transformStatus: null,
-  followUpStatus: null,
  name: null,
-  customerId: null,
-  contactNextTime: [],
  telephone: null,
-  mobile: null,
+  mobile: null
-  address: null,
-  ownerUserId: null,
-  contactLastTime: [],
-  createTime: []
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中

--- a/src/views/crm/contract/index.vue
+++ b/src/views/crm/contract/index.vue
@@ -166,7 +166,7 @@ import download from '@/utils/download'
 import * as ContractApi from '@/api/crm/contract'
 import ContractForm from './ContractForm.vue'
-defineOptions({ name: 'Contract' })
+defineOptions({ name: 'CrmContract' })
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化

--- a/src/views/crm/customer/CustomerForm.vue
+++ b/src/views/crm/customer/CustomerForm.vue
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-row>
+        <!-- TODO @wanwan：name 参数校验，必填 -->
+        <el-form-item label="客户名称" prop="name">
+          <el-input v-model="formData.name" placeholder="请输入客户名称" />
+        </el-form-item>
+        <el-form-item label="所属行业" prop="industryId">
+          <el-select v-model="formData.industryId" placeholder="请选择所属行业">
+            <el-option
+              v-for="dict in getStrDictOptions(DICT_TYPE.CRM_CUSTOMER_INDUSTRY)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-form-item label="客户来源" prop="source">
+          <el-select v-model="formData.source" placeholder="请选择客户来源">
+            <el-option
+              v-for="dict in getStrDictOptions(DICT_TYPE.CRM_CUSTOMER_SOURCE)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="客户等级" prop="level">
+          <el-select v-model="formData.level" placeholder="请选择客户等级">
+            <el-option
+              v-for="dict in getStrDictOptions(DICT_TYPE.CRM_CUSTOMER_LEVEL)"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-form-item label="手机" prop="mobile">
+          <el-input v-model="formData.mobile" placeholder="请输入手机" />
+        </el-form-item>
+        <el-form-item label="电话" prop="telephone">
+          <el-input v-model="formData.telephone" placeholder="请输入电话" />
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-form-item label="邮箱" prop="email">
+          <el-input v-model="formData.email" placeholder="请输入邮箱" />
+        </el-form-item>
+        <el-form-item label="QQ" prop="qq">
+          <el-input v-model="formData.qq" placeholder="请输入QQ" />
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-form-item label="微信" prop="wechat">
+          <el-input v-model="formData.wechat" placeholder="请输入微信" />
+        </el-form-item>
+        <el-form-item label="网址" prop="website">
+          <el-input v-model="formData.website" placeholder="请输入网址" />
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <!-- TODO @wanwan：地区的多级选择，可以参考 UserForm.vue 的 所在地 areaId -->
+        <el-form-item label="地区编号" prop="areaId">
+          <el-input v-model="formData.areaId" placeholder="请输入地区编号" />
+        </el-form-item>
+        <el-form-item label="详细地址" prop="detailAddress">
+          <el-input v-model="formData.detailAddress" placeholder="请输入详细地址" />
+        </el-form-item>
+      </el-row>
+      <!-- TODO @wanwan： 少一个负责人字段，默认先选中自己；可以先参考 TaskAssignRuleForm.vue 的 formData.userIds；注意，新增的时候，可以选择；修改的时候，只展示 -->
+      <el-row>
+        <el-form-item label="下次联系时间" prop="contactNextTime">
+          <el-date-picker
+            v-model="formData.contactNextTime"
+            type="date"
+            value-format="x"
+            placeholder="选择下次联系时间"
+          />
+        </el-form-item>
+      </el-row>
+      <el-form-item label="客户描述" prop="description">
+        <el-input v-model="formData.description" placeholder="请输入客户描述" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import * as CustomerApi from '@/api/crm/customer'
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: undefined,
+  mobile: undefined,
+  industryId: undefined,
+  level: undefined,
+  source: undefined,
+  telephone: undefined,
+  website: undefined,
+  qq: undefined,
+  wechat: undefined,
+  email: undefined,
+  description: undefined,
+  remark: undefined,
+  areaId: undefined,
+  detailAddress: undefined,
+  contactNextTime: undefined
+})
+const formRules = reactive({
+  name: [{ require: true, message: '客户名称不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await CustomerApi.getCustomer(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as CustomerApi.CustomerVO
+    if (formType.value === 'create') {
+      await CustomerApi.createCustomer(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await CustomerApi.updateCustomer(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    mobile: undefined,
+    industryId: undefined,
+    level: undefined,
+    source: undefined,
+    telephone: undefined,
+    website: undefined,
+    qq: undefined,
+    wechat: undefined,
+    email: undefined,
+    description: undefined,
+    remark: undefined,
+    areaId: undefined,
+    detailAddress: undefined,
+    contactNextTime: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
--- a/src/views/crm/customer/index.vue
+++ b/src/views/crm/customer/index.vue
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <!-- TODO @wanwan：看看怎么表单可以对齐一点； -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="客户名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入客户名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="手机" prop="mobile">
+        <el-input
+          v-model="queryParams.mobile"
+          placeholder="请输入手机"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <!-- TODO @wanwan：筛选字段，加所属行业、客户等级、客户来源 -->
+      <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 type="primary" @click="openForm('create')" v-hasPermi="['crm:customer:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['crm:customer:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+  <!-- 列表 -->
+  <!-- TODO @wanwan：列表，按照 docs 的再改下 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="客户名称" align="center" prop="name" width="160" />
+      <el-table-column label="所属行业" align="center" prop="industryId" width="120">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_INDUSTRY" :value="scope.row.industryId" />
+        </template>
+      </el-table-column>
+      <el-table-column label="客户来源" align="center" prop="source" width="100">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_SOURCE" :value="scope.row.source" />
+        </template>
+      </el-table-column>
+      <el-table-column label="客户等级" align="center" prop="level" width="120">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="scope.row.level" />
+        </template>
+      </el-table-column>
+      <el-table-column label="手机" align="center" prop="mobile" width="120" />
+      <el-table-column label="详细地址" align="center" prop="detailAddress" width="200" />
+      <!--  TODO @Wanwan 负责人回显，所属部门，创建人    -->
+      <el-table-column label="负责人" align="center" prop="ownerUserId" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="成交状态" align="center" prop="dealStatus">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.dealStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="下次联系时间"
+        align="center"
+        prop="contactNextTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column
+        label="最后跟进时间"
+        align="center"
+        prop="contactLastTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="锁定状态" align="center" prop="lockStatus">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.lockStatus" />
+        </template>
+      </el-table-column>
+      <!--  TODO @wanwan 距进入公海天数    -->
+      <!-- TODO @wanwan：操作要 fixed 再右侧哈； -->
+      <el-table-column label="操作" align="center" width="160">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['crm:customer:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['crm:customer:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+  <!-- 表单弹窗：添加/修改 -->
+  <CustomerForm ref="formRef" @success="getList" />
+</template>
+<script setup lang="ts">
+import { DICT_TYPE, getBoolDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as CustomerApi from '@/api/crm/customer'
+import CustomerForm from './CustomerForm.vue'
+defineOptions({ name: 'CrmCustomer' })
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: null,
+  mobile: null
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await CustomerApi.getCustomerPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await CustomerApi.deleteCustomer(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await CustomerApi.exportCustomer(queryParams)
+    download.excel(data, '客户.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
--- a/src/views/mall/promotion/banner/BannerForm.vue
+++ b/src/views/mall/promotion/banner/BannerForm.vue
@@ -9,12 +9,12 @@
    >
      <el-row>
        <el-col :span="24">
-          <el-form-item label="Banner标题" prop="title">
+          <el-form-item label="标题" prop="title">
-            <el-input v-model="formData.title" placeholder="请输入Banner标题" />
+            <el-input v-model="formData.title" placeholder="请输入 Banner 标题" />
          </el-form-item>
        </el-col>
        <el-col :span="24">
-          <el-form-item label="图片">
+          <el-form-item label="图片" prop="picUrl">
            <UploadImg v-model="formData.picUrl" />
          </el-form-item>
        </el-col>
@@ -42,7 +42,7 @@
          </el-form-item>
        </el-col>
        <el-col :span="24">
-          <el-form-item label="定位" prop="position">
+          <el-form-item label="位置" prop="position">
            <el-radio-group v-model="formData.position">
              <el-radio
                v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_BANNER_POSITION)"
@@ -89,9 +89,11 @@ const formData = ref({
  memo: undefined
 })
 const formRules = reactive({
-  title: [{ required: true, message: 'Banner标题不能为空', trigger: 'blur' }],
+  title: [{ required: true, message: 'Banner 标题不能为空', trigger: 'blur' }],
-  picUrl: [{ required: true, message: '图片URL不能为空', trigger: 'blur' }],
+  picUrl: [{ required: true, message: '图片 URL 不能为空', trigger: 'blur' }],
  status: [{ required: true, message: '活动状态不能为空', trigger: 'blur' }],
+  position: [{ required: true, message: '位置不能为空', trigger: 'blur' }],
+  sort: [{ required: true, message: '排序不能为空', trigger: 'blur' }],
  url: [{ required: true, message: '跳转地址不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref

--- a/src/views/mall/promotion/diy/page/DiyPageForm.vue
+++ b/src/views/mall/promotion/diy/page/DiyPageForm.vue
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="页面名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入页面名称" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+      <el-form-item label="预览图" prop="previewImageUrls">
+        <UploadImgs v-model="formData.previewImageUrls" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as DiyPageApi from '@/api/mall/promotion/diy/page'
+/** 装修页面表单 */
+defineOptions({ name: 'DiyPageForm' })
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: undefined,
+  remark: undefined,
+  previewImageUrls: []
+})
+const formRules = reactive({
+  name: [{ required: true, message: '页面名称不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      const diyPage = await DiyPageApi.getDiyPage(id) // 处理预览图
+      if (diyPage?.previewImageUrls?.length > 0) {
+        diyPage.previewImageUrls = diyPage.previewImageUrls.map((url: string) => {
+          return { url }
+        })
+      }
+      formData.value = diyPage
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    // 处理预览图
+    const previewImageUrls = formData.value.previewImageUrls.map((item) => {
+      return item['url'] ? item['url'] : item
+    })
+    const data = { ...formData.value, previewImageUrls } as unknown as DiyPageApi.DiyPageVO
+    if (formType.value === 'create') {
+      await DiyPageApi.createDiyPage(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await DiyPageApi.updateDiyPage(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    remark: undefined,
+    previewImageUrls: []
+  }
+  formRef.value?.resetFields()
+}
+</script>
--- a/src/views/mall/promotion/diy/page/decorate.vue
+++ b/src/views/mall/promotion/diy/page/decorate.vue
+<template>
+  <DiyEditor
+    v-if="formData && !formLoading"
+    v-model="formData.property"
+    :title="formData.name"
+    :libs="componentLibs"
+    :show-navigation-bar="true"
+    :show-tab-bar="false"
+    @save="submitForm"
+  />
+</template>
+<script setup lang="ts">
+import * as DiyPageApi from '@/api/mall/promotion/diy/page'
+import { useTagsViewStore } from '@/store/modules/tagsView'
+import { DiyComponentLibrary } from '@/components/DiyEditor/util'
+/** 装修页面表单 */
+defineOptions({ name: 'DiyPageDecorate' })
+// 组件库
+const componentLibs = [
+  {
+    name: '基础组件',
+    extended: true,
+    components: [
+      'SearchBar',
+      'NoticeBar',
+      'GridNavigation',
+      'ListNavigation',
+      'Divider',
+      'TitleBar'
+    ]
+  },
+  { name: '图文组件', extended: true, components: ['Carousel'] },
+  { name: '商品组件', extended: true, components: ['ProductCard'] },
+  {
+    name: '会员组件',
+    extended: true,
+    components: ['UserCard', 'OrderCard', 'WalletCard', 'CouponCard']
+  },
+  { name: '营销组件', extended: true, components: ['Combination', 'Seckill', 'Point', 'Coupon'] }
+] as DiyComponentLibrary[]
+const message = useMessage() // 消息弹窗
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref<DiyPageApi.DiyPageVO>()
+const formRef = ref() // 表单 Ref
+// 获取详情
+const getPageDetail = async (id: any) => {
+  formLoading.value = true
+  try {
+    formData.value = await DiyPageApi.getDiyPage(id)
+  } finally {
+    formLoading.value = false
+  }
+}
+// 提交表单
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    await DiyPageApi.updateDiyPage(unref(formData)!)
+    message.success('保存成功')
+  } finally {
+    formLoading.value = false
+  }
+}
+// 重置表单
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    templateId: undefined,
+    name: '',
+    remark: '',
+    previewImageUrls: [],
+    property: ''
+  } as DiyPageApi.DiyPageVO
+  formRef.value?.resetFields()
+}
+/** 初始化 **/
+const { currentRoute } = useRouter() // 路由
+const { delView } = useTagsViewStore() // 视图操作
+const route = useRoute()
+onMounted(() => {
+  resetForm()
+  if (!route.params.id) {
+    message.warning('参数错误，页面编号不能为空！')
+    delView(unref(currentRoute))
+    return
+  }
+  getPageDetail(route.params.id)
+})
+</script>
--- a/src/views/mall/promotion/diy/page/index.vue
+++ b/src/views/mall/promotion/diy/page/index.vue
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="页面名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入页面名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </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"
+        />
+      </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
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['promotion:diy-page:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="预览图" align="center" prop="previewImageUrls">
+        <template #default="scope">
+          <el-image
+            class="h-40px max-w-40px"
+            v-for="(url, index) in scope.row.previewImageUrls"
+            :key="index"
+            :src="url"
+            :preview-src-list="scope.row.previewImageUrls"
+            :initial-index="index"
+            preview-teleported
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="页面名称" align="center" prop="name" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="handleDecorate(scope.row.id)"
+            v-hasPermi="['promotion:diy-page:update']"
+          >
+            装修
+          </el-button>
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['promotion:diy-page:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['promotion:diy-page:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+  <!-- 表单弹窗：添加/修改 -->
+  <DiyPageForm ref="formRef" @success="getList" />
+</template>
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import * as DiyPageApi from '@/api/mall/promotion/diy/page'
+import DiyPageForm from './DiyPageForm.vue'
+/** 装修页面 */
+defineOptions({ name: 'DiyPage' })
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: null,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await DiyPageApi.getDiyPagePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await DiyPageApi.deleteDiyPage(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+/** 打开装修页面 */
+const { push } = useRouter()
+const handleDecorate = (id: number) => {
+  push({ name: 'DiyPageDecorate', params: { id } })
+}
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
--- a/src/views/mall/promotion/diy/template/DiyTemplateForm.vue
+++ b/src/views/mall/promotion/diy/template/DiyTemplateForm.vue
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="模板名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入模板名称" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" type="textarea" />
+      </el-form-item>
+      <el-form-item label="预览图" prop="previewImageUrls">
+        <UploadImgs v-model="formData.previewImageUrls" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import * as DiyTemplateApi from '@/api/mall/promotion/diy/template'
+/** 装修模板表单 */
+defineOptions({ name: 'DiyTemplateForm' })
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  name: undefined,
+  remark: undefined,
+  previewImageUrls: []
+})
+const formRules = reactive({
+  name: [{ required: true, message: '模板名称不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      const diyTemplate = await DiyTemplateApi.getDiyTemplate(id)
+      // 处理预览图
+      if (diyTemplate?.previewImageUrls?.length > 0) {
+        diyTemplate.previewImageUrls = diyTemplate.previewImageUrls.map((url: string) => {
+          return { url }
+        })
+      }
+      formData.value = diyTemplate
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    // 处理预览图
+    const previewImageUrls = formData.value.previewImageUrls.map((item) => {
+      return item['url'] ? item['url'] : item
+    })
+    const data = { ...formData.value, previewImageUrls } as unknown as DiyTemplateApi.DiyTemplateVO
+    if (formType.value === 'create') {
+      await DiyTemplateApi.createDiyTemplate(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await DiyTemplateApi.updateDiyTemplate(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    remark: undefined,
+    previewImageUrls: []
+  }
+  formRef.value?.resetFields()
+}
+</script>
--- a/src/views/mall/promotion/diy/template/decorate.vue
+++ b/src/views/mall/promotion/diy/template/decorate.vue
+<template>
+  <DiyEditor
+    v-if="formData && !formLoading"
+    v-model="formData.property"
+    :title="templateItems[selectedTemplateItem].name"
+    :libs="libs"
+    :show-tab-bar="selectedTemplateItem === 0"
+    :show-navigation-bar="selectedTemplateItem > 0"
+    @save="submitForm"
+  >
+    <template #toolBarLeft>
+      <el-radio-group
+        v-model="selectedTemplateItem"
+        class="h-full!"
+        @change="handleTemplateItemChange"
+      >
+        <el-tooltip v-for="(item, index) in templateItems" :key="index" :content="item.name">
+          <el-radio-button :label="index">
+            <Icon :icon="item.icon" :size="24" />
+          </el-radio-button>
+        </el-tooltip>
+      </el-radio-group>
+    </template>
+  </DiyEditor>
+</template>
+<script setup lang="ts">
+import * as DiyTemplateApi from '@/api/mall/promotion/diy/template'
+import { useTagsViewStore } from '@/store/modules/tagsView'
+import { DiyComponentLibrary } from '@/components/DiyEditor/util'
+/** 装修模板表单 */
+defineOptions({ name: 'DiyTemplateDecorate' })
+// 左上角工具栏操作按钮
+const selectedTemplateItem = ref(0)
+const templateItems = reactive([
+  { name: '基础设置', icon: 'ep:iphone' },
+  { name: '首页', icon: 'ep:home-filled' },
+  { name: '我的', icon: 'ep:user-filled' }
+])
+const message = useMessage() // 消息弹窗
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref<DiyTemplateApi.DiyTemplateVO>()
+const formRef = ref() // 表单 Ref
+// 获取详情
+const getPageDetail = async (id: any) => {
+  formLoading.value = true
+  try {
+    formData.value = await DiyTemplateApi.getDiyTemplate(id)
+  } finally {
+    formLoading.value = false
+  }
+}
+// 模板组件库
+const templateLibs = [] as DiyComponentLibrary[]
+// 页面组件库
+const pageLibs = [
+  {
+    name: '基础组件',
+    extended: true,
+    components: [
+      'SearchBar',
+      'NoticeBar',
+      'GridNavigation',
+      'ListNavigation',
+      'Divider',
+      'TitleBar'
+    ]
+  },
+  { name: '图文组件', extended: true, components: ['Carousel'] },
+  { name: '商品组件', extended: true, components: ['ProductCard'] },
+  {
+    name: '会员组件',
+    extended: true,
+    components: ['UserCard', 'OrderCard', 'WalletCard', 'CouponCard']
+  },
+  { name: '营销组件', extended: true, components: ['Combination', 'Seckill', 'Point', 'Coupon'] }
+] as DiyComponentLibrary[]
+// 当前组件库
+const libs = ref<DiyComponentLibrary[]>(templateLibs)
+const handleTemplateItemChange = () => {
+  if (selectedTemplateItem.value === 0) {
+    libs.value = templateLibs
+  } else {
+    libs.value = pageLibs
+  }
+}
+// 提交表单
+const submitForm = async () => {
+  // 校验表单
+  if (!formRef) return
+  // 提交请求
+  formLoading.value = true
+  try {
+    await DiyTemplateApi.updateDiyTemplate(unref(formData)!)
+    message.success('保存成功')
+  } finally {
+    formLoading.value = false
+  }
+}
+// 重置表单
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: '',
+    used: false,
+    usedTime: undefined,
+    remark: '',
+    previewImageUrls: [],
+    property: ''
+  } as DiyTemplateApi.DiyTemplateVO
+  formRef.value?.resetFields()
+}
+/** 初始化 **/
+const { currentRoute } = useRouter() // 路由
+const { delView } = useTagsViewStore() // 视图操作
+const route = useRoute()
+onMounted(() => {
+  resetForm()
+  if (!route.params.id) {
+    message.warning('参数错误，页面编号不能为空！')
+    delView(unref(currentRoute))
+    return
+  }
+  getPageDetail(route.params.id)
+})
+</script>
--- a/src/views/mall/promotion/diy/template/index.vue
+++ b/src/views/mall/promotion/diy/template/index.vue
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="模板名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入模板名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </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"
+        />
+      </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
+          type="primary"
+          plain
+          @click="openForm('create')"
+          v-hasPermi="['promotion:diy-template:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="编号" align="center" prop="id" />
+      <el-table-column label="预览图" align="center" prop="previewImageUrls">
+        <template #default="scope">
+          <el-image
+            class="h-40px max-w-40px"
+            v-for="(url, index) in scope.row.previewImageUrls"
+            :key="index"
+            :src="url"
+            :preview-src-list="scope.row.previewImageUrls"
+            :initial-index="index"
+            preview-teleported
+          />
+        </template>
+      </el-table-column>
+      <el-table-column label="模板名称" align="center" prop="name" />
+      <el-table-column label="是否使用" align="center" prop="used">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.used" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="使用时间"
+        align="center"
+        prop="usedTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center" width="200">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="handleDecorate(scope.row.id)"
+            v-hasPermi="['promotion:diy-template:update']"
+          >
+            装修
+          </el-button>
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['promotion:diy-template:update']"
+          >
+            编辑
+          </el-button>
+          <template v-if="!scope.row.used">
+            <el-button
+              link
+              type="primary"
+              @click="handleUse(scope.row)"
+              v-hasPermi="['promotion:diy-template:use']"
+            >
+              使用
+            </el-button>
+            <el-button
+              link
+              type="danger"
+              @click="handleDelete(scope.row.id)"
+              v-hasPermi="['promotion:diy-template:delete']"
+            >
+              删除
+            </el-button>
+          </template>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+  <!-- 表单弹窗：添加/修改 -->
+  <DiyTemplateForm ref="formRef" @success="getList" />
+</template>
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import * as DiyTemplateApi from '@/api/mall/promotion/diy/template'
+import DiyTemplateForm from './DiyTemplateForm.vue'
+import { DICT_TYPE } from '@/utils/dict'
+/** 装修模板 */
+defineOptions({ name: 'DiyTemplate' })
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: null,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await DiyTemplateApi.getDiyTemplatePage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await DiyTemplateApi.deleteDiyTemplate(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+/** 使用模板 */
+const handleUse = async (row: DiyTemplateApi.DiyTemplateVO) => {
+  try {
+    // 使用模板的二次确认
+    await message.confirm(`是否使用模板“${row.name}”?`)
+    // 发起删除
+    await DiyTemplateApi.useDiyTemplate(row.id)
+    message.success('使用成功')
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+/** 打开装修页面 */
+const { push } = useRouter()
+const handleDecorate = (id: number) => {
+  push({ name: 'DiyTemplateDecorate', params: { id } })
+}
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
--- a/src/views/mall/trade/order/detail/index.vue
+++ b/src/views/mall/trade/order/detail/index.vue
@@ -16,7 +16,7 @@
      <el-descriptions-item label="付款方式: ">
        <dict-tag :type="DICT_TYPE.PAY_CHANNEL_CODE" :value="formData.payChannelCode!" />
      </el-descriptions-item>
-      <el-descriptions-item label="推广用户: " v-if="formData.brokerageUser">
+      <el-descriptions-item v-if="formData.brokerageUser" label="推广用户: ">
        {{ formData.brokerageUser?.nickname }}
      </el-descriptions-item>
    </el-descriptions>
@@ -26,7 +26,7 @@
      <el-descriptions-item label="订单状态: ">
        <dict-tag :type="DICT_TYPE.TRADE_ORDER_STATUS" :value="formData.status!" />
      </el-descriptions-item>
-      <el-descriptions-item label-class-name="no-colon">
+      <el-descriptions-item v-hasPermi="['trade:order:update']" label-class-name="no-colon">
        <el-button
          v-if="formData.status! === TradeOrderStatusEnum.UNPAID.status"
          type="primary"
@@ -150,7 +150,7 @@
      <el-descriptions-item label="联系电话: ">{{ formData.receiverMobile }}</el-descriptions-item>
      <!-- 快递配送 -->
      <div v-if="formData.deliveryType === DeliveryTypeEnum.EXPRESS.type">
-        <el-descriptions-item label="收货地址: " v-if="formData.receiverDetailAddress">
+        <el-descriptions-item v-if="formData.receiverDetailAddress" label="收货地址: ">
          {{ formData.receiverAreaName }} {{ formData.receiverDetailAddress }}
          <el-link
            v-clipboard:copy="formData.receiverAreaName + ' ' + formData.receiverDetailAddress"
@@ -159,17 +159,17 @@
            type="primary"
          />
        </el-descriptions-item>
-        <el-descriptions-item label="物流公司: " v-if="formData.logisticsId">
+        <el-descriptions-item v-if="formData.logisticsId" label="物流公司: ">
          {{ deliveryExpressList.find((item) => item.id === formData.logisticsId)?.name }}
        </el-descriptions-item>
-        <el-descriptions-item label="运单号: " v-if="formData.logisticsId">
+        <el-descriptions-item v-if="formData.logisticsId" label="运单号: ">
          {{ formData.logisticsNo }}
        </el-descriptions-item>
-        <el-descriptions-item label="发货时间: " v-if="formatDate.deliveryTime">
+        <el-descriptions-item v-if="formatDate.deliveryTime" label="发货时间: ">
          {{ formatDate(formData.deliveryTime) }}
        </el-descriptions-item>
        <el-descriptions-item v-for="item in 2" :key="item" label-class-name="no-colon" />
-        <el-descriptions-item label="物流详情: " v-if="expressTrackList.length > 0">
+        <el-descriptions-item v-if="expressTrackList.length > 0" label="物流详情: ">
          <el-timeline>
            <el-timeline-item
              v-for="(express, index) in expressTrackList"
@@ -183,7 +183,7 @@
      </div>
      <!-- 自提门店 -->
      <div v-if="formData.deliveryType === DeliveryTypeEnum.PICK_UP.type">
-        <el-descriptions-item label="自提门店: " v-if="formData.pickUpStoreId">
+        <el-descriptions-item v-if="formData.pickUpStoreId" label="自提门店: ">
          {{ pickUpStore?.name }}
        </el-descriptions-item>
      </div>

--- a/src/views/mall/trade/order/index.vue
+++ b/src/views/mall/trade/order/index.vue
@@ -125,10 +125,10 @@
        <el-input
          v-show="true"
          v-model="queryParams[queryType.queryParam]"
+          :type="queryType.queryParam === 'userId' ? 'number' : 'text'"
          class="!w-280px"
          clearable
          placeholder="请输入"
-          :type="queryType.queryParam === 'userId' ? 'number' : 'text'"
        >
          <template #prepend>
            <el-select
@@ -163,16 +163,24 @@
  <!-- 列表 -->
  <ContentWrap>
-    <el-table v-loading="loading" :data="list">
+    <!-- 添加 row-key="id" 解决列数据中的 table#header 数据不刷新的问题  -->
+    <el-table v-loading="loading" :data="list" row-key="id">
      <OrderTableColumn :list="list" :pick-up-store-list="pickUpStoreList">
        <template #default="{ row }">
-          <!-- TODO 权限后续补齐 -->
          <div class="flex items-center justify-center">
-            <el-button link type="primary" @click="openDetail(row.id)">
+            <el-button
+              v-hasPermi="['trade:order:query']"
+              link
+              type="primary"
+              @click="openDetail(row.id)"
+            >
              <Icon icon="ep:notification" />
              详情
            </el-button>
-            <el-dropdown @command="(command) => handleCommand(command, row)">
+            <el-dropdown
+              v-hasPermi="['trade:order:update']"
+              @command="(command) => handleCommand(command, row)"
+            >
              <el-button link type="primary">
                <Icon icon="ep:d-arrow-right" />
                更多

--- a/src/views/member/user/detail/UserOrderList.vue
+++ b/src/views/member/user/detail/UserOrderList.vue
@@ -162,7 +162,8 @@
  <!-- 列表 -->
  <ContentWrap>
-    <el-table v-loading="loading" :data="list">
+    <!-- 添加 row-key="id" 解决列数据中的 table#header 数据不刷新的问题  -->
+    <el-table v-loading="loading" :data="list" row-key="id">
      <OrderTableColumn :list="list" :pick-up-store-list="pickUpStoreList">
        <template #default="{ row }">
          <el-button link type="primary" @click="openDetail(row.id)">

--- a/stylelint.config.js
+++ b/stylelint.config.js
@@ -16,8 +16,8 @@ module.exports = {
        ignoreAtRules: ['function', 'if', 'each', 'include', 'mixin']
      }
    ],
-    // 命名规范
+    'media-query-no-invalid': null,
-    "selector-class-pattern": null,
+    'function-no-unknown': null,
    'no-empty-source': null,
    'named-grid-areas-no-invalid': null,
    'unicode-bom': 'never',
@@ -215,6 +215,8 @@ module.exports = {
      extends: ['stylelint-config-recommended', 'stylelint-config-html'],
      rules: {
        'keyframes-name-pattern': null,
+        'selector-class-pattern': null,
+        'no-duplicate-selectors': null,
        'selector-pseudo-class-no-unknown': [
          true,
          {