From 7c8f7d570f4e5027f604dd15a561525891ac0378 Mon Sep 17 00:00:00 2001
From: "KONGDY-PC\\Kongdy" <kongdy@bluemark.cn>
Date: Mon, 23 Oct 2023 10:37:39 +0800
Subject: [PATCH 01/38] =?UTF-8?q?=E6=BB=A1=E5=87=8F=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../promotion/rewardActivity/RewardForm.vue   | 195 ++++++++++++++++
 .../mall/promotion/rewardActivity/index.vue   | 213 ++++++++++++++++++
 2 files changed, 408 insertions(+)
 create mode 100644 src/views/mall/promotion/rewardActivity/RewardForm.vue
 create mode 100644 src/views/mall/promotion/rewardActivity/index.vue

diff --git a/src/views/mall/promotion/rewardActivity/RewardForm.vue b/src/views/mall/promotion/rewardActivity/RewardForm.vue
new file mode 100644
index 00000000..375aff7a
--- /dev/null
+++ b/src/views/mall/promotion/rewardActivity/RewardForm.vue
@@ -0,0 +1,195 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="80px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="活动名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入活动名称" />
+      </el-form-item>
+      <el-form-item label="活动时间" prop="startAndEndTime">
+        <el-date-picker
+          v-model="formData.startAndEndTime"
+          type="datetimerange"
+          range-separator="-"
+          :start-placeholder="t('common.startTimeText')"
+          :end-placeholder="t('common.endTimeText')"
+        />
+      </el-form-item>
+      <el-form-item label="条件类型" prop="conditionType">
+        <el-radio-group v-model="formData.conditionType">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_CONDITION_TYPE)"
+            :key="dict.value"
+            :label="parseInt(dict.value)"
+            >{{ dict.label }}</el-radio
+          >
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="优惠设置">
+        <!-- TODO 芋艿：待实现！ -->
+      </el-form-item>
+      <el-form-item label="活动商品" prop="productScope">
+        <el-radio-group v-model="formData.productScope">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_PRODUCT_SCOPE)"
+            :key="dict.value"
+            :label="parseInt(dict.value)"
+            >{{ dict.label }}</el-radio
+          >
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item
+        v-if="formData.productScope === PromotionProductScopeEnum.SPU.scope"
+        prop="productSpuIds"
+      >
+        <el-select
+          v-model="formData.productSpuIds"
+          placeholder="请选择活动商品"
+          clearable
+          size="small"
+          multiple
+          filterable
+          style="width: 400px"
+        >
+          <el-option v-for="item in productSpus" :key="item.id" :label="item.name" :value="item.id">
+            <span style="float: left">{{ item.name }}</span>
+            <span style="float: right; font-size: 13px; color: #8492a6"
+              >￥{{ (item.price / 100.0).toFixed(2) }}</span
+            >
+          </el-option>
+        </el-select>
+      </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 lang="ts" setup>
+import { getSpuSimpleList } from '@/api/mall/product/spu'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { CommonStatusEnum } from '@/utils/constants'
+import * as ProductBrandApi from '@/api/mall/product/brand'
+import {
+  PromotionConditionTypeEnum,
+  PromotionProductScopeEnum,
+  PromotionActivityStatusEnum
+} from '@/utils/constants'
+// 商品数据
+const productSpus = ref<any[]>([])
+
+/** 初始化 **/
+onMounted(() => {
+  getSpuSimpleList().then((response) => {
+    productSpus.value = response
+  })
+})
+defineOptions({ name: 'ProductBrandForm' })
+
+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,
+  startAndEndTime: undefined,
+  startTime: undefined,
+  endTime: undefined,
+  conditionType: PromotionConditionTypeEnum.PRICE.type,
+  remark: undefined,
+  productScope: PromotionProductScopeEnum.ALL.scope,
+  productSpuIds: undefined,
+  rules: undefined
+})
+const formRules = reactive({
+  name: [{ required: true, message: '活动名称不能为空', trigger: 'blur' }],
+  startAndEndTime: [{ required: true, message: '活动时间不能为空', trigger: 'blur' }],
+  conditionType: [{ required: true, message: '条件类型不能为空', trigger: 'change' }],
+  productScope: [{ required: true, message: '商品范围不能为空', trigger: 'blur' }],
+  productSpuIds: [{ 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 {
+      // formData.value = await ProductBrandApi.getBrand(id)
+      formData.value = {
+        conditionType: 10,
+        description: '',
+        id: undefined,
+        name: '测试活动',
+        picUrl: '',
+        productScope: 2,
+        productSpuIds: [634],
+        remark: '测试备注',
+        startAndEndTime: [new Date(), new Date('2023-12-31')],
+        status: 0
+      }
+    } 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
+  console.log(formData.value)
+  message.success('已在控制台打印数据')
+  return
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as ProductBrandApi.BrandVO
+    if (formType.value === 'create') {
+      await ProductBrandApi.createBrand(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductBrandApi.updateBrand(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: '',
+    picUrl: '',
+    status: CommonStatusEnum.ENABLE,
+    description: ''
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/mall/promotion/rewardActivity/index.vue b/src/views/mall/promotion/rewardActivity/index.vue
new file mode 100644
index 00000000..7a05c9fc
--- /dev/null
+++ b/src/views/mall/promotion/rewardActivity/index.vue
@@ -0,0 +1,213 @@
+<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="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择活动状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_ACTIVITY_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </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="['product:brand:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" row-key="id" default-expand-all>
+      <el-table-column label="活动名称" prop="name" />
+      <el-table-column
+        label="活动开始时间"
+        align="center"
+        prop="sort[0]"
+        :formatter="dateFormatter"
+      />
+      <el-table-column
+        label="活动结束时间"
+        align="center"
+        prop="sort[1]"
+        :formatter="dateFormatter"
+      />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.PROMOTION_ACTIVITY_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        width="180"
+        :formatter="dateFormatter"
+      />
+      <el-table-column label="操作" align="center">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['product:brand:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['product:brand: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>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <RewardForm ref="formRef" @success="getList" />
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import * as ProductBrandApi from '@/api/mall/product/brand'
+import RewardForm from './RewardForm.vue'
+
+defineOptions({ name: 'PromotionRewardActivity' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref<any[]>([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: undefined,
+  status: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    // const data = await ProductBrandApi.getBrandParam(queryParams)
+    const data = {
+      list: [
+        {
+          createTime: 1693463998000,
+          description: '',
+          id: 3,
+          name: '索尼',
+          picUrl:
+            'http://127.0.0.1:48080/admin-api/infra/file/4/get/f5b7a536306cd1180a42a2211a8212dc23de6b949d30c30d036caa063042f928.png',
+          sort: [+new Date(), +new Date('2023-12-31')],
+          status: 10
+        }
+      ],
+      total: 1
+    }
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  console.log(queryParams)
+  message.success('已打印搜索参数')
+  return
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  message.success('重置查询表单获取数据')
+  return
+  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()
+    message.success('您以确认删除')
+    return
+    // 发起删除
+    await ProductBrandApi.deleteBrand(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

From ca385bc08e10bde121423aa9e422dad03ab81c14 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Wed, 25 Oct 2023 11:14:00 +0800
Subject: [PATCH 02/38] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=88=97=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=B8=AD=E7=9A=84=20table#header=20=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=8D=E5=88=B7=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mall/trade/order/detail/index.vue    | 16 ++++++++--------
 src/views/mall/trade/order/index.vue           | 18 +++++++++++++-----
 src/views/member/user/detail/UserOrderList.vue |  3 ++-
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/views/mall/trade/order/detail/index.vue b/src/views/mall/trade/order/detail/index.vue
index 38b9342e..67e54767 100644
--- 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>
diff --git a/src/views/mall/trade/order/index.vue b/src/views/mall/trade/order/index.vue
index e08715df..c892292a 100644
--- 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" />
                 更多
diff --git a/src/views/member/user/detail/UserOrderList.vue b/src/views/member/user/detail/UserOrderList.vue
index 1f4359ca..b6870bc3 100644
--- 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)">

From 8935188a820c70c843780df0321008d83c407ee5 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Wed, 25 Oct 2023 16:07:58 +0800
Subject: [PATCH 03/38] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A4=BE=E4=BA=A4?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AB=AF=20CRUD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/social/client/index.ts         |  36 +++
 src/utils/dict.ts                             |   1 +
 .../system/social/client/SocialClientForm.vue | 146 +++++++++++
 src/views/system/social/client/index.vue      | 248 ++++++++++++++++++
 4 files changed, 431 insertions(+)
 create mode 100644 src/api/system/social/client/index.ts
 create mode 100644 src/views/system/social/client/SocialClientForm.vue
 create mode 100644 src/views/system/social/client/index.vue

diff --git a/src/api/system/social/client/index.ts b/src/api/system/social/client/index.ts
new file mode 100644
index 00000000..da87378e
--- /dev/null
+++ b/src/api/system/social/client/index.ts
@@ -0,0 +1,36 @@
+import request from '@/config/axios'
+
+export interface SocialClientVO {
+  id: number
+  name: string
+  socialType: number
+  userType: number
+  clientId: string
+  clientSecret: string
+  status: number
+}
+
+// 查询社交客户端列表
+export const getSocialClientPage = async (params) => {
+  return await request.get({ url: `/system/social-client/page`, params })
+}
+
+// 查询社交客户端详情
+export const getSocialClient = async (id: number) => {
+  return await request.get({ url: `/system/social-client/get?id=` + id })
+}
+
+// 新增社交客户端
+export const createSocialClient = async (data: SocialClientVO) => {
+  return await request.post({ url: `/system/social-client/create`, data })
+}
+
+// 修改社交客户端
+export const updateSocialClient = async (data: SocialClientVO) => {
+  return await request.put({ url: `/system/social-client/update`, data })
+}
+
+// 删除社交客户端
+export const deleteSocialClient = async (id: number) => {
+  return await request.delete({ url: `/system/social-client/delete?id=` + id })
+}
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 489d8e4b..65672a8b 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -116,6 +116,7 @@ export enum DICT_TYPE {
   SYSTEM_OAUTH2_GRANT_TYPE = 'system_oauth2_grant_type',
   SYSTEM_MAIL_SEND_STATUS = 'system_mail_send_status',
   SYSTEM_NOTIFY_TEMPLATE_TYPE = 'system_notify_template_type',
+  SYSTEM_SOCIAL_CLIENT_TYPE = 'system_social_client_type',
 
   // ========== INFRA 模块 ==========
   INFRA_BOOLEAN_STRING = 'infra_boolean_string',
diff --git a/src/views/system/social/client/SocialClientForm.vue b/src/views/system/social/client/SocialClientForm.vue
new file mode 100644
index 00000000..f4d02437
--- /dev/null
+++ b/src/views/system/social/client/SocialClientForm.vue
@@ -0,0 +1,146 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="120px"
+    >
+      <el-form-item label="应用名" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入应用名" />
+      </el-form-item>
+      <el-form-item label="社交平台" prop="socialType">
+        <el-radio-group v-model="formData.socialType">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_SOCIAL_CLIENT_TYPE)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="用户类型" prop="userType">
+        <el-radio-group v-model="formData.userType">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.USER_TYPE)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="客户端编号" prop="clientId">
+        <el-input v-model="formData.clientId" placeholder="请输入客户端编号" />
+      </el-form-item>
+      <el-form-item label="客户端密钥" prop="clientSecret">
+        <el-input v-model="formData.clientSecret" placeholder="请输入客户端密钥" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import * as SocialClientApi from '@/api/system/social/client'
+
+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,
+  socialType: undefined,
+  userType: undefined,
+  clientId: undefined,
+  clientSecret: undefined,
+  status: 0
+})
+const formRules = reactive({
+  name: [{ required: true, message: '应用名不能为空', trigger: 'blur' }],
+  socialType: [{ required: true, message: '社交平台不能为空', trigger: 'blur' }],
+  userType: [{ required: true, message: '用户类型不能为空', trigger: 'blur' }],
+  clientId: [{ required: true, message: '客户端编号不能为空', trigger: 'blur' }],
+  clientSecret: [{ required: true, message: '客户端密钥不能为空', trigger: 'blur' }],
+  status: [{ 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 {
+      formData.value = await SocialClientApi.getSocialClient(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 SocialClientApi.SocialClientVO
+    if (formType.value === 'create') {
+      await SocialClientApi.createSocialClient(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await SocialClientApi.updateSocialClient(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    socialType: undefined,
+    userType: undefined,
+    clientId: undefined,
+    clientSecret: undefined,
+    status: 0
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/social/client/index.vue b/src/views/system/social/client/index.vue
new file mode 100644
index 00000000..de3bf705
--- /dev/null
+++ b/src/views/system/social/client/index.vue
@@ -0,0 +1,248 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      ref="queryFormRef"
+      :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
+      label-width="130px"
+    >
+      <el-form-item label="应用名" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          class="!w-240px"
+          clearable
+          placeholder="请输入应用名"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="社交平台" prop="socialType">
+        <el-select
+          v-model="queryParams.socialType"
+          class="!w-240px"
+          clearable
+          placeholder="请选择社交平台"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_SOCIAL_CLIENT_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="用户类型" prop="userType">
+        <el-select
+          v-model="queryParams.userType"
+          class="!w-240px"
+          clearable
+          placeholder="请选择用户类型"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.USER_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="客户端编号" prop="clientId">
+        <el-input
+          v-model="queryParams.clientId"
+          class="!w-240px"
+          clearable
+          placeholder="请输入客户端编号"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="客户端密钥" prop="clientSecret">
+        <el-input
+          v-model="queryParams.clientSecret"
+          class="!w-240px"
+          clearable
+          placeholder="请输入客户端密钥"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" class="!w-240px" clearable placeholder="请选择状态">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+        <el-button
+          v-hasPermi="['system:social-client:create']"
+          plain
+          type="primary"
+          @click="openForm('create')"
+        >
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+      <el-table-column align="center" label="编号" prop="id" />
+      <el-table-column align="center" label="应用名" prop="name" />
+      <el-table-column align="center" label="社交平台" prop="socialType">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_SOCIAL_CLIENT_TYPE" :value="scope.row.socialType" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="用户类型" prop="userType">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.USER_TYPE" :value="scope.row.userType" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="客户端编号" prop="clientId" />
+      <el-table-column align="center" label="客户端密钥" prop="clientSecret" />
+      <el-table-column align="center" label="状态" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        :formatter="dateFormatter"
+        align="center"
+        label="创建时间"
+        prop="createTime"
+        width="180px"
+      />
+      <el-table-column align="center" label="操作">
+        <template #default="scope">
+          <el-button
+            v-hasPermi="['system:social-client:update']"
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-hasPermi="['system:social-client:delete']"
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <SocialClientForm ref="formRef" @success="getList" />
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import * as SocialClientApi from '@/api/system/social/client'
+import SocialClientForm from './SocialClientForm.vue'
+
+defineOptions({ name: 'SocialClient' })
+
+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,
+  socialType: null,
+  userType: null,
+  clientId: null,
+  clientSecret: null,
+  status: null,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await SocialClientApi.getSocialClientPage(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 SocialClientApi.deleteSocialClient(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

From 6ee2492ff167bd0036c19c9d502a1d10b4069388 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Wed, 25 Oct 2023 17:02:11 +0800
Subject: [PATCH 04/38] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A4=BE=E4=BA=A4?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=20RUD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/social/user/index.ts           |  34 +++
 .../system/social/user/SocialUserForm.vue     | 139 ++++++++++++
 src/views/system/social/user/index.vue        | 204 ++++++++++++++++++
 3 files changed, 377 insertions(+)
 create mode 100644 src/api/system/social/user/index.ts
 create mode 100644 src/views/system/social/user/SocialUserForm.vue
 create mode 100644 src/views/system/social/user/index.vue

diff --git a/src/api/system/social/user/index.ts b/src/api/system/social/user/index.ts
new file mode 100644
index 00000000..f2850a62
--- /dev/null
+++ b/src/api/system/social/user/index.ts
@@ -0,0 +1,34 @@
+import request from '@/config/axios'
+
+export interface SocialUserVO {
+  id: number
+  type: number
+  openid: string
+  token: string
+  rawTokenInfo: string
+  nickname: string
+  avatar: string
+  rawUserInfo: string
+  code: string
+  state: string
+}
+
+// 查询社交用户列表
+export const getSocialUserPage = async (params) => {
+  return await request.get({ url: `/system/social-user/page`, params })
+}
+
+// 查询社交用户详情
+export const getSocialUser = async (id: number) => {
+  return await request.get({ url: `/system/social-user/get?id=` + id })
+}
+
+// 修改社交用户
+export const updateSocialUser = async (data: SocialUserVO) => {
+  return await request.put({ url: `/system/social-user/update`, data })
+}
+
+// 删除社交用户
+export const deleteSocialUser = async (id: number) => {
+  return await request.delete({ url: `/system/social-user/delete?id=` + id })
+}
diff --git a/src/views/system/social/user/SocialUserForm.vue b/src/views/system/social/user/SocialUserForm.vue
new file mode 100644
index 00000000..181bc6f8
--- /dev/null
+++ b/src/views/system/social/user/SocialUserForm.vue
@@ -0,0 +1,139 @@
+<template>
+  <Dialog v-model="dialogVisible" :title="dialogTitle">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="150px"
+    >
+      <el-form-item label="社交平台" prop="type">
+        <el-radio-group v-model="formData.type">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_SOCIAL_CLIENT_TYPE)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="社交 openid" prop="openid">
+        <el-input v-model="formData.openid" placeholder="请输入社交 openid" />
+      </el-form-item>
+      <el-form-item label="社交 token" prop="token">
+        <el-input v-model="formData.token" placeholder="请输入社交 token" />
+      </el-form-item>
+      <el-form-item label="原始 Token 数据" prop="rawTokenInfo">
+        <el-input v-model="formData.rawTokenInfo" placeholder="请输入原始 Token 数据" />
+      </el-form-item>
+      <el-form-item label="用户昵称" prop="nickname">
+        <el-input v-model="formData.nickname" placeholder="请输入用户昵称" />
+      </el-form-item>
+      <el-form-item label="用户头像" prop="avatar">
+        <el-input v-model="formData.avatar" placeholder="请输入用户头像" />
+      </el-form-item>
+      <el-form-item label="原始用户数据" prop="rawUserInfo">
+        <el-input v-model="formData.rawUserInfo" placeholder="请输入原始用户数据" />
+      </el-form-item>
+      <el-form-item label="最后一次的认证 code" prop="code">
+        <el-input v-model="formData.code" placeholder="请输入最后一次的认证 code" />
+      </el-form-item>
+      <el-form-item label="最后一次的认证 state" prop="state">
+        <el-input v-model="formData.state" placeholder="请输入最后一次的认证 state" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import * as SocialUserApi from '@/api/system/social/user'
+
+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,
+  type: undefined,
+  openid: undefined,
+  token: undefined,
+  rawTokenInfo: undefined,
+  nickname: undefined,
+  avatar: undefined,
+  rawUserInfo: undefined,
+  code: undefined,
+  state: 0
+})
+const formRules = reactive({
+  type: [{ required: true, message: '社交平台不能为空', trigger: 'blur' }],
+  openid: [{ required: true, message: '社交 openid 不能为空', trigger: 'blur' }],
+  nickname: [{ 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 {
+      formData.value = await SocialUserApi.getSocialUser(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 SocialUserApi.SocialUserVO
+    if (formType.value === 'update') {
+      await SocialUserApi.updateSocialUser(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    type: undefined,
+    openid: undefined,
+    token: undefined,
+    rawTokenInfo: undefined,
+    nickname: undefined,
+    avatar: undefined,
+    rawUserInfo: undefined,
+    code: undefined,
+    state: 0
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/system/social/user/index.vue b/src/views/system/social/user/index.vue
new file mode 100644
index 00000000..f4f0a8b0
--- /dev/null
+++ b/src/views/system/social/user/index.vue
@@ -0,0 +1,204 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      ref="queryFormRef"
+      :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
+      label-width="68px"
+    >
+      <el-form-item label="社交平台" prop="type">
+        <el-select
+          v-model="queryParams.type"
+          class="!w-240px"
+          clearable
+          placeholder="请选择社交平台"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_SOCIAL_CLIENT_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="用户昵称" prop="nickname">
+        <el-input
+          v-model="queryParams.nickname"
+          class="!w-240px"
+          clearable
+          placeholder="请输入用户昵称"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+          end-placeholder="结束日期"
+          start-placeholder="开始日期"
+          type="daterange"
+          value-format="YYYY-MM-DD HH:mm:ss"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button @click="handleQuery">
+          <Icon class="mr-5px" icon="ep:search" />
+          搜索
+        </el-button>
+        <el-button @click="resetQuery">
+          <Icon class="mr-5px" icon="ep:refresh" />
+          重置
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+      <el-table-column align="center" label="社交平台" prop="type">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_SOCIAL_CLIENT_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="社交 openid" prop="openid" />
+      <el-table-column align="center" label="社交 token" prop="token" />
+      <el-table-column align="center" label="原始 Token 数据" prop="rawTokenInfo" />
+      <el-table-column align="center" label="用户昵称" prop="nickname" />
+      <el-table-column align="center" label="用户头像" prop="avatar">
+        <template #default="{ row }">
+          <el-image :src="row.avatar" class="h-30px w-30px" @click="imagePreview(row.avatar)" />
+        </template>
+      </el-table-column>
+      <el-table-column align="center" label="原始用户数据" prop="rawUserInfo" />
+      <el-table-column align="center" label="最后一次的认证 code" prop="code" />
+      <el-table-column align="center" label="最后一次的认证 state" prop="state" />
+      <el-table-column
+        :formatter="dateFormatter"
+        align="center"
+        label="创建时间"
+        prop="createTime"
+        width="180px"
+      />
+      <el-table-column align="center" fixed="right" label="操作">
+        <template #default="scope">
+          <el-button
+            v-hasPermi="['system:social-user:update']"
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+          >
+            编辑
+          </el-button>
+          <el-button
+            v-hasPermi="['system:social-user:delete']"
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <SocialUserForm ref="formRef" @success="getList" />
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import * as SocialUserApi from '@/api/system/social/user'
+import SocialUserForm from './SocialUserForm.vue'
+import { createImageViewer } from '@/components/ImageViewer'
+
+defineOptions({ name: 'SocialUser' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  type: undefined,
+  openid: undefined,
+  token: undefined,
+  rawTokenInfo: undefined,
+  nickname: undefined,
+  avatar: undefined,
+  rawUserInfo: undefined,
+  code: undefined,
+  state: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await SocialUserApi.getSocialUserPage(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 imagePreview = (imgUrl: string) => {
+  createImageViewer({
+    urlList: [imgUrl]
+  })
+}
+
+/** 修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await SocialUserApi.deleteSocialUser(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

From 88a22d90e5c918d480d4295afcdd85394b013f85 Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Thu, 26 Oct 2023 16:19:22 +0800
Subject: [PATCH 05/38] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=92=89=E9=92=89?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Profile/Index.vue                 | 11 +++++-----
 src/views/Profile/components/UserSocial.vue | 24 ++++++++++++++++-----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/views/Profile/Index.vue b/src/views/Profile/Index.vue
index b05f93cc..8e1695b5 100644
--- a/src/views/Profile/Index.vue
+++ b/src/views/Profile/Index.vue
@@ -15,7 +15,7 @@
         </div>
       </template>
       <div>
-        <el-tabs v-model="activeName" tab-position="top" style="height: 400px" class="profile-tabs">
+        <el-tabs v-model="activeName" class="profile-tabs" style="height: 400px" tab-position="top">
           <el-tab-pane :label="t('profile.info.basicInfo')" name="basicInfo">
             <BasicInfo />
           </el-tab-pane>
@@ -23,17 +23,18 @@
             <ResetPwd />
           </el-tab-pane>
           <el-tab-pane :label="t('profile.info.userSocial')" name="userSocial">
-            <UserSocial />
+            <UserSocial v-model:activeName="activeName" />
           </el-tab-pane>
         </el-tabs>
       </div>
     </el-card>
   </div>
 </template>
-<script setup lang="ts" name="Profile">
-import { BasicInfo, ProfileUser, ResetPwd, UserSocial } from './components/'
-const { t } = useI18n()
+<script lang="ts" setup>
+import { BasicInfo, ProfileUser, ResetPwd, UserSocial } from './components'
 
+const { t } = useI18n()
+defineOptions({ name: 'Profile' })
 const activeName = ref('basicInfo')
 </script>
 <style scoped>
diff --git a/src/views/Profile/components/UserSocial.vue b/src/views/Profile/components/UserSocial.vue
index 2f021abf..7746f510 100644
--- a/src/views/Profile/components/UserSocial.vue
+++ b/src/views/Profile/components/UserSocial.vue
@@ -27,12 +27,15 @@ import { getUserProfile, ProfileVO } from '@/api/system/user/profile'
 import { socialAuthRedirect, socialBind, socialUnbind } from '@/api/system/user/socialUser'
 
 defineOptions({ name: 'UserSocial' })
-
+defineProps<{
+  activeName: string
+}>()
 const message = useMessage()
 const socialUsers = ref<any[]>([])
 const userInfo = ref<ProfileVO>()
 
 const initSocial = async () => {
+  socialUsers.value = [] // 重置避免无限增长
   const res = await getUserProfile()
   userInfo.value = res
   for (const i in SystemUserSocialTypeEnum) {
@@ -49,9 +52,12 @@ const initSocial = async () => {
   }
 }
 const route = useRoute()
+const emit = defineEmits<{
+  (e: 'update:activeName', v: string): void
+}>()
 const bindSocial = () => {
   // 社交绑定
-  const type = route.query.type
+  const type = getUrlValue('type')
   const code = route.query.code
   const state = route.query.state
   if (!code) {
@@ -59,11 +65,20 @@ const bindSocial = () => {
   }
   socialBind(type, code, state).then(() => {
     message.success('绑定成功')
+    emit('update:activeName', 'userSocial')
     initSocial()
   })
 }
+
+// 双层 encode 需要在回调后进行 decode
+function getUrlValue(key: string): string {
+  const url = new URL(decodeURIComponent(location.href))
+  return url.searchParams.get(key) ?? ''
+}
+
 const bind = (row) => {
-  const redirectUri = location.origin + '/user/profile?type=' + row.type
+  // 双层 encode 解决钉钉回调 type 参数丢失的问题
+  const redirectUri = location.origin + '/user/profile?' + encodeURIComponent(`type=${row.type}`)
   // 进行跳转
   socialAuthRedirect(row.type, encodeURIComponent(redirectUri)).then((res) => {
     window.location.href = res
@@ -83,9 +98,8 @@ onMounted(async () => {
 
 watch(
   () => route,
-  (newRoute) => {
+  () => {
     bindSocial()
-    console.log(newRoute)
   },
   {
     immediate: true

From a624db04e93455b1af5d0b316771361b77f5960b Mon Sep 17 00:00:00 2001
From: puhui999 <puhui999@163.com>
Date: Thu, 26 Oct 2023 17:00:13 +0800
Subject: [PATCH 06/38] =?UTF-8?q?=E4=B8=89=E6=96=B9=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=88=E6=9D=83=E6=96=B9=E7=9A=84=E7=BD=91?=
 =?UTF-8?q?=E9=A1=B5=E5=BA=94=E7=94=A8=20agentId=20=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/social/client/index.ts               |  1 +
 src/views/system/social/client/SocialClientForm.vue | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/api/system/social/client/index.ts b/src/api/system/social/client/index.ts
index da87378e..bf13ab49 100644
--- a/src/api/system/social/client/index.ts
+++ b/src/api/system/social/client/index.ts
@@ -7,6 +7,7 @@ export interface SocialClientVO {
   userType: number
   clientId: string
   clientSecret: string
+  agentId: string
   status: number
 }
 
diff --git a/src/views/system/social/client/SocialClientForm.vue b/src/views/system/social/client/SocialClientForm.vue
index f4d02437..5ca0e158 100644
--- a/src/views/system/social/client/SocialClientForm.vue
+++ b/src/views/system/social/client/SocialClientForm.vue
@@ -33,10 +33,16 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item label="客户端编号" prop="clientId">
-        <el-input v-model="formData.clientId" placeholder="请输入客户端编号" />
+        <el-input v-model="formData.clientId" placeholder="请输入客户端编号,对应各平台的appKey" />
       </el-form-item>
       <el-form-item label="客户端密钥" prop="clientSecret">
-        <el-input v-model="formData.clientSecret" placeholder="请输入客户端密钥" />
+        <el-input
+          v-model="formData.clientSecret"
+          placeholder="请输入客户端密钥,对应各平台的appSecret"
+        />
+      </el-form-item>
+      <el-form-item label="agentId" prop="agentId">
+        <el-input v-model="formData.agentId" placeholder="授权方的网页应用ID,有则填" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-radio-group v-model="formData.status">
@@ -74,6 +80,7 @@ const formData = ref({
   userType: undefined,
   clientId: undefined,
   clientSecret: undefined,
+  agentId: undefined,
   status: 0
 })
 const formRules = reactive({
@@ -139,6 +146,7 @@ const resetForm = () => {
     userType: undefined,
     clientId: undefined,
     clientSecret: undefined,
+    agentId: undefined,
     status: 0
   }
   formRef.value?.resetFields()

From b9ab22dad170349cfab009ea71d98ed1dabbe000 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 27 Oct 2023 23:01:00 +0800
Subject: [PATCH 07/38] =?UTF-8?q?code=20review=EF=BC=9A=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/crm/customer/CustomerForm.vue | 1 +
 src/views/crm/customer/index.vue        | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/views/crm/customer/CustomerForm.vue b/src/views/crm/customer/CustomerForm.vue
index 52ff923a..4c04617e 100644
--- a/src/views/crm/customer/CustomerForm.vue
+++ b/src/views/crm/customer/CustomerForm.vue
@@ -1,5 +1,6 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <!-- TODO @wanwan：表单按照 docs 提供的再改下 -->
     <el-form
       ref="formRef"
       :model="formData"
diff --git a/src/views/crm/customer/index.vue b/src/views/crm/customer/index.vue
index 15a0d144..7db9bb03 100644
--- a/src/views/crm/customer/index.vue
+++ b/src/views/crm/customer/index.vue
@@ -1,6 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
+    <!-- TODO @wanwan：筛选条件，按照 docs 的再改下 -->
     <el-form
       class="-mb-15px"
       :model="queryParams"
@@ -64,6 +65,7 @@
   </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" />

From dc5cf9f24cb6c9cf71d293e24df147d790ea2925 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 29 Oct 2023 17:55:39 +0800
Subject: [PATCH 08/38] =?UTF-8?q?code=20review=EF=BC=9A=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/crm/customer/CustomerForm.vue | 5 +++--
 src/views/crm/customer/index.vue        | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/crm/customer/CustomerForm.vue b/src/views/crm/customer/CustomerForm.vue
index 6d08450e..6e5cd62e 100644
--- a/src/views/crm/customer/CustomerForm.vue
+++ b/src/views/crm/customer/CustomerForm.vue
@@ -1,6 +1,5 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <!-- TODO @wanwan：表单按照 docs 提供的再改下 -->
     <el-form
       ref="formRef"
       :model="formData"
@@ -9,6 +8,7 @@
       v-loading="formLoading"
     >
       <el-row>
+        <!-- TODO @wanwan：name 参数校验，必填 -->
         <el-form-item label="客户名称" prop="name">
           <el-input v-model="formData.name" placeholder="请输入客户名称" />
         </el-form-item>
@@ -70,6 +70,7 @@
         </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>
@@ -77,7 +78,7 @@
           <el-input v-model="formData.detailAddress" placeholder="请输入详细地址" />
         </el-form-item>
       </el-row>
-      <!-- TODO @Wanwan 少一个负责人字段，默认先选中自己 -->
+      <!-- TODO @wanwan： 少一个负责人字段，默认先选中自己；可以先参考 TaskAssignRuleForm.vue 的 formData.userIds；注意，新增的时候，可以选择；修改的时候，只展示 -->
       <el-row>
         <el-form-item label="下次联系时间" prop="contactNextTime">
           <el-date-picker
diff --git a/src/views/crm/customer/index.vue b/src/views/crm/customer/index.vue
index 58543449..ace56dac 100644
--- a/src/views/crm/customer/index.vue
+++ b/src/views/crm/customer/index.vue
@@ -1,7 +1,7 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <!-- TODO @wanwan：筛选条件，按照 docs 的再改下 -->
+    <!-- TODO @wanwan：看看怎么表单可以对齐一点； -->
     <el-form
       class="-mb-15px"
       :model="queryParams"
@@ -27,6 +27,7 @@
           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>
@@ -102,7 +103,8 @@
           <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.lockStatus" />
         </template>
       </el-table-column>
-      <!--  TODO @Wanwan 距进入公海天数    -->
+      <!--  TODO @wanwan 距进入公海天数    -->
+      <!-- TODO @wanwan：操作要 fixed 再右侧哈； -->
       <el-table-column label="操作" align="center" width="160">
         <template #default="scope">
           <el-button

From e9ff8d323752dd0df8bebbb71b8c3fe4f6e8caff Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Sun, 29 Oct 2023 22:03:24 +0800
Subject: [PATCH 09/38] =?UTF-8?q?=E5=95=86=E5=9F=8E=E8=A3=85=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mall/promotion/diy/page.ts            |  35 ++
 src/api/mall/promotion/diy/template.ts        |  41 ++
 src/assets/imgs/diy/statusBar.png             | Bin 0 -> 8917 bytes
 src/components/ColorInput/index.vue           |  54 ++
 .../DiyEditor/components/ComponentLibrary.vue | 196 +++++++
 .../components/mobile/Carousel/config.ts      |  44 ++
 .../components/mobile/Carousel/index.vue      |  75 +++
 .../components/mobile/Carousel/property.vue   | 125 ++++
 .../components/mobile/Divider/config.ts       |  29 +
 .../components/mobile/Divider/index.vue       |  29 +
 .../components/mobile/Divider/property.vue    |  80 +++
 .../components/mobile/NavigationBar/config.ts |  38 ++
 .../components/mobile/NavigationBar/index.vue |  60 ++
 .../mobile/NavigationBar/property.vue         |  63 ++
 .../components/mobile/NoticeBar/config.ts     |  39 ++
 .../components/mobile/NoticeBar/index.vue     |  26 +
 .../components/mobile/NoticeBar/property.vue  |  77 +++
 .../components/mobile/PageConfig/config.ts    |  23 +
 .../components/mobile/PageConfig/property.vue |  34 ++
 .../components/mobile/SearchBar/config.ts     |  35 ++
 .../components/mobile/SearchBar/index.vue     |  80 +++
 .../components/mobile/SearchBar/property.vue  | 100 ++++
 .../components/mobile/TabBar/config.ts        |  91 +++
 .../components/mobile/TabBar/index.vue        |  58 ++
 .../components/mobile/TabBar/property.vue     | 161 ++++++
 .../components/mobile/TitleBar/config.ts      |  65 +++
 .../components/mobile/TitleBar/index.vue      |  80 +++
 .../components/mobile/TitleBar/property.vue   | 115 ++++
 .../DiyEditor/components/mobile/index.ts      |  61 ++
 src/components/DiyEditor/index.vue            | 539 ++++++++++++++++++
 src/components/DiyEditor/util.ts              |  59 ++
 src/components/UploadFile/src/UploadImg.vue   |  14 +-
 src/router/modules/remaining.ts               |  28 +
 .../mall/promotion/diy/page/DiyPageForm.vue   | 114 ++++
 .../mall/promotion/diy/page/decorate.vue      |  99 ++++
 src/views/mall/promotion/diy/page/index.vue   | 189 ++++++
 .../diy/template/DiyTemplateForm.vue          | 115 ++++
 .../mall/promotion/diy/template/decorate.vue  | 134 +++++
 .../mall/promotion/diy/template/index.vue     | 225 ++++++++
 39 files changed, 3425 insertions(+), 5 deletions(-)
 create mode 100644 src/api/mall/promotion/diy/page.ts
 create mode 100644 src/api/mall/promotion/diy/template.ts
 create mode 100644 src/assets/imgs/diy/statusBar.png
 create mode 100644 src/components/ColorInput/index.vue
 create mode 100644 src/components/DiyEditor/components/ComponentLibrary.vue
 create mode 100644 src/components/DiyEditor/components/mobile/Carousel/config.ts
 create mode 100644 src/components/DiyEditor/components/mobile/Carousel/index.vue
 create mode 100644 src/components/DiyEditor/components/mobile/Carousel/property.vue
 create mode 100644 src/components/DiyEditor/components/mobile/Divider/config.ts
 create mode 100644 src/components/DiyEditor/components/mobile/Divider/index.vue
 create mode 100644 src/components/DiyEditor/components/mobile/Divider/property.vue
 create mode 100644 src/components/DiyEditor/components/mobile/NavigationBar/config.ts
 create mode 100644 src/components/DiyEditor/components/mobile/NavigationBar/index.vue
 create mode 100644 src/components/DiyEditor/components/mobile/NavigationBar/property.vue
 create mode 100644 src/components/DiyEditor/components/mobile/NoticeBar/config.ts
 create mode 100644 src/components/DiyEditor/components/mobile/NoticeBar/index.vue
 create mode 100644 src/components/DiyEditor/components/mobile/NoticeBar/property.vue
 create mode 100644 src/components/DiyEditor/components/mobile/PageConfig/config.ts
 create mode 100644 src/components/DiyEditor/components/mobile/PageConfig/property.vue
 create mode 100644 src/components/DiyEditor/components/mobile/SearchBar/config.ts
 create mode 100644 src/components/DiyEditor/components/mobile/SearchBar/index.vue
 create mode 100644 src/components/DiyEditor/components/mobile/SearchBar/property.vue
 create mode 100644 src/components/DiyEditor/components/mobile/TabBar/config.ts
 create mode 100644 src/components/DiyEditor/components/mobile/TabBar/index.vue
 create mode 100644 src/components/DiyEditor/components/mobile/TabBar/property.vue
 create mode 100644 src/components/DiyEditor/components/mobile/TitleBar/config.ts
 create mode 100644 src/components/DiyEditor/components/mobile/TitleBar/index.vue
 create mode 100644 src/components/DiyEditor/components/mobile/TitleBar/property.vue
 create mode 100644 src/components/DiyEditor/components/mobile/index.ts
 create mode 100644 src/components/DiyEditor/index.vue
 create mode 100644 src/components/DiyEditor/util.ts
 create mode 100644 src/views/mall/promotion/diy/page/DiyPageForm.vue
 create mode 100644 src/views/mall/promotion/diy/page/decorate.vue
 create mode 100644 src/views/mall/promotion/diy/page/index.vue
 create mode 100644 src/views/mall/promotion/diy/template/DiyTemplateForm.vue
 create mode 100644 src/views/mall/promotion/diy/template/decorate.vue
 create mode 100644 src/views/mall/promotion/diy/template/index.vue

diff --git a/src/api/mall/promotion/diy/page.ts b/src/api/mall/promotion/diy/page.ts
new file mode 100644
index 00000000..255015d2
--- /dev/null
+++ b/src/api/mall/promotion/diy/page.ts
@@ -0,0 +1,35 @@
+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 })
+}
diff --git a/src/api/mall/promotion/diy/template.ts b/src/api/mall/promotion/diy/template.ts
new file mode 100644
index 00000000..72eea41c
--- /dev/null
+++ b/src/api/mall/promotion/diy/template.ts
@@ -0,0 +1,41 @@
+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 })
+}
diff --git a/src/assets/imgs/diy/statusBar.png b/src/assets/imgs/diy/statusBar.png
new file mode 100644
index 0000000000000000000000000000000000000000..b85562e4236852358c93161735671f8f0466db71
GIT binary patch
literal 8917
zcmc(F^;;ax5-zd?hs6o*?h**@9^BpCEy3O0J-9<~hsE831a}MWF5zy@z0di+^B3It
zVV>FQ-m<Cbu70Z`6y+t65%3ToARv&XrNopWAfU^@&zx{j;Cny2k{<*F352wmu<AF+
zv-PhN9BN&#mx#u_f%?4e;-}$onze=(a5cvIvfc*xB>8|CV`C1y6aa=OM<gX4IWCMa
zX0ov)WCu<M8Jwn&uvK74fwN#*k{4S>PR6>$*WBN3xxYL7Y|SmEKD!+7{(gAz@iQ~$
z>iF|~@=l*i0t5sK0pXy8N#FnhB(*DOOWsWehCi79{`zO=l^BW?qy_tbC;dON4O9Sd
zlhY~7CE<U_;CayhL-_wVk8xo@?SL%kANzm+Dv2#-zo&5rzn9g9DV~#AS?0IZ%|G`w
zes4BAKV0lv2eEb5cCcGo*U#)9dSC@Ei5^;q)phJR$Kgf1ErgkU{>7|z1^Bp2{QlTa
z{O7W9PX1-;E9fRn@D&msbl!gQ>6iG%;}92U($3yxv17w6P0!t9ZI|ewHjMvN{%iZ(
zeA4pi^GQu^`%N@q4d~fgKrG~1f~$QdRma|ATxY}iwD#cj!tdS7wqeEaW|C{uwqf#k
zI%Sz<)bGzt?xMa|H6q9AHLYcq!c(hh%MBG*TSP9sV1G(4sRcaLJ1HETMsnO!IB~py
zGgn$$!pSx1;Qkz!t<}L{bZLnK(%rkoiJJY2r505K1*OWtQHR{Gi02<PFF`$c!g*2{
zTDU;{9f?tvw-rS;41}Bnw;8lVan3JfPU3vS&0-?aa_dHT7#rnmxrK28&ltIn1985$
zg<0#T=3HGzUt(B{9`-HOd%6!YZT?)v`SI<b#eEx<)xUoIEl8|x!rbk`mc_Q?bzENR
zdul@ba-`s=ZBFI=c4{H`;t!2-m~H9u+u;3qvHSh)B88O;HO4;ZL&o=Dg}D11GgSHa
z6NC56{@a_}_t)!j=I+z_aqm@W^gl15({>JCI_Kl=t9C8BvAi39?pt!bm8RG#Z;_#F
zFd!@5r@?N!@O|h&WbTar(7o7oF1`&%Ist<$5hYQOMzLFl$5ZN{IT?u_-;gD5hM(b7
ztgysR?JSWCno~;D&~*xNKxvLxe?8#3uvuPlaJ=Erd5$bGe$qz1W{0cd1VoAfc|LS1
zd~14|bntb#U$(%wd|CS~0FH+o>blcFe>wz9>VoGySbocs>J}n;C(O(tP!mB(5lw2Z
zRcDyMZ9a5Gxd&H7_jRa(-}9W{%kuQO*XE1Bg~#-&+oIluV;HZTGvlPwL2JylzW3GO
zU;j)ZRHIY)Tm})p`or@1n`iAXbRl>~)}^itPCjltfT(@-dGtN@Q^L0>g1ql44c=B3
zLFOrPvrA)O53MU6OXE#1g{t&TyiOzMx=ekRbca}W(@Rx)(kzkhz10>Hu-`}n-BO|(
zD+%n8qW1b<Z3#qVI@uo)0T!sBCZN?^Uay7`^>m#_DWN_%3SnP;eyVpnSx5jGjk8AM
zmkYk#&I!IhO^+i9fFq#P?i}p+ICoZLp6zs#*r$DFKWQ^!@5|mm8WlKR!X3Je`{ous
z*BNo9?YcOh)1erANd=AjY`;HG#7`rVn#L>Uas2m=br{+p2cHw2+@}c(rq(Se^E=KO
zj~JlrCT+bST$LvPsM7Z`s^ELQ<}&TGM^4<f>H89cu40<TDQT75ukZFtjpAIrr5$Vi
zx=fNE!Rd6*f=_efQAv_8#K721irowx1b<X=pH;^IULOZj=c3+cK6Ch^)$UOXTt&or
zOqc{uOW;R!pqWza{i^Z3+glluqv7z}1=~g3wH<UftFg8<qf#|Nq+yK`pI@oKy$#^n
zNmh|>d+54Yhd*7SwUgPQ&sNl`iD>pkk;{QM>RQVR_*B503`%_f2RiZFp(JW!_97|b
z15WqjAgb?W5c@P=QoLp|l@(!Jtig_`TlfBm|J&oR;KA?~i1(~<jvpKwDX2<|Pp0H>
zRd|3y$b3ZCn`ri_Jf60N;HYQwY&cr1UX^v1Y5taV_tk*bBNn{qg}=;`<ar`G*;Q{f
zE4yy$)pnR{BRFtANi!-!AxT&6QwT1rwg>JPI!-JrmNox$EB!K?uFfh--tZCC@3FsS
z**vSxf>lQ*T5r3BcQ6zgf5=@rh@_SdjmDRXl;>&yBkHF|RRy5-_^#k%_J&Cuzq(Yc
zaof1wd7vARKcQyx{m(<EJ%g4O9lb%v5=k41&o-jL&xBba9k+pF*UuN7H)H*#(>~`e
zcNM{EIB1Q3A2Csui^d4Z)|c3=$Ezu;o9a}4@?lPaUje<c0;gL=_(Ae<^W`zvi9YRU
zPeT=7q8Iv(22bVkKIzmUS15Bpa<;FopWp9M3oc{%JdGQa6p{$86MUk)%CR5v9EE}C
z(>ub4%w^j4*?>qZW`~$t{967}Eq=&ekQyRhf~3ngM6!_Ue_rk2V}qy>IuqRHPg$#4
z(48$6)f60D?Myti+|vDaRx0>*)X9}^P-%Ca(mroh>I2lggR51z7Rd##YFL%<T_Xz-
zAjO=4$S-6z1ytx3zM$J;=9C$mm1yZ6BaM-ZQR-Z|W7gBDS|?WDg3fd<9gzvEXz33Z
zHlkfDJ@R2A^$M-L<J1V8a)n0(DE{zrBHn{P9xo3slp&9@T<&25#Kj<B?~KyA!HW+z
z88=;LG6Y>;X|YB6BQ@VPd@|C4u=gc<2FB}YA@Lhcdvr_0fjU908jo;mnwa1|twMsT
zuqi9H^K*=YH*`RLCU;}vuTaJ=sXD3OPQ!$fF<XU^x<>@$Bt%Or`V=8*O+f9y(#+4#
zq|6j`x(fX6K|1m-1vF$Z2%j#U0eX);SSiuVOK1nHJ(R6H+}(%b%mrmIZC~JV96U&p
za$QLyYQ*vtHpSa5xM^f}huEFHOZLa-(4bHJZ9BoAidoE`+fu;{EZ)fL>n=<*?eNqN
z<Ua%-bjdiPDa#Gf7|C~3BmLJ$>Z|@nl1|mhVoggG<AUQR2tVgd*bo;|IzRVyk2?2x
zz7#h|19Y7-?R~(0@oktlm5D&sI>5(sn0LczFG2FW^JdBwrjC%P)+6~eNvnXaTbjH9
zn8-Kz!A!@rAbE_{ia@(hUN8DnmLn?t3BxH_%zF_vzjSuQIO9~2r$hRqGC9%bo;%qE
zH~$$P7^3OtV>asp>THWlm;g0@e~wsmT64TBvd(DE2pc_|N=BiV^RL}mI5MMBaU<Pn
zpC~Z(cyE7-&KOikn6U^bc2tIAieujnrl9g&3JLExk3@vufYT1hyKLguEm$Y@iTs~h
z2r<q1LWfKqMDPT9au8`-<+IS=lqf;oCcC>JZM=r>UlWm!i#z*;tMIIZS>w2O;8IY3
zI3=FDIEc<UUnud4<47fF8GUU$pGUAxQnQ^P%;d>4>*cL8Wn6fB*xW>S`h7g}WUm>%
z`F8%*;ALe|hTpLd$$t52R{yaNhsgJF`?Zq`bQLr0G3COb2uc0YW`BxtB8#*qpnqSV
zM(Dm|gmja&`D!lPkjWIKY4%;zTbRoW<T7O`Y#2l0e_W@gTErmZ5!~ppUC#<o@r_Si
zjJ~rbBJ9vBs0J@$UbZwNN&Y9NB7!6dns)*(r#JU4-FmcsO>#MBVPCH^^e_=A9A)cT
zX+Hi!hmg>OeP(Oth*10?g)Y0iI7@PyKJdd4(`9v$0i3&N3kgYtx59gzcU*wN2%N(;
zcgrpd`o1xyMs$zSa?Xw8Ids3>Ka*K|PnCrBE)5*udS*iU0r6~h%5i3^{)}xEd^7DN
zpls9R#x7e?n{PP9q#lAXi-QTOL?=1zb7a%gd_>_r_4nc!HaKoJQc8gAs+)%_wN#kQ
z6z%Gvm9TWz+6b@7VnjXkO;)L36TSejWwEF4HV>M<(e7iLDUrWKTk!RZ46wcQ;jg%u
zt;vt~&1M)=QGOpt)r_)_pbVd?4@|8RfpIyEUQC3|RZgx(hK|nk5=iJ0Uj7^?!Or@G
zn32%+u+h<A=@YqJA`8@1fm2L|A_5@yitlRo9a6sp@OqlVT%}}u93gLVEaVB+7QD?z
zt&>~RAcS|Q{PJ`J34MjntoQr5UQPU%S4X}+iK&=)Lida?Nn)LKC{V&3K?9YBRYRj*
zj_zy1!Ldn;{FpRQK6T$TVlwsKo^xcHq}CnSL#&D!K8UWb-m3D=3IYo;yab3pYR%6#
z)|%ww?JrE-$)Q|#@YsmT*@yAzn=BE`NExOlbOzcmr-;!H-CGf%x2me1=D7UUsuY}A
zFXR6E&K;~87FF3h#yb?ewGmL-ic{>_H~|kVCSF*zGnzJH!?Eq$N?YeZn!@gs*2n#-
z0+cNsft_*cyoK)Tl$!7WmD|1_YvtO+bM4N8jOu5MDB_<N9xQ|EymZm(E4{;dYdeLe
zmFTS`ZFM4|d$rIie<uIbqFD8%Lf9M}`7&KyKS^oWXe*n(k}8;D$-<Cuh}m3+AsYlf
z`N$yit4aOj8ONmvAuz@oP?XJ4hWtV`OvENd#EGj`63BHMo#=0j7qgp!mg7IJno6NC
zPUilJXk+x$XchO9U`9~&P?}5v9~M`iI%UF#aOPEM80iS>r$C&}9=O8D5G&Ta6ZCU8
zJ>4td<~DC)VI@A~LbjU(>q~Ijh+zRhQ7#QaolV<l28~`#GX#1I1gLEkp1&juU>r!Z
z#-l75fyl+K*_xX*F%#MgV7mT-^*G;vsjdwx%wB8l`g1FAc<p7yS<N2vJG_w_6^HwH
z)M4k|J|zg<CFPE%E7#upH=p_DsQM@r&24j0*{KEpiPrJ`htMWdGy}|}5DetZ*vIR=
zBAG!wT#5kw0S(-t5t`Q39-cAhisK|BQ`sdY)uoE2HCA)_RlXUsAj9c<IP^+WYFs>)
ze!h|QubW+ShN!w4C@=veia<lubXar^0q9zikRr_&W4^Jh2+I%V{aLdg1<B{n@uIG1
zSV$T=Z6HaRHOnM*@SC=3n*1VjJ1spWVwj`K+~ZU8L|d1McoK99uTF`J8}`Mx>)@E&
z2Bbz*X1*03#Jf9>ejhX%jF~?9Zk%|84p2vi0$4w4169oRm_l&I9KYh(@I^;nzFX|I
zcrJcJ<DqXB7gX(A;lpXSmE&mPGgU`<qSdELm4qQ(YhR61&wvj7QZTNli7lu*`CAy4
zu;{iRu8B*b<>zYrZ2`W<7qihDM8epvY_Km)6a;HNOk{cIhN%XN9^RJnpIOoDc77nn
z9ZuZ&O}i)V!l>eb+&s5y|H>$Sb&TzJHFLf<04uC9VF>8OXI8zI^kzun)caIx@t{Cq
z)#!B(K5w(YLm@%i`A^hAk`>xYSK`#mI{YN!Q!}Pl4!p7IC%#YrlsfABjYG`45#1n0
zNz_P*jG?EegQ^I6pv7%S%a^XaZ=}vq$+Rjh!NqOOoYe{;OyFbec`b-;vR2=-T&(n1
zJVlGOxIhd9)6Tv3Gu^ED2p^!%55-2|3MUZhdjFIiQq7}{ha>06i2$oX)yK%nfP7n^
z3CFuG!i$wlz)#ZFX}`fd7&3n>dmr-akcT5jJ}(at@ylKbQ8Vuf*|HQ>*+?^Yik<0p
zG7#0G$7CSz#3uYvhD>pJj1J&5Xb2GG@u}HwZA#6Asra)VdX*t6G1H$uQ5~|uSNKaE
zJ3CADA**)wo01Xg@VC;$0>m(xfKC|gEHiR27Ew$lbfgl96n$8wtrKfz1Gw+Mfe6`_
z{#Yjw@@P$)DH|r$_sCRG&Agi*)qRybam9eB)?n;8wA@9WO+Gn5R$}(uy*{U2EuG&c
ztU7kc>4Xw7?59*RR{znq<xz>ce0;>691H!)zNHK~K*@U3_V3Gxga|0$I)p`Pn$}M%
zB-7P?P8Kf1gU7Z_SK;TeT`rU*1r<AO_YzsD<<j;@UJkA_Uf~%sv5GKkSO`%p-8g;=
zS5<S0b3zgnkBuRh6r;pzz9@?7Fu2X}tU`rCF&L>rGbs8(h|8`hzbg+%7jA%(>jsh>
zd<v1@e_1nRJ~4`)_rQ$&yoqrabD+DBTet%<54?j4e%ms<>Zd^VAWdh@8jxGDdNVqn
zja{fLOH8F)=o7)0Id`V4w%Qao^8;$S0)mC+5%Zg+@*i~Tg@WrWKNw3v5Ejta>10TH
zd5=-57+XVYBDx1&(eOT1)<^2I7iss@HWIwlv3U-aFS8d1BbAn30oU;Kjo&T#hT<5-
z&L=w^WctMUtOq+_fLn$wci3rHZ6_q?;zTjAi>b?C3@MMqzq5V?6H#*hD>cJC&hL!;
z#n#5&^rzL<`dA;RDAnY`V%8lS)ZACK8qXBm+$v1u5@wCH{to4}Vr!ALFW18+?g-3Q
z@RDfziKF?OkL}kYV{B$I&r_=&Scr8P^BDT`RRd{E_ZtV=BlL1mYbg{UW0ndFiVM|m
zBj%pY@)9*zqcjf_150t%tEclV00STL$-9NVsZs~RMe{=ZDVvBJKBN)-dU~=}bIJwd
zF1lbtFS#C`Ay+2@i8Sd0zVId>DRGHw<W1}pg%=nV>)DXXU3^G==TSBpu4HHvU!4d&
z#U+#a@W#-mBZPrDljdt^TNYT4!Fe0pWKlfIIlkRNq-|feEVZp~r02Q@P0u0CPaZ?M
z)IU`oc)9H*>$Ff<jT`{);C_=x#Y(CO_q-sxRq1t;iIG2Z=zF!Nvwp)44s|N1^h(q$
zc@2&Su9k77&0?p|rdj#K=i%bG>iB({nvhn-CG!%I7?oNDO$5cgmY;W`^+?da>;D2#
zv=U&YsWuH7sV7q+mAXfz?{0Fymzd&BmNVTpS7PfEgy(V9*sJgGK0j(x_D;?*%zbK(
z<gK@^cb@0(V<gx)kNqAi(jwCdow2AEtBv8VO|w%Y!d>QaX2yvdjMFqfQaNbqk@4Y#
zCVGH}&aez#-NF^YCawCqH*^x4UHykWBbzy$^HObkwkLT#8o*rGzlp@`&uQ4a3R)l0
zM!%30tz@bY_dtiiYcDc}$llp)d1+-6z$^|4FN?HRhHtby+@VtVtd#&?*SMTw4563P
z&uRHUYvK!yM!Mv)6uOoFqw$UTxso<{xK>#Lu!05C`%sA0B*;q%FJ_)Va21R>x{~>m
zD&pbN`OFUc5URnRT3YE22}3Aq0wgf2fI%}?<1-?-96yjLJXATiI-J)({2ndrjGcw{
z)+S<DIFTj|i)S53W0x~~ibEm@LV3Lm6J$`AGRcdm41H_|Rz!>7m)%uBtfZ$rej3)^
zwxgHs8G^RcG;s>TY)Zyr;lZF+XnWAvxW+ch@@#Z8*c_wSLpk=9)#4r&EMrW0)Gl0@
zgM=mMS(A~Jp-Kf_Aos3SYT>vngbs2Vh0Z;qM}ZN@6Gq9zo+QMR>aV2u!iMgEaIA+!
z3eR(4>ku`?lM+lBe=#+PofFJ?xCG2KLKbLlN(XGt+XekLkwn?z`J)tFiZ9BxDWcq5
z%ehh9_;W~KzMn9ej(dHDznlM5l)l7gG3)~q`f(71$eJr+mmhFsJZkv^P0{+wVe{3|
zi6rk%>*~Oxfe^634V5fG3hJ}iYs5eXG!ihz$l?<uqmZ__!i*B0S(X+)a%eFzwEg-J
zV#!lBMHX|KvUea_J@d^qFs)09VVB}QZ(M@pLgsb9mGA!YI<4EAvg={t_4i{^2@FgM
z(}Cu0bpI|h%avQ!n?dF?mU?d%Etmb;;q%Pc6ry`supwjbN{@_q=0`?8H7%WW2Tqn4
zS+lO<4tULk4Vj^2>;{Xc%%XN4Y+3)#coPDRDJ8{ah3h<mu;T2fj4F+U7;x%FB2=HA
z@fYhj&VwsNg)atrOJzI4iHtU~;6gh(WnoRvz#}Ebq?XN!OHud)66ZSh!8g|SK%4aM
zHEN?|7hC{~g}+=aO|Gfb673NEaz+_7u(HBqg6%ll1^v)IgT;$EVhad)#LIPOvx}Qj
zl=NXA{R5Vo2?xZkfId={p|2JH96d(WBs2<~o^5qaQ<h+NL?z^nV2&74i`QsJOtbvn
z=#qt?+)YulziI7pu)<xlLnF+!k_S5Mk$$^n#O<`s)=6GeQ?apJ4Ssg#yDBEjimMS;
zEHZui6I^gp5_^uhhqHQ_+jAQ5m765fcH%Izl2D6be!;*>2idJOWlV|&rQ|KkZIq!n
z#YlKDRd$6&R~_d!deC-ouVVaAcD4BntJ`?&Hd@vd2N63T;i&#>)hzd47;_0rL?b#(
zOf$dv%dXgKSC*Wncme?on}1vdw|h9&XE4Ac`Pr;ac~5UYrIpsX+#5S?&sL!<99I6z
z;3!;%zu0$=)R9R`FB}m{Wro=tTOndUPU1UNHf<4MYraFua^=R2&>RlZUtB!j{*&!Q
zLR1LVeXEc=0|q2A_NwSi(jW&?)zjmadx8km8V0!3?Zr&CCaalz$p$Rx)yUoWPLt9=
zzjOTrewk9eo}u4yF#HNzKh{4HOu!KIi6^ETOp+>Gv2|rzX_ZS;gqyGo!den7&lIH|
z#t<s%Fzu(h0*<K;V;Hc8F6`PstTzteJUhpl?;D|v2d4hs$%}(N>~K*xby2GKQ!j$q
zUbeH{;D%l=<=vyosCYQjTEqTA7@U7+6fhF;N#IWL6L@<_$AP*PU^<N8NPzgxSZTOd
z(n?yc>>HeXta|myQ6KsBiP~mnS)we3$#`RaaaJ6YV=U@X-dL3fwu(0=;SFQl$QaEa
z4p|jneKi?*ASW?lz_p7=@q`@2lq);UL+6&4nT#_2HKX%hlQZc^tUBR8n}Yx#9v1b!
zEPux%7To~Em6lkwoq3Czqc|k&onRP;EHwkSu(C;J=Pa4XLS~%UZ(>jvNNFP0US-g|
zF*5j-@<<BJiHV?PYEyyuIyQhK#mLT3lo_K$5T;^=A|?cfA9i2+)T&uG!wv_EKR^Wk
zzy!rS93ibC%81zwZ#RNDhbdBV_zq+2?l;wP{HclqbuH;5sqt}jl8WvV!bJA+?k}xY
zHbTa8`Y{nH%*XZwpC|_y^K=zJz^@p8mS_au9ja|nSq`m2DLR_~6?A200$c1bqxj_S
z4tnwCffLPEa~a71l7`=?HtAe;^SZRPb0IUCIgihk)D@!Yk^Jnfm4_-g=HYi0$2VWZ
zO<G)KHz(B|Cgc&(Ja$$a>?t+(1JY|Z1O~u>uq&C6!$?39IqDSKq3$N00S4J#lgy$b
z)e6wawjN33HwnZodT!FiWPVd=<fpLgVfoyjf+i6)4TjT28y@@v>TN*%@sARLXf_y2
zMqz~6+Q}N3<6Pxm%M><fnHED%Q$VhH*2)OTce5=RVP@+`^Ujw0?;l%F0#lOlpBK5_
z>ykbycn_o0B_iVznHpf_9P2yb9k1G8Fi?H9G{p0!WohE82)K9Qqj)`cpk*M3K~<+#
z7~eW4t3Oxb8*lt^_xU@ADERaQ0oe>tDI!LbL}gpOWU4KIwM4x?Xx)u9`Opcaa$7uv
z>Wazh1h;$JEPJOUMUioLB>IaaHqp#8^vP)YS)0jCP_`eCnMDSuD~5C<wH&B_W>Qaj
zn*&|AmVG8?^xm?|gOZKp*h3I+dRejX1J?j^;D8)~qPJy;quAKQjQOTA#gI?eeq4Kt
zvbc>_u|hZ=gOR1jn-8FeqmXoKi5^x01%L;AhCh9IS`^Vwz7NU#2VIp-mqqclmhcZN
z3OG(FX1UzcGE8k(-{5d^*f4w5aCo;;v*1HWKqm$B!Wl$vMt#uFr5;w}buljim_a*+
zKO;qO%UGNR*V{@?Kdq0NUx*7MT4~A=(0Xgsopx;8{iwsaxF1JvPiRmuj6@rOa2S>0
zIW8-lShIZtqg7sKW-|_bW*mbdMPPJ<0Wbg^tOl;d<o+$gY>0&lr{d_Z)G+iaVD-q2
z`@Wn}7tM5XEK`VOc&1b;k@w2W5o%kabj;he6T#q&8}(b(W>TNw!{(^<_aq~*war5A
z$leGI@e=fqm5Ji8+Nuct`pK1hiV9Up1bM5J{17jS;&Gz08Ce~<MF!Gjc%LgY@01a6
zhj(t;U=Q~kTQMm<yw2LVrP2$h_%6geDpsD*lVb4DzL@Z4gv4KPES4MurMhlovKp*S
zHqvl+t#psLL#H8RN{jHmzGSQGm4aL$#FUd*<gE(-k{;dDE0neX=kg9O5ijz$1ljtm
z^QWiX?SyXJ;P?nT`mx~E77GU!`u^;RWyp%bXTFl}_mW5$s|x?FJDY8_sLQLBCwKb@
z2fWhL??1HI1B0a?3zux2Py{G23~?`{FYfsRvkbmCJQgTTCCM-#T34}CyP?h#ZWK?6
z>132m6IO?3p233o-AFP+=;lgnMbo%KPU~{Ca%|~SKBT*=p|SDy#sjSvRUZZ9V7zU`
zI6=B87z}v#2BbUB{PcNP*XV_wI<96;MnVoMHpJOTCOe6`YbJA*qQD~oNIV%j2O1Ax
zOJ4%*XtkHX#VSk+q}H|Yn1-KL@)TU+W}M<n%?VES@H91c2^5P&>2zkY1V7uJYX_T^
zsMsGUu+G7NWf(nfgNq@XkLaY0;5Fk~r9g~1#=yY!(>-Gs|5Mu#hQUEVVV*=0(y;}5
zJd3C5uIKZ1p_GNqp7|z^luLhgK@FGf(w3g#<Xiu$G7_#uWsI2-X?xQIe&H++&qHn^
zjInGg)y_CKBmJ-MFMI5UKutvejg1+SF*MP3;zc3Xl@#wNxluC1iQLmN?Ft<(x!Z`1
zU1pLzfeh{U=pvwOb=`^WX!>@cJiqj5a4OK!h>cbP!~Wyc%+=AIc6}2B1XTRrUI3lq
z-~us}wv8RDxl|@Gxt75!PWAZ{%AG1I(Io`QI>-3~{Ef>GB_U&k{2Jg5wJ8*$p0cnH
z(GH&3h*Y;2R|7gg8eP)CuqzprGRV+XSpuNpRS_CR-&SOd(bZoA$Ez->^ivg@<U}e<
z31uF0XLWh0{0O<e>b(2g%YkUYiD2E=Scm3AEsxL9;q`FjBFyuao;hb4hSYWvy<}Ia
z*##(cQ6I9NJF|N2TW>B;CbT8jS>`HgKB%N_sac+W`5eM~T=q-Fx8fJ~QBl&dk`Jx1
z8f5>?=*-`?f*xhGyh9rM5^<prsN$#{Zzin%MpUT382&u)BUXx-HEY9Y3R0IC@0Cbf
zUih7+#VSX(Y!mg+sV=5A^%ddwv!y~Z7%~vl&=lFSy{AbBg9`L*&ewo_lL)eXlM_&A
zDeLz~l!xj6$oi-HUkilWONl{r%3>S+tHgf?w9w$La<F=D!5aLh3*tXxns5LSZ=9V^
zW{LkI!a+5V0e5)m1CNOR^?wpD<KRc80lP7Zf3*hy0p{W)17FnvbAsSg-G2odk^<qb
z^ukw@r9b>bB!QcV6biqnf-CvE4*yqRj|d5HrvunRn}qZa5uA8nfjcj>(B$6#%k;0>
zAwpnjr1mOQAOEcy3q81Vqk$~_&wrWzH5)MiEKOvsM2_u$R8t3=Y$49__CHo&Lj}CU
Y)KD1lT9stKL4Yr5ae1*HB8Gwg2lSJ;0RR91

literal 0
HcmV?d00001

diff --git a/src/components/ColorInput/index.vue b/src/components/ColorInput/index.vue
new file mode 100644
index 00000000..abd083a1
--- /dev/null
+++ b/src/components/ColorInput/index.vue
@@ -0,0 +1,54 @@
+<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>
diff --git a/src/components/DiyEditor/components/ComponentLibrary.vue b/src/components/DiyEditor/components/ComponentLibrary.vue
new file mode 100644
index 00000000..8e918fa9
--- /dev/null
+++ b/src/components/DiyEditor/components/ComponentLibrary.vue
@@ -0,0 +1,196 @@
+<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>
diff --git a/src/components/DiyEditor/components/mobile/Carousel/config.ts b/src/components/DiyEditor/components/mobile/Carousel/config.ts
new file mode 100644
index 00000000..6c790186
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/Carousel/config.ts
@@ -0,0 +1,44 @@
+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>
diff --git a/src/components/DiyEditor/components/mobile/Carousel/index.vue b/src/components/DiyEditor/components/mobile/Carousel/index.vue
new file mode 100644
index 00000000..e9a0ab39
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/Carousel/index.vue
@@ -0,0 +1,75 @@
+<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>
diff --git a/src/components/DiyEditor/components/mobile/Carousel/property.vue b/src/components/DiyEditor/components/mobile/Carousel/property.vue
new file mode 100644
index 00000000..acaee35f
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/Carousel/property.vue
@@ -0,0 +1,125 @@
+<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>
diff --git a/src/components/DiyEditor/components/mobile/Divider/config.ts b/src/components/DiyEditor/components/mobile/Divider/config.ts
new file mode 100644
index 00000000..9b553604
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/Divider/config.ts
@@ -0,0 +1,29 @@
+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>
diff --git a/src/components/DiyEditor/components/mobile/Divider/index.vue b/src/components/DiyEditor/components/mobile/Divider/index.vue
new file mode 100644
index 00000000..f7785043
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/Divider/index.vue
@@ -0,0 +1,29 @@
+<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>
diff --git a/src/components/DiyEditor/components/mobile/Divider/property.vue b/src/components/DiyEditor/components/mobile/Divider/property.vue
new file mode 100644
index 00000000..3d7be26d
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/Divider/property.vue
@@ -0,0 +1,80 @@
+<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>
diff --git a/src/components/DiyEditor/components/mobile/NavigationBar/config.ts b/src/components/DiyEditor/components/mobile/NavigationBar/config.ts
new file mode 100644
index 00000000..b250f5f1
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/NavigationBar/config.ts
@@ -0,0 +1,38 @@
+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>
diff --git a/src/components/DiyEditor/components/mobile/NavigationBar/index.vue b/src/components/DiyEditor/components/mobile/NavigationBar/index.vue
new file mode 100644
index 00000000..953748c7
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/NavigationBar/index.vue
@@ -0,0 +1,60 @@
+<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>
diff --git a/src/components/DiyEditor/components/mobile/NavigationBar/property.vue b/src/components/DiyEditor/components/mobile/NavigationBar/property.vue
new file mode 100644
index 00000000..c4ca4588
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/NavigationBar/property.vue
@@ -0,0 +1,63 @@
+<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>
diff --git a/src/components/DiyEditor/components/mobile/NoticeBar/config.ts b/src/components/DiyEditor/components/mobile/NoticeBar/config.ts
new file mode 100644
index 00000000..03e7143a
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/NoticeBar/config.ts
@@ -0,0 +1,39 @@
+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>
diff --git a/src/components/DiyEditor/components/mobile/NoticeBar/index.vue b/src/components/DiyEditor/components/mobile/NoticeBar/index.vue
new file mode 100644
index 00000000..dc360688
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/NoticeBar/index.vue
@@ -0,0 +1,26 @@
+<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>
diff --git a/src/components/DiyEditor/components/mobile/NoticeBar/property.vue b/src/components/DiyEditor/components/mobile/NoticeBar/property.vue
new file mode 100644
index 00000000..11e7f4b7
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/NoticeBar/property.vue
@@ -0,0 +1,77 @@
+<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>
diff --git a/src/components/DiyEditor/components/mobile/PageConfig/config.ts b/src/components/DiyEditor/components/mobile/PageConfig/config.ts
new file mode 100644
index 00000000..f8e45e45
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/PageConfig/config.ts
@@ -0,0 +1,23 @@
+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>
diff --git a/src/components/DiyEditor/components/mobile/PageConfig/property.vue b/src/components/DiyEditor/components/mobile/PageConfig/property.vue
new file mode 100644
index 00000000..278bc940
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/PageConfig/property.vue
@@ -0,0 +1,34 @@
+<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>
diff --git a/src/components/DiyEditor/components/mobile/SearchBar/config.ts b/src/components/DiyEditor/components/mobile/SearchBar/config.ts
new file mode 100644
index 00000000..1241748d
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/SearchBar/config.ts
@@ -0,0 +1,35 @@
+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>
diff --git a/src/components/DiyEditor/components/mobile/SearchBar/index.vue b/src/components/DiyEditor/components/mobile/SearchBar/index.vue
new file mode 100644
index 00000000..e120405a
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/SearchBar/index.vue
@@ -0,0 +1,80 @@
+<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>
diff --git a/src/components/DiyEditor/components/mobile/SearchBar/property.vue b/src/components/DiyEditor/components/mobile/SearchBar/property.vue
new file mode 100644
index 00000000..9123ebe5
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/SearchBar/property.vue
@@ -0,0 +1,100 @@
+<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>
diff --git a/src/components/DiyEditor/components/mobile/TabBar/config.ts b/src/components/DiyEditor/components/mobile/TabBar/config.ts
new file mode 100644
index 00000000..4a570a8e
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/TabBar/config.ts
@@ -0,0 +1,91 @@
+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' }
+]
diff --git a/src/components/DiyEditor/components/mobile/TabBar/index.vue b/src/components/DiyEditor/components/mobile/TabBar/index.vue
new file mode 100644
index 00000000..266a20c5
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/TabBar/index.vue
@@ -0,0 +1,58 @@
+<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>
diff --git a/src/components/DiyEditor/components/mobile/TabBar/property.vue b/src/components/DiyEditor/components/mobile/TabBar/property.vue
new file mode 100644
index 00000000..512bb5a8
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/TabBar/property.vue
@@ -0,0 +1,161 @@
+<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>
diff --git a/src/components/DiyEditor/components/mobile/TitleBar/config.ts b/src/components/DiyEditor/components/mobile/TitleBar/config.ts
new file mode 100644
index 00000000..3d486cc3
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/TitleBar/config.ts
@@ -0,0 +1,65 @@
+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>
diff --git a/src/components/DiyEditor/components/mobile/TitleBar/index.vue b/src/components/DiyEditor/components/mobile/TitleBar/index.vue
new file mode 100644
index 00000000..aab65779
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/TitleBar/index.vue
@@ -0,0 +1,80 @@
+<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>
diff --git a/src/components/DiyEditor/components/mobile/TitleBar/property.vue b/src/components/DiyEditor/components/mobile/TitleBar/property.vue
new file mode 100644
index 00000000..3e4dac2d
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/TitleBar/property.vue
@@ -0,0 +1,115 @@
+<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>
diff --git a/src/components/DiyEditor/components/mobile/index.ts b/src/components/DiyEditor/components/mobile/index.ts
new file mode 100644
index 00000000..c0dc67da
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/index.ts
@@ -0,0 +1,61 @@
+/*
+ * 组件注册
+ *
+ * 组件规范：
+ * 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 }
diff --git a/src/components/DiyEditor/index.vue b/src/components/DiyEditor/index.vue
new file mode 100644
index 00000000..520cd497
--- /dev/null
+++ b/src/components/DiyEditor/index.vue
@@ -0,0 +1,539 @@
+<template>
+  <el-container class="editor">
+    <!-- 顶部：工具栏 -->
+    <el-header class="editor-header">
+      <!-- 左侧操作区 -->
+      <slot name="toolBarLeft"></slot>
+      <!-- 中心操作区 -->
+      <div class="header-center flex flex-1 items-center justify-center">
+        <span>{{ title }}</span>
+      </div>
+      <!-- 右侧操作区 -->
+      <el-button-group class="header-right">
+        <el-tooltip content="重置">
+          <el-button @click="handleReset">
+            <Icon icon="system-uicons:reset-alt" :size="24" />
+          </el-button>
+        </el-tooltip>
+        <el-tooltip content="预览">
+          <el-button @click="handlePreview">
+            <Icon icon="ep:view" :size="24" />
+          </el-button>
+        </el-tooltip>
+        <el-tooltip content="保存">
+          <el-button @click="handleSave">
+            <Icon icon="ep:check" :size="24" />
+          </el-button>
+        </el-tooltip>
+      </el-button-group>
+    </el-header>
+    <!-- 中心区域 -->
+    <el-container class="editor-container">
+      <!-- 左侧：组件库 -->
+      <ComponentLibrary ref="componentLibrary" :list="libs" v-if="libs && libs.length > 0" />
+      <!-- 中心设计区域 -->
+      <div class="editor-center page-prop-area" @click="handlePageSelected">
+        <div class="editor-design">
+          <!-- 手机顶部 -->
+          <div class="editor-design-top">
+            <!-- 手机顶部状态栏 -->
+            <img src="@/assets/imgs/diy/statusBar.png" alt="" class="status-bar" />
+            <!-- 手机顶部导航栏 -->
+            <NavigationBar
+              v-if="showNavigationBar"
+              :property="navigationBarComponent.property"
+              @click="handleNavigationBarSelected"
+              :class="[
+                'component',
+                { active: selectedComponent?.id === navigationBarComponent.id }
+              ]"
+            />
+          </div>
+          <!-- 手机页面编辑区域 -->
+          <el-scrollbar class="editor-design-center" height="100%" view-class="page-prop-area">
+            <div
+              class="phone-container"
+              :style="{
+                backgroundColor: pageConfigComponent.property.backgroundColor,
+                backgroundImage: `url(${pageConfigComponent.property.backgroundImage})`
+              }"
+            >
+              <draggable
+                class="drag-area page-prop-area"
+                v-model="pageComponents"
+                item-key="index"
+                :animation="200"
+                filter=".component-toolbar"
+                ghost-class="draggable-ghost"
+                :force-fallback="true"
+                group="component"
+                @change="handleComponentChange"
+              >
+                <template #item="{ element, index }">
+                  <div class="component-box" @click="handleComponentSelected(element, index)">
+                    <!-- 左侧组件名 -->
+                    <div
+                      :class="['component-name', { active: selectedComponentIndex === index }]"
+                      v-if="element.name"
+                    >
+                      {{ element.name }}
+                    </div>
+                    <!-- 组件内容区 -->
+                    <component
+                      :is="element.id"
+                      :property="element.property"
+                      :class="['component', { active: selectedComponentIndex === index }]"
+                      :data-type="element.id"
+                    />
+                    <!-- 左侧：组件操作工具栏 -->
+                    <div
+                      class="component-toolbar"
+                      v-if="element.name && selectedComponentIndex === index"
+                    >
+                      <el-button-group type="primary">
+                        <el-tooltip content="上移" placement="right">
+                          <el-button
+                            :disabled="index === 0"
+                            @click.stop="handleMoveComponent(index, -1)"
+                          >
+                            <Icon icon="ep:arrow-up" />
+                          </el-button>
+                        </el-tooltip>
+                        <el-tooltip content="下移" placement="right">
+                          <el-button
+                            :disabled="index === pageComponents.length - 1"
+                            @click.stop="handleMoveComponent(index, 1)"
+                          >
+                            <Icon icon="ep:arrow-down" />
+                          </el-button>
+                        </el-tooltip>
+                        <el-tooltip content="复制" placement="right">
+                          <el-button @click.stop="handleCopyComponent(index)">
+                            <Icon icon="ep:copy-document" />
+                          </el-button>
+                        </el-tooltip>
+                        <el-tooltip content="删除" placement="right">
+                          <el-button @click.stop="handleDeleteComponent(index)">
+                            <Icon icon="ep:delete" />
+                          </el-button>
+                        </el-tooltip>
+                      </el-button-group>
+                    </div>
+                  </div>
+                </template>
+              </draggable>
+            </div>
+          </el-scrollbar>
+          <!-- 手机底部导航 -->
+          <div
+            v-if="showTabBar"
+            :class="[
+              'editor-design-bottom',
+              'component',
+              { active: selectedComponent?.id === tabBarComponent.id }
+            ]"
+          >
+            <TabBar :property="tabBarComponent.property" @click="handleTabBarSelected" />
+          </div>
+        </div>
+      </div>
+      <!-- 右侧属性面板 -->
+      <el-aside class="editor-right" width="350px" v-if="selectedComponent?.property">
+        <el-card
+          shadow="never"
+          body-class="h-[calc(100%-var(--el-card-padding)-var(--el-card-padding))]"
+          class="h-full"
+        >
+          <!-- 组件名称 -->
+          <template #header>
+            <div class="flex items-center gap-8px">
+              <Icon :icon="selectedComponent.icon" color="gray" />
+              <span>{{ selectedComponent.name }}</span>
+            </div>
+          </template>
+          <el-scrollbar
+            class="m-[calc(0px-var(--el-card-padding))]"
+            view-class="p-[var(--el-card-padding)] p-b-[calc(var(--el-card-padding)+var(--el-card-padding))] property"
+          >
+            <component
+              :is="selectedComponent.id + 'Property'"
+              v-model="selectedComponent.property"
+            />
+          </el-scrollbar>
+        </el-card>
+      </el-aside>
+    </el-container>
+  </el-container>
+</template>
+<script lang="ts">
+// 注册所有的组件
+import { components } from './components/mobile/index'
+export default {
+  components: { ...components }
+}
+</script>
+<script lang="ts" setup>
+import draggable from 'vuedraggable'
+import ComponentLibrary from './components/ComponentLibrary.vue'
+import NavigationBar from './components/mobile/NavigationBar/index.vue'
+import TabBar from './components/mobile/TabBar/index.vue'
+import { cloneDeep, includes } from 'lodash-es'
+import { component as PAGE_CONFIG_COMPONENT } from '@/components/DiyEditor/components/mobile/PageConfig/config'
+import { component as NAVIGATION_BAR_COMPONENT } from './components/mobile/NavigationBar/config'
+import { component as TAB_BAR_COMPONENT } from './components/mobile/TabBar/config'
+import { isString } from '@/utils/is'
+import { DiyComponent, DiyComponentLibrary, PageConfig } from '@/components/DiyEditor/util'
+import { componentConfigs } from '@/components/DiyEditor/components/mobile'
+
+/** 页面装修详情页 */
+defineOptions({ name: 'DiyPageDetail' })
+
+// 消息弹窗
+const message = useMessage()
+// 左侧组件库
+const componentLibrary = ref()
+// 页面设置组件
+const pageConfigComponent = ref<DiyComponent<any>>(cloneDeep(PAGE_CONFIG_COMPONENT))
+// 顶部导航栏
+const navigationBarComponent = ref<DiyComponent<any>>(cloneDeep(NAVIGATION_BAR_COMPONENT))
+// 底部导航菜单
+const tabBarComponent = ref<DiyComponent<any>>(cloneDeep(TAB_BAR_COMPONENT))
+
+// 选中的组件，默认选中顶部导航栏
+const selectedComponent = ref<DiyComponent<any>>(unref(pageConfigComponent))
+// 选中的组件索引
+const selectedComponentIndex = ref<number>(-1)
+// 组件列表
+const pageComponents = ref<DiyComponent<any>[]>([])
+// 定义属性
+const props = defineProps<{
+  modelValue: string | PageConfig
+  title: string
+  libs: DiyComponentLibrary[] // 组件库
+  showNavigationBar: boolean
+  showTabBar: boolean
+}>()
+
+// 监听传入的页面配置
+watch(
+  () => props.modelValue,
+  () => {
+    const modelValue = isString(props.modelValue)
+      ? (JSON.parse(props.modelValue) as PageConfig)
+      : props.modelValue
+    pageConfigComponent.value.property = modelValue?.page || PAGE_CONFIG_COMPONENT.property
+    navigationBarComponent.value.property =
+      modelValue?.navigationBar || NAVIGATION_BAR_COMPONENT.property
+    tabBarComponent.value.property = modelValue?.tabBar || TAB_BAR_COMPONENT.property
+    // 查找对应的页面组件
+    pageComponents.value = (modelValue?.components || []).map((item) => {
+      const component = componentConfigs[item.id]
+      return { ...component, property: item.property }
+    })
+  },
+  {
+    immediate: true
+  }
+)
+// 保存
+const handleSave = () => {
+  const pageConfig = {
+    page: pageConfigComponent.value.property,
+    navigationBar: navigationBarComponent.value.property,
+    tabBar: tabBarComponent.value.property,
+    components: pageComponents.value.map((component) => {
+      // 只保留APP有用的字段
+      return { id: component.id, property: component.property }
+    })
+  } as PageConfig
+  // 发送数据更新通知
+  const modelValue = isString(props.modelValue) ? JSON.stringify(pageConfig) : pageConfig
+  emits('update:modelValue', modelValue)
+  // 发送保存通知
+  emits('save', pageConfig)
+}
+
+// 处理页面选中：显示属性表单
+const handlePageSelected = (event: any) => {
+  // 配置了样式 page-prop-area 的元素，才显示页面设置
+  if (includes(event?.target?.classList, 'page-prop-area')) {
+    handleComponentSelected(unref(pageConfigComponent))
+  }
+}
+
+/**
+ * 选中组件
+ *
+ * @param component 组件
+ * @param index 组件的索引
+ */
+const handleComponentSelected = (component: DiyComponent<any>, index: number = -1) => {
+  selectedComponent.value = component
+  selectedComponentIndex.value = index
+}
+
+// 选中顶部导航栏
+const handleNavigationBarSelected = () => {
+  handleComponentSelected(unref(navigationBarComponent))
+}
+
+// 选中底部导航菜单
+const handleTabBarSelected = () => {
+  handleComponentSelected(unref(tabBarComponent))
+}
+
+// 组件变动
+const handleComponentChange = (dragEvent: any) => {
+  // 新增，即从组件库拖拽添加组件
+  if (dragEvent.added) {
+    const { element, newIndex } = dragEvent.added
+    handleComponentSelected(element, newIndex)
+  } else if (dragEvent.moved) {
+    // 拖拽排序
+    const { newIndex } = dragEvent.moved
+    // 保持选中
+    selectedComponentIndex.value = newIndex
+  }
+}
+
+// 交换组件
+const swapComponent = (oldIndex: number, newIndex: number) => {
+  ;[pageComponents.value[oldIndex], pageComponents.value[newIndex]] = [
+    pageComponents.value[newIndex],
+    pageComponents.value[oldIndex]
+  ]
+  // 保持选中
+  selectedComponentIndex.value = newIndex
+}
+
+/** 移动组件 */
+const handleMoveComponent = (index: number, direction: number) => {
+  const newIndex = index + direction
+  if (newIndex < 0 || newIndex >= pageComponents.value.length) return
+
+  swapComponent(index, newIndex)
+}
+/** 复制组件 */
+const handleCopyComponent = (index: number) => {
+  const component = cloneDeep(pageComponents.value[index])
+  pageComponents.value.splice(index + 1, 0, component)
+}
+/**
+ * 删除组件
+ * @param index 当前组件index
+ */
+const handleDeleteComponent = (index: number) => {
+  // 删除组件
+  pageComponents.value.splice(index, 1)
+  if (index < pageComponents.value.length) {
+    // 1. 不是最后一个组件时，删除后选中下面的组件
+    let bottomIndex = index
+    handleComponentSelected(pageComponents.value[bottomIndex], bottomIndex)
+  } else if (pageComponents.value.length > 0) {
+    // 2. 不是第一个组件时，删除后选中上面的组件
+    let topIndex = index - 1
+    handleComponentSelected(pageComponents.value[topIndex], topIndex)
+  } else {
+    // 3. 组件全部删除之后，显示页面设置
+    handleComponentSelected(unref(pageConfigComponent))
+  }
+}
+
+// 工具栏操作
+const emits = defineEmits(['reset', 'preview', 'save', 'update:modelValue'])
+// 重置
+const handleReset = () => {
+  message.warning('开发中~')
+  emits('reset')
+}
+// 预览
+const handlePreview = () => {
+  message.warning('开发中~')
+  emits('preview')
+}
+</script>
+<style lang="scss" scoped>
+.editor {
+  height: 100%;
+  margin: calc(0px - var(--app-content-padding));
+  display: flex;
+  flex-direction: column;
+}
+.editor-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: auto;
+  padding: 0;
+  border-bottom: solid 1px var(--el-border-color);
+  background-color: var(--el-bg-color);
+
+  .header-right {
+    height: 100%;
+    .el-button {
+      height: 100%;
+    }
+  }
+
+  :deep(.el-radio-button__inner),
+  :deep(.el-button) {
+    border-top: none !important;
+    border-bottom: none !important;
+    border-radius: 0 !important;
+  }
+}
+.editor-container {
+  height: calc(
+    100vh - var(--top-tool-height) - var(--tags-view-height) - var(--app-footer-height) - 42px
+  );
+  /* 右侧属性面板 */
+  .editor-right {
+    flex-shrink: 0;
+    box-shadow: -8px 0 8px -8px rgba(0, 0, 0, 0.12);
+
+    :deep(.el-card__header) {
+      padding: 8px 16px;
+    }
+
+    .property-group {
+      /* 属性分组 */
+      :deep(.el-card__header) {
+        border: none;
+        background: var(--el-bg-color-page);
+      }
+    }
+  }
+
+  /* 中心 */
+  .editor-center {
+    flex: 1 1 0;
+    padding: 16px 0;
+    background-color: var(--app-content-bg-color);
+    display: flex;
+    justify-content: center;
+
+    .editor-design {
+      position: relative;
+      height: 100%;
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      overflow: hidden;
+
+      /* 组件 */
+      .component {
+        border: 1px solid #fff;
+        width: 375px !important;
+
+        &:hover {
+          border: 1px dashed #155bd4;
+        }
+      }
+      .component.active {
+        border: 2px solid #155bd4 !important;
+      }
+
+      .editor-design-top {
+        width: 379px;
+
+        .status-bar {
+          height: 20px;
+          width: 100%;
+          background-color: #fff;
+        }
+
+        .navigation-bar {
+          width: 100%;
+        }
+      }
+
+      .editor-design-bottom {
+        width: 379px;
+      }
+
+      .editor-design-center {
+        width: 100%;
+        flex: 1 1 0;
+
+        :deep(.el-scrollbar__view) {
+          height: 100%;
+        }
+
+        /* 主体内容 */
+        .phone-container {
+          height: 100%;
+          box-sizing: border-box;
+          cursor: move;
+          position: relative;
+          background-repeat: no-repeat;
+          background-size: 100% 100%;
+          width: 379px;
+          margin: 0 auto;
+
+          .drag-area {
+            height: 100%;
+          }
+
+          /* 组件容器 */
+          .component-box {
+            width: 100%;
+            position: relative;
+            /* 组件名称 */
+            .component-name {
+              position: absolute;
+              width: 80px;
+              text-align: center;
+              line-height: 25px;
+              height: 25px;
+              background: #fff;
+              font-size: 12px;
+              left: -80px;
+              top: 0;
+              box-shadow:
+                0 0 4px #00000014,
+                0 2px 6px #0000000f,
+                0 4px 8px 2px #0000000a;
+            }
+            .component-name.active {
+              background: #2d8cf0;
+              color: #fff;
+            }
+            /* 组件操作按钮 */
+            .component-toolbar {
+              position: absolute;
+              top: 0;
+              right: -50px;
+
+              .el-button-group {
+                display: inline-flex;
+                flex-direction: column;
+              }
+              .el-button-group > .el-button:first-child {
+                border-bottom-left-radius: 0;
+                border-bottom-right-radius: 0;
+                border-top-right-radius: var(--el-border-radius-base);
+                border-bottom-color: var(--el-button-divide-border-color);
+              }
+              .el-button-group > .el-button:last-child {
+                border-top-left-radius: 0;
+                border-top-right-radius: 0;
+                border-bottom-left-radius: var(--el-border-radius-base);
+                border-top-color: var(--el-button-divide-border-color);
+              }
+              .el-button-group .el-button--primary:not(:first-child):not(:last-child) {
+                border-top-color: var(--el-button-divide-border-color);
+                border-bottom-color: var(--el-button-divide-border-color);
+              }
+              .el-button-group > .el-button:not(:last-child) {
+                margin-bottom: -1px;
+                margin-right: 0;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/components/DiyEditor/util.ts b/src/components/DiyEditor/util.ts
new file mode 100644
index 00000000..407efa30
--- /dev/null
+++ b/src/components/DiyEditor/util.ts
@@ -0,0 +1,59 @@
+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 }
+}
diff --git a/src/components/UploadFile/src/UploadImg.vue b/src/components/UploadFile/src/UploadImg.vue
index 3cfc0a73..996fe40b 100644
--- 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() // 消息弹窗
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index aa260cf1..70dc5b2f 100644
--- 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')
+      }
+    ]
   }
 ]
 
diff --git a/src/views/mall/promotion/diy/page/DiyPageForm.vue b/src/views/mall/promotion/diy/page/DiyPageForm.vue
new file mode 100644
index 00000000..e0cb18b6
--- /dev/null
+++ b/src/views/mall/promotion/diy/page/DiyPageForm.vue
@@ -0,0 +1,114 @@
+<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>
diff --git a/src/views/mall/promotion/diy/page/decorate.vue b/src/views/mall/promotion/diy/page/decorate.vue
new file mode 100644
index 00000000..76336bc4
--- /dev/null
+++ b/src/views/mall/promotion/diy/page/decorate.vue
@@ -0,0 +1,99 @@
+<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>
diff --git a/src/views/mall/promotion/diy/page/index.vue b/src/views/mall/promotion/diy/page/index.vue
new file mode 100644
index 00000000..6436c2f7
--- /dev/null
+++ b/src/views/mall/promotion/diy/page/index.vue
@@ -0,0 +1,189 @@
+<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>
diff --git a/src/views/mall/promotion/diy/template/DiyTemplateForm.vue b/src/views/mall/promotion/diy/template/DiyTemplateForm.vue
new file mode 100644
index 00000000..e4289f65
--- /dev/null
+++ b/src/views/mall/promotion/diy/template/DiyTemplateForm.vue
@@ -0,0 +1,115 @@
+<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>
diff --git a/src/views/mall/promotion/diy/template/decorate.vue b/src/views/mall/promotion/diy/template/decorate.vue
new file mode 100644
index 00000000..9c7500b2
--- /dev/null
+++ b/src/views/mall/promotion/diy/template/decorate.vue
@@ -0,0 +1,134 @@
+<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>
diff --git a/src/views/mall/promotion/diy/template/index.vue b/src/views/mall/promotion/diy/template/index.vue
new file mode 100644
index 00000000..dcf13698
--- /dev/null
+++ b/src/views/mall/promotion/diy/template/index.vue
@@ -0,0 +1,225 @@
+<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>

From 0c81a0d96a07fe473a1fac7636e64e84b2bb4062 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 29 Oct 2023 22:29:03 +0800
Subject: [PATCH 10/38] =?UTF-8?q?code=20review=EF=BC=9A=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/crm/contract/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/crm/contract/index.vue b/src/views/crm/contract/index.vue
index 7a8211be..1670c418 100644
--- 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() // 国际化

From 55a961e86265a1c2b37874dfd076b60935de6964 Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Sun, 29 Oct 2023 23:48:10 +0800
Subject: [PATCH 11/38] =?UTF-8?q?=E8=BD=AC=E8=B4=A6=20-=20=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=90=8E=E5=8F=B0=E6=96=B0=E5=A2=9E=E8=BD=AC=E8=B4=A6?=
 =?UTF-8?q?=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/pay/demo/transfer/index.ts            |  25 +++
 src/api/pay/transfer/index.ts                 |  18 +++
 src/utils/dict.ts                             |   2 +
 src/views/pay/demo/{ => order}/index.vue      |   0
 .../pay/demo/transfer/DemoTransferForm.vue    | 122 ++++++++++++++
 src/views/pay/demo/transfer/index.vue         | 152 ++++++++++++++++++
 src/views/pay/transfer/CreatePayTransfer.vue  | 141 ++++++++++++++++
 .../WalletRechargePackageForm.vue             |   2 +-
 8 files changed, 461 insertions(+), 1 deletion(-)
 create mode 100644 src/api/pay/demo/transfer/index.ts
 create mode 100644 src/api/pay/transfer/index.ts
 rename src/views/pay/demo/{ => order}/index.vue (100%)
 create mode 100644 src/views/pay/demo/transfer/DemoTransferForm.vue
 create mode 100644 src/views/pay/demo/transfer/index.vue
 create mode 100644 src/views/pay/transfer/CreatePayTransfer.vue

diff --git a/src/api/pay/demo/transfer/index.ts b/src/api/pay/demo/transfer/index.ts
new file mode 100644
index 00000000..a95b0d5c
--- /dev/null
+++ b/src/api/pay/demo/transfer/index.ts
@@ -0,0 +1,25 @@
+import request from '@/config/axios'
+
+export interface DemoTransferVO {
+  price: number
+  type: number
+  userName: string
+  alipayLogonId: string
+  openid: string
+}
+
+// 创建示例转账单
+export function createDemoTransfer(data: DemoTransferVO) {
+  return request.post({
+    url: '/pay/demo-transfer/create',
+    data: data
+  })
+}
+
+// 获得示例订单分页
+export function getDemoTransferPage(query: PageParam) {
+  return request.get({
+    url: '/pay/demo-transfer/page',
+    params: query
+  })
+}
diff --git a/src/api/pay/transfer/index.ts b/src/api/pay/transfer/index.ts
new file mode 100644
index 00000000..4b2f3154
--- /dev/null
+++ b/src/api/pay/transfer/index.ts
@@ -0,0 +1,18 @@
+import request from '@/config/axios'
+
+export interface TransferVO {
+  appId: number
+  channelCode: string
+  merchantTransferId: string
+  type: number
+  price: number
+  subject: string
+  userName: string
+  alipayLogonId: string
+  openid: string
+}
+
+// 新增转账单
+export const createTransfer = async (data: TransferVO) => {
+  return await request.post({ url: `/pay/transfer/create`, data })
+}
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 489d8e4b..12d01507 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -143,6 +143,8 @@ export enum DICT_TYPE {
   PAY_REFUND_STATUS = 'pay_refund_status', // 退款订单状态
   PAY_NOTIFY_STATUS = 'pay_notify_status', // 商户支付回调状态
   PAY_NOTIFY_TYPE = 'pay_notify_type', // 商户支付回调状态
+  PAY_TRANSFER_STATUS = 'pay_transfer_status', // 转账订单状态
+  PAY_TRANSFER_TYPE = 'pay_transfer_type', // 转账订单状态
 
   // ========== MP 模块 ==========
   MP_AUTO_REPLY_REQUEST_MATCH = 'mp_auto_reply_request_match', // 自动回复请求匹配类型
diff --git a/src/views/pay/demo/index.vue b/src/views/pay/demo/order/index.vue
similarity index 100%
rename from src/views/pay/demo/index.vue
rename to src/views/pay/demo/order/index.vue
diff --git a/src/views/pay/demo/transfer/DemoTransferForm.vue b/src/views/pay/demo/transfer/DemoTransferForm.vue
new file mode 100644
index 00000000..e5448f10
--- /dev/null
+++ b/src/views/pay/demo/transfer/DemoTransferForm.vue
@@ -0,0 +1,122 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="120px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="转账类型" prop="type">
+        <el-radio-group v-model="formData.type">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.PAY_TRANSFER_TYPE)"
+            :key="dict.value"
+            :label="dict.value"
+            :disabled="dict.value === 2 || dict.value === 3 || dict.value === 4"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="转账金额(元)" prop="price">
+        <el-input-number
+          v-model="formData.price"
+          :min="0"
+          :precision="2"
+          :step="0.01"
+          placeholder="请输入转账金额"
+          style="width: 200px"
+        />
+      </el-form-item>
+      <el-form-item label="收款人姓名" prop="userName">
+        <el-input v-model="formData.userName" placeholder="请输入收款人姓名" />
+      </el-form-item>
+      <el-form-item v-show="formData.type === 1" label="支付宝登录账号" prop="alipayLogonId">
+        <el-input v-model="formData.alipayLogonId" placeholder="请输入支付宝登录账号" />
+      </el-form-item>
+      <el-form-item v-show="formData.type === 2" label="微信 openid" prop="openid">
+        <el-input v-model="formData.openid" placeholder="请输入微信 openid" />
+      </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 DemoTransferApi from '@/api/pay/demo/transfer'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { yuanToFen } from '@/utils'
+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,
+  price: undefined,
+  type: undefined,
+  userName: undefined,
+  alipayLogonId: undefined,
+  openid: undefined
+})
+const formRules = reactive({
+  price: [{ required: true, message: '转账金额不能为空', trigger: 'blur' }],
+  type: [{ required: true, message: '转账类型不能为空', trigger: 'change' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+}
+/** 关闭弹窗 */
+const close = async () => {
+  dialogVisible.value = false
+  resetForm()
+}
+defineExpose({ open, close }) // 提供 open， close 方法，用于打开, 关闭弹窗
+
+/** 提交表单 */
+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 }
+    data.price = yuanToFen(data.price)
+    if (formType.value === 'create') {
+      await DemoTransferApi.createDemoTransfer(data)
+      message.success(t('common.createSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    price: undefined,
+    userName: undefined,
+    alipayLogonId: undefined,
+    openid: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/pay/demo/transfer/index.vue b/src/views/pay/demo/transfer/index.vue
new file mode 100644
index 00000000..7d0d8bad
--- /dev/null
+++ b/src/views/pay/demo/transfer/index.vue
@@ -0,0 +1,152 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <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')"
+          ><Icon icon="ep:plus" />创建业务转账单
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true">
+      <el-table-column label="订单编号" align="center" prop="id" />
+      <el-table-column label="转账类型" align="center" prop="type" width="120">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.PAY_TRANSFER_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="转账金额" align="center" prop="price">
+        <template #default="scope">
+          <span>￥{{ (scope.row.price / 100.0).toFixed(2) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="收款人姓名" align="center" prop="userName" width="120" />
+      <el-table-column label="支付宝登录账号" align="center" prop="alipayLogonId" width="180" />
+      <el-table-column label="微信 openid" align="center" prop="openid" width="120" />
+      <el-table-column label="转账状态" align="center" prop="transferStatus">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.PAY_TRANSFER_STATUS" :value="scope.row.transferStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="转账单号" align="center" prop="payTransferId" />
+      <el-table-column label="支付渠道" align="center" prop="payChannelCode" />
+      <el-table-column
+        label="转账时间"
+        align="center"
+        prop="transferTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="handleTransfer(scope.row)"
+            v-if="scope.row.transferStatus === 0"
+          >
+            发起转账
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <DemoTransferForm ref="demoFormRef" @success="getList" />
+  <CreatePayTransfer ref="payTransferRef" :payTransfer="payTransfer" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import * as DemoTransferApi from '@/api/pay/demo/transfer'
+import * as PayTransferApi from '@/api/pay/transfer'
+import DemoTransferForm from './DemoTransferForm.vue'
+import CreatePayTransfer from '../../transfer/CreatePayTransfer.vue'
+import { DICT_TYPE } from '@/utils/dict'
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10
+})
+const queryFormRef = ref() // 搜索的表单
+
+let payTransfer = {
+  appId: undefined,
+  merchantTransferId: undefined,
+  type: undefined,
+  price: undefined,
+  subject: undefined,
+  userName: undefined,
+  alipayLogonId: undefined,
+  openid: undefined
+} as PayTransferApi.TransferVO // 传递给转账订单的数据
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await DemoTransferApi.getDemoTransferPage(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 demoFormRef = ref()
+const payTransferRef = ref()
+const openForm = (type: string) => {
+  demoFormRef.value.open(type)
+}
+
+/** 发起转账操作 */
+const handleTransfer = (row: any) => {
+  payTransfer = { ...row }
+  payTransfer.merchantTransferId = row.id.toString()
+  payTransfer.subject = '示例转账'
+  payTransferRef.value.showPayTransfer(payTransfer)
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
diff --git a/src/views/pay/transfer/CreatePayTransfer.vue b/src/views/pay/transfer/CreatePayTransfer.vue
new file mode 100644
index 00000000..5f0ea166
--- /dev/null
+++ b/src/views/pay/transfer/CreatePayTransfer.vue
@@ -0,0 +1,141 @@
+<template>
+  <Dialog title="发起转账" v-model="dialogVisible" width="800px">
+    <el-card style="margin-top: 10px">
+      <el-descriptions title="转账信息" :column="2" border>
+        <el-descriptions-item label="转账类型">
+          {{ typeName }}
+        </el-descriptions-item>
+        <el-descriptions-item label="转账金额(元)">
+          ￥{{ (transfer.price / 100.0).toFixed(2) }}
+        </el-descriptions-item>
+        <el-descriptions-item label="收款人姓名">
+          {{ transfer.userName }}
+        </el-descriptions-item>
+        <el-descriptions-item label="支付宝登录账号" v-if="transfer.type === 1">
+          {{ transfer.alipayLogonId }}
+        </el-descriptions-item>
+        <el-descriptions-item label="微信 openid" v-if="transfer.type === 2">
+          {{ transfer.openid }}
+        </el-descriptions-item>
+      </el-descriptions>
+    </el-card>
+    <el-card style="margin-top: 20px">
+      <template #header>
+        <div class="card-header">
+          <span>选择转账渠道</span>
+        </div>
+      </template>
+      <div>
+        <el-radio-group v-model="channelCode">
+          <el-radio
+            label="alipay_pc"
+            :disabled="transfer.type === 2 || transfer.type === 3 || transfer.type === 4"
+          >
+            <img :src="svg_alipay_app" />
+          </el-radio>
+          <el-radio
+            label="wx_app"
+            :disabled="transfer.type === 1 || transfer.type === 3 || transfer.type === 4"
+          >
+            <img :src="svg_wx_app" />
+          </el-radio>
+        </el-radio-group>
+      </div>
+    </el-card>
+    <el-divider />
+    <div style="text-align: right">
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </div>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import * as PayTransferApi from '@/api/pay/transfer'
+import { computed, PropType } from 'vue'
+import { DICT_TYPE, getDictLabel } from '@/utils/dict'
+// 导入图标
+import svg_alipay_app from '@/assets/svgs/pay/icon/alipay_app.svg'
+import svg_wx_app from '@/assets/svgs/pay/icon/wx_app.svg'
+import { yuanToFen } from '@/utils'
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const formLoading = ref(false) // 提交的按钮禁用
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+defineOptions({ name: 'CreatePayTransfer' })
+
+const props = defineProps({
+  payTransfer: {
+    type: Object as PropType<PayTransferApi.TransferVO>,
+    required: true
+  }
+})
+// 提交数据
+let submitTransferData = {
+  appId: undefined,
+  channelCode: undefined,
+  merchantTransferId: undefined,
+  type: undefined,
+  price: undefined,
+  subject: undefined,
+  userName: undefined,
+  alipayLogonId: undefined,
+  openid: undefined
+} as PayTransferApi.TransferVO
+
+const transfer = reactive(props.payTransfer)
+const dialogVisible = ref(false)
+const typeName = computed(() => {
+  return getDictLabel(DICT_TYPE.PAY_TRANSFER_TYPE, transfer.type)
+})
+const channelCode = computed(() => {
+  let channelCode = 'alipay_pc'
+  if (transfer.type === 2) {
+    channelCode = 'wx_app'
+  }
+  // TODO 银行卡和钱包 转账待实现
+  return channelCode
+})
+
+/** 打开弹窗 */
+const showPayTransfer = async (payTransfer: PayTransferApi.TransferVO) => {
+  dialogVisible.value = true
+  submitTransferData = payTransfer
+  transfer.merchantTransferId = payTransfer.merchantTransferId
+  transfer.price = payTransfer.price
+  transfer.userName = payTransfer.userName
+  transfer.type = payTransfer.type
+  transfer.appId = payTransfer.appId
+  transfer.subject = payTransfer.subject
+  transfer.alipayLogonId = payTransfer.alipayLogonId
+  transfer.openid = payTransfer.openid
+}
+/** 关闭弹窗 */
+const close = async () => {
+  dialogVisible.value = false
+}
+defineExpose({ showPayTransfer, close }) // 提供 showPayTransfer， close 方法，用于打开, 关闭弹窗
+
+const submitForm = async () => {
+  // 校验表单
+  formLoading.value = true
+  try {
+    submitTransferData.channelCode = channelCode.value
+    await PayTransferApi.createTransfer(submitTransferData)
+    message.success('发起转账成功. 是否转账成功,以转账订单状态为准')
+    // 发送操作成功的事件
+    emit('success')
+    dialogVisible.value = false
+  } finally {
+    formLoading.value = false
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+</style>
diff --git a/src/views/pay/wallet/rechargePackage/WalletRechargePackageForm.vue b/src/views/pay/wallet/rechargePackage/WalletRechargePackageForm.vue
index f538b78c..0153225e 100644
--- a/src/views/pay/wallet/rechargePackage/WalletRechargePackageForm.vue
+++ b/src/views/pay/wallet/rechargePackage/WalletRechargePackageForm.vue
@@ -90,7 +90,7 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as unknown as WalletRechargePackageApi.WalletRechargePackageVO
+    const data = { ...formData.value }
     data.payPrice = yuanToFen(data.payPrice)
     data.bonusPrice = yuanToFen(data.bonusPrice)
     if (formType.value === 'create') {

From c269cab6b2bf17ca0edcb9c8bc1a5b07a53a6664 Mon Sep 17 00:00:00 2001
From: lzy <7783739+lzyyd@user.noreply.gitee.com>
Date: Mon, 30 Oct 2023 06:20:16 +0000
Subject: [PATCH 12/38] =?UTF-8?q?update=20src/layout/components/Message/sr?=
 =?UTF-8?q?c/Message.vue.=20fix:=20=20=E5=A4=84=E7=90=86=E7=AB=99=E5=86=85?=
 =?UTF-8?q?=E4=BF=A1=E5=86=85=E5=AE=B9=E8=BF=87=E5=A4=9A=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lzy <7783739+lzyyd@user.noreply.gitee.com>
---
 src/layout/components/Message/src/Message.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/Message/src/Message.vue b/src/layout/components/Message/src/Message.vue
index 28f796b3..3019df29 100644
--- a/src/layout/components/Message/src/Message.vue
+++ b/src/layout/components/Message/src/Message.vue
@@ -53,7 +53,7 @@ onMounted(() => {
       </template>
       <ElTabs v-model="activeName">
         <ElTabPane label="我的站内信" name="notice">
-          <div class="message-list">
+          <el-scrollbar class="message-list">
             <template v-for="item in list" :key="item.id">
               <div class="message-item">
                 <img alt="" class="message-icon" src="@/assets/imgs/avatar.gif" />
@@ -67,7 +67,7 @@ onMounted(() => {
                 </div>
               </div>
             </template>
-          </div>
+          </el-scrollbar>
         </ElTabPane>
       </ElTabs>
       <!-- 更多 -->
@@ -88,6 +88,7 @@ onMounted(() => {
 }
 
 .message-list {
+  height: 400px;
   display: flex;
   flex-direction: column;
 

From 2b84de7e0927371a2c5271886bc1612a07fc6497 Mon Sep 17 00:00:00 2001
From: liuhongfeng <291117974@qq.com>
Date: Mon, 30 Oct 2023 21:32:50 +0800
Subject: [PATCH 13/38] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91?=
 =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=20=E3=80=90=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=91=E8=A7=84=E8=8C=83=E5=91=BD=E5=90=8D=EF=BC=9A=E6=9C=9F?=
 =?UTF-8?q?=E6=95=B0=EF=BC=9AindexNo-=E3=80=8Bperiod?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/receivablePlan/index.ts           |  2 +-
 src/views/crm/receivable/ReceivableForm.vue   | 32 ++++++----
 src/views/crm/receivable/index.vue            | 13 +++--
 .../crm/receivablePlan/ReceivablePlanForm.vue | 45 ++++++++------
 src/views/crm/receivablePlan/index.vue        | 58 +++++++++++--------
 5 files changed, 90 insertions(+), 60 deletions(-)

diff --git a/src/api/crm/receivablePlan/index.ts b/src/api/crm/receivablePlan/index.ts
index 178b21b5..f80f0572 100644
--- a/src/api/crm/receivablePlan/index.ts
+++ b/src/api/crm/receivablePlan/index.ts
@@ -2,7 +2,7 @@ import request from '@/config/axios'
 
 export interface ReceivablePlanVO {
   id: number
-  indexNo: number
+  period: number
   receivableId: number
   status: number
   checkStatus: string
diff --git a/src/views/crm/receivable/ReceivableForm.vue b/src/views/crm/receivable/ReceivableForm.vue
index 2b9278fe..4ac9136a 100644
--- a/src/views/crm/receivable/ReceivableForm.vue
+++ b/src/views/crm/receivable/ReceivableForm.vue
@@ -54,15 +54,22 @@
         <el-input-number v-model="formData.price" placeholder="请输入回款金额" />
       </el-form-item>
       <el-form-item label="负责人" prop="ownerUserId">
-        <el-input v-model="formData.ownerUserId" placeholder="请输入负责人" />
+        <el-select v-model="formData.ownerUserId" clearable placeholder="请输入负责人">
+          <el-option
+            v-for="item in userList"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="批次" prop="batchId">
-        <el-input v-model="formData.batchId" placeholder="请输入批次" />
+        <el-input-number v-model="formData.batchId" placeholder="请输入批次" />
       </el-form-item>
-      <!--<el-form-item label="显示顺序" prop="sort">
-        <el-input v-model="formData.sort" placeholder="请输入显示顺序" />
-      </el-form-item>-->
-      <el-form-item label="状态" prop="status">
+      <el-form-item label="显示排序" prop="sort">
+        <el-input-number v-model="formData.sort" :min="0" controls-position="right" />
+      </el-form-item>
+      <!--<el-form-item label="状态" prop="status">
         <el-select v-model="formData.status" placeholder="请选择状态">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
@@ -71,7 +78,7 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item>-->
       <el-form-item label="备注" prop="remark">
         <el-input type="textarea" :rows="3" v-model="formData.remark" placeholder="请输入备注" />
       </el-form-item>
@@ -85,10 +92,11 @@
 <script setup lang="ts">
 import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
 import * as ReceivableApi from '@/api/crm/receivable'
+import * as UserApi from '@/api/system/user'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
-
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
@@ -112,9 +120,9 @@ const formData = ref({
   status: undefined,
   remark: undefined
 })
-const formRules = reactive({
-  status: [{ required: true, message: '状态不能为空', trigger: 'change' }]
-})
+// const formRules = reactive({
+//   status: [{ required: true, message: '状态不能为空', trigger: 'change' }]
+// })
 const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
@@ -132,6 +140,8 @@ const open = async (type: string, id?: number) => {
       formLoading.value = false
     }
   }
+  // 获得用户列表
+  userList.value = await UserApi.getSimpleUserList()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
diff --git a/src/views/crm/receivable/index.vue b/src/views/crm/receivable/index.vue
index 8a07fdda..ae483015 100644
--- a/src/views/crm/receivable/index.vue
+++ b/src/views/crm/receivable/index.vue
@@ -26,19 +26,19 @@
           class="!w-240px"
         />
       </el-form-item>-->
-      <el-form-item label="客户" prop="customerId">
+      <el-form-item label="客户名称" prop="customerId">
         <el-input
           v-model="queryParams.customerId"
-          placeholder="请输入客户"
+          placeholder="请输入客户名称"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="合同" prop="contractId">
+      <el-form-item label="合同名称" prop="contractId">
         <el-input
           v-model="queryParams.contractId"
-          placeholder="请输入合同"
+          placeholder="请输入合同名称"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
@@ -227,8 +227,11 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="操作" align="center" width="130px">
+      <el-table-column label="操作" align="center" width="180px">
         <template #default="scope">
+          <router-link :to="'/crm/receivable-plan?receivableId=' + scope.row.receivableId">
+            <el-button link type="primary">详情</el-button>
+          </router-link>
           <el-button
             link
             type="primary"
diff --git a/src/views/crm/receivablePlan/ReceivablePlanForm.vue b/src/views/crm/receivablePlan/ReceivablePlanForm.vue
index 22022ea0..bbc0379c 100644
--- a/src/views/crm/receivablePlan/ReceivablePlanForm.vue
+++ b/src/views/crm/receivablePlan/ReceivablePlanForm.vue
@@ -7,8 +7,24 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="期数" prop="indexNo">
-        <el-input-number v-model="formData.indexNo" placeholder="请输入期数" />
+      <el-form-item label="客户名称" prop="customerId">
+        <el-input v-model="formData.customerId" placeholder="请输入客户名称" />
+      </el-form-item>
+      <el-form-item label="合同名称" prop="contractId">
+        <el-input v-model="formData.contractId" placeholder="请输入合同名称" />
+      </el-form-item>
+      <el-form-item label="负责人" prop="ownerUserId">
+        <el-select v-model="formData.ownerUserId" clearable placeholder="请输入负责人">
+          <el-option
+            v-for="item in userList"
+            :key="item.id"
+            :label="item.nickname"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="期数" prop="period">
+        <el-input-number v-model="formData.period" placeholder="请输入期数" />
       </el-form-item>
       <!--<el-form-item label="回款ID" prop="receivableId">
         <el-input v-model="formData.receivableId" placeholder="请输入回款ID" />
@@ -58,18 +74,9 @@
           placeholder="选择提醒日期"
         />
       </el-form-item>
-      <el-form-item label="客户ID" prop="customerId">
-        <el-input v-model="formData.customerId" placeholder="请输入客户ID" />
+      <el-form-item label="显示排序" prop="sort">
+        <el-input-number v-model="formData.sort" :min="0" controls-position="right" />
       </el-form-item>
-      <el-form-item label="合同ID" prop="contractId">
-        <el-input v-model="formData.contractId" placeholder="请输入合同ID" />
-      </el-form-item>
-      <el-form-item label="负责人" prop="ownerUserId">
-        <el-input v-model="formData.ownerUserId" placeholder="请输入负责人" />
-      </el-form-item>
-      <!--<el-form-item label="显示顺序" prop="sort">
-        <el-input v-model="formData.sort" placeholder="请输入显示顺序" />
-      </el-form-item>-->
       <el-form-item label="备注" prop="remark">
         <el-input type="textarea" :rows="3" v-model="formData.remark" placeholder="请输入备注" />
       </el-form-item>
@@ -81,19 +88,18 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import { DICT_TYPE, getIntDictOptions, getStrDictOptions } from '@/utils/dict'
 import * as ReceivablePlanApi from '@/api/crm/receivablePlan'
-
+import * as UserApi from '@/api/system/user'
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
-
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
-  indexNo: undefined,
+  period: undefined,
   receivableId: undefined,
   status: undefined,
   checkStatus: undefined,
@@ -128,6 +134,9 @@ const open = async (type: string, id?: number) => {
       formLoading.value = false
     }
   }
+
+  // 获得用户列表
+  userList.value = await UserApi.getSimpleUserList()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -161,7 +170,7 @@ const submitForm = async () => {
 const resetForm = () => {
   formData.value = {
     id: undefined,
-    indexNo: undefined,
+    period: undefined,
     receivableId: undefined,
     status: undefined,
     checkStatus: undefined,
diff --git a/src/views/crm/receivablePlan/index.vue b/src/views/crm/receivablePlan/index.vue
index 46857dcd..290e1cd8 100644
--- a/src/views/crm/receivablePlan/index.vue
+++ b/src/views/crm/receivablePlan/index.vue
@@ -8,9 +8,9 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="期数" prop="indexNo">
+      <el-form-item label="期数" prop="period">
         <el-input
-          v-model="queryParams.indexNo"
+          v-model="queryParams.period"
           placeholder="请输入期数"
           clearable
           @keyup.enter="handleQuery"
@@ -152,23 +152,13 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="期数" align="center" prop="indexNo" />
-      <!--<el-table-column label="回款ID" align="center" prop="receivableId" />-->
-      <el-table-column label="完成状态" align="center" prop="status">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
-        </template>
-      </el-table-column>
-      <el-table-column label="审批状态" align="center" prop="checkStatus" width="130px">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.CRM_RECEIVABLE_CHECK_STATUS" :value="scope.row.checkStatus" />
-        </template>
-      </el-table-column>
-      <!--<el-table-column label="工作流编号" align="center" prop="processInstanceId" />-->
-      <el-table-column label="回款金额" align="center" prop="price" />
+      <!--<el-table-column label="ID" align="center" prop="id" />-->
+      <el-table-column label="客户名称" align="center" prop="customerId" width="150px" />
+      <el-table-column label="合同名称" align="center" prop="contractId" width="150px" />
+      <el-table-column label="期数" align="center" prop="period" />
+      <el-table-column label="计划回款" align="center" prop="price" />
       <el-table-column
-        label="回款日期"
+        label="计划回款日期"
         align="center"
         prop="returnTime"
         :formatter="dateFormatter2"
@@ -182,10 +172,24 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="客户ID" align="center" prop="customerId" />
-      <el-table-column label="合同ID" align="center" prop="contractId" />
-      <el-table-column label="负责人" align="center" prop="ownerUserId" />
-      <!--<el-table-column label="显示顺序" align="center" prop="sort" />-->
+      <!--<el-table-column label="回款ID" align="center" prop="receivableId" />-->
+      <el-table-column label="完成状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="审批状态" align="center" prop="checkStatus" width="130px">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.CRM_RECEIVABLE_CHECK_STATUS" :value="scope.row.checkStatus" />
+        </template>
+      </el-table-column>
+      <!--<el-table-column label="工作流编号" align="center" prop="processInstanceId" />-->
+      <el-table-column prop="ownerUserId" label="负责人" width="120">
+        <template #default="scope">
+          {{ userList.find((user) => user.id === scope.row.ownerUserId)?.nickname }}
+        </template>
+      </el-table-column>
+      <el-table-column label="显示顺序" align="center" prop="sort" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column
         label="创建时间"
@@ -234,6 +238,7 @@ import { dateFormatter, dateFormatter2 } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as ReceivablePlanApi from '@/api/crm/receivablePlan'
 import ReceivablePlanForm from './ReceivablePlanForm.vue'
+import * as UserApi from '@/api/system/user'
 
 defineOptions({ name: 'ReceivablePlan' })
 
@@ -243,10 +248,11 @@ const { t } = useI18n() // 国际化
 const loading = ref(true) // 列表的加载中
 const total = ref(0) // 列表的总页数
 const list = ref([]) // 列表的数据
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
-  indexNo: null,
+  period: null,
   status: null,
   checkStatus: null,
   returnTime: [],
@@ -320,7 +326,9 @@ const handleExport = async () => {
 }
 
 /** 初始化 **/
-onMounted(() => {
-  getList()
+onMounted(async () => {
+  await getList()
+  // 获取用户列表
+  userList.value = await UserApi.getSimpleUserList()
 })
 </script>

From 881c4f3a2932ff4892bf09e6de9f790d5f93d9c6 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Tue, 31 Oct 2023 16:01:22 +0800
Subject: [PATCH 14/38] =?UTF-8?q?=E8=90=A5=E9=94=80=EF=BC=9A=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E5=95=86=E5=9F=8E=E8=A3=85=E4=BF=AE=201.=20=E6=8B=86?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=9D=A2=E8=AE=BE=E8=AE=A1=E7=94=A8=E7=9A=84?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3=202.=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A8=A1=E6=9D=BF=E7=9A=84=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=203.=20=E5=A2=9E=E5=8A=A0=E5=94=AF=E4=B8=80?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=A0=A1=E9=AA=8C=204.=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=BC=96=E8=BE=91=E5=99=A8=EF=BC=8C=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E9=80=89=E4=B8=AD=E7=BB=84=E4=BB=B6=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mall/promotion/diy/page.ts            | 10 +++++
 src/api/mall/promotion/diy/template.ts        | 17 ++++++++
 src/components/DiyEditor/index.vue            | 31 +++++++++++++--
 .../mall/promotion/diy/page/decorate.vue      |  5 ++-
 .../mall/promotion/diy/template/decorate.vue  | 39 ++++++++++++++-----
 5 files changed, 88 insertions(+), 14 deletions(-)

diff --git a/src/api/mall/promotion/diy/page.ts b/src/api/mall/promotion/diy/page.ts
index 255015d2..1cd34282 100644
--- a/src/api/mall/promotion/diy/page.ts
+++ b/src/api/mall/promotion/diy/page.ts
@@ -33,3 +33,13 @@ export const updateDiyPage = async (data: DiyPageVO) => {
 export const deleteDiyPage = async (id: number) => {
   return await request.delete({ url: `/promotion/diy-page/delete?id=` + id })
 }
+
+// 获得装修页面属性
+export const getDiyPageProperty = async (id: number) => {
+  return await request.get({ url: `/promotion/diy-page/get-property?id=` + id })
+}
+
+// 更新装修页面属性
+export const updateDiyPageProperty = async (data: DiyPageVO) => {
+  return await request.put({ url: `/promotion/diy-page/update-property`, data })
+}
diff --git a/src/api/mall/promotion/diy/template.ts b/src/api/mall/promotion/diy/template.ts
index 72eea41c..f8d4bc80 100644
--- a/src/api/mall/promotion/diy/template.ts
+++ b/src/api/mall/promotion/diy/template.ts
@@ -1,4 +1,5 @@
 import request from '@/config/axios'
+import { DiyPageVO } from '@/api/mall/promotion/diy/page'
 
 export interface DiyTemplateVO {
   id?: number
@@ -10,6 +11,10 @@ export interface DiyTemplateVO {
   property: string
 }
 
+export interface DiyTemplatePropertyVO extends DiyTemplateVO {
+  pages: DiyPageVO[]
+}
+
 // 查询装修模板列表
 export const getDiyTemplatePage = async (params: any) => {
   return await request.get({ url: `/promotion/diy-template/page`, params })
@@ -39,3 +44,15 @@ export const deleteDiyTemplate = async (id: number) => {
 export const useDiyTemplate = async (id: number) => {
   return await request.put({ url: `/promotion/diy-template/use?id=` + id })
 }
+
+// 获得装修模板属性
+export const getDiyTemplateProperty = async (id: number) => {
+  return await request.get<DiyTemplatePropertyVO>({
+    url: `/promotion/diy-template/get-property?id=` + id
+  })
+}
+
+// 更新装修模板属性
+export const updateDiyTemplateProperty = async (data: DiyTemplateVO) => {
+  return await request.put({ url: `/promotion/diy-template/update-property`, data })
+}
diff --git a/src/components/DiyEditor/index.vue b/src/components/DiyEditor/index.vue
index 520cd497..f0fed316 100644
--- a/src/components/DiyEditor/index.vue
+++ b/src/components/DiyEditor/index.vue
@@ -59,7 +59,7 @@
               }"
             >
               <draggable
-                class="drag-area page-prop-area"
+                class="page-prop-area drag-area"
                 v-model="pageComponents"
                 item-key="index"
                 :animation="200"
@@ -200,18 +200,25 @@ const navigationBarComponent = ref<DiyComponent<any>>(cloneDeep(NAVIGATION_BAR_C
 const tabBarComponent = ref<DiyComponent<any>>(cloneDeep(TAB_BAR_COMPONENT))
 
 // 选中的组件，默认选中顶部导航栏
-const selectedComponent = ref<DiyComponent<any>>(unref(pageConfigComponent))
+const selectedComponent = ref<DiyComponent<any>>()
 // 选中的组件索引
 const selectedComponentIndex = ref<number>(-1)
 // 组件列表
 const pageComponents = ref<DiyComponent<any>[]>([])
 // 定义属性
 const props = defineProps<{
+  // 页面配置，支持Json字符串
   modelValue: string | PageConfig
+  // 标题
   title: string
-  libs: DiyComponentLibrary[] // 组件库
+  // 组件库
+  libs: DiyComponentLibrary[]
+  // 是否显示顶部导航栏
   showNavigationBar: boolean
+  // 是否显示底部导航菜单
   showTabBar: boolean
+  // 是否显示页面配置
+  showPageConfig: boolean
 }>()
 
 // 监听传入的页面配置
@@ -255,6 +262,8 @@ const handleSave = () => {
 
 // 处理页面选中：显示属性表单
 const handlePageSelected = (event: any) => {
+  if (!props.showPageConfig) return
+
   // 配置了样式 page-prop-area 的元素，才显示页面设置
   if (includes(event?.target?.classList, 'page-prop-area')) {
     handleComponentSelected(unref(pageConfigComponent))
@@ -351,6 +360,22 @@ const handlePreview = () => {
   message.warning('开发中~')
   emits('preview')
 }
+
+// 设置默认选中的组件
+const setDefaultSelectedComponent = () => {
+  if (props.showPageConfig) {
+    selectedComponent.value = unref(pageConfigComponent)
+  } else if (props.showNavigationBar) {
+    selectedComponent.value = unref(navigationBarComponent)
+  } else if (props.showTabBar) {
+    selectedComponent.value = unref(tabBarComponent)
+  }
+}
+watch(
+  () => [props.showPageConfig, props.showNavigationBar, props.showTabBar],
+  () => setDefaultSelectedComponent()
+)
+onMounted(() => setDefaultSelectedComponent())
 </script>
 <style lang="scss" scoped>
 .editor {
diff --git a/src/views/mall/promotion/diy/page/decorate.vue b/src/views/mall/promotion/diy/page/decorate.vue
index 76336bc4..54e7206c 100644
--- a/src/views/mall/promotion/diy/page/decorate.vue
+++ b/src/views/mall/promotion/diy/page/decorate.vue
@@ -4,6 +4,7 @@
     v-model="formData.property"
     :title="formData.name"
     :libs="componentLibs"
+    :show-page-config="true"
     :show-navigation-bar="true"
     :show-tab-bar="false"
     @save="submitForm"
@@ -51,7 +52,7 @@ const formRef = ref() // 表单 Ref
 const getPageDetail = async (id: any) => {
   formLoading.value = true
   try {
-    formData.value = await DiyPageApi.getDiyPage(id)
+    formData.value = await DiyPageApi.getDiyPageProperty(id)
   } finally {
     formLoading.value = false
   }
@@ -63,7 +64,7 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    await DiyPageApi.updateDiyPage(unref(formData)!)
+    await DiyPageApi.updateDiyPageProperty(unref(formData)!)
     message.success('保存成功')
   } finally {
     formLoading.value = false
diff --git a/src/views/mall/promotion/diy/template/decorate.vue b/src/views/mall/promotion/diy/template/decorate.vue
index 9c7500b2..7a3cff2f 100644
--- a/src/views/mall/promotion/diy/template/decorate.vue
+++ b/src/views/mall/promotion/diy/template/decorate.vue
@@ -1,11 +1,12 @@
 <template>
   <DiyEditor
     v-if="formData && !formLoading"
-    v-model="formData.property"
+    v-model="currentFormData!.property"
     :title="templateItems[selectedTemplateItem].name"
     :libs="libs"
+    :show-page-config="selectedTemplateItem !== 0"
     :show-tab-bar="selectedTemplateItem === 0"
-    :show-navigation-bar="selectedTemplateItem > 0"
+    :show-navigation-bar="selectedTemplateItem !== 0"
     @save="submitForm"
   >
     <template #toolBarLeft>
@@ -25,6 +26,7 @@
 </template>
 <script setup lang="ts">
 import * as DiyTemplateApi from '@/api/mall/promotion/diy/template'
+import * as DiyPageApi from '@/api/mall/promotion/diy/page'
 import { useTagsViewStore } from '@/store/modules/tagsView'
 import { DiyComponentLibrary } from '@/components/DiyEditor/util'
 
@@ -42,14 +44,17 @@ const templateItems = reactive([
 const message = useMessage() // 消息弹窗
 
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formData = ref<DiyTemplateApi.DiyTemplateVO>()
+const formData = ref<DiyTemplateApi.DiyTemplatePropertyVO>()
 const formRef = ref() // 表单 Ref
+// 当前编辑的属性
+const currentFormData = ref<DiyTemplateApi.DiyTemplatePropertyVO | DiyPageApi.DiyPageVO>()
 
 // 获取详情
 const getPageDetail = async (id: any) => {
   formLoading.value = true
   try {
-    formData.value = await DiyTemplateApi.getDiyTemplate(id)
+    formData.value = await DiyTemplateApi.getDiyTemplateProperty(id)
+    currentFormData.value = formData.value
   } finally {
     formLoading.value = false
   }
@@ -82,12 +87,21 @@ const pageLibs = [
 ] as DiyComponentLibrary[]
 // 当前组件库
 const libs = ref<DiyComponentLibrary[]>(templateLibs)
+// 模板选项切换
 const handleTemplateItemChange = () => {
+  // 编辑模板
   if (selectedTemplateItem.value === 0) {
     libs.value = templateLibs
-  } else {
-    libs.value = pageLibs
+    currentFormData.value = formData.value
+    return
   }
+
+  // 编辑页面
+  libs.value = pageLibs
+  currentFormData.value = formData.value!.pages.find(
+    (page: DiyPageApi.DiyPageVO) => page.name === templateItems[selectedTemplateItem.value].name
+  )
+  console.log(currentFormData.value)
 }
 
 // 提交表单
@@ -97,7 +111,13 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    await DiyTemplateApi.updateDiyTemplate(unref(formData)!)
+    if (selectedTemplateItem.value === 0) {
+      // 提交模板属性
+      await DiyTemplateApi.updateDiyTemplateProperty(unref(formData)!)
+    } else {
+      // 提交页面属性
+      await DiyPageApi.updateDiyPageProperty(unref(currentFormData)!)
+    }
     message.success('保存成功')
   } finally {
     formLoading.value = false
@@ -113,8 +133,9 @@ const resetForm = () => {
     usedTime: undefined,
     remark: '',
     previewImageUrls: [],
-    property: ''
-  } as DiyTemplateApi.DiyTemplateVO
+    property: '',
+    pages: []
+  } as DiyTemplateApi.DiyTemplatePropertyVO
   formRef.value?.resetFields()
 }
 

From 9bd33355e281276fcead1cc8429396e87da30e15 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Tue, 31 Oct 2023 17:17:46 +0800
Subject: [PATCH 15/38] =?UTF-8?q?=E8=90=A5=E9=94=80=EF=BC=9A=E8=A3=85?=
 =?UTF-8?q?=E4=BF=AE=E7=BC=96=E8=BE=91=E5=99=A8=E6=A0=B7=E5=BC=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/mobile/NavigationBar/index.vue |   1 -
 .../components/mobile/NoticeBar/index.vue     |   2 +-
 src/components/DiyEditor/index.vue            | 355 ++++++++++--------
 3 files changed, 194 insertions(+), 164 deletions(-)

diff --git a/src/components/DiyEditor/components/mobile/NavigationBar/index.vue b/src/components/DiyEditor/components/mobile/NavigationBar/index.vue
index 953748c7..345b6681 100644
--- a/src/components/DiyEditor/components/mobile/NavigationBar/index.vue
+++ b/src/components/DiyEditor/components/mobile/NavigationBar/index.vue
@@ -40,7 +40,6 @@ defineProps<{ property: NavigationBarProperty }>()
   display: flex;
   justify-content: space-between;
   align-items: center;
-  cursor: pointer;
   /* 左边 */
   .left {
     margin-left: 8px;
diff --git a/src/components/DiyEditor/components/mobile/NoticeBar/index.vue b/src/components/DiyEditor/components/mobile/NoticeBar/index.vue
index dc360688..fce1afbb 100644
--- a/src/components/DiyEditor/components/mobile/NoticeBar/index.vue
+++ b/src/components/DiyEditor/components/mobile/NoticeBar/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    class="flex items-center text-12px"
+    class="flex items-center p-y-4px text-12px"
     :style="{ backgroundColor: property.backgroundColor, color: property.textColor }"
   >
     <el-image :src="property.iconUrl" class="h-18px" />
diff --git a/src/components/DiyEditor/index.vue b/src/components/DiyEditor/index.vue
index f0fed316..d0d49812 100644
--- a/src/components/DiyEditor/index.vue
+++ b/src/components/DiyEditor/index.vue
@@ -45,6 +45,7 @@
               @click="handleNavigationBarSelected"
               :class="[
                 'component',
+                'cursor-pointer!',
                 { active: selectedComponent?.id === navigationBarComponent.id }
               ]"
             />
@@ -70,7 +71,7 @@
                 @change="handleComponentChange"
               >
                 <template #item="{ element, index }">
-                  <div class="component-box" @click="handleComponentSelected(element, index)">
+                  <div class="component-container" @click="handleComponentSelected(element, index)">
                     <!-- 左侧组件名 -->
                     <div
                       :class="['component-name', { active: selectedComponentIndex === index }]"
@@ -79,12 +80,13 @@
                       {{ element.name }}
                     </div>
                     <!-- 组件内容区 -->
-                    <component
-                      :is="element.id"
-                      :property="element.property"
-                      :class="['component', { active: selectedComponentIndex === index }]"
-                      :data-type="element.id"
-                    />
+                    <div :class="['component', { active: selectedComponentIndex === index }]">
+                      <component
+                        :is="element.id"
+                        :property="element.property"
+                        :data-type="element.id"
+                      />
+                    </div>
                     <!-- 左侧：组件操作工具栏 -->
                     <div
                       class="component-toolbar"
@@ -130,6 +132,7 @@
             :class="[
               'editor-design-bottom',
               'component',
+              'cursor-pointer!',
               { active: selectedComponent?.id === tabBarComponent.id }
             ]"
           >
@@ -378,181 +381,209 @@ watch(
 onMounted(() => setDefaultSelectedComponent())
 </script>
 <style lang="scss" scoped>
+/* 手机宽度 */
+$phone-width: 375px;
+/* 根节点样式 */
 .editor {
   height: 100%;
   margin: calc(0px - var(--app-content-padding));
   display: flex;
   flex-direction: column;
-}
-.editor-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  height: auto;
-  padding: 0;
-  border-bottom: solid 1px var(--el-border-color);
-  background-color: var(--el-bg-color);
-
-  .header-right {
-    height: 100%;
-    .el-button {
-      height: 100%;
-    }
-  }
-
-  :deep(.el-radio-button__inner),
-  :deep(.el-button) {
-    border-top: none !important;
-    border-bottom: none !important;
-    border-radius: 0 !important;
-  }
-}
-.editor-container {
-  height: calc(
-    100vh - var(--top-tool-height) - var(--tags-view-height) - var(--app-footer-height) - 42px
-  );
-  /* 右侧属性面板 */
-  .editor-right {
-    flex-shrink: 0;
-    box-shadow: -8px 0 8px -8px rgba(0, 0, 0, 0.12);
-
-    :deep(.el-card__header) {
-      padding: 8px 16px;
-    }
-
-    .property-group {
-      /* 属性分组 */
-      :deep(.el-card__header) {
-        border: none;
-        background: var(--el-bg-color-page);
-      }
-    }
-  }
-
-  /* 中心 */
-  .editor-center {
-    flex: 1 1 0;
-    padding: 16px 0;
-    background-color: var(--app-content-bg-color);
+  /* 顶部：工具栏 */
+  .editor-header {
     display: flex;
-    justify-content: center;
-
-    .editor-design {
-      position: relative;
+    align-items: center;
+    justify-content: space-between;
+    height: auto;
+    padding: 0;
+    border-bottom: solid 1px var(--el-border-color);
+    background-color: var(--el-bg-color);
+    /* 工具栏：右侧按钮 */
+    .header-right {
       height: 100%;
-      width: 100%;
+      .el-button {
+        height: 100%;
+      }
+    }
+    /* 隐藏工具栏按钮的边框 */
+    :deep(.el-radio-button__inner),
+    :deep(.el-button) {
+      border-top: none !important;
+      border-bottom: none !important;
+      border-radius: 0 !important;
+    }
+  }
+  /* 中心操作区 */
+  .editor-container {
+    height: calc(
+      100vh - var(--top-tool-height) - var(--tags-view-height) - var(--app-footer-height) - 42px
+    );
+    /* 右侧属性面板 */
+    .editor-right {
+      flex-shrink: 0;
+      box-shadow: -8px 0 8px -8px rgba(0, 0, 0, 0.12);
+      /* 属性面板顶部：减少内边距 */
+      :deep(.el-card__header) {
+        padding: 8px 16px;
+      }
+      /* 属性面板分组 */
+      .property-group {
+        /* 属性分组 */
+        :deep(.el-card__header) {
+          border: none;
+          background: var(--el-bg-color-page);
+        }
+      }
+    }
+
+    /* 中心区域 */
+    .editor-center {
+      flex: 1 1 0;
+      padding: 16px 0;
+      background-color: var(--app-content-bg-color);
       display: flex;
-      flex-direction: column;
-      align-items: center;
-      overflow: hidden;
-
-      /* 组件 */
-      .component {
-        border: 1px solid #fff;
-        width: 375px !important;
-
-        &:hover {
-          border: 1px dashed #155bd4;
-        }
-      }
-      .component.active {
-        border: 2px solid #155bd4 !important;
-      }
-
-      .editor-design-top {
-        width: 379px;
-
-        .status-bar {
-          height: 20px;
-          width: 100%;
-          background-color: #fff;
-        }
-
-        .navigation-bar {
-          width: 100%;
-        }
-      }
-
-      .editor-design-bottom {
-        width: 379px;
-      }
-
-      .editor-design-center {
+      justify-content: center;
+      /* 中心设计区域 */
+      .editor-design {
+        position: relative;
+        height: 100%;
         width: 100%;
-        flex: 1 1 0;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        overflow: hidden;
 
-        :deep(.el-scrollbar__view) {
-          height: 100%;
-        }
-
-        /* 主体内容 */
-        .phone-container {
-          height: 100%;
-          box-sizing: border-box;
+        /* 组件 */
+        .component {
+          border: 1px solid #fff;
+          width: $phone-width;
           cursor: move;
-          position: relative;
-          background-repeat: no-repeat;
-          background-size: 100% 100%;
-          width: 379px;
-          margin: 0 auto;
+          /* 鼠标放到组件上时 */
+          &:hover {
+            border: 1px dashed var(--el-color-primary);
+          }
+        }
+        /* 组件选中 */
+        .component.active {
+          border: 2px solid var(--el-color-primary);
+        }
+        /* 手机顶部 */
+        .editor-design-top {
+          width: $phone-width;
+          /* 手机顶部状态栏 */
+          .status-bar {
+            height: 20px;
+            width: $phone-width;
+            background-color: #fff;
+          }
+        }
+        /* 手机底部导航 */
+        .editor-design-bottom {
+          width: $phone-width;
+        }
+        /* 手机页面编辑区域 */
+        .editor-design-center {
+          width: 100%;
+          flex: 1 1 0;
 
-          .drag-area {
+          :deep(.el-scrollbar__view) {
             height: 100%;
           }
 
-          /* 组件容器 */
-          .component-box {
-            width: 100%;
+          /* 主体内容 */
+          .phone-container {
+            height: 100%;
+            box-sizing: border-box;
             position: relative;
-            /* 组件名称 */
-            .component-name {
-              position: absolute;
-              width: 80px;
-              text-align: center;
-              line-height: 25px;
-              height: 25px;
-              background: #fff;
-              font-size: 12px;
-              left: -80px;
-              top: 0;
-              box-shadow:
-                0 0 4px #00000014,
-                0 2px 6px #0000000f,
-                0 4px 8px 2px #0000000a;
+            background-repeat: no-repeat;
+            background-size: 100% 100%;
+            width: $phone-width;
+            margin: 0 auto;
+            .drag-area {
+              height: 100%;
             }
-            .component-name.active {
-              background: #2d8cf0;
-              color: #fff;
-            }
-            /* 组件操作按钮 */
-            .component-toolbar {
-              position: absolute;
-              top: 0;
-              right: -50px;
 
-              .el-button-group {
-                display: inline-flex;
-                flex-direction: column;
+            /* 组件容器（左侧：组件名称，中间：组件，右侧：操作工具栏） */
+            .component-container {
+              width: 100%;
+              position: relative;
+              /* 左侧：组件名称 */
+              .component-name {
+                position: absolute;
+                width: 80px;
+                text-align: center;
+                line-height: 25px;
+                height: 25px;
+                background: #fff;
+                font-size: 12px;
+                left: -85px;
+                top: 0;
+                box-shadow:
+                  0 0 4px #00000014,
+                  0 2px 6px #0000000f,
+                  0 4px 8px 2px #0000000a;
+                /* 右侧小三角 */
+                &:after {
+                  position: absolute;
+                  top: 7.5px;
+                  right: -10px;
+                  content: ' ';
+                  height: 0;
+                  width: 0;
+                  border: 5px solid transparent;
+                  border-left-color: #fff;
+                }
               }
-              .el-button-group > .el-button:first-child {
-                border-bottom-left-radius: 0;
-                border-bottom-right-radius: 0;
-                border-top-right-radius: var(--el-border-radius-base);
-                border-bottom-color: var(--el-button-divide-border-color);
+              /* 组件选中按钮 */
+              .component-name.active {
+                background: var(--el-color-primary);
+                color: #fff;
+                &:after {
+                  border-left-color: var(--el-color-primary);
+                }
               }
-              .el-button-group > .el-button:last-child {
-                border-top-left-radius: 0;
-                border-top-right-radius: 0;
-                border-bottom-left-radius: var(--el-border-radius-base);
-                border-top-color: var(--el-button-divide-border-color);
-              }
-              .el-button-group .el-button--primary:not(:first-child):not(:last-child) {
-                border-top-color: var(--el-button-divide-border-color);
-                border-bottom-color: var(--el-button-divide-border-color);
-              }
-              .el-button-group > .el-button:not(:last-child) {
-                margin-bottom: -1px;
-                margin-right: 0;
+              /* 右侧：组件操作工具栏 */
+              .component-toolbar {
+                position: absolute;
+                top: 0;
+                right: -57px;
+                /* 左侧小三角 */
+                &:before {
+                  position: absolute;
+                  top: 10px;
+                  left: -10px;
+                  content: ' ';
+                  height: 0;
+                  width: 0;
+                  border: 5px solid transparent;
+                  border-right-color: #2d8cf0;
+                }
+
+                /* 重写 Element 按钮组的样式（官方只支持水平显示，增加垂直显示的样式） */
+                .el-button-group {
+                  display: inline-flex;
+                  flex-direction: column;
+                }
+                .el-button-group > .el-button:first-child {
+                  border-bottom-left-radius: 0;
+                  border-bottom-right-radius: 0;
+                  border-top-right-radius: var(--el-border-radius-base);
+                  border-bottom-color: var(--el-button-divide-border-color);
+                }
+                .el-button-group > .el-button:last-child {
+                  border-top-left-radius: 0;
+                  border-top-right-radius: 0;
+                  border-bottom-left-radius: var(--el-border-radius-base);
+                  border-top-color: var(--el-button-divide-border-color);
+                }
+                .el-button-group .el-button--primary:not(:first-child):not(:last-child) {
+                  border-top-color: var(--el-button-divide-border-color);
+                  border-bottom-color: var(--el-button-divide-border-color);
+                }
+                .el-button-group > .el-button:not(:last-child) {
+                  margin-bottom: -1px;
+                  margin-right: 0;
+                }
               }
             }
           }

From 3d54ad3a6aec15c56a2732d11b4fa35eefc0c4e9 Mon Sep 17 00:00:00 2001
From: liuhongfeng <291117974@qq.com>
Date: Tue, 31 Oct 2023 23:32:35 +0800
Subject: [PATCH 16/38] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=A2=9E=E3=80=91?=
 =?UTF-8?q?=E8=B4=9F=E8=B4=A3=E4=BA=BA=20=E3=80=90=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=91=E8=A7=84=E8=8C=83=E5=91=BD=E5=90=8D=EF=BC=9A=E6=9C=9F?=
 =?UTF-8?q?=E6=95=B0=EF=BC=9AindexNo-=E3=80=8Bperiod?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/crm/receivable/ReceivableForm.vue | 14 +++----
 src/views/crm/receivable/index.vue          |  8 ++--
 src/views/crm/receivablePlan/index.vue      | 45 +++++++++------------
 3 files changed, 29 insertions(+), 38 deletions(-)

diff --git a/src/views/crm/receivable/ReceivableForm.vue b/src/views/crm/receivable/ReceivableForm.vue
index 4ac9136a..c338fe97 100644
--- a/src/views/crm/receivable/ReceivableForm.vue
+++ b/src/views/crm/receivable/ReceivableForm.vue
@@ -10,14 +10,14 @@
       <el-form-item label="回款编号" prop="no">
         <el-input v-model="formData.no" placeholder="请输入回款编号" />
       </el-form-item>
-      <!--<el-form-item label="回款计划ID" prop="planId">
-        <el-input v-model="formData.planId" placeholder="请输入回款计划ID" />
-      </el-form-item>-->
-      <el-form-item label="客户ID" prop="customerId">
-        <el-input v-model="formData.customerId" placeholder="请输入客户ID" />
+      <el-form-item label="回款计划" prop="planId">
+        <el-input v-model="formData.planId" placeholder="请输入回款计划" />
       </el-form-item>
-      <el-form-item label="合同ID" prop="contractId">
-        <el-input v-model="formData.contractId" placeholder="请输入合同ID" />
+      <el-form-item label="客户名称" prop="customerId">
+        <el-input v-model="formData.customerId" placeholder="请输入客户名称" />
+      </el-form-item>
+      <el-form-item label="合同名称" prop="contractId">
+        <el-input v-model="formData.contractId" placeholder="请输入合同名称" />
       </el-form-item>
       <!--<el-form-item label="审批状态" prop="checkStatus">
         <el-select v-model="formData.checkStatus" placeholder="请选择审批状态">
diff --git a/src/views/crm/receivable/index.vue b/src/views/crm/receivable/index.vue
index ae483015..dc2b2f64 100644
--- a/src/views/crm/receivable/index.vue
+++ b/src/views/crm/receivable/index.vue
@@ -103,7 +103,7 @@
           class="!w-240px"
         />
       </el-form-item>-->
-      <el-form-item label="负责人" prop="ownerUserId">
+      <!--<el-form-item label="负责人" prop="ownerUserId">
         <el-input
           v-model="queryParams.ownerUserId"
           placeholder="请输入负责人"
@@ -112,7 +112,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <!--<el-form-item label="批次" prop="batchId">
+      <el-form-item label="批次" prop="batchId">
         <el-input
           v-model="queryParams.batchId"
           placeholder="请输入批次"
@@ -229,9 +229,9 @@
       />
       <el-table-column label="操作" align="center" width="180px">
         <template #default="scope">
-          <router-link :to="'/crm/receivable-plan?receivableId=' + scope.row.receivableId">
+          <!--<router-link :to="'/crm/receivable-plan?receivableId=' + scope.row.receivableId">
             <el-button link type="primary">详情</el-button>
-          </router-link>
+          </router-link>-->
           <el-button
             link
             type="primary"
diff --git a/src/views/crm/receivablePlan/index.vue b/src/views/crm/receivablePlan/index.vue
index 290e1cd8..2a18b931 100644
--- a/src/views/crm/receivablePlan/index.vue
+++ b/src/views/crm/receivablePlan/index.vue
@@ -8,10 +8,19 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="期数" prop="period">
+      <el-form-item label="客户" prop="customerId">
         <el-input
-          v-model="queryParams.period"
-          placeholder="请输入期数"
+          v-model="queryParams.customerId"
+          placeholder="请输入客户"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="合同" prop="contractId">
+        <el-input
+          v-model="queryParams.contractId"
+          placeholder="请输入合同"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
@@ -67,7 +76,7 @@
           class="!w-240px"
         />
       </el-form-item>-->
-      <el-form-item label="提醒日期" prop="remindTime">
+      <!--<el-form-item label="提醒日期" prop="remindTime">
         <el-date-picker
           v-model="queryParams.remindTime"
           value-format="YYYY-MM-DD HH:mm:ss"
@@ -77,26 +86,8 @@
           :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="customerId">
-        <el-input
-          v-model="queryParams.customerId"
-          placeholder="请输入客户"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="合同" prop="contractId">
-        <el-input
-          v-model="queryParams.contractId"
-          placeholder="请输入合同"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="负责人" prop="ownerUserId">
+      </el-form-item>-->
+      <!--<el-form-item label="负责人" prop="ownerUserId">
         <el-input
           v-model="queryParams.ownerUserId"
           placeholder="请输入负责人"
@@ -105,7 +96,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <!--<el-form-item label="备注" prop="remark">
+      <el-form-item label="备注" prop="remark">
         <el-input
           v-model="queryParams.remark"
           placeholder="请输入备注"
@@ -165,13 +156,13 @@
         width="180px"
       />
       <el-table-column label="提前几天提醒" align="center" prop="remindDays" />
-      <el-table-column
+      <!--<el-table-column
         label="提醒日期"
         align="center"
         prop="remindTime"
         :formatter="dateFormatter"
         width="180px"
-      />
+      />-->
       <!--<el-table-column label="回款ID" align="center" prop="receivableId" />-->
       <el-table-column label="完成状态" align="center" prop="status">
         <template #default="scope">

From bf418653e431bf290b89591deca96e6098b1dfeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A3=8E=E7=8B=97?= <909275705@qq.com>
Date: Thu, 2 Nov 2023 02:08:26 +0000
Subject: [PATCH 17/38] =?UTF-8?q?update=20src/views/mall/trade/delivery/ex?=
 =?UTF-8?q?pressTemplate/ExpressTemplateForm.vue.=20=E5=9C=B0=E5=8C=BA?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A1=86placeholder=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 风狗 <909275705@qq.com>
---
 .../mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue b/src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue
index 09bbc76e..edbcbc3a 100644
--- a/src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue
+++ b/src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue
@@ -31,7 +31,7 @@
                 :props="defaultProps2"
                 class="w-1/1"
                 clearable
-                placeholder="请选择商品分类"
+                placeholder="请选择地区"
                 filterable
                 collapse-tags
               />

From 3c0f3ceed5f5e3c32d92fc7e4a6970990bc83358 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Fri, 3 Nov 2023 06:47:46 +0800
Subject: [PATCH 18/38] =?UTF-8?q?=E8=90=A5=E9=94=80=EF=BC=9A=E8=A3=85?=
 =?UTF-8?q?=E4=BF=AE=E6=A8=A1=E6=9D=BF=EF=BC=8C=E5=BA=95=E9=83=A8=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E9=80=82=E9=85=8DAPP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/mobile/TabBar/config.ts        | 40 +++++++++++--------
 .../components/mobile/TabBar/index.vue        |  8 ++--
 .../components/mobile/TabBar/property.vue     | 36 +++++------------
 3 files changed, 37 insertions(+), 47 deletions(-)

diff --git a/src/components/DiyEditor/components/mobile/TabBar/config.ts b/src/components/DiyEditor/components/mobile/TabBar/config.ts
index 4a570a8e..88d706fe 100644
--- a/src/components/DiyEditor/components/mobile/TabBar/config.ts
+++ b/src/components/DiyEditor/components/mobile/TabBar/config.ts
@@ -12,18 +12,24 @@ export interface TabBarProperty {
 
 // 选项属性
 export interface TabBarItemProperty {
-  name: string // 标签名称
-  link: string // 链接
-  iconUrl: string // 默认图标链接
-  activeIconUrl: string // 选中的图标链接
+  // 标签文字
+  text: string
+  // 链接
+  url: string
+  // 默认图标链接
+  iconUrl: string
+  // 选中的图标链接
+  activeIconUrl: string
 }
 
 // 样式
 export interface TabBarStyle {
   // 背景类型
-  backgroundType: 'color' | 'img'
-  // 背景颜色 或 图片链接
-  background: string
+  bgType: 'color' | 'img'
+  // 背景颜色
+  bgColor: string
+  // 图片链接
+  bgImg: string
   // 默认颜色
   color: string
   // 选中的颜色
@@ -38,33 +44,33 @@ export const component = {
   property: {
     theme: 'red',
     style: {
-      backgroundType: 'color',
-      background: '#fff',
+      bgType: 'color',
+      bgColor: '#fff',
       color: '#282828',
       activeColor: '#fc4141'
     },
     items: [
       {
-        name: '首页',
-        link: '/',
+        text: '首页',
+        url: '/pages/index/index',
         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',
+        text: '分类',
+        url: '/pages/index/category?id=3',
         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',
+        text: '购物车',
+        url: '/pages/index/cart',
         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',
+        text: '我的',
+        url: '/pages/index/user',
         iconUrl: 'http://mall.yudao.iocoder.cn/static/images/4-001.png',
         activeIconUrl: 'http://mall.yudao.iocoder.cn/static/images/4-002.png'
       }
diff --git a/src/components/DiyEditor/components/mobile/TabBar/index.vue b/src/components/DiyEditor/components/mobile/TabBar/index.vue
index 266a20c5..647e3369 100644
--- a/src/components/DiyEditor/components/mobile/TabBar/index.vue
+++ b/src/components/DiyEditor/components/mobile/TabBar/index.vue
@@ -4,9 +4,9 @@
       class="tab-bar-bg"
       :style="{
         background:
-          property.style.backgroundType === 'color'
-            ? property.style.background
-            : `url(${property.style.background})`,
+          property.style.bgType === 'color'
+            ? property.style.bgColor
+            : `url(${property.style.bgImg})`,
         backgroundSize: '100% 100%',
         backgroundRepeat: 'no-repeat'
       }"
@@ -14,7 +14,7 @@
       <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 }}
+          {{ item.text }}
         </span>
       </div>
     </div>
diff --git a/src/components/DiyEditor/components/mobile/TabBar/property.vue b/src/components/DiyEditor/components/mobile/TabBar/property.vue
index 512bb5a8..eefdf54a 100644
--- a/src/components/DiyEditor/components/mobile/TabBar/property.vue
+++ b/src/components/DiyEditor/components/mobile/TabBar/property.vue
@@ -2,7 +2,7 @@
   <div class="tab-bar">
     <!-- 表单 -->
     <el-form :model="formData" label-width="80px">
-      <el-form-item label="主题">
+      <el-form-item label="主题" prop="theme">
         <el-select v-model="formData!.theme" @change="handleThemeChange">
           <el-option
             v-for="(theme, index) in THEME_LIST"
@@ -26,24 +26,16 @@
         <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-group v-model="formData!.style.bgType">
           <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 label="选择颜色" v-if="formData!.style.bgType === 'color'">
+        <ColorInput v-model="formData!.style.bgColor" />
       </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"
-        >
+      <el-form-item label="选择图片" v-if="formData!.style.bgType === 'img'">
+        <UploadImg v-model="formData!.style.bgImg" width="100%" height="50px" class="min-w-200px">
           <template #tip> 建议尺寸 375 * 50 </template>
         </UploadImg>
       </el-form-item>
@@ -92,11 +84,11 @@
                   <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 prop="text" label-width="0" class="m-b-8px!">
+                <el-input v-model="element.text" 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 prop="url" label-width="0" class="m-b-0!">
+                <el-input v-model="element.url" placeholder="请选择链接" />
               </el-form-item>
             </div>
           </div>
@@ -132,14 +124,6 @@ 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)

From 753f5de81e6d49cba07f99532f4e8dd4511e432e Mon Sep 17 00:00:00 2001
From: jason <2667446@qq.com>
Date: Fri, 3 Nov 2023 08:46:53 +0800
Subject: [PATCH 19/38] =?UTF-8?q?=E8=BD=AC=E8=B4=A6=20-=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=BD=AC=E8=B4=A6=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/pay/transfer/index.ts                |   9 +
 src/views/pay/demo/transfer/index.vue        |  11 +-
 src/views/pay/order/OrderDetail.vue          |   2 +-
 src/views/pay/transfer/CreatePayTransfer.vue |  14 +-
 src/views/pay/transfer/TransferDetail.vue    |  80 ++++++
 src/views/pay/transfer/index.vue             | 267 +++++++++++++++++++
 6 files changed, 370 insertions(+), 13 deletions(-)
 create mode 100644 src/views/pay/transfer/TransferDetail.vue
 create mode 100644 src/views/pay/transfer/index.vue

diff --git a/src/api/pay/transfer/index.ts b/src/api/pay/transfer/index.ts
index 4b2f3154..7a58abf4 100644
--- a/src/api/pay/transfer/index.ts
+++ b/src/api/pay/transfer/index.ts
@@ -16,3 +16,12 @@ export interface TransferVO {
 export const createTransfer = async (data: TransferVO) => {
   return await request.post({ url: `/pay/transfer/create`, data })
 }
+
+// 查询转账单列表
+export const getTransferPage = async (params) => {
+  return await request.get({ url: `/pay/transfer/page`, params })
+}
+
+export const getTransfer = async (id: number) => {
+  return await request.get({ url: '/pay/transfer/get?id=' + id })
+}
diff --git a/src/views/pay/demo/transfer/index.vue b/src/views/pay/demo/transfer/index.vue
index 7d0d8bad..44d07b12 100644
--- a/src/views/pay/demo/transfer/index.vue
+++ b/src/views/pay/demo/transfer/index.vue
@@ -49,13 +49,20 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="100"
+        fixed="right"
+      >
         <template #default="scope">
           <el-button
             link
             type="primary"
             @click="handleTransfer(scope.row)"
             v-if="scope.row.transferStatus === 0"
+            v-hasPermi="['pay:transfer:create']"
           >
             发起转账
           </el-button>
@@ -73,7 +80,7 @@
 
   <!-- 表单弹窗：添加/修改 -->
   <DemoTransferForm ref="demoFormRef" @success="getList" />
-  <CreatePayTransfer ref="payTransferRef" :payTransfer="payTransfer" @success="getList" />
+  <CreatePayTransfer ref="payTransferRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
diff --git a/src/views/pay/order/OrderDetail.vue b/src/views/pay/order/OrderDetail.vue
index 5f2a496c..4f05c14a 100644
--- a/src/views/pay/order/OrderDetail.vue
+++ b/src/views/pay/order/OrderDetail.vue
@@ -62,7 +62,7 @@
     <el-divider />
     <el-descriptions :column="1" label-class-name="desc-label" direction="vertical" border>
       <el-descriptions-item label="支付通道异步回调内容">
-        {{ detailData.extension.channelNotifyData }}
+        <el-text>{{ detailData.extension.channelNotifyData }}</el-text>
       </el-descriptions-item>
     </el-descriptions>
   </Dialog>
diff --git a/src/views/pay/transfer/CreatePayTransfer.vue b/src/views/pay/transfer/CreatePayTransfer.vue
index 5f0ea166..31706504 100644
--- a/src/views/pay/transfer/CreatePayTransfer.vue
+++ b/src/views/pay/transfer/CreatePayTransfer.vue
@@ -64,14 +64,10 @@ const formLoading = ref(false) // 提交的按钮禁用
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 defineOptions({ name: 'CreatePayTransfer' })
 
-const props = defineProps({
-  payTransfer: {
-    type: Object as PropType<PayTransferApi.TransferVO>,
-    required: true
-  }
-})
 // 提交数据
-let submitTransferData = {
+let submitTransferData: PayTransferApi.TransferVO
+
+const transfer = reactive({
   appId: undefined,
   channelCode: undefined,
   merchantTransferId: undefined,
@@ -81,9 +77,7 @@ let submitTransferData = {
   userName: undefined,
   alipayLogonId: undefined,
   openid: undefined
-} as PayTransferApi.TransferVO
-
-const transfer = reactive(props.payTransfer)
+})
 const dialogVisible = ref(false)
 const typeName = computed(() => {
   return getDictLabel(DICT_TYPE.PAY_TRANSFER_TYPE, transfer.type)
diff --git a/src/views/pay/transfer/TransferDetail.vue b/src/views/pay/transfer/TransferDetail.vue
new file mode 100644
index 00000000..ad769d2b
--- /dev/null
+++ b/src/views/pay/transfer/TransferDetail.vue
@@ -0,0 +1,80 @@
+<template>
+  <Dialog v-model="dialogVisible" title="转账单详情" width="700px">
+    <el-descriptions :column="2" label-class-name="desc-label">
+      <el-descriptions-item label="商户单号">
+        <el-tag size="small">{{ detailData.merchantTransferId }}</el-tag>
+      </el-descriptions-item>
+      <el-descriptions-item label="转账单号">
+        <el-tag type="warning" size="small" v-if="detailData.no">{{ detailData.no }}</el-tag>
+      </el-descriptions-item>
+      <el-descriptions-item label="应用编号">{{ detailData.appId }}</el-descriptions-item>
+      <el-descriptions-item label="转账状态">
+        <dict-tag :type="DICT_TYPE.PAY_TRANSFER_STATUS" :value="detailData.status" size="small" />
+      </el-descriptions-item>
+      <el-descriptions-item label="转账金额">
+        <el-tag type="success" size="small">￥{{ (detailData.price / 100.0).toFixed(2) }}</el-tag>
+      </el-descriptions-item>
+      <el-descriptions-item label="转账时间">
+        {{ formatDate(detailData.successTime) }}
+      </el-descriptions-item>
+      <el-descriptions-item label="创建时间">
+        {{ formatDate(detailData.createTime) }}
+      </el-descriptions-item>
+    </el-descriptions>
+    <!-- 分割线 -->
+    <el-divider />
+    <el-descriptions :column="2" label-class-name="desc-label">
+      <el-descriptions-item label="收款人姓名">{{ detailData.userName }}</el-descriptions-item>
+      <el-descriptions-item label="支付宝登录账号" v-if="detailData.type === 1">
+        {{ detailData.alipayLogonId }}
+      </el-descriptions-item>
+      <el-descriptions-item label="微信 openid" v-if="detailData.type === 2">
+        {{ detailData.openid }}
+      </el-descriptions-item>
+      <el-descriptions-item label="支付渠道">
+        <dict-tag :type="DICT_TYPE.PAY_CHANNEL_CODE" :value="detailData.channelCode" />
+      </el-descriptions-item>
+      <el-descriptions-item label="支付 IP">{{ detailData.userIp }}</el-descriptions-item>
+      <el-descriptions-item label="渠道单号">
+        <el-tag size="mini" type="success" v-if="detailData.channelTransferNo">
+          {{ detailData.channelTransferNo }}
+        </el-tag>
+      </el-descriptions-item>
+      <el-descriptions-item label="通知 URL">{{ detailData.notifyUrl }}</el-descriptions-item>
+    </el-descriptions>
+    <el-divider />
+    <el-descriptions :column="1" label-class-name="desc-label" direction="vertical" border>
+      <el-descriptions-item label="转账渠道通知内容">
+        <el-text>{{ detailData.channelNotifyData }}</el-text>
+      </el-descriptions-item>
+    </el-descriptions>
+    <el-divider />
+    <div style="text-align: right">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </div>
+  </Dialog>
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE } from '@/utils/dict'
+import * as TransferApi from '@/api/pay/transfer'
+import { formatDate } from '@/utils/formatTime'
+defineOptions({ name: 'PayTransferDetail' })
+const dialogVisible = ref(false) // 弹窗的是否展示
+const detailLoading = ref(false) // 表单的加载中
+const detailData = ref({})
+/** 打开弹窗 */
+const open = async (id: number) => {
+  dialogVisible.value = true
+  // 设置数据
+  detailLoading.value = true
+  try {
+    detailData.value = await TransferApi.getTransfer(id)
+  } finally {
+    detailLoading.value = false
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>
+
+<style scoped></style>
diff --git a/src/views/pay/transfer/index.vue b/src/views/pay/transfer/index.vue
new file mode 100644
index 00000000..b901f34b
--- /dev/null
+++ b/src/views/pay/transfer/index.vue
@@ -0,0 +1,267 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="100px"
+    >
+      <el-form-item label="转账单号" prop="no">
+        <el-input
+          v-model="queryParams.no"
+          placeholder="请输入转账单号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="转账渠道" prop="channelCode">
+        <el-select
+          v-model="queryParams.channelCode"
+          placeholder="请选择支付渠道"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.PAY_CHANNEL_CODE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="商户单号" prop="merchantTransferId">
+        <el-input
+          v-model="queryParams.merchantTransferId"
+          placeholder="请输入商户单号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择类型" clearable class="!w-240px">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.PAY_TRANSFER_TYPE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="转账状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择转账状态"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.PAY_TRANSFER_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="收款人姓名" prop="userName">
+        <el-input
+          v-model="queryParams.userName"
+          placeholder="请输入收款人姓名"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="渠道单号" prop="channelTransferNo">
+        <el-input
+          v-model="queryParams.channelTransferNo"
+          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-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="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="应用编号" align="center" prop="appId" />
+      <el-table-column label="类型" align="center" prop="type" width="120">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.PAY_TRANSFER_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="转账金额" align="center" prop="price">
+        <template #default="scope">
+          <span>￥{{ (scope.row.price / 100.0).toFixed(2) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="转账状态" align="center" prop="status" width="120">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.PAY_TRANSFER_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="订单号" align="left" width="300">
+        <template #default="scope">
+          <p class="transfer-font">
+            <el-tag size="small"> 商户</el-tag>
+            {{ scope.row.merchantTransferId }}
+          </p>
+          <p class="transfer-font" v-if="scope.row.no">
+            <el-tag size="small" type="warning">转账</el-tag>
+            {{ scope.row.no }}
+          </p>
+          <p class="transfer-font" v-if="scope.row.channelTransferNo">
+            <el-tag size="small" type="success">渠道</el-tag>
+            {{ scope.row.channelTransferNo }}
+          </p>
+        </template>
+      </el-table-column>
+      <el-table-column label="收款人姓名" align="center" prop="userName" width="120" />
+      <el-table-column label="收款账号" align="left" width="200">
+        <template #default="scope">
+          <p class="transfer-font" v-if="scope.row.alipayLogonId">
+            <el-tag size="small">支付宝登录号</el-tag>
+            {{ scope.row.alipayLogonId }}
+          </p>
+          <p class="transfer-font" v-if="scope.row.openid">
+            <el-tag size="small">微信 openId</el-tag>
+            {{ scope.row.openid }}
+          </p>
+        </template>
+      </el-table-column>
+      <el-table-column label="转账标题" align="center" prop="subject" width="120" />
+      <el-table-column label="转账渠道" align="center" prop="channelCode">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.PAY_CHANNEL_CODE" :value="scope.row.channelCode" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="转账成功时间"
+        align="center"
+        prop="successTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center" fixed="right">
+        <template #default="scope">
+          <el-button link type="primary" @click="openDetail(scope.row.id)"> 详情 </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+    <TransferDetail ref="detailRef" />
+  </ContentWrap>
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import * as TransferApi from '@/api/pay/transfer'
+import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
+import TransferDetail from './TransferDetail.vue'
+defineOptions({ name: 'PayTransfer' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  no: null,
+  appId: null,
+  channelId: null,
+  channelCode: null,
+  merchantTransferId: null,
+  type: null,
+  status: null,
+  successTime: [],
+  price: null,
+  subject: null,
+  userName: null,
+  alipayLogonId: null,
+  openid: null,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await TransferApi.getTransferPage(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 detailRef = ref()
+const openDetail = (id: number) => {
+  detailRef.value.open(id)
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
+
+<style scoped>
+.transfer-font {
+  padding: 2px 0;
+  font-size: 12px;
+}
+</style>

From de62a7a5b7d4a2fecb36c992ffd107023e4d489a Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 3 Nov 2023 18:44:56 +0800
Subject: [PATCH 20/38] =?UTF-8?q?bugfix=EF=BC=9A=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E6=8E=89=20uno=20=E7=9A=84=20transformerVariantGroup=EF=BC=8C?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=20vite=20=E7=9B=91=E6=8E=A7=E5=88=B0=20css?=
 =?UTF-8?q?=20=E5=8F=98=E5=8C=96=EF=BC=8C=E5=AF=BC=E8=87=B4=20Login.vue=20?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=B6=E7=9A=84=E9=87=8D=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 uno.config.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/uno.config.ts b/uno.config.ts
index 8b874a4a..d1467319 100644
--- a/uno.config.ts
+++ b/uno.config.ts
@@ -1,5 +1,5 @@
 import { defineConfig, toEscapedSelector as e, presetUno } from 'unocss'
-import transformerVariantGroup from '@unocss/transformer-variant-group'
+// import transformerVariantGroup from '@unocss/transformer-variant-group'
 
 export default defineConfig({
   // ...UnoCSS options
@@ -101,7 +101,7 @@ ${selector}:after {
     ]
   ],
   presets: [presetUno({ dark: 'class', attributify: false })],
-  transformers: [transformerVariantGroup()],
+  // transformers: [transformerVariantGroup()],
   shortcuts: {
     'wh-full': 'w-full h-full'
   }

From 23f483ac452c6f140b399351918caaffb54c7129 Mon Sep 17 00:00:00 2001
From: Wanwan <913752709@qq.com>
Date: Sat, 4 Nov 2023 03:21:01 +0800
Subject: [PATCH 21/38] =?UTF-8?q?feat:=20=E5=AE=A2=E6=88=B7=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=20+=20review=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/customer/index.ts                 |  24 +-
 src/router/modules/remaining.ts               |  18 ++
 src/views/crm/clue/ClueForm.vue               |   5 +-
 src/views/crm/clue/index.vue                  |   2 +-
 src/views/crm/customer/CustomerForm.vue       | 233 +++++++++++-------
 .../crm/customer/detail/CustomerBasicInfo.vue |  18 ++
 .../crm/customer/detail/CustomerDetails.vue   |  91 +++++++
 src/views/crm/customer/detail/index.vue       | 154 ++++++++++++
 src/views/crm/customer/index.vue              |  70 +++++-
 9 files changed, 508 insertions(+), 107 deletions(-)
 create mode 100644 src/views/crm/customer/detail/CustomerBasicInfo.vue
 create mode 100644 src/views/crm/customer/detail/CustomerDetails.vue
 create mode 100644 src/views/crm/customer/detail/index.vue

diff --git a/src/api/crm/customer/index.ts b/src/api/crm/customer/index.ts
index 0cbba590..59260cbc 100644
--- a/src/api/crm/customer/index.ts
+++ b/src/api/crm/customer/index.ts
@@ -1,13 +1,14 @@
 import request from '@/config/axios'
 
 export interface CustomerVO {
-  id: number
+  id?: number
   name: string
   industryId: number
   level: number
   source: number
-  followUpStatus: boolean
-  lockStatus: boolean
+  followUpStatus?: boolean
+  lockStatus?: boolean
+  dealStatus?: boolean
   mobile: string
   telephone: string
   website: string
@@ -16,13 +17,20 @@ export interface CustomerVO {
   email: string
   description: string
   remark: string
-  ownerUserId: number
-  roUserIds: string
-  rwUserIds: string
-  areaId: number
+  ownerUserId?: number
+  ownerUserName?: string
+  ownerUserDept?: string
+  roUserIds?: string
+  rwUserIds?: string
+  areaId?: number
+  areaName?: string
   detailAddress: string
-  contactLastTime: Date
+  contactLastTime?: Date
   contactNextTime: Date
+  createTime?: Date
+  updateTime?: Date
+  creator?: string
+  creatorName?: string
 }
 
 // 查询客户列表
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index 70dc5b2f..58eb1733 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -487,6 +487,24 @@ const remainingRouter: AppRouteRecordRaw[] = [
         component: () => import('@/views/mall/promotion/diy/page/decorate.vue')
       }
     ]
+  },
+  {
+    path: '/crm',
+    component: Layout,
+    name: 'CrmCenter',
+    meta: { hidden: true },
+    children: [
+      {
+        path: 'customer/detail/:id',
+        name: 'CrmCustomerDetail',
+        meta: {
+          title: '客户详情',
+          noCache: true,
+          hidden: true
+        },
+        component: () => import('@/views/crm/customer/detail/index.vue')
+      }
+    ]
   }
 ]
 
diff --git a/src/views/crm/clue/ClueForm.vue b/src/views/crm/clue/ClueForm.vue
index 877b26d9..4321f952 100644
--- a/src/views/crm/clue/ClueForm.vue
+++ b/src/views/crm/clue/ClueForm.vue
@@ -10,7 +10,7 @@
       <el-form-item label="线索名称" prop="name">
         <el-input v-model="formData.name" placeholder="请输入线索名称" />
       </el-form-item>
-      <!-- TODO 客户选择 -->
+      <!-- TODO wanwan 客户选择 -->
       <el-form-item label="客户" prop="customerId">
         <el-input v-model="formData.customerId" placeholder="请选择客户" />
       </el-form-item>
@@ -31,7 +31,7 @@
       <el-form-item label="地址" prop="address">
         <el-input v-model="formData.address" placeholder="请输入地址" />
       </el-form-item>
-      <!-- TODO 负责人选择 -->
+      <!-- TODO wanwan 负责人选择 -->
       <el-form-item label="负责人" prop="ownerUserId">
         <el-input v-model="formData.ownerUserId" placeholder="请输入负责人" />
       </el-form-item>
@@ -46,7 +46,6 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import { DICT_TYPE, getBoolDictOptions } from '@/utils/dict'
 import * as ClueApi from '@/api/crm/clue'
 
 const { t } = useI18n() // 国际化
diff --git a/src/views/crm/clue/index.vue b/src/views/crm/clue/index.vue
index e866a725..cf742276 100644
--- a/src/views/crm/clue/index.vue
+++ b/src/views/crm/clue/index.vue
@@ -96,7 +96,7 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="操作" align="center">
+      <el-table-column label="操作" align="center" min-width="110" fixed="right">
         <template #default="scope">
           <el-button
             link
diff --git a/src/views/crm/customer/CustomerForm.vue b/src/views/crm/customer/CustomerForm.vue
index 6e5cd62e..99f7e858 100644
--- a/src/views/crm/customer/CustomerForm.vue
+++ b/src/views/crm/customer/CustomerForm.vue
@@ -8,93 +8,135 @@
       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-col :span="12">
+          <el-form-item label="客户名称" prop="name">
+            <el-input v-model="formData.name" placeholder="请输入客户名称" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <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-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <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-col>
+        <el-col :span="12">
+          <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-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="手机" prop="mobile">
+            <el-input v-model="formData.mobile" placeholder="请输入手机" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="电话" prop="telephone">
+            <el-input v-model="formData.telephone" placeholder="请输入电话" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="邮箱" prop="email">
+            <el-input v-model="formData.email" placeholder="请输入邮箱" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="QQ" prop="qq">
+            <el-input v-model="formData.qq" placeholder="请输入QQ" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="微信" prop="wechat">
+            <el-input v-model="formData.wechat" placeholder="请输入微信" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="网址" prop="website">
+            <el-input v-model="formData.website" placeholder="请输入网址" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="所在地" prop="areaId">
+            <el-tree-select
+              v-model="formData.areaId"
+              :data="areaList"
+              :props="defaultProps"
+              :render-after-expand="true"
             />
-          </el-select>
-        </el-form-item>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="详细地址" prop="detailAddress">
+            <el-input v-model="formData.detailAddress" placeholder="请输入详细地址" />
+          </el-form-item>
+        </el-col>
       </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 v-if="formType === 'create'" label="负责人" prop="userIds" span="24">
+        <el-select v-model="formData.ownerUserId">
+          <el-option
+            v-for="item in userOptions"
+            :key="parseInt(item.id)"
+            :label="item.nickname"
+            :value="parseInt(item.id)"
           />
-        </el-form-item>
+        </el-select>
+      </el-form-item>
+      <el-row>
+        <el-col :span="12">
+          <el-form-item label="下次联系时间" prop="contactNextTime">
+            <el-date-picker
+              v-model="formData.contactNextTime"
+              type="date"
+              value-format="x"
+              placeholder="选择下次联系时间"
+            />
+          </el-form-item>
+        </el-col>
       </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-col :span="24">
+        <el-form-item label="客户描述" prop="description">
+          <el-input v-model="formData.description" placeholder="请输入客户描述" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="24">
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="formData.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-col>
     </el-form>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
@@ -105,6 +147,10 @@
 <script setup lang="ts">
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import * as CustomerApi from '@/api/crm/customer'
+import * as AreaApi from '@/api/system/area'
+import { defaultProps } from '@/utils/tree'
+import * as UserApi from '@/api/system/user'
+import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -113,6 +159,8 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const dialogTitle = ref('') // 弹窗的标题
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const areaList = ref([]) // 地区列表
+const userOptions = ref<UserApi.UserVO[]>([]) // 用户列表
 const formData = ref({
   id: undefined,
   name: undefined,
@@ -129,10 +177,12 @@ const formData = ref({
   remark: undefined,
   areaId: undefined,
   detailAddress: undefined,
-  contactNextTime: undefined
+  contactNextTime: undefined,
+  ownerUserId: undefined
 })
 const formRules = reactive({
-  name: [{ require: true, message: '客户名称不能为空', trigger: 'blur' }]
+  name: [{ required: true, message: '客户名称不能为空', trigger: 'blur' }],
+  ownerUserId: [{ required: true, message: '负责人不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -151,6 +201,16 @@ const open = async (type: string, id?: number) => {
       formLoading.value = false
     }
   }
+  // 获得地区列表
+  areaList.value = await AreaApi.getAreaTree()
+  // 获得用户列表
+  userOptions.value = await UserApi.getSimpleUserList()
+  // 默认新建时选中自己
+  if (formType.value === 'create') {
+    const { wsCache } = useCache()
+    const user = wsCache.get(CACHE_KEY.USER).user
+    formData.value.ownerUserId = user.id
+  }
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -198,7 +258,8 @@ const resetForm = () => {
     remark: undefined,
     areaId: undefined,
     detailAddress: undefined,
-    contactNextTime: undefined
+    contactNextTime: undefined,
+    ownerUserId: undefined
   }
   formRef.value?.resetFields()
 }
diff --git a/src/views/crm/customer/detail/CustomerBasicInfo.vue b/src/views/crm/customer/detail/CustomerBasicInfo.vue
new file mode 100644
index 00000000..0329db8f
--- /dev/null
+++ b/src/views/crm/customer/detail/CustomerBasicInfo.vue
@@ -0,0 +1,18 @@
+<template>
+  <el-col> 客户 </el-col>
+  <el-col>
+    <el-row>
+      <span class="text-xl font-bold">{{ customer.name }}</span>
+    </el-row>
+  </el-col>
+  <el-col class="mt-10px">
+    <Icon icon="ant-design:tag-filled" />
+    <!-- TODO 标签 -->
+  </el-col>
+</template>
+<script setup lang="ts">
+import * as CustomerApi from '@/api/crm/customer'
+
+const { customer } = defineProps<{ customer: CustomerApi.CustomerVO }>()
+</script>
+<style scoped lang="scss"></style>
diff --git a/src/views/crm/customer/detail/CustomerDetails.vue b/src/views/crm/customer/detail/CustomerDetails.vue
new file mode 100644
index 00000000..f6215224
--- /dev/null
+++ b/src/views/crm/customer/detail/CustomerDetails.vue
@@ -0,0 +1,91 @@
+<template>
+  <el-collapse v-model="activeNames">
+    <el-collapse-item name="basicInfo">
+      <template #title>
+        <span class="text-base font-bold">基本信息</span>
+      </template>
+      <el-descriptions :column="2">
+        <el-descriptions-item label="客户名称">
+          {{ customer.name }}
+        </el-descriptions-item>
+        <el-descriptions-item label="所属行业">
+          <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_INDUSTRY" :value="customer.industryId" />
+        </el-descriptions-item>
+        <el-descriptions-item label="客户来源">
+          <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_SOURCE" :value="customer.source" />
+        </el-descriptions-item>
+        <el-descriptions-item label="客户等级">
+          <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="customer.level" />
+        </el-descriptions-item>
+        <el-descriptions-item label="手机">
+          {{ customer.mobile }}
+        </el-descriptions-item>
+        <el-descriptions-item label="电话">
+          {{ customer.telephone }}
+        </el-descriptions-item>
+        <el-descriptions-item label="邮箱">
+          {{ customer.email }}
+        </el-descriptions-item>
+        <el-descriptions-item label="QQ">
+          {{ customer.qq }}
+        </el-descriptions-item>
+        <el-descriptions-item label="微信">
+          {{ customer.wechat }}
+        </el-descriptions-item>
+        <el-descriptions-item label="网址">
+          {{ customer.website }}
+        </el-descriptions-item>
+        <el-descriptions-item label="所在地">
+          {{ customer.areaName }}
+        </el-descriptions-item>
+        <el-descriptions-item label="详细地址">
+          {{ customer.detailAddress }}
+        </el-descriptions-item>
+        <el-descriptions-item label="下次联系时间">
+          {{ customer.contactNextTime ? formatDate(customer.contactNextTime, 'YYYY-MM-DD') : '空' }}
+        </el-descriptions-item>
+      </el-descriptions>
+      <el-descriptions :column="1">
+        <el-descriptions-item label="客户描述">
+          {{ customer.description }}
+        </el-descriptions-item>
+        <el-descriptions-item label="备注">
+          {{ customer.remark }}
+        </el-descriptions-item>
+      </el-descriptions>
+    </el-collapse-item>
+    <el-collapse-item name="systemInfo">
+      <template #title>
+        <span class="text-base font-bold">系统信息</span>
+      </template>
+      <el-descriptions :column="2">
+        <el-descriptions-item label="负责人">
+          {{ customer.ownerUserName }}
+        </el-descriptions-item>
+        <el-descriptions-item label="创建人">
+          {{ customer.creatorName }}
+        </el-descriptions-item>
+        <el-descriptions-item label="创建时间">
+          {{ customer.createTime ? formatDate(customer.createTime) : '空' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="更新时间">
+          {{ customer.updateTime ? formatDate(customer.updateTime) : '空' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="最后跟进时间">
+          {{ customer.contactLastTime ? formatDate(customer.contactLastTime) : '空' }}
+        </el-descriptions-item>
+      </el-descriptions>
+    </el-collapse-item>
+  </el-collapse>
+</template>
+<script setup lang="ts">
+import * as CustomerApi from '@/api/crm/customer'
+import { DICT_TYPE } from '@/utils/dict'
+import { formatDate } from '@/utils/formatTime'
+
+const { customer } = defineProps<{ customer: CustomerApi.CustomerVO }>()
+
+// 展示的折叠面板
+const activeNames = ref(['basicInfo', 'systemInfo'])
+</script>
+<style scoped lang="scss"></style>
diff --git a/src/views/crm/customer/detail/index.vue b/src/views/crm/customer/detail/index.vue
new file mode 100644
index 00000000..e5c8ef43
--- /dev/null
+++ b/src/views/crm/customer/detail/index.vue
@@ -0,0 +1,154 @@
+<template>
+  <div v-loading="loading">
+    <div class="flex items-start justify-between">
+      <div>
+        <!-- 左上：客户基本信息 -->
+        <CustomerBasicInfo :customer="customer" />
+      </div>
+      <div>
+        <!-- 右上：按钮 -->
+        <el-button @click="openForm('update', customer.id)" v-hasPermi="['crm:customer:update']">
+          编辑
+        </el-button>
+        <el-button>更改成交状态</el-button>
+      </div>
+    </div>
+    <el-row class="mt-10px">
+      <el-button>
+        <Icon icon="ph:calendar-fill" class="mr-5px" />
+        创建任务
+      </el-button>
+      <el-button>
+        <Icon icon="carbon:email" class="mr-5px" />
+        发送邮件
+      </el-button>
+      <el-button>
+        <Icon icon="system-uicons:contacts" class="mr-5px" />
+        创建联系人
+      </el-button>
+      <el-button>
+        <Icon icon="ep:opportunity" class="mr-5px" />
+        创建商机
+      </el-button>
+      <el-button>
+        <Icon icon="clarity:contract-line" class="mr-5px" />
+        创建合同
+      </el-button>
+      <el-button>
+        <Icon icon="icon-park:income-one" class="mr-5px" />
+        创建回款
+      </el-button>
+      <el-button>
+        <Icon icon="fluent:people-team-add-20-filled" class="mr-5px" />
+        添加团队成员
+      </el-button>
+    </el-row>
+  </div>
+  <ContentWrap class="mt-10px">
+    <el-descriptions :column="5" direction="vertical">
+      <el-descriptions-item label="客户级别">
+        <dict-tag :type="DICT_TYPE.CRM_CUSTOMER_LEVEL" :value="customer.level" />
+      </el-descriptions-item>
+      <el-descriptions-item label="成交状态">
+        {{ customer.dealStatus ? '已成交' : '未成交' }}
+      </el-descriptions-item>
+      <el-descriptions-item label="负责人">
+        {{ customer.ownerUserName }}
+      </el-descriptions-item>
+      <!-- TODO wanwan 首要联系人? -->
+      <el-descriptions-item label="首要联系人" />
+      <!-- TODO wanwan 首要联系人电话? -->
+      <el-descriptions-item label="首要联系人电话">
+        {{ customer.mobile }}
+      </el-descriptions-item>
+    </el-descriptions>
+  </ContentWrap>
+  <el-col :span="18">
+    <el-tabs>
+      <el-tab-pane label="详细资料">
+        <CustomerDetails class="ml-2" :customer="customer" />
+      </el-tab-pane>
+      <el-tab-pane label="活动" lazy> 活动</el-tab-pane>
+      <el-tab-pane label="邮件" lazy> 邮件</el-tab-pane>
+      <el-tab-pane label="工商信息" lazy> 工商信息</el-tab-pane>
+      <el-tab-pane label="客户关系" lazy> 客户关系</el-tab-pane>
+      <!-- TODO wanwan 以下标签上的数量需要接口统计返回 -->
+      <el-tab-pane label="联系人" lazy>
+        <template #label> 联系人<el-badge :value="12" class="item" type="primary" /> </template>
+        联系人
+      </el-tab-pane>
+      <el-tab-pane label="团队成员" lazy>
+        <template #label> 团队成员<el-badge :value="2" class="item" type="primary" /> </template>
+        团队成员
+      </el-tab-pane>
+      <el-tab-pane label="商机" lazy> 商机</el-tab-pane>
+      <el-tab-pane label="合同" lazy>
+        <template #label> 合同<el-badge :value="3" class="item" type="primary" /> </template>
+        合同
+      </el-tab-pane>
+      <el-tab-pane label="回款" lazy>
+        <template #label> 回款<el-badge :value="4" class="item" type="primary" /> </template>
+        回款
+      </el-tab-pane>
+      <el-tab-pane label="回访" lazy> 回访</el-tab-pane>
+      <el-tab-pane label="发票" lazy> 发票</el-tab-pane>
+    </el-tabs>
+  </el-col>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <CustomerForm ref="formRef" @success="getCustomerData(id)" />
+</template>
+
+<script setup lang="ts">
+import { ElMessage } from 'element-plus'
+import { useTagsViewStore } from '@/store/modules/tagsView'
+import * as CustomerApi from '@/api/crm/customer'
+import CustomerBasicInfo from '@/views/crm/customer/detail/CustomerBasicInfo.vue'
+import { DICT_TYPE } from '@/utils/dict'
+import CustomerDetails from '@/views/crm/customer/detail/CustomerDetails.vue'
+import CustomerForm from '@/views/crm/customer/CustomerForm.vue'
+
+defineOptions({ name: 'CustomerDetail' })
+
+const { delView } = useTagsViewStore() // 视图操作
+const route = useRoute()
+const { currentRoute } = useRouter() // 路由
+const id = Number(route.params.id)
+const loading = ref(true) // 加载中
+
+// 客户详情
+const customer = ref<CustomerApi.CustomerVO>({} as CustomerApi.CustomerVO)
+
+/**
+ * 获取详情
+ *
+ * @param id
+ */
+const getCustomerData = async (id: number) => {
+  loading.value = true
+  try {
+    customer.value = await CustomerApi.getCustomer(id)
+  } finally {
+    loading.value = false
+  }
+}
+
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/**
+ * 初始化
+ */
+onMounted(() => {
+  if (!id) {
+    ElMessage.warning('参数错误，客户不能为空！')
+    delView(unref(currentRoute))
+    return
+  }
+  getCustomerData(id)
+})
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/crm/customer/index.vue b/src/views/crm/customer/index.vue
index ace56dac..073bf8cb 100644
--- a/src/views/crm/customer/index.vue
+++ b/src/views/crm/customer/index.vue
@@ -1,7 +1,6 @@
 <template>
   <ContentWrap>
     <!-- 搜索工作栏 -->
-    <!-- TODO @wanwan：看看怎么表单可以对齐一点； -->
     <el-form
       class="-mb-15px"
       :model="queryParams"
@@ -27,7 +26,51 @@
           class="!w-240px"
         />
       </el-form-item>
-      <!-- TODO @wanwan：筛选字段，加所属行业、客户等级、客户来源 -->
+      <el-form-item label="所属行业" prop="industryId">
+        <el-select
+          v-model="queryParams.industryId"
+          placeholder="请选择所属行业"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.CRM_CUSTOMER_INDUSTRY)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="客户等级" prop="level">
+        <el-select
+          v-model="queryParams.level"
+          placeholder="请选择客户等级"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.CRM_CUSTOMER_LEVEL)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="客户来源" prop="source">
+        <el-select
+          v-model="queryParams.source"
+          placeholder="请选择客户来源"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.CRM_CUSTOMER_SOURCE)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </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>
@@ -48,7 +91,6 @@
   </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" />
@@ -70,8 +112,9 @@
       </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="ownerUserName" />
+      <el-table-column label="所属部门" align="center" prop="ownerUserDept" />
+      <el-table-column label="创建人" align="center" prop="creatorName" />
       <el-table-column
         label="创建时间"
         align="center"
@@ -104,9 +147,9 @@
         </template>
       </el-table-column>
       <!--  TODO @wanwan 距进入公海天数    -->
-      <!-- TODO @wanwan：操作要 fixed 再右侧哈； -->
-      <el-table-column label="操作" align="center" width="160">
+      <el-table-column label="操作" align="center" min-width="150" fixed="right">
         <template #default="scope">
+          <el-button link type="primary" @click="openDetail(scope.row.id)">详情</el-button>
           <el-button
             link
             type="primary"
@@ -140,7 +183,7 @@
 </template>
 
 <script setup lang="ts">
-import { DICT_TYPE, getBoolDictOptions } from '@/utils/dict'
+import { DICT_TYPE, getBoolDictOptions, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import * as CustomerApi from '@/api/crm/customer'
@@ -158,7 +201,10 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   name: null,
-  mobile: null
+  mobile: null,
+  industryId: null,
+  level: null,
+  source: null
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -187,6 +233,12 @@ const resetQuery = () => {
   handleQuery()
 }
 
+/** 打开客户详情 */
+const { push } = useRouter()
+const openDetail = (id: number) => {
+  push({ name: 'CrmCustomerDetail', params: { id } })
+}
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = (type: string, id?: number) => {

From a9faeb1bdb58334b7446b776dcfba79e7ea75a8c Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 4 Nov 2023 10:12:40 +0800
Subject: [PATCH 22/38] =?UTF-8?q?code=20review=EF=BC=9A=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/crm/customer/detail/CustomerBasicInfo.vue | 4 +---
 src/views/crm/customer/detail/CustomerDetails.vue   | 3 ++-
 src/views/crm/customer/detail/index.vue             | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/views/crm/customer/detail/CustomerBasicInfo.vue b/src/views/crm/customer/detail/CustomerBasicInfo.vue
index 0329db8f..86f9c9d7 100644
--- a/src/views/crm/customer/detail/CustomerBasicInfo.vue
+++ b/src/views/crm/customer/detail/CustomerBasicInfo.vue
@@ -1,13 +1,12 @@
 <template>
-  <el-col> 客户 </el-col>
   <el-col>
     <el-row>
       <span class="text-xl font-bold">{{ customer.name }}</span>
     </el-row>
   </el-col>
   <el-col class="mt-10px">
-    <Icon icon="ant-design:tag-filled" />
     <!-- TODO 标签 -->
+    <!--    <Icon icon="ant-design:tag-filled" />-->
   </el-col>
 </template>
 <script setup lang="ts">
@@ -15,4 +14,3 @@ import * as CustomerApi from '@/api/crm/customer'
 
 const { customer } = defineProps<{ customer: CustomerApi.CustomerVO }>()
 </script>
-<style scoped lang="scss"></style>
diff --git a/src/views/crm/customer/detail/CustomerDetails.vue b/src/views/crm/customer/detail/CustomerDetails.vue
index f6215224..1065b22c 100644
--- a/src/views/crm/customer/detail/CustomerDetails.vue
+++ b/src/views/crm/customer/detail/CustomerDetails.vue
@@ -4,7 +4,7 @@
       <template #title>
         <span class="text-base font-bold">基本信息</span>
       </template>
-      <el-descriptions :column="2">
+      <el-descriptions :column="4">
         <el-descriptions-item label="客户名称">
           {{ customer.name }}
         </el-descriptions-item>
@@ -71,6 +71,7 @@
         <el-descriptions-item label="更新时间">
           {{ customer.updateTime ? formatDate(customer.updateTime) : '空' }}
         </el-descriptions-item>
+        <!-- TODO wanwan：要不把“最后跟进时间”放到“下次联系时间”后面 -->
         <el-descriptions-item label="最后跟进时间">
           {{ customer.contactLastTime ? formatDate(customer.contactLastTime) : '空' }}
         </el-descriptions-item>
diff --git a/src/views/crm/customer/detail/index.vue b/src/views/crm/customer/detail/index.vue
index e5c8ef43..1caeadef 100644
--- a/src/views/crm/customer/detail/index.vue
+++ b/src/views/crm/customer/detail/index.vue
@@ -63,9 +63,11 @@
       </el-descriptions-item>
     </el-descriptions>
   </ContentWrap>
+  <!-- TODO wanwan：这个 tab 拉满哈，可以更好看； -->
   <el-col :span="18">
     <el-tabs>
       <el-tab-pane label="详细资料">
+        <!-- TODO wanwan：这个 ml-2 是不是可以优化下，不要整个左移，而是里面的内容有个几 px 的偏移，不顶在框里 -->
         <CustomerDetails class="ml-2" :customer="customer" />
       </el-tab-pane>
       <el-tab-pane label="活动" lazy> 活动</el-tab-pane>
@@ -150,5 +152,3 @@ onMounted(() => {
   getCustomerData(id)
 })
 </script>
-
-<style scoped lang="scss"></style>

From f79d31a64a3a56ddcfb53608384151b3a84abd33 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 4 Nov 2023 10:39:39 +0800
Subject: [PATCH 23/38] =?UTF-8?q?code=20review=EF=BC=9A=E6=BB=A1=E5=87=8F?=
 =?UTF-8?q?=E9=80=81=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mall/promotion/rewardActivity/RewardForm.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/mall/promotion/rewardActivity/RewardForm.vue b/src/views/mall/promotion/rewardActivity/RewardForm.vue
index 375aff7a..18827014 100644
--- a/src/views/mall/promotion/rewardActivity/RewardForm.vue
+++ b/src/views/mall/promotion/rewardActivity/RewardForm.vue
@@ -30,7 +30,7 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item label="优惠设置">
-        <!-- TODO 芋艿：待实现！ -->
+        <!-- TODO 待实现！这个实现下哈 -->
       </el-form-item>
       <el-form-item label="活动商品" prop="productScope">
         <el-radio-group v-model="formData.productScope">
@@ -42,6 +42,7 @@
           >
         </el-radio-group>
       </el-form-item>
+      <!-- TODO：活动商品的开发，可以参考优惠劵的，已经搞好啦； -->
       <el-form-item
         v-if="formData.productScope === PromotionProductScopeEnum.SPU.scope"
         prop="productSpuIds"

From a9b91e743645b8510dd585ac7772794f32638548 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 4 Nov 2023 14:37:23 +0800
Subject: [PATCH 24/38] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E7=A4=BE?=
 =?UTF-8?q?=E4=BA=A4=E7=99=BB=E5=BD=95=E3=80=81=E7=94=A8=E6=88=B7=E7=9A=84?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/social/user/index.ts           |  10 --
 src/utils/dict.ts                             |   2 +-
 src/views/system/loginlog/LoginLogDetail.vue  |   2 +-
 .../system/social/client/SocialClientForm.vue |   6 +-
 src/views/system/social/client/index.vue      |  31 +---
 .../system/social/user/SocialUserDetail.vue   |  60 ++++++++
 .../system/social/user/SocialUserForm.vue     | 139 ------------------
 src/views/system/social/user/index.vue        |  74 ++++------
 8 files changed, 98 insertions(+), 226 deletions(-)
 create mode 100644 src/views/system/social/user/SocialUserDetail.vue
 delete mode 100644 src/views/system/social/user/SocialUserForm.vue

diff --git a/src/api/system/social/user/index.ts b/src/api/system/social/user/index.ts
index f2850a62..f11231b7 100644
--- a/src/api/system/social/user/index.ts
+++ b/src/api/system/social/user/index.ts
@@ -22,13 +22,3 @@ export const getSocialUserPage = async (params) => {
 export const getSocialUser = async (id: number) => {
   return await request.get({ url: `/system/social-user/get?id=` + id })
 }
-
-// 修改社交用户
-export const updateSocialUser = async (data: SocialUserVO) => {
-  return await request.put({ url: `/system/social-user/update`, data })
-}
-
-// 删除社交用户
-export const deleteSocialUser = async (id: number) => {
-  return await request.delete({ url: `/system/social-user/delete?id=` + id })
-}
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index b2bf39b2..6afe0aa6 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -116,7 +116,7 @@ export enum DICT_TYPE {
   SYSTEM_OAUTH2_GRANT_TYPE = 'system_oauth2_grant_type',
   SYSTEM_MAIL_SEND_STATUS = 'system_mail_send_status',
   SYSTEM_NOTIFY_TEMPLATE_TYPE = 'system_notify_template_type',
-  SYSTEM_SOCIAL_CLIENT_TYPE = 'system_social_client_type',
+  SYSTEM_SOCIAL_TYPE = 'system_social_type',
 
   // ========== INFRA 模块 ==========
   INFRA_BOOLEAN_STRING = 'infra_boolean_string',
diff --git a/src/views/system/loginlog/LoginLogDetail.vue b/src/views/system/loginlog/LoginLogDetail.vue
index 54db0259..3679fa98 100644
--- a/src/views/system/loginlog/LoginLogDetail.vue
+++ b/src/views/system/loginlog/LoginLogDetail.vue
@@ -34,7 +34,7 @@ defineOptions({ name: 'SystemLoginLogDetail' })
 
 const dialogVisible = ref(false) // 弹窗的是否展示
 const detailLoading = ref(false) // 表单的加载中
-const detailData = ref() // 详情数据
+const detailData = ref({}) // 详情数据
 
 /** 打开弹窗 */
 const open = async (data: LoginLogApi.LoginLogVO) => {
diff --git a/src/views/system/social/client/SocialClientForm.vue b/src/views/system/social/client/SocialClientForm.vue
index 5ca0e158..e6f92bd6 100644
--- a/src/views/system/social/client/SocialClientForm.vue
+++ b/src/views/system/social/client/SocialClientForm.vue
@@ -13,7 +13,7 @@
       <el-form-item label="社交平台" prop="socialType">
         <el-radio-group v-model="formData.socialType">
           <el-radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_SOCIAL_CLIENT_TYPE)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_SOCIAL_TYPE)"
             :key="dict.value"
             :label="dict.value"
           >
@@ -41,8 +41,8 @@
           placeholder="请输入客户端密钥,对应各平台的appSecret"
         />
       </el-form-item>
-      <el-form-item label="agentId" prop="agentId">
-        <el-input v-model="formData.agentId" placeholder="授权方的网页应用ID,有则填" />
+      <el-form-item label="agentId" prop="agentId" v-if="formData!.socialType === 30">
+        <el-input v-model="formData.agentId" placeholder="授权方的网页应用 ID，有则填" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-radio-group v-model="formData.status">
diff --git a/src/views/system/social/client/index.vue b/src/views/system/social/client/index.vue
index de3bf705..4f3cdb84 100644
--- a/src/views/system/social/client/index.vue
+++ b/src/views/system/social/client/index.vue
@@ -25,7 +25,7 @@
           placeholder="请选择社交平台"
         >
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_SOCIAL_CLIENT_TYPE)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_SOCIAL_TYPE)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -56,15 +56,6 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="客户端密钥" prop="clientSecret">
-        <el-input
-          v-model="queryParams.clientSecret"
-          class="!w-240px"
-          clearable
-          placeholder="请输入客户端密钥"
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" class="!w-240px" clearable placeholder="请选择状态">
           <el-option
@@ -75,17 +66,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-          end-placeholder="结束日期"
-          start-placeholder="开始日期"
-          type="daterange"
-          value-format="YYYY-MM-DD HH:mm:ss"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery">
           <Icon class="mr-5px" icon="ep:search" />
@@ -115,7 +95,7 @@
       <el-table-column align="center" label="应用名" prop="name" />
       <el-table-column align="center" label="社交平台" prop="socialType">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.SYSTEM_SOCIAL_CLIENT_TYPE" :value="scope.row.socialType" />
+          <dict-tag :type="DICT_TYPE.SYSTEM_SOCIAL_TYPE" :value="scope.row.socialType" />
         </template>
       </el-table-column>
       <el-table-column align="center" label="用户类型" prop="userType">
@@ -123,8 +103,7 @@
           <dict-tag :type="DICT_TYPE.USER_TYPE" :value="scope.row.userType" />
         </template>
       </el-table-column>
-      <el-table-column align="center" label="客户端编号" prop="clientId" />
-      <el-table-column align="center" label="客户端密钥" prop="clientSecret" />
+      <el-table-column align="center" label="客户端编号" prop="clientId" width="180px" />
       <el-table-column align="center" label="状态" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
@@ -192,9 +171,7 @@ const queryParams = reactive({
   socialType: null,
   userType: null,
   clientId: null,
-  clientSecret: null,
-  status: null,
-  createTime: []
+  status: null
 })
 const queryFormRef = ref() // 搜索的表单
 
diff --git a/src/views/system/social/user/SocialUserDetail.vue b/src/views/system/social/user/SocialUserDetail.vue
new file mode 100644
index 00000000..1fa8b480
--- /dev/null
+++ b/src/views/system/social/user/SocialUserDetail.vue
@@ -0,0 +1,60 @@
+<template>
+  <Dialog v-model="dialogVisible" title="详情" width="800">
+    <el-descriptions :column="1" border>
+      <el-descriptions-item label="社交平台" min-width="160">
+        <dict-tag :type="DICT_TYPE.SYSTEM_SOCIAL_TYPE" :value="detailData.type" />
+      </el-descriptions-item>
+      <el-descriptions-item label="用户昵称" min-width="120">
+        {{ detailData.nickname }}
+      </el-descriptions-item>
+      <el-descriptions label="用户头像" min-width="120">
+        <el-image :src="detailData.avatar" class="h-30px w-30px" />
+      </el-descriptions>
+      <el-descriptions-item label="社交 token" min-width="120">
+        {{ detailData.token }}
+      </el-descriptions-item>
+      <el-descriptions-item label="原始 Token 数据" min-width="120">
+        <el-input
+          v-model="detailData.rawTokenInfo"
+          :autosize="{ maxRows: 20 }"
+          :readonly="true"
+          type="textarea"
+        />
+      </el-descriptions-item>
+      <el-descriptions-item label="原始 User 数据" min-width="120">
+        <el-input
+          v-model="detailData.rawUserInfo"
+          :autosize="{ maxRows: 20 }"
+          :readonly="true"
+          type="textarea"
+        />
+      </el-descriptions-item>
+      <el-descriptions-item label="最后一次的认证 code" min-width="120">
+        {{ detailData.code }}
+      </el-descriptions-item>
+      <el-descriptions-item label="最后一次的认证 state" min-width="120">
+        {{ detailData.state }}
+      </el-descriptions-item>
+    </el-descriptions>
+  </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE } from '@/utils/dict'
+import * as SocialUserApi from '@/api/system/social/user'
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const detailLoading = ref(false) // 表单的加载中
+const detailData = ref({}) // 详情数据
+
+/** 打开弹窗 */
+const open = async (id: number) => {
+  dialogVisible.value = true
+  // 设置数据
+  try {
+    detailData.value = await SocialUserApi.getSocialUser(id)
+  } finally {
+    detailLoading.value = false
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+</script>
diff --git a/src/views/system/social/user/SocialUserForm.vue b/src/views/system/social/user/SocialUserForm.vue
deleted file mode 100644
index 181bc6f8..00000000
--- a/src/views/system/social/user/SocialUserForm.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<template>
-  <Dialog v-model="dialogVisible" :title="dialogTitle">
-    <el-form
-      ref="formRef"
-      v-loading="formLoading"
-      :model="formData"
-      :rules="formRules"
-      label-width="150px"
-    >
-      <el-form-item label="社交平台" prop="type">
-        <el-radio-group v-model="formData.type">
-          <el-radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_SOCIAL_CLIENT_TYPE)"
-            :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="社交 openid" prop="openid">
-        <el-input v-model="formData.openid" placeholder="请输入社交 openid" />
-      </el-form-item>
-      <el-form-item label="社交 token" prop="token">
-        <el-input v-model="formData.token" placeholder="请输入社交 token" />
-      </el-form-item>
-      <el-form-item label="原始 Token 数据" prop="rawTokenInfo">
-        <el-input v-model="formData.rawTokenInfo" placeholder="请输入原始 Token 数据" />
-      </el-form-item>
-      <el-form-item label="用户昵称" prop="nickname">
-        <el-input v-model="formData.nickname" placeholder="请输入用户昵称" />
-      </el-form-item>
-      <el-form-item label="用户头像" prop="avatar">
-        <el-input v-model="formData.avatar" placeholder="请输入用户头像" />
-      </el-form-item>
-      <el-form-item label="原始用户数据" prop="rawUserInfo">
-        <el-input v-model="formData.rawUserInfo" placeholder="请输入原始用户数据" />
-      </el-form-item>
-      <el-form-item label="最后一次的认证 code" prop="code">
-        <el-input v-model="formData.code" placeholder="请输入最后一次的认证 code" />
-      </el-form-item>
-      <el-form-item label="最后一次的认证 state" prop="state">
-        <el-input v-model="formData.state" placeholder="请输入最后一次的认证 state" />
-      </el-form-item>
-    </el-form>
-    <template #footer>
-      <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
-      <el-button @click="dialogVisible = false">取 消</el-button>
-    </template>
-  </Dialog>
-</template>
-<script lang="ts" setup>
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import * as SocialUserApi from '@/api/system/social/user'
-
-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,
-  type: undefined,
-  openid: undefined,
-  token: undefined,
-  rawTokenInfo: undefined,
-  nickname: undefined,
-  avatar: undefined,
-  rawUserInfo: undefined,
-  code: undefined,
-  state: 0
-})
-const formRules = reactive({
-  type: [{ required: true, message: '社交平台不能为空', trigger: 'blur' }],
-  openid: [{ required: true, message: '社交 openid 不能为空', trigger: 'blur' }],
-  nickname: [{ 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 {
-      formData.value = await SocialUserApi.getSocialUser(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 SocialUserApi.SocialUserVO
-    if (formType.value === 'update') {
-      await SocialUserApi.updateSocialUser(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    type: undefined,
-    openid: undefined,
-    token: undefined,
-    rawTokenInfo: undefined,
-    nickname: undefined,
-    avatar: undefined,
-    rawUserInfo: undefined,
-    code: undefined,
-    state: 0
-  }
-  formRef.value?.resetFields()
-}
-</script>
diff --git a/src/views/system/social/user/index.vue b/src/views/system/social/user/index.vue
index f4f0a8b0..a54d5e6a 100644
--- a/src/views/system/social/user/index.vue
+++ b/src/views/system/social/user/index.vue
@@ -6,7 +6,7 @@
       :inline="true"
       :model="queryParams"
       class="-mb-15px"
-      label-width="68px"
+      label-width="120px"
     >
       <el-form-item label="社交平台" prop="type">
         <el-select
@@ -16,7 +16,7 @@
           placeholder="请选择社交平台"
         >
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_SOCIAL_CLIENT_TYPE)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_SOCIAL_TYPE)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -32,6 +32,15 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="社交 openid" prop="openid">
+        <el-input
+          v-model="queryParams.openid"
+          class="!w-240px"
+          clearable
+          placeholder="请输入社交 openid"
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
@@ -61,21 +70,16 @@
     <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
       <el-table-column align="center" label="社交平台" prop="type">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.SYSTEM_SOCIAL_CLIENT_TYPE" :value="scope.row.type" />
+          <dict-tag :type="DICT_TYPE.SYSTEM_SOCIAL_TYPE" :value="scope.row.type" />
         </template>
       </el-table-column>
       <el-table-column align="center" label="社交 openid" prop="openid" />
-      <el-table-column align="center" label="社交 token" prop="token" />
-      <el-table-column align="center" label="原始 Token 数据" prop="rawTokenInfo" />
       <el-table-column align="center" label="用户昵称" prop="nickname" />
       <el-table-column align="center" label="用户头像" prop="avatar">
         <template #default="{ row }">
           <el-image :src="row.avatar" class="h-30px w-30px" @click="imagePreview(row.avatar)" />
         </template>
       </el-table-column>
-      <el-table-column align="center" label="原始用户数据" prop="rawUserInfo" />
-      <el-table-column align="center" label="最后一次的认证 code" prop="code" />
-      <el-table-column align="center" label="最后一次的认证 state" prop="state" />
       <el-table-column
         :formatter="dateFormatter"
         align="center"
@@ -83,23 +87,22 @@
         prop="createTime"
         width="180px"
       />
+      <el-table-column
+        :formatter="dateFormatter"
+        align="center"
+        label="更新时间"
+        prop="updateTime"
+        width="180px"
+      />
       <el-table-column align="center" fixed="right" label="操作">
         <template #default="scope">
           <el-button
-            v-hasPermi="['system:social-user:update']"
+            v-hasPermi="['system:social-user:query']"
             link
             type="primary"
-            @click="openForm('update', scope.row.id)"
+            @click="openDetail(scope.row.id)"
           >
-            编辑
-          </el-button>
-          <el-button
-            v-hasPermi="['system:social-user:delete']"
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-          >
-            删除
+            详情
           </el-button>
         </template>
       </el-table-column>
@@ -113,15 +116,15 @@
     />
   </ContentWrap>
 
-  <!-- 表单弹窗：添加/修改 -->
-  <SocialUserForm ref="formRef" @success="getList" />
+  <!-- 表单弹窗：详情 -->
+  <SocialUserDetail ref="detailRef" />
 </template>
 
 <script lang="ts" setup>
 import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import * as SocialUserApi from '@/api/system/social/user'
-import SocialUserForm from './SocialUserForm.vue'
+import SocialUserDetail from './SocialUserDetail.vue'
 import { createImageViewer } from '@/components/ImageViewer'
 
 defineOptions({ name: 'SocialUser' })
@@ -137,13 +140,7 @@ const queryParams = reactive({
   pageSize: 10,
   type: undefined,
   openid: undefined,
-  token: undefined,
-  rawTokenInfo: undefined,
   nickname: undefined,
-  avatar: undefined,
-  rawUserInfo: undefined,
-  code: undefined,
-  state: undefined,
   createTime: []
 })
 const queryFormRef = ref() // 搜索的表单
@@ -178,23 +175,10 @@ const imagePreview = (imgUrl: string) => {
   })
 }
 
-/** 修改操作 */
-const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
-}
-
-/** 删除按钮操作 */
-const handleDelete = async (id: number) => {
-  try {
-    // 删除的二次确认
-    await message.delConfirm()
-    // 发起删除
-    await SocialUserApi.deleteSocialUser(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
+/** 详情操作 */
+const detailRef = ref()
+const openDetail = (id: number) => {
+  detailRef.value.open(id)
 }
 
 /** 初始化 **/

From ff6f05df84c223f6df7676f1ffd2a5da09813c18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?ZanGe=E4=B8=B6?= <385454831@qq.com>
Date: Sat, 4 Nov 2023 18:28:59 +0800
Subject: [PATCH 25/38] =?UTF-8?q?=E3=80=90crm:=E4=BA=A7=E5=93=81=E5=8F=8A?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=88=86=E7=B1=BB=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/product/index.ts                  |  43 +++
 src/api/crm/productCategory/index.ts          |  32 +++
 src/utils/dict.ts                             |   3 +-
 src/views/crm/product/ProductDetail.vue       |  70 +++++
 src/views/crm/product/ProductForm.vue         | 184 ++++++++++++
 src/views/crm/product/index.vue               | 269 ++++++++++++++++++
 .../productCategory/ProductCategoryForm.vue   | 110 +++++++
 src/views/crm/productCategory/index.vue       | 137 +++++++++
 8 files changed, 847 insertions(+), 1 deletion(-)
 create mode 100644 src/api/crm/product/index.ts
 create mode 100644 src/api/crm/productCategory/index.ts
 create mode 100644 src/views/crm/product/ProductDetail.vue
 create mode 100644 src/views/crm/product/ProductForm.vue
 create mode 100644 src/views/crm/product/index.vue
 create mode 100644 src/views/crm/productCategory/ProductCategoryForm.vue
 create mode 100644 src/views/crm/productCategory/index.vue

diff --git a/src/api/crm/product/index.ts b/src/api/crm/product/index.ts
new file mode 100644
index 00000000..cb1ddcda
--- /dev/null
+++ b/src/api/crm/product/index.ts
@@ -0,0 +1,43 @@
+import request from '@/config/axios'
+
+export interface ProductVO {
+  id: number
+  name: string
+  no: string
+  unit: string
+  price: number
+  status: number
+  categoryId: number
+  description: string
+  ownerUserId: number
+}
+
+// 查询产品列表
+export const getProductPage = async (params) => {
+  return await request.get({ url: `/crm/product/page`, params })
+}
+
+// 查询产品详情
+export const getProduct = async (id: number) => {
+  return await request.get({ url: `/crm/product/get?id=` + id })
+}
+
+// 新增产品
+export const createProduct = async (data: ProductVO) => {
+  return await request.post({ url: `/crm/product/create`, data })
+}
+
+// 修改产品
+export const updateProduct = async (data: ProductVO) => {
+  return await request.put({ url: `/crm/product/update`, data })
+}
+
+// 删除产品
+export const deleteProduct = async (id: number) => {
+  return await request.delete({ url: `/crm/product/delete?id=` + id })
+}
+
+// 导出产品 Excel
+export const exportProduct = async (params) => {
+  return await request.download({ url: `/crm/product/export-excel`, params })
+}
diff --git a/src/api/crm/productCategory/index.ts b/src/api/crm/productCategory/index.ts
new file mode 100644
index 00000000..cdf8a966
--- /dev/null
+++ b/src/api/crm/productCategory/index.ts
@@ -0,0 +1,32 @@
+import request from '@/config/axios'
+
+export interface ProductCategoryVO {
+  id: number
+  name: string
+  parentId: number
+}
+
+// 查询产品分类详情
+export const getProductCategory = async (id: number) => {
+  return await request.get({ url: `/crm/product-category/get?id=` + id })
+}
+
+// 新增产品分类
+export const createProductCategory = async (data: ProductCategoryVO) => {
+  return await request.post({ url: `/crm/product-category/create`, data })
+}
+
+// 修改产品分类
+export const updateProductCategory = async (data: ProductCategoryVO) => {
+  return await request.put({ url: `/crm/product-category/update`, data })
+}
+
+// 删除产品分类
+export const deleteProductCategory = async (id: number) => {
+  return await request.delete({ url: `/crm/product-category/delete?id=` + id })
+}
+
+// 产品分类列表
+export const getProductCategoryList = async (params) => {
+  return await request.get({ url: `/crm/product-category/list`, params })
+}
diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 85e08e67..c059612a 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -191,5 +191,6 @@ export enum DICT_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'
+  CRM_CUSTOMER_SOURCE = 'crm_customer_source',
+  CRM_PRODUCT_STATUS = 'crm_product_status'
 }
diff --git a/src/views/crm/product/ProductDetail.vue b/src/views/crm/product/ProductDetail.vue
new file mode 100644
index 00000000..f14e571a
--- /dev/null
+++ b/src/views/crm/product/ProductDetail.vue
@@ -0,0 +1,70 @@
+<template>
+  <Dialog v-model="dialogVisible" :max-height="500" :scroll="true" title="产品详情">
+    <el-descriptions :column="1" border>
+      <el-descriptions-item label="产品名称">
+        {{ detailData.name }}
+      </el-descriptions-item>
+      <el-descriptions-item label="创建时间">
+        {{ formatDate(detailData.createTime) }}
+      </el-descriptions-item>
+      <el-descriptions-item label="状态">
+        <dict-tag :type="DICT_TYPE.CRM_PRODUCT_STATUS" :value="detailData.status" />
+      </el-descriptions-item>
+      <el-descriptions-item label="产品分类">
+        {{ productCategoryList?.find((c) => c.id === detailData.categoryId)?.name }}
+      </el-descriptions-item>
+      <el-descriptions-item label="产品编码">
+        {{ detailData.no }}
+      </el-descriptions-item>
+      <el-descriptions-item label="产品描述">
+        {{ detailData.description }}
+      </el-descriptions-item>
+      <el-descriptions-item label="负责人">
+        {{ detailData.ownerUserId }}
+      </el-descriptions-item>
+      <el-descriptions-item label="单位">
+        <dict-tag :type="DICT_TYPE.PRODUCT_UNIT" :value="detailData.unit" />
+      </el-descriptions-item>
+      <el-descriptions-item label="价格">
+        {{ fenToYuan(detailData.price) }}元
+      </el-descriptions-item>
+    </el-descriptions>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { DICT_TYPE } from '@/utils/dict'
+import * as ProductCategoryApi from '@/api/crm/productCategory'
+import * as ProductApi from '@/api/crm/product'
+import { formatDate } from '@/utils/formatTime'
+import { fenToYuan } from '@/utils'
+import { getSimpleUserList, UserVO } from '@/api/system/user'
+
+defineOptions({ name: 'CrmProductDetail' })
+
+const { t } = useI18n() // 国际化
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const detailLoading = ref(false) // 表单的加载中
+const detailData = ref() // 详情数据
+
+/** 打开弹窗 */
+const open = async (data: ProductApi.ProductVO) => {
+  dialogVisible.value = true
+  // 设置数据
+  detailLoading.value = true
+  try {
+    detailData.value = data
+  } finally {
+    detailLoading.value = false
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+const productCategoryList = ref([]) // 产品分类树
+const userList = ref<UserVO[]>([]) // 系统用户
+
+onMounted(async () => {
+  productCategoryList.value = await ProductCategoryApi.getProductCategoryList({})
+  userList.value = await getSimpleUserList()
+})
+</script>
diff --git a/src/views/crm/product/ProductForm.vue b/src/views/crm/product/ProductForm.vue
new file mode 100644
index 00000000..78d2a7c1
--- /dev/null
+++ b/src/views/crm/product/ProductForm.vue
@@ -0,0 +1,184 @@
+<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="no">
+        <el-input v-model="formData.no" placeholder="请输入产品编码" />
+      </el-form-item>
+      <el-form-item label="单位" prop="unit">
+        <el-select v-model="formData.unit" class="w-1/1" placeholder="请选择单位">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.PRODUCT_UNIT)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="价格" prop="price">
+        <el-input type="number" v-model="formData.price" placeholder="请输入价格" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="formData.status" placeholder="请选择状态">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.CRM_PRODUCT_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="产品分类" prop="categoryId">
+        <el-cascader
+          v-model="formData.categoryId"
+          :options="productCategoryList"
+          :props="defaultProps"
+          class="w-1/1"
+          clearable
+          placeholder="请选择产品分类"
+          filterable
+        />
+      </el-form-item>
+      <el-form-item label="产品描述" prop="description">
+        <el-input v-model="formData.description" placeholder="请输入产品描述" />
+      </el-form-item>
+      <el-form-item label="负责人" prop="ownerUserId">
+        <el-select
+          v-model="formData.ownerUserId"
+          placeholder="请选择负责人"
+          :disabled="formData.id"
+        >
+          <el-option
+            v-for="user in userList"
+            :key="user.id"
+            :label="user.nickname"
+            :value="user.id"
+          />
+        </el-select>
+      </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, getIntDictOptions } from '@/utils/dict'
+import * as ProductApi from '@/api/crm/product'
+import * as ProductCategoryApi from '@/api/crm/productCategory'
+import { defaultProps, handleTree } from '@/utils/tree'
+import { getSimpleUserList, UserVO } from '@/api/system/user'
+import { useUserStore } from '@/store/modules/user'
+
+defineOptions({ name: 'CrmProductForm' })
+
+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 userId = useUserStore().getUser.id // 当前登录的编号
+const formData = ref({
+  id: undefined,
+  name: undefined,
+  no: undefined,
+  unit: undefined,
+  price: undefined,
+  status: undefined,
+  categoryId: undefined,
+  description: undefined,
+  ownerUserId: undefined
+})
+const formRules = reactive({
+  name: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
+  no: [{ required: true, message: '产品编码不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '状态不能为空', trigger: 'change' }],
+  categoryId: [{ required: true, message: '产品分类ID不能为空', trigger: 'blur' }],
+  ownerUserId: [{ required: true, message: '负责人不能为空', trigger: 'blur' }],
+  unit: [{ required: true, message: '单位不能为空', trigger: 'blur' }],
+  price: [{ 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()
+  formData.value.ownerUserId = userId
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await ProductApi.getProduct(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 ProductApi.ProductVO
+    if (formType.value === 'create') {
+      await ProductApi.createProduct(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductApi.updateProduct(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    no: undefined,
+    unit: undefined,
+    price: undefined,
+    status: undefined,
+    categoryId: undefined,
+    description: undefined,
+    ownerUserId: undefined
+  }
+  formRef.value?.resetFields()
+}
+const productCategoryList = ref<any[]>([]) // 产品分类树
+const userList = ref<UserVO[]>([]) // 系统用户
+
+onMounted(async () => {
+  const data = await ProductCategoryApi.getProductCategoryList({})
+  productCategoryList.value = handleTree(data, 'id', 'parentId')
+  userList.value = await getSimpleUserList()
+})
+</script>
diff --git a/src/views/crm/product/index.vue b/src/views/crm/product/index.vue
new file mode 100644
index 00000000..122f964d
--- /dev/null
+++ b/src/views/crm/product/index.vue
@@ -0,0 +1,269 @@
+<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="no">
+        <el-input
+          v-model="queryParams.no"
+          placeholder="请输入产品编码"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
+          <el-option
+            v-for="dict in getBoolDictOptions(DICT_TYPE.CRM_PRODUCT_STATUS)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="产品分类" prop="categoryId">
+        <el-input
+          v-model="queryParams.categoryId"
+          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" @click="openForm('create')" v-hasPermi="['crm:product:create']">
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['crm:product:export']"
+        >
+          <Icon icon="ep:download" 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="主键id" align="center" prop="id" />-->
+      <el-table-column label="产品名称" align="center" prop="name" />
+      <el-table-column label="产品编码" align="center" prop="no" />
+      <el-table-column label="单位" align="center" prop="unit">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.PRODUCT_UNIT" :value="scope.row.unit" />
+        </template>
+      </el-table-column>
+      <el-table-column label="价格" align="center" prop="price">
+        <template #default="{ row }">
+          {{ fenToYuan(row.price) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.CRM_PRODUCT_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="产品分类" align="center" prop="categoryId">
+        <template #default="{ row }">
+          <span>{{ productCategoryList?.find((c) => c.id === row.categoryId)?.name }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="产品描述" align="center" prop="description" />
+      <el-table-column label="负责人" align="center" prop="ownerUserId">
+        <template #default="{ row }">
+          <span>{{ userList?.find((c) => c.id === row.ownerUserId)?.nickname }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center" width="160">
+        <template #default="scope">
+          <el-button
+            v-hasPermi="['crm:product:query']"
+            link
+            type="primary"
+            @click="openDetail(scope.row)"
+          >
+            详情
+          </el-button>
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['crm:product:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['crm:product: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>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ProductForm ref="formRef" @success="getList" />
+
+  <!-- 表单弹窗：详情 -->
+  <ProductDetail ref="detailRef" @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 ProductApi from '@/api/crm/product'
+import ProductForm from './ProductForm.vue'
+import ProductDetail from './ProductDetail.vue'
+import { fenToYuan } from '@/utils'
+import * as ProductCategoryApi from '@/api/crm/productCategory'
+import { getSimpleUserList, UserVO } from '@/api/system/user'
+
+defineOptions({ name: 'CrmProduct' })
+
+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,
+  no: null,
+  unit: null,
+  price: null,
+  status: null,
+  categoryId: null,
+  description: null,
+  ownerUserId: null,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ProductApi.getProductPage(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 detailRef = ref()
+const openDetail = (data: ProductApi.ProductVO) => {
+  detailRef.value.open(data)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ProductApi.deleteProduct(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductApi.exportProduct(queryParams)
+    download.excel(data, '产品.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+const productCategoryList = ref([]) // 产品分类树
+const userList = ref<UserVO[]>([]) // 系统用户
+
+/** 初始化 **/
+onMounted(async () => {
+  await getList()
+  productCategoryList.value = await ProductCategoryApi.getProductCategoryList({})
+  userList.value = await getSimpleUserList()
+})
+</script>
diff --git a/src/views/crm/productCategory/ProductCategoryForm.vue b/src/views/crm/productCategory/ProductCategoryForm.vue
new file mode 100644
index 00000000..22cd09a8
--- /dev/null
+++ b/src/views/crm/productCategory/ProductCategoryForm.vue
@@ -0,0 +1,110 @@
+<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="父级id" prop="parentId">
+        <el-select v-model="formData.parentId" placeholder="请选择上级分类">
+          <el-option :key="0" label="顶级分类" :value="0" />
+          <el-option
+            v-for="item in productCategoryList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="名称" prop="name">
+        <el-input v-model="formData.name" 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 * as ProductCategoryApi from '@/api/crm/productCategory'
+
+defineOptions({ name: 'CrmProductCategoryForm' })
+
+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,
+  parentId: undefined
+})
+const formRules = reactive({
+  name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+  parentId: [{ required: true, message: '父级分类不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+const productCategoryList = ref<any[]>([]) // 产品分类树
+
+/** 打开弹窗 */
+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 ProductCategoryApi.getProductCategory(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  // 获得分类树
+  productCategoryList.value = await ProductCategoryApi.getProductCategoryList({ parentId: 0 })
+}
+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 ProductCategoryApi.ProductCategoryVO
+    if (formType.value === 'create') {
+      await ProductCategoryApi.createProductCategory(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductCategoryApi.updateProductCategory(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    parentId: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/crm/productCategory/index.vue b/src/views/crm/productCategory/index.vue
new file mode 100644
index 00000000..3cf7c5f0
--- /dev/null
+++ b/src/views/crm/productCategory/index.vue
@@ -0,0 +1,137 @@
+<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>
+        <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="['crm:product-category:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" row-key="id" default-expand-all>
+      <el-table-column label="名称" align="center" prop="name" />
+      <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="openForm('update', scope.row.id)"
+            v-hasPermi="['crm:product-category:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['crm:product-category:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ProductCategoryForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as ProductCategoryApi from '@/api/crm/productCategory'
+import ProductCategoryForm from './ProductCategoryForm.vue'
+import { handleTree } from '@/utils/tree'
+
+defineOptions({ name: 'CrmProductCategory' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<any[]>([]) // 列表的数据
+const queryParams = reactive({
+  name: null
+})
+const queryFormRef = ref() // 搜索的表单
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ProductCategoryApi.getProductCategoryList(queryParams)
+    list.value = handleTree(data, 'id', 'parentId')
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  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 ProductCategoryApi.deleteProductCategory(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>

From 4f2f4f72b50d7aefab84ec750798a79e5f9dc9c2 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 4 Nov 2023 20:43:36 +0800
Subject: [PATCH 26/38] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E7=A4=BE?=
 =?UTF-8?q?=E4=BA=A4=E7=99=BB=E5=BD=95=E3=80=81=E7=94=A8=E6=88=B7=E7=9A=84?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/social/client/index.vue | 2 ++
 src/views/system/social/user/index.vue   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/views/system/social/client/index.vue b/src/views/system/social/client/index.vue
index 4f3cdb84..82f66297 100644
--- a/src/views/system/social/client/index.vue
+++ b/src/views/system/social/client/index.vue
@@ -1,4 +1,6 @@
 <template>
+  <doc-alert title="三方登录" url="https://doc.iocoder.cn/social-user/" />
+
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <el-form
diff --git a/src/views/system/social/user/index.vue b/src/views/system/social/user/index.vue
index a54d5e6a..c4b4f7f7 100644
--- a/src/views/system/social/user/index.vue
+++ b/src/views/system/social/user/index.vue
@@ -1,4 +1,6 @@
 <template>
+  <doc-alert title="三方登录" url="https://doc.iocoder.cn/social-user/" />
+
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <el-form

From aedf0144072ddd2696a0c29e32e59dc9a2a643eb Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Sat, 4 Nov 2023 22:06:40 +0800
Subject: [PATCH 27/38] =?UTF-8?q?=E8=90=A5=E9=94=80=EF=BC=9A=E8=A3=85?=
 =?UTF-8?q?=E4=BF=AE=E9=A1=B5=E9=9D=A2=E9=80=82=E9=85=8D=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ComponentContainer.vue         |  45 +++++
 .../components/ComponentContainerProperty.vue | 164 ++++++++++++++++++
 .../DiyEditor/components/ComponentLibrary.vue |   2 +-
 .../components/mobile/NavigationBar/config.ts |   2 +-
 .../components/mobile/SearchBar/config.ts     |  20 ++-
 .../components/mobile/SearchBar/index.vue     |   8 +-
 .../components/mobile/SearchBar/property.vue  | 145 ++++++++--------
 src/components/DiyEditor/index.vue            |   8 +-
 src/components/DiyEditor/util.ts              |  28 +++
 9 files changed, 332 insertions(+), 90 deletions(-)
 create mode 100644 src/components/DiyEditor/components/ComponentContainer.vue
 create mode 100644 src/components/DiyEditor/components/ComponentContainerProperty.vue

diff --git a/src/components/DiyEditor/components/ComponentContainer.vue b/src/components/DiyEditor/components/ComponentContainer.vue
new file mode 100644
index 00000000..95eb647a
--- /dev/null
+++ b/src/components/DiyEditor/components/ComponentContainer.vue
@@ -0,0 +1,45 @@
+<template>
+  <div
+    :style="{
+      ...style,
+      background: property.bgType === 'color' ? property.bgColor : `url(${property.bgImg})`
+    }"
+  >
+    <slot></slot>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ComponentStyle } from '@/components/DiyEditor/util'
+
+/**
+ * 组件容器
+ * 用于包裹组件，为组件提供 背景、外边距、内边距、边框等样式
+ */
+defineOptions({ name: 'ComponentContainer' })
+
+const props = defineProps<{ property: ComponentStyle }>()
+
+const style = computed(() => {
+  if (!props.property) {
+    return {}
+  }
+  return {
+    marginTop: `${props.property.marginTop || 0}px`,
+    marginBottom: `${props.property.marginBottom || 0}px`,
+    marginLeft: `${props.property.marginLeft || 0}px`,
+    marginRight: `${props.property.marginRight || 0}px`,
+    paddingTop: `${props.property.paddingTop || 0}px`,
+    paddingRight: `${props.property.paddingRight || 0}px`,
+    paddingBottom: `${props.property.paddingBottom || 0}px`,
+    paddingLeft: `${props.property.paddingLeft || 0}px`,
+    borderTopLeftRadius: `${props.property.borderTopLeftRadius || 0}px`,
+    borderTopRightRadius: `${props.property.borderTopRightRadius || 0}px`,
+    borderBottomRightRadius: `${props.property.borderBottomRightRadius || 0}px`,
+    borderBottomLeftRadius: `${props.property.borderBottomLeftRadius || 0}px`,
+    overflow: 'hidden'
+  }
+})
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/components/DiyEditor/components/ComponentContainerProperty.vue b/src/components/DiyEditor/components/ComponentContainerProperty.vue
new file mode 100644
index 00000000..0cfbbe1e
--- /dev/null
+++ b/src/components/DiyEditor/components/ComponentContainerProperty.vue
@@ -0,0 +1,164 @@
+<template>
+  <el-tabs stretch>
+    <el-tab-pane label="内容">
+      <slot></slot>
+    </el-tab-pane>
+    <el-tab-pane label="样式" lazy>
+      <el-card header="组件样式" class="property-group">
+        <el-form :model="formData" label-width="80px">
+          <el-form-item label="组件背景" prop="bgType">
+            <el-radio-group v-model="formData.bgType">
+              <el-radio label="color">纯色</el-radio>
+              <el-radio label="img">图片</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="选择颜色" prop="bgColor" v-if="formData.bgType === 'color'">
+            <ColorInput v-model="formData.bgColor" />
+          </el-form-item>
+          <el-form-item label="上传图片" prop="bgImg" v-else>
+            <UploadImg v-model="formData.bgImg" :limit="1">
+              <template #tip>建议宽度 750px</template>
+            </UploadImg>
+          </el-form-item>
+          <el-tree :data="treeData" :expand-on-click-node="false">
+            <template #default="{ node, data }">
+              <el-form-item
+                :label="data.label"
+                :prop="data.prop"
+                :label-width="node.level === 1 ? '80px' : '62px'"
+                class="tree-form-item w-full m-b-0!"
+              >
+                <el-slider
+                  v-model="formData[data.prop]"
+                  :max="100"
+                  :min="0"
+                  show-input
+                  input-size="small"
+                  :show-input-controls="false"
+                  @input="handleSliderChange(data.prop)"
+                />
+              </el-form-item>
+            </template>
+          </el-tree>
+        </el-form>
+      </el-card>
+    </el-tab-pane>
+  </el-tabs>
+</template>
+
+<script setup lang="ts">
+import { ComponentStyle, usePropertyForm } from '@/components/DiyEditor/util'
+
+/**
+ * 组件容器属性
+ * 用于包裹组件，为组件提供 背景、外边距、内边距、边框等样式
+ */
+defineOptions({ name: 'ComponentContainer' })
+
+const props = defineProps<{ modelValue: ComponentStyle }>()
+const emit = defineEmits(['update:modelValue'])
+const { formData } = usePropertyForm(props.modelValue, emit)
+
+const treeData = [
+  {
+    label: '外部边距',
+    prop: 'margin',
+    children: [
+      {
+        label: '上',
+        prop: 'marginTop'
+      },
+      {
+        label: '右',
+        prop: 'marginRight'
+      },
+      {
+        label: '下',
+        prop: 'marginBottom'
+      },
+      {
+        label: '左',
+        prop: 'marginLeft'
+      }
+    ]
+  },
+  {
+    label: '内部边距',
+    prop: 'padding',
+    children: [
+      {
+        label: '上',
+        prop: 'paddingTop'
+      },
+      {
+        label: '右',
+        prop: 'paddingRight'
+      },
+      {
+        label: '下',
+        prop: 'paddingBottom'
+      },
+      {
+        label: '左',
+        prop: 'paddingLeft'
+      }
+    ]
+  },
+  {
+    label: '边框圆角',
+    prop: 'borderRadius',
+    children: [
+      {
+        label: '上左',
+        prop: 'borderTopLeftRadius'
+      },
+      {
+        label: '上右',
+        prop: 'borderTopRightRadius'
+      },
+      {
+        label: '下右',
+        prop: 'borderBottomRightRadius'
+      },
+      {
+        label: '下左',
+        prop: 'borderBottomLeftRadius'
+      }
+    ]
+  }
+]
+
+const handleSliderChange = (prop: string) => {
+  switch (prop) {
+    case 'margin':
+      formData.value.marginTop = formData.value.margin
+      formData.value.marginRight = formData.value.margin
+      formData.value.marginBottom = formData.value.margin
+      formData.value.marginLeft = formData.value.margin
+      break
+    case 'padding':
+      formData.value.paddingTop = formData.value.padding
+      formData.value.paddingRight = formData.value.padding
+      formData.value.paddingBottom = formData.value.padding
+      formData.value.paddingLeft = formData.value.padding
+      break
+    case 'borderRadius':
+      formData.value.borderTopLeftRadius = formData.value.borderRadius
+      formData.value.borderTopRightRadius = formData.value.borderRadius
+      formData.value.borderBottomRightRadius = formData.value.borderRadius
+      formData.value.borderBottomLeftRadius = formData.value.borderRadius
+      break
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.tree-form-item {
+  :deep(.el-slider__runway) {
+    margin-right: 16px;
+  }
+  :deep(.el-input-number) {
+    width: 50px;
+  }
+}
+</style>
diff --git a/src/components/DiyEditor/components/ComponentLibrary.vue b/src/components/DiyEditor/components/ComponentLibrary.vue
index 8e918fa9..abeb40b5 100644
--- a/src/components/DiyEditor/components/ComponentLibrary.vue
+++ b/src/components/DiyEditor/components/ComponentLibrary.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-aside class="editor-left" width="260px">
+  <el-aside class="editor-left" width="261px">
     <el-scrollbar>
       <el-collapse v-model="extendGroups">
         <el-collapse-item
diff --git a/src/components/DiyEditor/components/mobile/NavigationBar/config.ts b/src/components/DiyEditor/components/mobile/NavigationBar/config.ts
index b250f5f1..f722d525 100644
--- a/src/components/DiyEditor/components/mobile/NavigationBar/config.ts
+++ b/src/components/DiyEditor/components/mobile/NavigationBar/config.ts
@@ -29,7 +29,7 @@ export const component = {
     title: '页面标题',
     description: '',
     navBarHeight: 35,
-    backgroundColor: '#f5f5f5',
+    backgroundColor: '#fff',
     backgroundImage: '',
     styleType: 'default',
     alwaysShow: true,
diff --git a/src/components/DiyEditor/components/mobile/SearchBar/config.ts b/src/components/DiyEditor/components/mobile/SearchBar/config.ts
index 1241748d..ef47b27c 100644
--- a/src/components/DiyEditor/components/mobile/SearchBar/config.ts
+++ b/src/components/DiyEditor/components/mobile/SearchBar/config.ts
@@ -1,4 +1,4 @@
-import { DiyComponent } from '@/components/DiyEditor/util'
+import { ComponentStyle, DiyComponent } from '@/components/DiyEditor/util'
 
 /** 搜索框属性 */
 export interface SearchProperty {
@@ -7,10 +7,10 @@ export interface SearchProperty {
   borderRadius: number // 框体样式
   placeholder: string // 占位文字
   placeholderPosition: PlaceholderPosition // 占位文字位置
-  backgroundColor: string // 背景颜色
-  borderColor: string // 框体颜色
+  backgroundColor: string // 框体颜色
   textColor: string // 字体颜色
   hotKeywords: string[] // 热词
+  style: ComponentStyle
 }
 
 // 文字位置
@@ -27,9 +27,17 @@ export const component = {
     borderRadius: 0,
     placeholder: '搜索商品',
     placeholderPosition: 'left',
-    backgroundColor: 'rgb(249, 249, 249)',
-    borderColor: 'rgb(255, 255, 255)',
+    backgroundColor: 'rgb(238, 238, 238)',
     textColor: 'rgb(150, 151, 153)',
-    hotKeywords: []
+    hotKeywords: [],
+    style: {
+      bgType: 'color',
+      bgColor: '#fff',
+      marginBottom: 8,
+      paddingTop: 8,
+      paddingRight: 8,
+      paddingBottom: 8,
+      paddingLeft: 8
+    } as ComponentStyle
   }
 } as DiyComponent<SearchProperty>
diff --git a/src/components/DiyEditor/components/mobile/SearchBar/index.vue b/src/components/DiyEditor/components/mobile/SearchBar/index.vue
index e120405a..27db1c51 100644
--- a/src/components/DiyEditor/components/mobile/SearchBar/index.vue
+++ b/src/components/DiyEditor/components/mobile/SearchBar/index.vue
@@ -2,8 +2,6 @@
   <div
     class="search-bar"
     :style="{
-      background: property.backgroundColor,
-      border: `1px solid ${property.backgroundColor}`,
       color: property.textColor
     }"
   >
@@ -12,7 +10,7 @@
       class="inner"
       :style="{
         height: `${property.height}px`,
-        background: property.borderColor,
+        background: property.backgroundColor,
         borderRadius: `${property.borderRadius}px`
       }"
     >
@@ -44,13 +42,11 @@ defineProps<{ property: SearchProperty }>()
 
 <style scoped lang="scss">
 .search-bar {
-  position: relative;
+  width: 375px;
   /* 搜索框 */
   .inner {
     position: relative;
-    width: calc(100% - 16px);
     min-height: 28px;
-    margin: 5px auto;
     display: flex;
     align-items: center;
     font-size: 14px;
diff --git a/src/components/DiyEditor/components/mobile/SearchBar/property.vue b/src/components/DiyEditor/components/mobile/SearchBar/property.vue
index 9123ebe5..d121a1e3 100644
--- a/src/components/DiyEditor/components/mobile/SearchBar/property.vue
+++ b/src/components/DiyEditor/components/mobile/SearchBar/property.vue
@@ -1,78 +1,77 @@
 <template>
-  <el-text tag="p"> 搜索热词 </el-text>
-  <el-text type="info" size="small"> 拖动左侧的小圆点可以调整热词顺序 </el-text>
+  <ComponentContainerProperty v-model="formData.style">
+    <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>
+    <!-- 表单 -->
+    <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 class="lef" label="文本颜色" prop="textColor">
+        <ColorInput v-model="formData.textColor" />
+      </el-form-item>
+    </el-form>
+  </ComponentContainerProperty>
 </template>
 
 <script setup lang="ts">
diff --git a/src/components/DiyEditor/index.vue b/src/components/DiyEditor/index.vue
index d0d49812..e45dc9d3 100644
--- a/src/components/DiyEditor/index.vue
+++ b/src/components/DiyEditor/index.vue
@@ -427,11 +427,13 @@ $phone-width: 375px;
         padding: 8px 16px;
       }
       /* 属性面板分组 */
-      .property-group {
-        /* 属性分组 */
-        :deep(.el-card__header) {
+      :deep(.property-group) {
+        margin: 0 -20px;
+        /* 属性分组名称 */
+        .el-card__header {
           border: none;
           background: var(--el-bg-color-page);
+          padding: 8px 32px;
         }
       }
     }
diff --git a/src/components/DiyEditor/util.ts b/src/components/DiyEditor/util.ts
index 407efa30..b781fe3c 100644
--- a/src/components/DiyEditor/util.ts
+++ b/src/components/DiyEditor/util.ts
@@ -16,6 +16,34 @@ export interface DiyComponentLibrary {
   components: string[]
 }
 
+// 组件样式
+export interface ComponentStyle {
+  // 背景类型
+  bgType: 'color' | 'img'
+  // 背景颜色
+  bgColor: string
+  // 背景图片
+  bgImg: string
+  // 外边距
+  margin: number
+  marginTop: number
+  marginRight: number
+  marginBottom: number
+  marginLeft: number
+  // 内边距
+  padding: number
+  paddingTop: number
+  paddingRight: number
+  paddingBottom: number
+  paddingLeft: number
+  // 边框圆角
+  borderRadius: number
+  borderTopLeftRadius: number
+  borderTopRightRadius: number
+  borderBottomRightRadius: number
+  borderBottomLeftRadius: number
+}
+
 // 页面配置
 export interface PageConfig {
   // 页面属性

From 984351fbf0ac217f2dc622ee6a1b811316b0e550 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Sun, 5 Nov 2023 09:47:54 +0800
Subject: [PATCH 28/38] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=86=85=E5=AE=B9=E5=8C=BA=E4=BC=9A=E5=87=BA?=
 =?UTF-8?q?=E7=8E=B0=E6=BB=9A=E5=8A=A8=E6=9D=A1=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?:=20=E5=BA=95=E9=83=A8=E7=89=88=E6=9D=83=E6=A0=8F=E7=9A=84P?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=9C=89=E9=BB=98=E8=AE=A4=E7=9A=84margin?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Footer/src/Footer.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layout/components/Footer/src/Footer.vue b/src/layout/components/Footer/src/Footer.vue
index c350e38a..3eede386 100644
--- a/src/layout/components/Footer/src/Footer.vue
+++ b/src/layout/components/Footer/src/Footer.vue
@@ -19,6 +19,6 @@ const title = computed(() => appStore.getTitle)
     :class="prefixCls"
     class="h-[var(--app-footer-height)] bg-[var(--app-content-bg-color)] text-center leading-[var(--app-footer-height)] text-[var(--el-text-color-placeholder)] dark:bg-[var(--el-bg-color)]"
   >
-    <p style="font-size: 14px">Copyright ©2022-{{ title }}</p>
+    <span class="text-14px">Copyright ©2022-{{ title }}</span>
   </div>
 </template>

From 0b0ba1f31367011c18fbb47e939bc6b4d7f30e61 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Sun, 5 Nov 2023 10:08:03 +0800
Subject: [PATCH 29/38] =?UTF-8?q?=E8=90=A5=E9=94=80=EF=BC=9A=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=A3=85=E4=BF=AE=E7=BC=96=E8=BE=91=E5=99=A8=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ComponentContainer.vue         |   9 +-
 .../DiyEditor/components/ComponentLibrary.vue |   1 +
 .../components/mobile/SearchBar/index.vue     |   1 -
 src/components/DiyEditor/index.vue            | 328 +++++++++---------
 4 files changed, 174 insertions(+), 165 deletions(-)

diff --git a/src/components/DiyEditor/components/ComponentContainer.vue b/src/components/DiyEditor/components/ComponentContainer.vue
index 95eb647a..ecd7cb48 100644
--- a/src/components/DiyEditor/components/ComponentContainer.vue
+++ b/src/components/DiyEditor/components/ComponentContainer.vue
@@ -1,8 +1,7 @@
 <template>
   <div
     :style="{
-      ...style,
-      background: property.bgType === 'color' ? property.bgColor : `url(${property.bgImg})`
+      ...style
     }"
   >
     <slot></slot>
@@ -18,7 +17,7 @@ import { ComponentStyle } from '@/components/DiyEditor/util'
  */
 defineOptions({ name: 'ComponentContainer' })
 
-const props = defineProps<{ property: ComponentStyle }>()
+const props = defineProps<{ property: ComponentStyle | undefined }>()
 
 const style = computed(() => {
   if (!props.property) {
@@ -37,7 +36,9 @@ const style = computed(() => {
     borderTopRightRadius: `${props.property.borderTopRightRadius || 0}px`,
     borderBottomRightRadius: `${props.property.borderBottomRightRadius || 0}px`,
     borderBottomLeftRadius: `${props.property.borderBottomLeftRadius || 0}px`,
-    overflow: 'hidden'
+    overflow: 'hidden',
+    background:
+      props.property.bgType === 'color' ? props.property.bgColor : `url(${props.property.bgImg})`
   }
 })
 </script>
diff --git a/src/components/DiyEditor/components/ComponentLibrary.vue b/src/components/DiyEditor/components/ComponentLibrary.vue
index abeb40b5..2bcd81fd 100644
--- a/src/components/DiyEditor/components/ComponentLibrary.vue
+++ b/src/components/DiyEditor/components/ComponentLibrary.vue
@@ -11,6 +11,7 @@
           <draggable
             class="component-container"
             ghost-class="draggable-ghost"
+            item-key="index"
             :list="group.components"
             :sort="false"
             :group="{ name: 'component', pull: 'clone', put: false }"
diff --git a/src/components/DiyEditor/components/mobile/SearchBar/index.vue b/src/components/DiyEditor/components/mobile/SearchBar/index.vue
index 27db1c51..618c918b 100644
--- a/src/components/DiyEditor/components/mobile/SearchBar/index.vue
+++ b/src/components/DiyEditor/components/mobile/SearchBar/index.vue
@@ -42,7 +42,6 @@ defineProps<{ property: SearchProperty }>()
 
 <style scoped lang="scss">
 .search-bar {
-  width: 375px;
   /* 搜索框 */
   .inner {
     position: relative;
diff --git a/src/components/DiyEditor/index.vue b/src/components/DiyEditor/index.vue
index e45dc9d3..004d97d1 100644
--- a/src/components/DiyEditor/index.vue
+++ b/src/components/DiyEditor/index.vue
@@ -33,111 +33,111 @@
       <ComponentLibrary ref="componentLibrary" :list="libs" v-if="libs && libs.length > 0" />
       <!-- 中心设计区域 -->
       <div class="editor-center page-prop-area" @click="handlePageSelected">
-        <div class="editor-design">
-          <!-- 手机顶部 -->
-          <div class="editor-design-top">
-            <!-- 手机顶部状态栏 -->
-            <img src="@/assets/imgs/diy/statusBar.png" alt="" class="status-bar" />
-            <!-- 手机顶部导航栏 -->
-            <NavigationBar
-              v-if="showNavigationBar"
-              :property="navigationBarComponent.property"
-              @click="handleNavigationBarSelected"
-              :class="[
-                'component',
-                'cursor-pointer!',
-                { active: selectedComponent?.id === navigationBarComponent.id }
-              ]"
-            />
-          </div>
-          <!-- 手机页面编辑区域 -->
-          <el-scrollbar class="editor-design-center" height="100%" view-class="page-prop-area">
-            <div
-              class="phone-container"
-              :style="{
-                backgroundColor: pageConfigComponent.property.backgroundColor,
-                backgroundImage: `url(${pageConfigComponent.property.backgroundImage})`
-              }"
-            >
-              <draggable
-                class="page-prop-area drag-area"
-                v-model="pageComponents"
-                item-key="index"
-                :animation="200"
-                filter=".component-toolbar"
-                ghost-class="draggable-ghost"
-                :force-fallback="true"
-                group="component"
-                @change="handleComponentChange"
-              >
-                <template #item="{ element, index }">
-                  <div class="component-container" @click="handleComponentSelected(element, index)">
-                    <!-- 左侧组件名 -->
-                    <div
-                      :class="['component-name', { active: selectedComponentIndex === index }]"
-                      v-if="element.name"
-                    >
-                      {{ element.name }}
-                    </div>
-                    <!-- 组件内容区 -->
-                    <div :class="['component', { active: selectedComponentIndex === index }]">
-                      <component
-                        :is="element.id"
-                        :property="element.property"
-                        :data-type="element.id"
-                      />
-                    </div>
-                    <!-- 左侧：组件操作工具栏 -->
-                    <div
-                      class="component-toolbar"
-                      v-if="element.name && selectedComponentIndex === index"
-                    >
-                      <el-button-group type="primary">
-                        <el-tooltip content="上移" placement="right">
-                          <el-button
-                            :disabled="index === 0"
-                            @click.stop="handleMoveComponent(index, -1)"
-                          >
-                            <Icon icon="ep:arrow-up" />
-                          </el-button>
-                        </el-tooltip>
-                        <el-tooltip content="下移" placement="right">
-                          <el-button
-                            :disabled="index === pageComponents.length - 1"
-                            @click.stop="handleMoveComponent(index, 1)"
-                          >
-                            <Icon icon="ep:arrow-down" />
-                          </el-button>
-                        </el-tooltip>
-                        <el-tooltip content="复制" placement="right">
-                          <el-button @click.stop="handleCopyComponent(index)">
-                            <Icon icon="ep:copy-document" />
-                          </el-button>
-                        </el-tooltip>
-                        <el-tooltip content="删除" placement="right">
-                          <el-button @click.stop="handleDeleteComponent(index)">
-                            <Icon icon="ep:delete" />
-                          </el-button>
-                        </el-tooltip>
-                      </el-button-group>
-                    </div>
-                  </div>
-                </template>
-              </draggable>
-            </div>
-          </el-scrollbar>
-          <!-- 手机底部导航 -->
-          <div
-            v-if="showTabBar"
+        <!-- 手机顶部 -->
+        <div class="editor-design-top">
+          <!-- 手机顶部状态栏 -->
+          <img src="@/assets/imgs/diy/statusBar.png" alt="" class="status-bar" />
+          <!-- 手机顶部导航栏 -->
+          <NavigationBar
+            v-if="showNavigationBar"
+            :property="navigationBarComponent.property"
+            @click="handleNavigationBarSelected"
             :class="[
-              'editor-design-bottom',
               'component',
               'cursor-pointer!',
-              { active: selectedComponent?.id === tabBarComponent.id }
+              { active: selectedComponent?.id === navigationBarComponent.id }
             ]"
+          />
+        </div>
+        <!-- 手机页面编辑区域 -->
+        <el-scrollbar
+          height="100%"
+          wrap-class="editor-design-center page-prop-area"
+          view-class="phone-container"
+          :view-style="{
+            backgroundColor: pageConfigComponent.property.backgroundColor,
+            backgroundImage: `url(${pageConfigComponent.property.backgroundImage})`
+          }"
+        >
+          <draggable
+            class="page-prop-area drag-area"
+            v-model="pageComponents"
+            item-key="index"
+            :animation="200"
+            filter=".component-toolbar"
+            ghost-class="draggable-ghost"
+            :force-fallback="true"
+            group="component"
+            @change="handleComponentChange"
           >
-            <TabBar :property="tabBarComponent.property" @click="handleTabBarSelected" />
-          </div>
+            <template #item="{ element, index }">
+              <div class="component" @click="handleComponentSelected(element, index)">
+                <!-- 组件内容区 -->
+                <ComponentContainer :property="element.property.style">
+                  <component
+                    :is="element.id"
+                    :property="element.property"
+                    :data-type="element.id"
+                  />
+                </ComponentContainer>
+                <div :class="['component-wrap', { active: selectedComponentIndex === index }]">
+                  <!-- 左侧组件名 -->
+                  <div
+                    :class="['component-name', { active: selectedComponentIndex === index }]"
+                    v-if="element.name"
+                  >
+                    {{ element.name }}
+                  </div>
+                  <!-- 左侧：组件操作工具栏 -->
+                  <div
+                    class="component-toolbar"
+                    v-if="element.name && selectedComponentIndex === index"
+                  >
+                    <el-button-group type="primary">
+                      <el-tooltip content="上移" placement="right">
+                        <el-button
+                          :disabled="index === 0"
+                          @click.stop="handleMoveComponent(index, -1)"
+                        >
+                          <Icon icon="ep:arrow-up" />
+                        </el-button>
+                      </el-tooltip>
+                      <el-tooltip content="下移" placement="right">
+                        <el-button
+                          :disabled="index === pageComponents.length - 1"
+                          @click.stop="handleMoveComponent(index, 1)"
+                        >
+                          <Icon icon="ep:arrow-down" />
+                        </el-button>
+                      </el-tooltip>
+                      <el-tooltip content="复制" placement="right">
+                        <el-button @click.stop="handleCopyComponent(index)">
+                          <Icon icon="ep:copy-document" />
+                        </el-button>
+                      </el-tooltip>
+                      <el-tooltip content="删除" placement="right">
+                        <el-button @click.stop="handleDeleteComponent(index)">
+                          <Icon icon="ep:delete" />
+                        </el-button>
+                      </el-tooltip>
+                    </el-button-group>
+                  </div>
+                </div>
+              </div>
+            </template>
+          </draggable>
+        </el-scrollbar>
+        <!-- 手机底部导航 -->
+        <div
+          v-if="showTabBar"
+          :class="[
+            'editor-design-bottom',
+            'component',
+            'cursor-pointer!',
+            { active: selectedComponent?.id === tabBarComponent.id }
+          ]"
+        >
+          <TabBar :property="tabBarComponent.property" @click="handleTabBarSelected" />
         </div>
       </div>
       <!-- 右侧属性面板 -->
@@ -383,6 +383,7 @@ onMounted(() => setDefaultSelectedComponent())
 <style lang="scss" scoped>
 /* 手机宽度 */
 $phone-width: 375px;
+$toolbar-height: 42px;
 /* 根节点样式 */
 .editor {
   height: 100%;
@@ -394,7 +395,7 @@ $phone-width: 375px;
     display: flex;
     align-items: center;
     justify-content: space-between;
-    height: auto;
+    height: $toolbar-height;
     padding: 0;
     border-bottom: solid 1px var(--el-border-color);
     background-color: var(--el-bg-color);
@@ -416,12 +417,14 @@ $phone-width: 375px;
   /* 中心操作区 */
   .editor-container {
     height: calc(
-      100vh - var(--top-tool-height) - var(--tags-view-height) - var(--app-footer-height) - 42px
+      100vh - var(--top-tool-height) - var(--tags-view-height) - var(--app-footer-height) -
+        $toolbar-height
     );
     /* 右侧属性面板 */
     .editor-right {
       flex-shrink: 0;
       box-shadow: -8px 0 8px -8px rgba(0, 0, 0, 0.12);
+      overflow: hidden;
       /* 属性面板顶部：减少内边距 */
       :deep(.el-card__header) {
         padding: 8px 16px;
@@ -440,75 +443,80 @@ $phone-width: 375px;
 
     /* 中心区域 */
     .editor-center {
+      position: relative;
       flex: 1 1 0;
-      padding: 16px 0;
       background-color: var(--app-content-bg-color);
       display: flex;
+      flex-direction: column;
       justify-content: center;
-      /* 中心设计区域 */
-      .editor-design {
-        position: relative;
-        height: 100%;
+      margin: 16px 0 0 0;
+      overflow: hidden;
+      width: 100%;
+
+      /* 组件 */
+      .component {
+        width: $phone-width;
+        cursor: move;
+        /* 鼠标放到组件上时 */
+        &:hover {
+          border: 1px dashed var(--el-color-primary);
+          box-shadow: 0 0 5px 0 rgba(24, 144, 255, 0.3);
+        }
+      }
+      /* 组件选中 */
+      .component.active {
+        border: 2px solid var(--el-color-primary);
+      }
+      /* 手机顶部 */
+      .editor-design-top {
+        width: $phone-width;
+        margin: 0 auto;
+        /* 手机顶部状态栏 */
+        .status-bar {
+          height: 20px;
+          width: $phone-width;
+          background-color: #fff;
+        }
+      }
+      /* 手机底部导航 */
+      .editor-design-bottom {
+        width: $phone-width;
+        margin: 0 auto;
+      }
+      /* 手机页面编辑区域 */
+      :deep(.editor-design-center) {
         width: 100%;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        overflow: hidden;
 
-        /* 组件 */
-        .component {
-          border: 1px solid #fff;
+        /* 主体内容 */
+        .phone-container {
+          position: relative;
+          background-repeat: no-repeat;
+          background-size: 100% 100%;
+          height: 100%;
           width: $phone-width;
-          cursor: move;
-          /* 鼠标放到组件上时 */
-          &:hover {
-            border: 1px dashed var(--el-color-primary);
-          }
-        }
-        /* 组件选中 */
-        .component.active {
-          border: 2px solid var(--el-color-primary);
-        }
-        /* 手机顶部 */
-        .editor-design-top {
-          width: $phone-width;
-          /* 手机顶部状态栏 */
-          .status-bar {
-            height: 20px;
-            width: $phone-width;
-            background-color: #fff;
-          }
-        }
-        /* 手机底部导航 */
-        .editor-design-bottom {
-          width: $phone-width;
-        }
-        /* 手机页面编辑区域 */
-        .editor-design-center {
-          width: 100%;
-          flex: 1 1 0;
-
-          :deep(.el-scrollbar__view) {
+          margin: 0 auto;
+          .drag-area {
             height: 100%;
+            width: 100%;
           }
 
-          /* 主体内容 */
-          .phone-container {
-            height: 100%;
-            box-sizing: border-box;
+          .component {
             position: relative;
-            background-repeat: no-repeat;
-            background-size: 100% 100%;
-            width: $phone-width;
-            margin: 0 auto;
-            .drag-area {
-              height: 100%;
-            }
+            cursor: move;
 
-            /* 组件容器（左侧：组件名称，中间：组件，右侧：操作工具栏） */
-            .component-container {
+            .component-wrap {
+              display: none;
+              position: absolute;
+              left: -2px;
+              top: 0;
               width: 100%;
-              position: relative;
+              height: 100%;
+
+              &.active {
+                display: block;
+                border: 2px solid var(--el-color-primary);
+                box-shadow: 0 0 10px 0 rgba(24, 144, 255, 0.3);
+              }
               /* 左侧：组件名称 */
               .component-name {
                 position: absolute;
@@ -518,7 +526,7 @@ $phone-width: 375px;
                 height: 25px;
                 background: #fff;
                 font-size: 12px;
-                left: -85px;
+                left: -88px;
                 top: 0;
                 box-shadow:
                   0 0 4px #00000014,
@@ -548,7 +556,7 @@ $phone-width: 375px;
               .component-toolbar {
                 position: absolute;
                 top: 0;
-                right: -57px;
+                right: -55px;
                 /* 左侧小三角 */
                 &:before {
                   position: absolute;

From 434aa864da30e4a35a093099e09fb620302ab944 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Sun, 5 Nov 2023 12:40:32 +0800
Subject: [PATCH 30/38] =?UTF-8?q?=E8=90=A5=E9=94=80=EF=BC=9A=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=A3=85=E4=BF=AE=E7=BC=96=E8=BE=91=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ComponentContainer.vue         | 222 ++++++++++++++++--
 src/components/DiyEditor/index.vue            | 211 +++--------------
 src/components/DiyEditor/util.ts              |   2 +-
 src/components/VerticalButtonGroup/index.vue  |  40 ++++
 4 files changed, 267 insertions(+), 208 deletions(-)
 create mode 100644 src/components/VerticalButtonGroup/index.vue

diff --git a/src/components/DiyEditor/components/ComponentContainer.vue b/src/components/DiyEditor/components/ComponentContainer.vue
index ecd7cb48..c013362f 100644
--- a/src/components/DiyEditor/components/ComponentContainer.vue
+++ b/src/components/DiyEditor/components/ComponentContainer.vue
@@ -1,15 +1,57 @@
 <template>
-  <div
-    :style="{
-      ...style
-    }"
-  >
-    <slot></slot>
+  <div :class="['component', { active: active }]">
+    <div
+      :style="{
+        ...style
+      }"
+    >
+      <component :is="component.id" :property="component.property" />
+    </div>
+    <div class="component-wrap">
+      <!-- 左侧组件名 -->
+      <div class="component-name" v-if="component.name">
+        {{ component.name }}
+      </div>
+      <!-- 左侧：组件操作工具栏 -->
+      <div class="component-toolbar" v-if="showToolbar && component.name && active">
+        <VerticalButtonGroup type="primary">
+          <el-tooltip content="上移" placement="right">
+            <el-button :disabled="!canMoveUp" @click.stop="handleMoveComponent(-1)">
+              <Icon icon="ep:arrow-up" />
+            </el-button>
+          </el-tooltip>
+          <el-tooltip content="下移" placement="right">
+            <el-button :disabled="!canMoveDown" @click.stop="handleMoveComponent(1)">
+              <Icon icon="ep:arrow-down" />
+            </el-button>
+          </el-tooltip>
+          <el-tooltip content="复制" placement="right">
+            <el-button @click.stop="handleCopyComponent()">
+              <Icon icon="ep:copy-document" />
+            </el-button>
+          </el-tooltip>
+          <el-tooltip content="删除" placement="right">
+            <el-button @click.stop="handleDeleteComponent()">
+              <Icon icon="ep:delete" />
+            </el-button>
+          </el-tooltip>
+        </VerticalButtonGroup>
+      </div>
+    </div>
   </div>
 </template>
 
+<script lang="ts">
+// 注册所有的组件
+import { components } from '../components/mobile/index'
+export default {
+  components: { ...components }
+}
+</script>
 <script setup lang="ts">
-import { ComponentStyle } from '@/components/DiyEditor/util'
+import { ComponentStyle, DiyComponent } from '@/components/DiyEditor/util'
+import { propTypes } from '@/utils/propTypes'
+import { object } from 'vue-types'
 
 /**
  * 组件容器
@@ -17,30 +59,164 @@ import { ComponentStyle } from '@/components/DiyEditor/util'
  */
 defineOptions({ name: 'ComponentContainer' })
 
-const props = defineProps<{ property: ComponentStyle | undefined }>()
+type DiyComponentWithStyle = DiyComponent<any> & { property: { style?: ComponentStyle } }
+const props = defineProps({
+  component: object<DiyComponentWithStyle>().isRequired,
+  active: propTypes.bool.def(false),
+  canMoveUp: propTypes.bool.def(false),
+  canMoveDown: propTypes.bool.def(false),
+  showToolbar: propTypes.bool.def(true)
+})
 
+/**
+ * 组件样式
+ */
 const style = computed(() => {
-  if (!props.property) {
+  let componentStyle = props.component.property.style
+  if (!componentStyle) {
     return {}
   }
   return {
-    marginTop: `${props.property.marginTop || 0}px`,
-    marginBottom: `${props.property.marginBottom || 0}px`,
-    marginLeft: `${props.property.marginLeft || 0}px`,
-    marginRight: `${props.property.marginRight || 0}px`,
-    paddingTop: `${props.property.paddingTop || 0}px`,
-    paddingRight: `${props.property.paddingRight || 0}px`,
-    paddingBottom: `${props.property.paddingBottom || 0}px`,
-    paddingLeft: `${props.property.paddingLeft || 0}px`,
-    borderTopLeftRadius: `${props.property.borderTopLeftRadius || 0}px`,
-    borderTopRightRadius: `${props.property.borderTopRightRadius || 0}px`,
-    borderBottomRightRadius: `${props.property.borderBottomRightRadius || 0}px`,
-    borderBottomLeftRadius: `${props.property.borderBottomLeftRadius || 0}px`,
+    marginTop: `${componentStyle.marginTop || 0}px`,
+    marginBottom: `${componentStyle.marginBottom || 0}px`,
+    marginLeft: `${componentStyle.marginLeft || 0}px`,
+    marginRight: `${componentStyle.marginRight || 0}px`,
+    paddingTop: `${componentStyle.paddingTop || 0}px`,
+    paddingRight: `${componentStyle.paddingRight || 0}px`,
+    paddingBottom: `${componentStyle.paddingBottom || 0}px`,
+    paddingLeft: `${componentStyle.paddingLeft || 0}px`,
+    borderTopLeftRadius: `${componentStyle.borderTopLeftRadius || 0}px`,
+    borderTopRightRadius: `${componentStyle.borderTopRightRadius || 0}px`,
+    borderBottomRightRadius: `${componentStyle.borderBottomRightRadius || 0}px`,
+    borderBottomLeftRadius: `${componentStyle.borderBottomLeftRadius || 0}px`,
     overflow: 'hidden',
     background:
-      props.property.bgType === 'color' ? props.property.bgColor : `url(${props.property.bgImg})`
+      componentStyle.bgType === 'color' ? componentStyle.bgColor : `url(${componentStyle.bgImg})`
   }
 })
+
+const emits = defineEmits<{
+  (e: 'move', direction: number): void
+  (e: 'copy'): void
+  (e: 'delete'): void
+}>()
+/**
+ * 移动组件
+ * @param direction 移动方向
+ */
+const handleMoveComponent = (direction: number) => {
+  emits('move', direction)
+}
+/**
+ * 复制组件
+ */
+const handleCopyComponent = () => {
+  emits('copy')
+}
+/**
+ * 删除组件
+ */
+const handleDeleteComponent = () => {
+  emits('delete')
+}
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+$active-border-width: 2px;
+$hover-border-width: 1px;
+$name-position: -85px;
+$toolbar-position: -55px;
+/* 组件 */
+.component {
+  position: relative;
+  cursor: move;
+  .component-wrap {
+    display: block;
+    position: absolute;
+    left: -$active-border-width;
+    top: 0;
+    width: 100%;
+    height: 100%;
+    /* 鼠标放到组件上时 */
+    &:hover {
+      border: $hover-border-width dashed var(--el-color-primary);
+      box-shadow: 0 0 5px 0 rgba(24, 144, 255, 0.3);
+      .component-name {
+        /* 防止加了边框之后，位置移动 */
+        left: $name-position - $hover-border-width;
+        top: $hover-border-width;
+      }
+    }
+    /* 左侧：组件名称 */
+    .component-name {
+      display: block;
+      position: absolute;
+      width: 80px;
+      text-align: center;
+      line-height: 25px;
+      height: 25px;
+      background: #fff;
+      font-size: 12px;
+      left: $name-position;
+      top: $active-border-width;
+      box-shadow:
+        0 0 4px #00000014,
+        0 2px 6px #0000000f,
+        0 4px 8px 2px #0000000a;
+      /* 右侧小三角 */
+      &:after {
+        position: absolute;
+        top: 7.5px;
+        right: -10px;
+        content: ' ';
+        height: 0;
+        width: 0;
+        border: 5px solid transparent;
+        border-left-color: #fff;
+      }
+    }
+    /* 右侧：组件操作工具栏 */
+    .component-toolbar {
+      display: none;
+      position: absolute;
+      top: 0;
+      right: $toolbar-position;
+      /* 左侧小三角 */
+      &:before {
+        position: absolute;
+        top: 10px;
+        left: -10px;
+        content: ' ';
+        height: 0;
+        width: 0;
+        border: 5px solid transparent;
+        border-right-color: #2d8cf0;
+      }
+    }
+  }
+  /* 组件选中时 */
+  &.active {
+    margin-bottom: 4px;
+
+    .component-wrap {
+      border: $active-border-width solid var(--el-color-primary) !important;
+      box-shadow: 0 0 10px 0 rgba(24, 144, 255, 0.3);
+      margin-bottom: $active-border-width + $active-border-width;
+
+      .component-name {
+        background: var(--el-color-primary);
+        color: #fff;
+        /* 防止加了边框之后，位置移动 */
+        left: $name-position - $active-border-width !important;
+        top: 0 !important;
+        &:after {
+          border-left-color: var(--el-color-primary);
+        }
+      }
+      .component-toolbar {
+        display: block;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/components/DiyEditor/index.vue b/src/components/DiyEditor/index.vue
index 004d97d1..6c30f461 100644
--- a/src/components/DiyEditor/index.vue
+++ b/src/components/DiyEditor/index.vue
@@ -38,15 +38,13 @@
           <!-- 手机顶部状态栏 -->
           <img src="@/assets/imgs/diy/statusBar.png" alt="" class="status-bar" />
           <!-- 手机顶部导航栏 -->
-          <NavigationBar
+          <ComponentContainer
             v-if="showNavigationBar"
-            :property="navigationBarComponent.property"
+            :component="navigationBarComponent"
+            :show-toolbar="false"
+            :active="selectedComponent?.id === navigationBarComponent.id"
             @click="handleNavigationBarSelected"
-            :class="[
-              'component',
-              'cursor-pointer!',
-              { active: selectedComponent?.id === navigationBarComponent.id }
-            ]"
+            class="cursor-pointer!"
           />
         </div>
         <!-- 手机页面编辑区域 -->
@@ -71,73 +69,27 @@
             @change="handleComponentChange"
           >
             <template #item="{ element, index }">
-              <div class="component" @click="handleComponentSelected(element, index)">
-                <!-- 组件内容区 -->
-                <ComponentContainer :property="element.property.style">
-                  <component
-                    :is="element.id"
-                    :property="element.property"
-                    :data-type="element.id"
-                  />
-                </ComponentContainer>
-                <div :class="['component-wrap', { active: selectedComponentIndex === index }]">
-                  <!-- 左侧组件名 -->
-                  <div
-                    :class="['component-name', { active: selectedComponentIndex === index }]"
-                    v-if="element.name"
-                  >
-                    {{ element.name }}
-                  </div>
-                  <!-- 左侧：组件操作工具栏 -->
-                  <div
-                    class="component-toolbar"
-                    v-if="element.name && selectedComponentIndex === index"
-                  >
-                    <el-button-group type="primary">
-                      <el-tooltip content="上移" placement="right">
-                        <el-button
-                          :disabled="index === 0"
-                          @click.stop="handleMoveComponent(index, -1)"
-                        >
-                          <Icon icon="ep:arrow-up" />
-                        </el-button>
-                      </el-tooltip>
-                      <el-tooltip content="下移" placement="right">
-                        <el-button
-                          :disabled="index === pageComponents.length - 1"
-                          @click.stop="handleMoveComponent(index, 1)"
-                        >
-                          <Icon icon="ep:arrow-down" />
-                        </el-button>
-                      </el-tooltip>
-                      <el-tooltip content="复制" placement="right">
-                        <el-button @click.stop="handleCopyComponent(index)">
-                          <Icon icon="ep:copy-document" />
-                        </el-button>
-                      </el-tooltip>
-                      <el-tooltip content="删除" placement="right">
-                        <el-button @click.stop="handleDeleteComponent(index)">
-                          <Icon icon="ep:delete" />
-                        </el-button>
-                      </el-tooltip>
-                    </el-button-group>
-                  </div>
-                </div>
-              </div>
+              <ComponentContainer
+                :component="element"
+                :active="selectedComponentIndex === index"
+                :can-move-up="index > 0"
+                :can-move-down="index < pageComponents.length - 1"
+                @move="(direction) => handleMoveComponent(index, direction)"
+                @copy="handleCopyComponent(index)"
+                @delete="handleDeleteComponent(index)"
+                @click="handleComponentSelected(element, index)"
+              />
             </template>
           </draggable>
         </el-scrollbar>
         <!-- 手机底部导航 -->
-        <div
-          v-if="showTabBar"
-          :class="[
-            'editor-design-bottom',
-            'component',
-            'cursor-pointer!',
-            { active: selectedComponent?.id === tabBarComponent.id }
-          ]"
-        >
-          <TabBar :property="tabBarComponent.property" @click="handleTabBarSelected" />
+        <div v-if="showTabBar" :class="['editor-design-bottom', 'component', 'cursor-pointer!']">
+          <ComponentContainer
+            :component="tabBarComponent"
+            :show-toolbar="false"
+            :active="selectedComponent?.id === tabBarComponent.id"
+            @click="handleTabBarSelected"
+          />
         </div>
       </div>
       <!-- 右侧属性面板 -->
@@ -178,8 +130,6 @@ export default {
 <script lang="ts" setup>
 import draggable from 'vuedraggable'
 import ComponentLibrary from './components/ComponentLibrary.vue'
-import NavigationBar from './components/mobile/NavigationBar/index.vue'
-import TabBar from './components/mobile/TabBar/index.vue'
 import { cloneDeep, includes } from 'lodash-es'
 import { component as PAGE_CONFIG_COMPONENT } from '@/components/DiyEditor/components/mobile/PageConfig/config'
 import { component as NAVIGATION_BAR_COMPONENT } from './components/mobile/NavigationBar/config'
@@ -256,6 +206,9 @@ const handleSave = () => {
       return { id: component.id, property: component.property }
     })
   } as PageConfig
+  if (!props.showTabBar) {
+    delete pageConfig.tabBar
+  }
   // 发送数据更新通知
   const modelValue = isString(props.modelValue) ? JSON.stringify(pageConfig) : pageConfig
   emits('update:modelValue', modelValue)
@@ -453,24 +406,12 @@ $toolbar-height: 42px;
       overflow: hidden;
       width: 100%;
 
-      /* 组件 */
-      .component {
-        width: $phone-width;
-        cursor: move;
-        /* 鼠标放到组件上时 */
-        &:hover {
-          border: 1px dashed var(--el-color-primary);
-          box-shadow: 0 0 5px 0 rgba(24, 144, 255, 0.3);
-        }
-      }
-      /* 组件选中 */
-      .component.active {
-        border: 2px solid var(--el-color-primary);
-      }
       /* 手机顶部 */
       .editor-design-top {
         width: $phone-width;
         margin: 0 auto;
+        display: flex;
+        flex-direction: column;
         /* 手机顶部状态栏 */
         .status-bar {
           height: 20px;
@@ -499,104 +440,6 @@ $toolbar-height: 42px;
             height: 100%;
             width: 100%;
           }
-
-          .component {
-            position: relative;
-            cursor: move;
-
-            .component-wrap {
-              display: none;
-              position: absolute;
-              left: -2px;
-              top: 0;
-              width: 100%;
-              height: 100%;
-
-              &.active {
-                display: block;
-                border: 2px solid var(--el-color-primary);
-                box-shadow: 0 0 10px 0 rgba(24, 144, 255, 0.3);
-              }
-              /* 左侧：组件名称 */
-              .component-name {
-                position: absolute;
-                width: 80px;
-                text-align: center;
-                line-height: 25px;
-                height: 25px;
-                background: #fff;
-                font-size: 12px;
-                left: -88px;
-                top: 0;
-                box-shadow:
-                  0 0 4px #00000014,
-                  0 2px 6px #0000000f,
-                  0 4px 8px 2px #0000000a;
-                /* 右侧小三角 */
-                &:after {
-                  position: absolute;
-                  top: 7.5px;
-                  right: -10px;
-                  content: ' ';
-                  height: 0;
-                  width: 0;
-                  border: 5px solid transparent;
-                  border-left-color: #fff;
-                }
-              }
-              /* 组件选中按钮 */
-              .component-name.active {
-                background: var(--el-color-primary);
-                color: #fff;
-                &:after {
-                  border-left-color: var(--el-color-primary);
-                }
-              }
-              /* 右侧：组件操作工具栏 */
-              .component-toolbar {
-                position: absolute;
-                top: 0;
-                right: -55px;
-                /* 左侧小三角 */
-                &:before {
-                  position: absolute;
-                  top: 10px;
-                  left: -10px;
-                  content: ' ';
-                  height: 0;
-                  width: 0;
-                  border: 5px solid transparent;
-                  border-right-color: #2d8cf0;
-                }
-
-                /* 重写 Element 按钮组的样式（官方只支持水平显示，增加垂直显示的样式） */
-                .el-button-group {
-                  display: inline-flex;
-                  flex-direction: column;
-                }
-                .el-button-group > .el-button:first-child {
-                  border-bottom-left-radius: 0;
-                  border-bottom-right-radius: 0;
-                  border-top-right-radius: var(--el-border-radius-base);
-                  border-bottom-color: var(--el-button-divide-border-color);
-                }
-                .el-button-group > .el-button:last-child {
-                  border-top-left-radius: 0;
-                  border-top-right-radius: 0;
-                  border-bottom-left-radius: var(--el-border-radius-base);
-                  border-top-color: var(--el-button-divide-border-color);
-                }
-                .el-button-group .el-button--primary:not(:first-child):not(:last-child) {
-                  border-top-color: var(--el-button-divide-border-color);
-                  border-bottom-color: var(--el-button-divide-border-color);
-                }
-                .el-button-group > .el-button:not(:last-child) {
-                  margin-bottom: -1px;
-                  margin-right: 0;
-                }
-              }
-            }
-          }
         }
       }
     }
diff --git a/src/components/DiyEditor/util.ts b/src/components/DiyEditor/util.ts
index b781fe3c..f3461007 100644
--- a/src/components/DiyEditor/util.ts
+++ b/src/components/DiyEditor/util.ts
@@ -51,7 +51,7 @@ export interface PageConfig {
   // 顶部导航栏属性
   navigationBar: NavigationBarProperty
   // 底部导航菜单属性
-  tabBar: TabBarProperty
+  tabBar?: TabBarProperty
   // 页面组件列表
   components: PageComponent[]
 }
diff --git a/src/components/VerticalButtonGroup/index.vue b/src/components/VerticalButtonGroup/index.vue
new file mode 100644
index 00000000..479ed559
--- /dev/null
+++ b/src/components/VerticalButtonGroup/index.vue
@@ -0,0 +1,40 @@
+<template>
+  <el-button-group v-bind="$attrs">
+    <slot></slot>
+  </el-button-group>
+</template>
+
+<script setup lang="ts">
+/**
+ * 垂直按钮组
+ * Element官方的按钮组只支持水平显示，通过重写样式实现垂直布局
+ */
+defineOptions({ name: 'VerticalButtonGroup' })
+</script>
+
+<style scoped lang="scss">
+.el-button-group {
+  display: inline-flex;
+  flex-direction: column;
+}
+.el-button-group > :deep(.el-button:first-child) {
+  border-bottom-left-radius: 0;
+  border-bottom-right-radius: 0;
+  border-top-right-radius: var(--el-border-radius-base);
+  border-bottom-color: var(--el-button-divide-border-color);
+}
+.el-button-group > :deep(.el-button:last-child) {
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  border-bottom-left-radius: var(--el-border-radius-base);
+  border-top-color: var(--el-button-divide-border-color);
+}
+.el-button-group :deep(.el-button--primary:not(:first-child):not(:last-child)) {
+  border-top-color: var(--el-button-divide-border-color);
+  border-bottom-color: var(--el-button-divide-border-color);
+}
+.el-button-group > :deep(.el-button:not(:last-child)) {
+  margin-bottom: -1px;
+  margin-right: 0;
+}
+</style>

From 17742988c9607b4dab3bbb05f4a5896aa3488746 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 5 Nov 2023 20:25:52 +0800
Subject: [PATCH 31/38] =?UTF-8?q?code=20review=EF=BC=9A=E5=9B=9E=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/crm/receivable/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/crm/receivable/index.vue b/src/views/crm/receivable/index.vue
index dc2b2f64..ac1def09 100644
--- a/src/views/crm/receivable/index.vue
+++ b/src/views/crm/receivable/index.vue
@@ -229,6 +229,7 @@
       />
       <el-table-column label="操作" align="center" width="180px">
         <template #default="scope">
+          <!-- todo @liuhongfeng：用路径参数哈，receivableId -->
           <!--<router-link :to="'/crm/receivable-plan?receivableId=' + scope.row.receivableId">
             <el-button link type="primary">详情</el-button>
           </router-link>-->

From fa710b560d9a146c49bfc5f24dff7df3d6373c8c Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Sun, 5 Nov 2023 20:42:50 +0800
Subject: [PATCH 32/38] =?UTF-8?q?=E8=90=A5=E9=94=80=EF=BC=9A=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=95=86=E5=9F=8E=E8=A3=85=E4=BF=AE=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E3=80=90=E5=9B=BE=E7=89=87=E5=B1=95=E7=A4=BA=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/mobile/ImageBar/config.ts      | 27 +++++++++++++++
 .../components/mobile/ImageBar/index.vue      | 24 +++++++++++++
 .../components/mobile/ImageBar/property.vue   | 34 +++++++++++++++++++
 src/components/DiyEditor/util.ts              | 33 ++++++++++++++++++
 .../mall/promotion/diy/page/decorate.vue      | 28 ++-------------
 .../mall/promotion/diy/template/decorate.vue  | 27 ++-------------
 6 files changed, 122 insertions(+), 51 deletions(-)
 create mode 100644 src/components/DiyEditor/components/mobile/ImageBar/config.ts
 create mode 100644 src/components/DiyEditor/components/mobile/ImageBar/index.vue
 create mode 100644 src/components/DiyEditor/components/mobile/ImageBar/property.vue

diff --git a/src/components/DiyEditor/components/mobile/ImageBar/config.ts b/src/components/DiyEditor/components/mobile/ImageBar/config.ts
new file mode 100644
index 00000000..68edf728
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/ImageBar/config.ts
@@ -0,0 +1,27 @@
+import { ComponentStyle, DiyComponent } from '@/components/DiyEditor/util'
+
+/** 图片展示属性 */
+export interface ImageBarProperty {
+  // 图片链接
+  imgUrl: string
+  // 跳转链接
+  url: string
+  // 组件样式
+  style: ComponentStyle
+}
+
+// 定义组件
+export const component = {
+  id: 'ImageBar',
+  name: '图片展示',
+  icon: 'ep:picture',
+  property: {
+    imgUrl: '',
+    url: '',
+    style: {
+      bgType: 'color',
+      bgColor: '#fff',
+      marginBottom: 8
+    } as ComponentStyle
+  }
+} as DiyComponent<ImageBarProperty>
diff --git a/src/components/DiyEditor/components/mobile/ImageBar/index.vue b/src/components/DiyEditor/components/mobile/ImageBar/index.vue
new file mode 100644
index 00000000..6f70c52d
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/ImageBar/index.vue
@@ -0,0 +1,24 @@
+<template>
+  <!-- 无图片 -->
+  <div class="h-50px flex items-center justify-center bg-gray-3" v-if="!property.imgUrl">
+    <Icon icon="ep:picture" class="text-gray-8 text-30px!" />
+  </div>
+  <el-image class="min-h-30px" v-else :src="property.imgUrl" />
+</template>
+<script setup lang="ts">
+import { ImageBarProperty } from './config'
+
+/** 图片展示 */
+defineOptions({ name: 'ImageBar' })
+
+defineProps<{ property: ImageBarProperty }>()
+</script>
+
+<style scoped lang="scss">
+/* 图片 */
+img {
+  width: 100%;
+  height: 100%;
+  display: block;
+}
+</style>
diff --git a/src/components/DiyEditor/components/mobile/ImageBar/property.vue b/src/components/DiyEditor/components/mobile/ImageBar/property.vue
new file mode 100644
index 00000000..58af1bc8
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/ImageBar/property.vue
@@ -0,0 +1,34 @@
+<template>
+  <ComponentContainerProperty v-model="formData.style">
+    <el-form label-width="80px" :model="formData">
+      <el-form-item label="上传图片" prop="imgUrl">
+        <UploadImg
+          v-model="formData.imgUrl"
+          draggable="false"
+          height="80px"
+          width="100%"
+          class="min-w-80px"
+        >
+          <template #tip> 建议宽度750 </template>
+        </UploadImg>
+      </el-form-item>
+      <el-form-item label="链接" prop="url">
+        <el-input placeholder="链接" v-model="formData.url" />
+      </el-form-item>
+    </el-form>
+  </ComponentContainerProperty>
+</template>
+
+<script setup lang="ts">
+import { ImageBarProperty } from './config'
+import { usePropertyForm } from '@/components/DiyEditor/util'
+
+// 图片展示属性面板
+defineOptions({ name: 'ImageBarProperty' })
+
+const props = defineProps<{ modelValue: ImageBarProperty }>()
+const emit = defineEmits(['update:modelValue'])
+const { formData } = usePropertyForm(props.modelValue, emit)
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/components/DiyEditor/util.ts b/src/components/DiyEditor/util.ts
index f3461007..0f246ac1 100644
--- a/src/components/DiyEditor/util.ts
+++ b/src/components/DiyEditor/util.ts
@@ -3,16 +3,25 @@ import { PageConfigProperty } from '@/components/DiyEditor/components/mobile/Pag
 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[]
 }
 
@@ -85,3 +94,27 @@ export function usePropertyForm<T>(modelValue: T, emit: Function): { formData: R
 
   return { formData }
 }
+
+// 页面组件库
+export const PAGE_LIBS = [
+  {
+    name: '基础组件',
+    extended: true,
+    components: [
+      'SearchBar',
+      'NoticeBar',
+      'GridNavigation',
+      'ListNavigation',
+      'Divider',
+      'TitleBar'
+    ]
+  },
+  { name: '图文组件', extended: true, components: ['ImageBar', 'Carousel'] },
+  { name: '商品组件', extended: true, components: ['ProductCard'] },
+  {
+    name: '会员组件',
+    extended: true,
+    components: ['UserCard', 'OrderCard', 'WalletCard', 'CouponCard']
+  },
+  { name: '营销组件', extended: true, components: ['Combination', 'Seckill', 'Point', 'Coupon'] }
+] as DiyComponentLibrary[]
diff --git a/src/views/mall/promotion/diy/page/decorate.vue b/src/views/mall/promotion/diy/page/decorate.vue
index 54e7206c..c5e90311 100644
--- a/src/views/mall/promotion/diy/page/decorate.vue
+++ b/src/views/mall/promotion/diy/page/decorate.vue
@@ -3,7 +3,7 @@
     v-if="formData && !formLoading"
     v-model="formData.property"
     :title="formData.name"
-    :libs="componentLibs"
+    :libs="PAGE_LIBS"
     :show-page-config="true"
     :show-navigation-bar="true"
     :show-tab-bar="false"
@@ -13,35 +13,11 @@
 <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'
+import { PAGE_LIBS } 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）提交的按钮禁用
diff --git a/src/views/mall/promotion/diy/template/decorate.vue b/src/views/mall/promotion/diy/template/decorate.vue
index 7a3cff2f..8304088a 100644
--- a/src/views/mall/promotion/diy/template/decorate.vue
+++ b/src/views/mall/promotion/diy/template/decorate.vue
@@ -28,7 +28,7 @@
 import * as DiyTemplateApi from '@/api/mall/promotion/diy/template'
 import * as DiyPageApi from '@/api/mall/promotion/diy/page'
 import { useTagsViewStore } from '@/store/modules/tagsView'
-import { DiyComponentLibrary } from '@/components/DiyEditor/util'
+import { DiyComponentLibrary, PAGE_LIBS } from '@/components/DiyEditor/util'
 
 /** 装修模板表单 */
 defineOptions({ name: 'DiyTemplateDecorate' })
@@ -62,29 +62,6 @@ const getPageDetail = async (id: any) => {
 
 // 模板组件库
 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)
 // 模板选项切换
@@ -97,7 +74,7 @@ const handleTemplateItemChange = () => {
   }
 
   // 编辑页面
-  libs.value = pageLibs
+  libs.value = PAGE_LIBS
   currentFormData.value = formData.value!.pages.find(
     (page: DiyPageApi.DiyPageVO) => page.name === templateItems[selectedTemplateItem.value].name
   )

From 47bb88d8924543f00900f594b8eabfb37813fb0d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 5 Nov 2023 20:50:13 +0800
Subject: [PATCH 33/38] =?UTF-8?q?code=20review=EF=BC=9A=E4=BA=A7=E5=93=81?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/crm/productCategory/index.ts    | 1 +
 src/views/crm/product/ProductForm.vue   | 1 +
 src/views/crm/productCategory/index.vue | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/api/crm/productCategory/index.ts b/src/api/crm/productCategory/index.ts
index cdf8a966..6341d1bc 100644
--- a/src/api/crm/productCategory/index.ts
+++ b/src/api/crm/productCategory/index.ts
@@ -1,5 +1,6 @@
 import request from '@/config/axios'
 
+// TODO @zange：挪到 product 下，建个 category 包，挪进去哈；
 export interface ProductCategoryVO {
   id: number
   name: string
diff --git a/src/views/crm/product/ProductForm.vue b/src/views/crm/product/ProductForm.vue
index 78d2a7c1..13d0e402 100644
--- a/src/views/crm/product/ProductForm.vue
+++ b/src/views/crm/product/ProductForm.vue
@@ -1,5 +1,6 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <!-- TODO @zange：改成每行两个哈； -->
     <el-form
       ref="formRef"
       :model="formData"
diff --git a/src/views/crm/productCategory/index.vue b/src/views/crm/productCategory/index.vue
index 3cf7c5f0..897a08c0 100644
--- a/src/views/crm/productCategory/index.vue
+++ b/src/views/crm/productCategory/index.vue
@@ -1,4 +1,5 @@
 <template>
+  <!-- TODO @zange：挪到 product 下，建个 category 包，挪进去哈； -->
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <el-form

From 3f803767c43afca73a8e456282129a0aea4e8285 Mon Sep 17 00:00:00 2001
From: VicoHu <vicohu@163.com>
Date: Sun, 5 Nov 2023 13:59:28 +0000
Subject: [PATCH 34/38] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E6=8B=BC=E5=9B=A2=E6=B4=BB=E5=8A=A8=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?URL=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: VicoHu <vicohu@163.com>
---
 src/api/mall/promotion/combination/combinationActivity.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/mall/promotion/combination/combinationActivity.ts b/src/api/mall/promotion/combination/combinationActivity.ts
index 15b7eef3..062db5c2 100644
--- a/src/api/mall/promotion/combination/combinationActivity.ts
+++ b/src/api/mall/promotion/combination/combinationActivity.ts
@@ -57,7 +57,7 @@ export const updateCombinationActivity = async (data: CombinationActivityVO) =>
 
 // 关闭拼团活动
 export const closeCombinationActivity = async (id: number) => {
-  return await request.put({ url: '/promotion/bargain-combination/close?id=' + id })
+  return await request.put({ url: '/promotion/combination-activity/close?id=' + id })
 }
 
 // 删除拼团活动

From bb2b7ffd034fc8abab9041be02f35d6284ebebc4 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Sun, 5 Nov 2023 22:53:30 +0800
Subject: [PATCH 35/38] =?UTF-8?q?=E8=90=A5=E9=94=80=EF=BC=9A=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=95=86=E5=9F=8E=E8=A3=85=E4=BF=AE=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E3=80=90=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ComponentContainerProperty.vue | 15 +++--
 .../components/mobile/VideoPlayer/config.ts   | 37 +++++++++++++
 .../components/mobile/VideoPlayer/index.vue   | 30 ++++++++++
 .../mobile/VideoPlayer/property.vue           | 55 +++++++++++++++++++
 src/components/DiyEditor/util.ts              |  2 +-
 src/components/UploadFile/src/UploadFile.vue  | 55 +++++++++++++------
 6 files changed, 169 insertions(+), 25 deletions(-)
 create mode 100644 src/components/DiyEditor/components/mobile/VideoPlayer/config.ts
 create mode 100644 src/components/DiyEditor/components/mobile/VideoPlayer/index.vue
 create mode 100644 src/components/DiyEditor/components/mobile/VideoPlayer/property.vue

diff --git a/src/components/DiyEditor/components/ComponentContainerProperty.vue b/src/components/DiyEditor/components/ComponentContainerProperty.vue
index 0cfbbe1e..5c5ed9a0 100644
--- a/src/components/DiyEditor/components/ComponentContainerProperty.vue
+++ b/src/components/DiyEditor/components/ComponentContainerProperty.vue
@@ -26,7 +26,7 @@
                 :label="data.label"
                 :prop="data.prop"
                 :label-width="node.level === 1 ? '80px' : '62px'"
-                class="tree-form-item w-full m-b-0!"
+                class="w-full m-b-0!"
               >
                 <el-slider
                   v-model="formData[data.prop]"
@@ -40,6 +40,7 @@
               </el-form-item>
             </template>
           </el-tree>
+          <slot name="style" :formData="formData"></slot>
         </el-form>
       </el-card>
     </el-tab-pane>
@@ -153,12 +154,10 @@ const handleSliderChange = (prop: string) => {
 </script>
 
 <style scoped lang="scss">
-.tree-form-item {
-  :deep(.el-slider__runway) {
-    margin-right: 16px;
-  }
-  :deep(.el-input-number) {
-    width: 50px;
-  }
+:deep(.el-slider__runway) {
+  margin-right: 16px;
+}
+:deep(.el-input-number) {
+  width: 50px;
 }
 </style>
diff --git a/src/components/DiyEditor/components/mobile/VideoPlayer/config.ts b/src/components/DiyEditor/components/mobile/VideoPlayer/config.ts
new file mode 100644
index 00000000..30501cb8
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/VideoPlayer/config.ts
@@ -0,0 +1,37 @@
+import { ComponentStyle, DiyComponent } from '@/components/DiyEditor/util'
+
+/** 视频播放属性 */
+export interface VideoPlayerProperty {
+  // 视频链接
+  videoUrl: string
+  // 封面链接
+  posterUrl: string
+  // 是否自动播放
+  autoplay: boolean
+  // 组件样式
+  style: VideoPlayerStyle
+}
+
+// 视频播放样式
+export interface VideoPlayerStyle extends ComponentStyle {
+  // 视频高度
+  height: number
+}
+
+// 定义组件
+export const component = {
+  id: 'VideoPlayer',
+  name: '视频播放',
+  icon: 'ep:video-play',
+  property: {
+    videoUrl: '',
+    posterUrl: '',
+    autoplay: false,
+    style: {
+      bgType: 'color',
+      bgColor: '#fff',
+      marginBottom: 8,
+      height: 300
+    } as ComponentStyle
+  }
+} as DiyComponent<VideoPlayerProperty>
diff --git a/src/components/DiyEditor/components/mobile/VideoPlayer/index.vue b/src/components/DiyEditor/components/mobile/VideoPlayer/index.vue
new file mode 100644
index 00000000..a62dea08
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/VideoPlayer/index.vue
@@ -0,0 +1,30 @@
+<template>
+  <div class="w-full" :style="{ height: `${property.style.height}px` }">
+    <el-image class="w-full w-full" :src="property.posterUrl" v-if="property.posterUrl" />
+    <video
+      v-else
+      class="w-full w-full"
+      :src="property.videoUrl"
+      :poster="property.posterUrl"
+      :autoplay="property.autoplay"
+      controls
+    ></video>
+  </div>
+</template>
+<script setup lang="ts">
+import { VideoPlayerProperty } from './config'
+
+/** 视频播放 */
+defineOptions({ name: 'VideoPlayer' })
+
+defineProps<{ property: VideoPlayerProperty }>()
+</script>
+
+<style scoped lang="scss">
+/* 图片 */
+img {
+  width: 100%;
+  height: 100%;
+  display: block;
+}
+</style>
diff --git a/src/components/DiyEditor/components/mobile/VideoPlayer/property.vue b/src/components/DiyEditor/components/mobile/VideoPlayer/property.vue
new file mode 100644
index 00000000..96f317d6
--- /dev/null
+++ b/src/components/DiyEditor/components/mobile/VideoPlayer/property.vue
@@ -0,0 +1,55 @@
+<template>
+  <ComponentContainerProperty v-model="formData.style">
+    <template #style="{ formData }">
+      <el-form-item label="高度" prop="height">
+        <el-slider
+          v-model="formData.height"
+          :max="500"
+          :min="100"
+          show-input
+          input-size="small"
+          :show-input-controls="false"
+        />
+      </el-form-item>
+    </template>
+    <el-form label-width="80px" :model="formData">
+      <el-form-item label="上传视频" prop="videoUrl">
+        <UploadFile
+          v-model="formData.videoUrl"
+          :file-type="['mp4']"
+          :limit="1"
+          :file-size="100"
+          class="min-w-80px"
+        />
+      </el-form-item>
+      <el-form-item label="上传封面" prop="posterUrl">
+        <UploadImg
+          v-model="formData.posterUrl"
+          draggable="false"
+          height="80px"
+          width="100%"
+          class="min-w-80px"
+        >
+          <template #tip> 建议宽度750 </template>
+        </UploadImg>
+      </el-form-item>
+      <el-form-item label="自动播放" prop="autoplay">
+        <el-switch v-model="formData.autoplay" />
+      </el-form-item>
+    </el-form>
+  </ComponentContainerProperty>
+</template>
+
+<script setup lang="ts">
+import { VideoPlayerProperty } from './config'
+import { usePropertyForm } from '@/components/DiyEditor/util'
+
+// 视频播放属性面板
+defineOptions({ name: 'VideoPlayerProperty' })
+
+const props = defineProps<{ modelValue: VideoPlayerProperty }>()
+const emit = defineEmits(['update:modelValue'])
+const { formData } = usePropertyForm(props.modelValue, emit)
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/components/DiyEditor/util.ts b/src/components/DiyEditor/util.ts
index 0f246ac1..29b44cf6 100644
--- a/src/components/DiyEditor/util.ts
+++ b/src/components/DiyEditor/util.ts
@@ -109,7 +109,7 @@ export const PAGE_LIBS = [
       'TitleBar'
     ]
   },
-  { name: '图文组件', extended: true, components: ['ImageBar', 'Carousel'] },
+  { name: '图文组件', extended: true, components: ['ImageBar', 'Carousel', 'VideoPlayer'] },
   { name: '商品组件', extended: true, components: ['ProductCard'] },
   {
     name: '会员组件',
diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index c8a3b972..42ed4f1d 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -33,11 +33,10 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { PropType } from 'vue'
-
 import { propTypes } from '@/utils/propTypes'
 import { getAccessToken, getTenantId } from '@/utils/auth'
 import type { UploadInstance, UploadUserFile, UploadProps, UploadRawFile } from 'element-plus'
+import { isArray, isString } from '@/utils/is'
 
 defineOptions({ name: 'UploadFile' })
 
@@ -45,10 +44,7 @@ const message = useMessage() // 消息弹窗
 const emit = defineEmits(['update:modelValue'])
 
 const props = defineProps({
-  modelValue: {
-    type: Array as PropType<UploadUserFile[]>,
-    required: true
-  },
+  modelValue: propTypes.oneOfType<string | string[]>([String, Array<String>]).isRequired,
   title: propTypes.string.def('文件上传'),
   updateUrl: propTypes.string.def(import.meta.env.VITE_UPLOAD_URL),
   fileType: propTypes.array.def(['doc', 'xls', 'ppt', 'txt', 'pdf']), // 文件类型, 例如['png', 'jpg', 'jpeg']
@@ -62,7 +58,7 @@ const props = defineProps({
 const valueRef = ref(props.modelValue)
 const uploadRef = ref<UploadInstance>()
 const uploadList = ref<UploadUserFile[]>([])
-const fileList = ref<UploadUserFile[]>(props.modelValue)
+const fileList = ref<UploadUserFile[]>([])
 const uploadNumber = ref<number>(0)
 const uploadHeaders = ref({
   Authorization: 'Bearer ' + getAccessToken(),
@@ -109,7 +105,7 @@ const handleFileSuccess: UploadProps['onSuccess'] = (res: any): void => {
     fileList.value = fileList.value.concat(uploadList.value)
     uploadList.value = []
     uploadNumber.value = 0
-    emit('update:modelValue', listToString(fileList.value))
+    emitUpdateModelValue()
   }
 }
 // 文件数超出提示
@@ -125,20 +121,47 @@ const handleRemove = (file) => {
   const findex = fileList.value.map((f) => f.name).indexOf(file.name)
   if (findex > -1) {
     fileList.value.splice(findex, 1)
-    emit('update:modelValue', listToString(fileList.value))
+    emitUpdateModelValue()
   }
 }
 const handlePreview: UploadProps['onPreview'] = (uploadFile) => {
   console.log(uploadFile)
 }
-// 对象转成指定字符串分隔
-const listToString = (list: UploadUserFile[], separator?: string) => {
-  let strs = ''
-  separator = separator || ','
-  for (let i in list) {
-    strs += list[i].url + separator
+
+// 监听模型绑定值变动
+watch(
+  () => props.modelValue,
+  () => {
+    const files: string[] = []
+    // 情况1：字符串
+    if (isString(props.modelValue)) {
+      // 情况1.1：逗号分隔的多值
+      if (props.modelValue.includes(',')) {
+        files.concat(props.modelValue.split(','))
+      } else {
+        files.push(props.modelValue)
+      }
+    } else if (isArray(props.modelValue)) {
+      // 情况2：字符串
+      files.concat(props.modelValue)
+    } else {
+      throw new Error('不支持的 modelValue 类型')
+    }
+    fileList.value = files.map((url: string) => {
+      return { url, name: url.substring(url.lastIndexOf('/') + 1) } as UploadUserFile
+    })
+  },
+  { immediate: true }
+)
+// 发送文件链接列表更新
+const emitUpdateModelValue = () => {
+  // 情况1：数组结果
+  let result: string | string[] = fileList.value.map((file) => file.url!)
+  // 情况2：逗号分隔的字符串
+  if (isString(props.modelValue)) {
+    result = result.join(',')
   }
-  return strs != '' ? strs.substr(0, strs.length - 1) : ''
+  emit('update:modelValue', result)
 }
 </script>
 <style scoped lang="scss">

From 4253173a2a9c9e716c7ebfcfb9ac25e93bbd1171 Mon Sep 17 00:00:00 2001
From: owen <owen@evolsun.com>
Date: Mon, 6 Nov 2023 09:31:42 +0800
Subject: [PATCH 36/38] =?UTF-8?q?=E8=90=A5=E9=94=80=EF=BC=9A=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=E5=95=86=E5=9F=8E=E8=A3=85=E4=BF=AE=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E3=80=90=E8=BD=AE=E6=92=AD=E5=9B=BE=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/mobile/Carousel/config.ts      |  58 ++---
 .../components/mobile/Carousel/index.vue      |  86 +++----
 .../components/mobile/Carousel/property.vue   | 215 ++++++++++--------
 src/components/DiyEditor/index.vue            |   6 +
 src/components/UploadFile/src/UploadFile.vue  |   2 +-
 5 files changed, 182 insertions(+), 185 deletions(-)

diff --git a/src/components/DiyEditor/components/mobile/Carousel/config.ts b/src/components/DiyEditor/components/mobile/Carousel/config.ts
index 6c790186..3e74a511 100644
--- a/src/components/DiyEditor/components/mobile/Carousel/config.ts
+++ b/src/components/DiyEditor/components/mobile/Carousel/config.ts
@@ -1,27 +1,30 @@
-import { DiyComponent } from '@/components/DiyEditor/util'
+import { ComponentStyle, DiyComponent } from '@/components/DiyEditor/util'
 
 /** 轮播图属性 */
 export interface CarouselProperty {
-  // 选择模板
-  swiperType: number
-  // 图片圆角
-  borderRadius: number
-  // 页面边距
-  pageMargin: number
-  // 图片边距
-  imageMargin: number
-  // 分页类型
-  pagingType: 'bullets' | 'fraction' | 'progressbar'
-  // 一行个数
-  rowIndividual: number
-  // 添加图片
+  // 类型：默认 | 卡片
+  type: 'default' | 'card'
+  // 指示器样式：点 | 数字
+  indicator: 'dot' | 'number'
+  // 是否自动播放
+  autoplay: boolean
+  // 播放间隔
+  interval: number
+  // 轮播内容
   items: CarouselItemProperty[]
+  // 组件样式
+  style: ComponentStyle
 }
-
+// 轮播内容属性
 export interface CarouselItemProperty {
-  title: string
+  // 类型：图片 | 视频
+  type: 'img' | 'video'
+  // 图片链接
   imgUrl: string
-  link: string
+  // 视频链接
+  videoUrl: string
+  // 跳转链接
+  url: string
 }
 
 // 定义组件
@@ -30,15 +33,18 @@ export const component = {
   name: '轮播图',
   icon: 'system-uicons:carousel',
   property: {
-    swiperType: 0, // 选择模板
-    borderRadius: 0, // 图片圆角
-    pageMargin: 0, // 页面边距
-    imageMargin: 0, // 图片边距
-    pagingType: 'bullets', // 分页类型
-    rowIndividual: 2, // 一行个数
+    type: 'default',
+    indicator: 'dot',
+    autoplay: false,
+    interval: 3,
     items: [
-      { imgUrl: 'https://static.iocoder.cn/mall/banner-01.jpg' },
-      { imgUrl: 'https://static.iocoder.cn/mall/banner-02.jpg' }
-    ] as CarouselItemProperty[]
+      { type: 'img', imgUrl: 'https://static.iocoder.cn/mall/banner-01.jpg', videoUrl: '' },
+      { type: 'img', imgUrl: 'https://static.iocoder.cn/mall/banner-02.jpg', videoUrl: '' }
+    ] as CarouselItemProperty[],
+    style: {
+      bgType: 'color',
+      bgColor: '#fff',
+      marginBottom: 8
+    } as ComponentStyle
   }
 } as DiyComponent<CarouselProperty>
diff --git a/src/components/DiyEditor/components/mobile/Carousel/index.vue b/src/components/DiyEditor/components/mobile/Carousel/index.vue
index e9a0ab39..940a9a56 100644
--- a/src/components/DiyEditor/components/mobile/Carousel/index.vue
+++ b/src/components/DiyEditor/components/mobile/Carousel/index.vue
@@ -6,70 +6,38 @@
   >
     <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 v-else class="relative">
+    <el-carousel
+      height="174px"
+      :type="property.type === 'card' ? 'card' : ''"
+      :autoplay="property.autoplay"
+      :interval="property.interval * 1000"
+      :indicator-position="property.indicator === 'number' ? 'none' : undefined"
+      @change="handleIndexChange"
+    >
+      <el-carousel-item v-for="(item, index) in property.items" :key="index">
+        <el-image class="h-full w-full" :src="item.imgUrl" />
+      </el-carousel-item>
+    </el-carousel>
+    <div
+      v-if="property.indicator === 'number'"
+      class="absolute p-y-2px bottom-10px right-10px rounded-xl bg-black p-x-8px text-10px text-white opacity-40"
+      >{{ currentIndex }} / {{ property.items.length }}</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' })
+/** 轮播图 */
+defineOptions({ name: 'Carousel' })
 
-const props = defineProps<{ property: CarouselProperty }>()
+defineProps<{ property: CarouselProperty }>()
+
+const currentIndex = ref(0)
+const handleIndexChange = (index: number) => {
+  currentIndex.value = index + 1
+}
 </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>
+<style scoped lang="scss"></style>
diff --git a/src/components/DiyEditor/components/mobile/Carousel/property.vue b/src/components/DiyEditor/components/mobile/Carousel/property.vue
index acaee35f..700e0005 100644
--- a/src/components/DiyEditor/components/mobile/Carousel/property.vue
+++ b/src/components/DiyEditor/components/mobile/Carousel/property.vue
@@ -1,103 +1,120 @@
 <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>
+  <ComponentContainerProperty v-model="formData.style">
+    <el-form label-width="80px" :model="formData">
+      <el-card header="样式设置" class="property-group" shadow="never">
+        <el-form-item label="样式" prop="type">
+          <el-radio-group v-model="formData.type">
+            <el-tooltip class="item" content="默认" placement="bottom">
+              <el-radio-button label="default">
+                <Icon icon="system-uicons:carousel" />
+              </el-radio-button>
+            </el-tooltip>
+            <el-tooltip class="item" content="卡片" placement="bottom">
+              <el-radio-button label="card">
+                <Icon icon="ic:round-view-carousel" />
+              </el-radio-button>
+            </el-tooltip>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="指示器" prop="indicator">
+          <el-radio-group v-model="formData.indicator">
+            <el-radio label="dot">小圆点</el-radio>
+            <el-radio label="number">数字</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="是否轮播" prop="autoplay">
+          <el-switch v-model="formData.autoplay" />
+        </el-form-item>
+        <el-form-item label="播放间隔" prop="interval" v-if="formData.autoplay">
+          <el-slider
+            v-model="formData.interval"
+            :max="10"
+            :min="0.5"
+            :step="0.5"
+            show-input
+            input-size="small"
+            :show-input-controls="false"
+          />
+          <el-text type="info">单位：秒</el-text>
+        </el-form-item>
+      </el-card>
+      <el-card header="内容设置" class="property-group" shadow="never">
+        <el-text type="info" size="small"> 拖动左上角的小圆点可对其排序 </el-text>
+        <template v-if="formData.items[0]">
+          <draggable
+            :list="formData.items"
+            :force-fallback="true"
+            :animation="200"
+            handle=".drag-icon"
+            class="m-t-8px"
+            item-key="index"
+          >
+            <template #item="{ element, index }">
+              <div class="content mb-4px flex flex-col gap-4px rounded bg-gray-50 p-8px">
+                <div
+                  class="m--8px m-b-8px flex flex-row items-center justify-between bg-gray-100 p-8px"
+                >
+                  <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>
+                <el-form-item label="类型" prop="type" class="m-b-8px!" label-width="50px">
+                  <el-radio-group v-model="element.type">
+                    <el-radio label="img">图片</el-radio>
+                    <el-radio label="video">视频</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+                <el-form-item
+                  label="图片"
+                  class="m-b-8px!"
+                  label-width="50px"
+                  v-if="element.type === 'img'"
+                >
+                  <UploadImg
+                    v-model="element.imgUrl"
+                    draggable="false"
+                    height="80px"
+                    width="100%"
+                    class="min-w-80px"
+                  />
+                </el-form-item>
+                <template v-else>
+                  <el-form-item label="封面" class="m-b-8px!" label-width="50px">
+                    <UploadImg
+                      v-model="element.imgUrl"
+                      draggable="false"
+                      height="80px"
+                      width="100%"
+                      class="min-w-80px"
+                    />
+                  </el-form-item>
+                  <el-form-item label="视频" class="m-b-8px!" label-width="50px">
+                    <UploadFile
+                      v-model="element.videoUrl"
+                      :file-type="['mp4']"
+                      :limit="1"
+                      :file-size="100"
+                      class="min-w-80px"
+                    />
+                  </el-form-item>
+                </template>
+                <el-form-item label="链接" class="m-b-8px!" label-width="50px">
+                  <el-input placeholder="链接" v-model="element.url" />
+                </el-form-item>
+              </div>
+            </template>
+          </draggable>
         </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>
+        <el-button @click="handleAddImage" type="primary" plain class="w-full">
+          添加图片
+        </el-button>
+      </el-card>
+    </el-form>
+  </ComponentContainerProperty>
 </template>
 
 <script setup lang="ts">
@@ -117,7 +134,7 @@ const handleAddImage = () => {
   formData.value.items.push({} as CarouselItemProperty)
 }
 // 删除图片
-const handleDeleteImage = (index) => {
+const handleDeleteImage = (index: number) => {
   formData.value.items.splice(index, 1)
 }
 </script>
diff --git a/src/components/DiyEditor/index.vue b/src/components/DiyEditor/index.vue
index 6c30f461..fbb7e103 100644
--- a/src/components/DiyEditor/index.vue
+++ b/src/components/DiyEditor/index.vue
@@ -385,12 +385,18 @@ $toolbar-height: 42px;
       /* 属性面板分组 */
       :deep(.property-group) {
         margin: 0 -20px;
+        &.el-card {
+          border: none;
+        }
         /* 属性分组名称 */
         .el-card__header {
           border: none;
           background: var(--el-bg-color-page);
           padding: 8px 32px;
         }
+        .el-card__body {
+          border: none;
+        }
       }
     }
 
diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue
index 42ed4f1d..6895440b 100644
--- a/src/components/UploadFile/src/UploadFile.vue
+++ b/src/components/UploadFile/src/UploadFile.vue
@@ -138,7 +138,7 @@ watch(
       // 情况1.1：逗号分隔的多值
       if (props.modelValue.includes(',')) {
         files.concat(props.modelValue.split(','))
-      } else {
+      } else if (props.modelValue.length > 0) {
         files.push(props.modelValue)
       }
     } else if (isArray(props.modelValue)) {

From c0d5c76a0614823f90fbf09f4d734ec0c1a54798 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 6 Nov 2023 19:09:20 +0800
Subject: [PATCH 37/38] =?UTF-8?q?=E5=A4=9A=E7=A7=9F=E6=88=B7=EF=BC=9A?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=20tenant=20=E8=A1=A8=E7=9A=84=20domain=20?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=B8=BA=20website=EF=BC=8C=E9=81=BF?=
 =?UTF-8?q?=E5=85=8D=20dm=20=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84=E5=85=B3?=
 =?UTF-8?q?=E9=94=AE=E5=AD=97=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/tenant/TenantForm.vue | 10 +++++-----
 src/views/system/tenant/index.vue      |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/system/tenant/TenantForm.vue b/src/views/system/tenant/TenantForm.vue
index a6085363..f6cdd075 100644
--- a/src/views/system/tenant/TenantForm.vue
+++ b/src/views/system/tenant/TenantForm.vue
@@ -54,8 +54,8 @@
           value-format="x"
         />
       </el-form-item>
-      <el-form-item label="绑定域名" prop="domain">
-        <el-input v-model="formData.domain" placeholder="请输入绑定域名" />
+      <el-form-item label="绑定域名" prop="website">
+        <el-input v-model="formData.website" placeholder="请输入绑定域名" />
       </el-form-item>
       <el-form-item label="租户状态" prop="status">
         <el-radio-group v-model="formData.status">
@@ -97,7 +97,7 @@ const formData = ref({
   contactMobile: undefined,
   accountCount: undefined,
   expireTime: undefined,
-  domain: undefined,
+  website: undefined,
   status: CommonStatusEnum.ENABLE
 })
 const formRules = reactive({
@@ -107,7 +107,7 @@ const formRules = reactive({
   status: [{ required: true, message: '租户状态不能为空', trigger: 'blur' }],
   accountCount: [{ required: true, message: '账号额度不能为空', trigger: 'blur' }],
   expireTime: [{ required: true, message: '过期时间不能为空', trigger: 'blur' }],
-  domain: [{ required: true, message: '绑定域名不能为空', trigger: 'blur' }],
+  website: [{ required: true, message: '绑定域名不能为空', trigger: 'blur' }],
   username: [{ required: true, message: '用户名称不能为空', trigger: 'blur' }],
   password: [{ required: true, message: '用户密码不能为空', trigger: 'blur' }]
 })
@@ -170,7 +170,7 @@ const resetForm = () => {
     contactMobile: undefined,
     accountCount: undefined,
     expireTime: undefined,
-    domain: undefined,
+    website: undefined,
     status: CommonStatusEnum.ENABLE
   }
   formRef.value?.resetFields()
diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index e357b6b4..703e01e4 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -125,7 +125,7 @@
         width="180"
         :formatter="dateFormatter"
       />
-      <el-table-column label="绑定域名" align="center" prop="domain" width="180" />
+      <el-table-column label="绑定域名" align="center" prop="website" width="180" />
       <el-table-column label="租户状态" align="center" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />

From 85ee558bef3937554deb7ab208b4c160590f6d2d Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 6 Nov 2023 19:42:28 +0800
Subject: [PATCH 38/38] =?UTF-8?q?=E5=A4=9A=E7=A7=9F=E6=88=B7=EF=BC=9A?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2=EF=BC=8C=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=20host=20=E5=9F=9F=E5=90=8D=E8=8E=B7=E5=8F=96=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E7=9A=84=E7=A7=9F=E6=88=B7=E7=BC=96=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/login/index.ts                   |  5 ++++
 src/views/Login/components/LoginForm.vue | 31 ++++++++++++++++++------
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/src/api/login/index.ts b/src/api/login/index.ts
index 1ffb38d6..ef86563b 100644
--- a/src/api/login/index.ts
+++ b/src/api/login/index.ts
@@ -27,6 +27,11 @@ export const getTenantIdByName = (name: string) => {
   return request.get({ url: '/system/tenant/get-id-by-name?name=' + name })
 }
 
+// 使用租户域名，获得租户信息
+export const getTenantByWebsite = (website: string) => {
+  return request.get({ url: '/system/tenant/get-by-website?website=' + website })
+}
+
 // 登出
 export const loginOut = () => {
   return request.post({ url: '/system/auth/logout' })
diff --git a/src/views/Login/components/LoginForm.vue b/src/views/Login/components/LoginForm.vue
index 9bee2523..ef212505 100644
--- a/src/views/Login/components/LoginForm.vue
+++ b/src/views/Login/components/LoginForm.vue
@@ -193,10 +193,10 @@ const loginData = reactive({
 })
 
 const socialList = [
-  { icon: 'ant-design:github-filled', type: 0 },
   { icon: 'ant-design:wechat-filled', type: 30 },
-  { icon: 'ant-design:alipay-circle-filled', type: 0 },
-  { icon: 'ant-design:dingtalk-circle-filled', type: 20 }
+  { icon: 'ant-design:dingtalk-circle-filled', type: 20 },
+  { icon: 'ant-design:github-filled', type: 0 },
+  { icon: 'ant-design:alipay-circle-filled', type: 0 }
 ]
 
 // 获取验证码
@@ -210,7 +210,7 @@ const getCode = async () => {
     verify.value.show()
   }
 }
-//获取租户ID
+// 获取租户 ID
 const getTenantId = async () => {
   if (loginData.tenantEnable === 'true') {
     const res = await LoginApi.getTenantIdByName(loginData.loginForm.tenantName)
@@ -230,6 +230,15 @@ const getCookie = () => {
     }
   }
 }
+// 根据域名，获得租户信息
+const getTenantByWebsite = async () => {
+  const website = location.host
+  const res = await LoginApi.getTenantByWebsite(website)
+  if (res) {
+    loginData.loginForm.tenantName = res.name
+    authUtil.setTenantId(res.id)
+  }
+}
 const loading = ref() // ElLoading.service 返回的实例
 // 登录
 const handleLogin = async (params) => {
@@ -278,10 +287,15 @@ const doSocialLogin = async (type: number) => {
   } else {
     loginLoading.value = true
     if (loginData.tenantEnable === 'true') {
-      await message.prompt('请输入租户名称', t('common.reminder')).then(async ({ value }) => {
-        const res = await LoginApi.getTenantIdByName(value)
-        authUtil.setTenantId(res)
-      })
+      // 尝试先通过 tenantName 获取租户
+      await getTenantId()
+      // 如果获取不到，则需要弹出提示，进行处理
+      if (!authUtil.getTenantId()) {
+        await message.prompt('请输入租户名称', t('common.reminder')).then(async ({ value }) => {
+          const res = await LoginApi.getTenantIdByName(value)
+          authUtil.setTenantId(res)
+        })
+      }
     }
     // 计算 redirectUri
     // tricky: type、redirect需要先encode一次，否则钉钉回调会丢失。
@@ -307,6 +321,7 @@ watch(
 )
 onMounted(() => {
   getCookie()
+  getTenantByWebsite()
 })
 </script>