Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3

src/views/mall/promotion/diy/template/decorate.vue

@@ -2,18 +2,18 @@
   <DiyEditor
     v-if="formData && !formLoading"
     v-model="currentFormData!.property"
-    :title="templateItems[selectedTemplateItem].name"
     :libs="libs"
+    :preview-url="previewUrl"
+    :show-navigation-bar="selectedTemplateItem !== 0"
     :show-page-config="selectedTemplateItem !== 0"
     :show-tab-bar="selectedTemplateItem === 0"
-    :show-navigation-bar="selectedTemplateItem !== 0"
-    :preview-url="previewUrl"
-    @save="submitForm"
+    :title="templateItems[selectedTemplateItem].name"
     @reset="handleEditorReset"
+    @save="submitForm"
   >
     <template #toolBarLeft>
       <el-radio-group
-        v-model="selectedTemplateItem"
+        :model-value="selectedTemplateItem"
         class="h-full!"
         @change="handleTemplateItemChange"
       >
@@ -26,13 +26,14 @@
     </template>
   </DiyEditor>
 </template>
-<script setup lang="ts">
+<script lang="ts" setup>
 // TODO @疯狂：要不要建个 decorate 目录，然后挪进去，改成 index.vue，这样可以更明确看到是个独立界面哈，更好找
 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, PAGE_LIBS } from '@/components/DiyEditor/util' // 商城的 DIY 组件，在 DiyEditor 目录下
 import { toNumber } from 'lodash-es'
+import { isEmpty } from '@/utils/is'
 
 /** 装修模板表单 */
 defineOptions({ name: 'DiyTemplateDecorate' })
@@ -52,6 +53,10 @@ const formData = ref<DiyTemplateApi.DiyTemplatePropertyVO>()
 const formRef = ref() // 表单 Ref
 // 当前编辑的属性
 const currentFormData = ref<DiyTemplateApi.DiyTemplatePropertyVO | DiyPageApi.DiyPageVO>()
+// templateItem 对应的缓存
+const currentFormDataMap = ref<
+  Map<string, DiyTemplateApi.DiyTemplatePropertyVO | DiyPageApi.DiyPageVO>
+>(new Map())
 // 商城 H5 预览地址
 const previewUrl = ref('')
 
@@ -60,8 +65,6 @@ const getPageDetail = async (id: any) => {
   formLoading.value = true
   try {
     formData.value = await DiyTemplateApi.getDiyTemplateProperty(id)
-    currentFormData.value = formData.value
-
     // 拼接手机预览链接
     const domain = import.meta.env.VITE_MALL_H5_DOMAIN
     previewUrl.value = `${domain}/#/pages/index/index?templateId=${formData.value.id}`
@@ -75,19 +78,31 @@ const templateLibs = [] as DiyComponentLibrary[]
 // 当前组件库
 const libs = ref<DiyComponentLibrary[]>(templateLibs)
 // 模板选项切换
-const handleTemplateItemChange = () => {
+const handleTemplateItemChange = (val: number) => {
+  // 缓存模版编辑数据
+  currentFormDataMap.value.set(
+    templateItems[selectedTemplateItem.value].name,
+    currentFormData.value!
+  )
+  // 读取模版缓存
+  const data = currentFormDataMap.value.get(templateItems[val].name)
+
+  // 切换模版
+  selectedTemplateItem.value = val
   // 编辑模板
-  if (selectedTemplateItem.value === 0) {
+  if (val === 0) {
     libs.value = templateLibs
-    currentFormData.value = formData.value
+    currentFormData.value = isEmpty(data) ? formData.value : data
     return
   }
 
   // 编辑页面
   libs.value = PAGE_LIBS
-  currentFormData.value = formData.value!.pages.find(
-    (page: DiyPageApi.DiyPageVO) => page.name === templateItems[selectedTemplateItem.value].name
-  )
+  currentFormData.value = isEmpty(data)
+    ? formData.value!.pages.find(
+        (page: DiyPageApi.DiyPageVO) => page.name === templateItems[val].name
+      )
+    : data
 }
 
 // 提交表单
@@ -97,12 +112,25 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    if (selectedTemplateItem.value === 0) {
-      // 提交模板属性
-      await DiyTemplateApi.updateDiyTemplateProperty(unref(formData)!)
-    } else {
+    // 对所有的 templateItems 都进行保存，有缓存则保存缓存，解决都有修改时只保存了当前所编辑的 templateItem，导致装修效果存在差异
+    for (let i = 0; i < templateItems.length; i++) {
+      const data = currentFormDataMap.value.get(templateItems[i].name) as any
+      // 情况一：基础设置
+      if (i === 0) {
+        // 提交模板属性
+        await DiyTemplateApi.updateDiyTemplateProperty(isEmpty(data) ? unref(formData)! : data)
+        continue
+      }
       // 提交页面属性
-      await DiyPageApi.updateDiyPageProperty(unref(currentFormData)!)
+      // 情况二：提交当前正在编辑的页面
+      if (currentFormData.value?.name.includes(templateItems[i].name)) {
+        await DiyPageApi.updateDiyPageProperty(unref(currentFormData)!)
+        continue
+      }
+      // 情况三：提交页面编辑缓存
+      if (!isEmpty(data)) {
+        await DiyPageApi.updateDiyPageProperty(data!)
+      }
     }
     message.success('保存成功')
   } finally {
@@ -140,10 +168,16 @@ const recoverPageIndex = () => {
   const pageIndex = toNumber(sessionStorage.getItem(DIY_PAGE_INDEX_KEY)) || 0
   // 移除标记
   sessionStorage.removeItem(DIY_PAGE_INDEX_KEY)
+
+  // 重新初始化数据
+  currentFormData.value = formData.value
+  currentFormDataMap.value = new Map<
+    string,
+    DiyTemplateApi.DiyTemplatePropertyVO | DiyPageApi.DiyPageVO
+  >()
   // 切换页面
   if (pageIndex !== selectedTemplateItem.value) {
-    selectedTemplateItem.value = pageIndex
-    handleTemplateItemChange()
+    handleTemplateItemChange(pageIndex)
   }
 }
 //#endregion

src/views/mall/trade/brokerage/user/BrokerageOrderListDialog.vue

@@ -1,27 +1,27 @@
 <template>
-  <Dialog v-model="dialogVisible" title="推广人列表" width="75%">
+  <Dialog v-model="dialogVisible" title="推广订单列表" width="75%">
     <ContentWrap>
       <!-- 搜索工作栏 -->
       <el-form
-        class="-mb-15px"
-        :model="queryParams"
         ref="queryFormRef"
         :inline="true"
+        :model="queryParams"
+        class="-mb-15px"
         label-width="85px"
       >
-        <el-form-item label="用户类型" prop="level">
-          <el-radio-group v-model="queryParams.level" @change="handleQuery">
-            <el-radio-button checked>全部</el-radio-button>
-            <el-radio-button value="1">一级推广人</el-radio-button>
-            <el-radio-button value="2">二级推广人</el-radio-button>
+        <el-form-item label="用户类型" prop="sourceUserLevel">
+          <el-radio-group v-model="queryParams.sourceUserLevel" @change="handleQuery">
+            <el-radio-button :value="0">全部</el-radio-button>
+            <el-radio-button :value="1">一级推广人</el-radio-button>
+            <el-radio-button :value="2">二级推广人</el-radio-button>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-select
             v-model="queryParams.status"
-            placeholder="请选择状态"
-            clearable
             class="!w-240px"
+            clearable
+            placeholder="请选择状态"
           >
             <el-option
               v-for="dict in getIntDictOptions(DICT_TYPE.BROKERAGE_RECORD_STATUS)"
@@ -34,64 +34,70 @@
         <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"
+            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 icon="ep:search" class="mr-5px" /> 搜索</el-button>
-          <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+          <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" :stripe="true" :show-overflow-tooltip="true">
-        <el-table-column label="订单编号" align="center" prop="bizId" min-width="80px" />
-        <el-table-column label="用户编号" align="center" prop="sourceUserId" min-width="80px" />
-        <el-table-column label="头像" align="center" prop="sourceUserAvatar" width="70px">
+      <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+        <el-table-column align="center" label="订单编号" min-width="80px" prop="bizId" />
+        <el-table-column align="center" label="用户编号" min-width="80px" prop="sourceUserId" />
+        <el-table-column align="center" label="头像" prop="sourceUserAvatar" width="70px">
           <template #default="scope">
             <el-avatar :src="scope.row.sourceUserAvatar" />
           </template>
         </el-table-column>
-        <el-table-column label="昵称" align="center" prop="sourceUserNickname" min-width="80px" />
+        <el-table-column align="center" label="昵称" min-width="80px" prop="sourceUserNickname" />
         <el-table-column
-          label="佣金"
-          align="center"
-          prop="price"
-          min-width="100px"
           :formatter="fenToYuanFormat"
+          align="center"
+          label="佣金"
+          min-width="100px"
+          prop="price"
         />
-        <el-table-column label="状态" align="center" prop="status" min-width="85">
+        <el-table-column align="center" label="状态" min-width="85" prop="status">
           <template #default="scope">
             <dict-tag :type="DICT_TYPE.BROKERAGE_RECORD_STATUS" :value="scope.row.status" />
           </template>
         </el-table-column>
         <el-table-column
-          label="创建时间"
-          align="center"
-          prop="createTime"
           :formatter="dateFormatter"
+          align="center"
+          label="创建时间"
+          prop="createTime"
           width="180px"
         />
       </el-table>
       <!-- 分页 -->
       <Pagination
-        :total="total"
-        v-model:page="queryParams.pageNo"
         v-model:limit="queryParams.pageSize"
+        v-model:page="queryParams.pageNo"
+        :total="total"
         @pagination="getList"
       />
     </ContentWrap>
   </Dialog>
 </template>
 
-<script setup lang="ts">
+<script lang="ts" setup>
 import { dateFormatter } from '@/utils/formatTime'
 import * as BrokerageRecordApi from '@/api/mall/trade/brokerage/record'
 import { BrokerageRecordBizTypeEnum } from '@/utils/constants'
@@ -101,8 +107,6 @@ import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
 /** 推广订单列表 */
 defineOptions({ name: 'BrokerageOrderListDialog' })
 
-const message = useMessage() // 消息弹窗
-
 const loading = ref(true) // 列表的加载中
 const total = ref(0) // 列表的总页数
 const list = ref([]) // 列表的数据
@@ -111,7 +115,7 @@ const queryParams = reactive({
   pageSize: 10,
   userId: null,
   bizType: BrokerageRecordBizTypeEnum.ORDER.type,
-  level: '',
+  sourceUserLevel: 0,
   createTime: [],
   status: null
 })
@@ -130,7 +134,11 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 const getList = async () => {
   loading.value = true
   try {
-    const data = await BrokerageRecordApi.getBrokerageRecordPage(queryParams)
+    // 处理全部的情况
+    const data = await BrokerageRecordApi.getBrokerageRecordPage({
+      ...queryParams,
+      sourceUserLevel: queryParams.sourceUserLevel === 0 ? undefined : queryParams.sourceUserLevel
+    })
     list.value = data.list
     total.value = data.total
   } finally {

src/views/mall/trade/brokerage/user/BrokerageUserCreateForm.vue

@@ -0,0 +1,161 @@
+<template>
+  <Dialog v-model="dialogVisible" title="创建分销员" width="800">
+    <el-form
+      ref="formRef"
+      v-loading="formLoading"
+      :model="formData"
+      :rules="formRules"
+      label-width="90"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12" :xs="24">
+          <el-form-item label="分销员" prop="userId">
+            <el-input
+              v-model="formData.userId"
+              v-loading="formLoading"
+              placeholder="请输入分销员编号"
+            >
+              <template #append>
+                <el-button @click="handleGetUser(formData.userId, '分销员')">
+                  <Icon class="mr-5px" icon="ep:search" />
+                </el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+          <!-- 展示分销员的信息 -->
+          <el-descriptions v-if="userInfo.user" :column="1" border>
+            <el-descriptions-item label="头像">
+              <el-avatar :src="userInfo.user?.avatar" />
+            </el-descriptions-item>
+            <el-descriptions-item label="昵称">{{ userInfo.user?.nickname }}</el-descriptions-item>
+          </el-descriptions>
+        </el-col>
+
+        <el-col :span="12" :xs="24">
+          <el-form-item label="上级推广人" prop="bindUserId">
+            <el-input
+              v-model="formData.bindUserId"
+              v-loading="formLoading"
+              placeholder="请输入推广员编号"
+            >
+              <template #append>
+                <el-button @click="handleGetUser(formData.bindUserId, '推广员')">
+                  <Icon class="mr-5px" icon="ep:search" />
+                </el-button>
+              </template>
+            </el-input>
+          </el-form-item>
+          <!-- 展示上级推广人的信息 -->
+          <el-descriptions v-if="userInfo.bindUser" :column="1" border>
+            <el-descriptions-item label="头像">
+              <el-avatar :src="userInfo.bindUser?.avatar" />
+            </el-descriptions-item>
+            <el-descriptions-item label="昵称"
+              >{{ userInfo.bindUser?.nickname }}
+            </el-descriptions-item>
+            <el-descriptions-item label="推广资格">
+              <el-tag v-if="userInfo.bindUser?.brokerageEnabled">有</el-tag>
+              <el-tag v-else type="info">无</el-tag>
+            </el-descriptions-item>
+            <el-descriptions-item label="成为推广员的时间">
+              {{ formatDate(userInfo.bindUser?.brokerageTime) }}
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-col>
+      </el-row>
+    </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 * as BrokerageUserApi from '@/api/mall/trade/brokerage/user'
+import * as UserApi from '@/api/member/user'
+import { formatDate } from '@/utils/formatTime'
+
+defineOptions({ name: 'BrokerageUserCreateForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formData = ref({
+  userId: undefined,
+  bindUserId: undefined
+})
+const formRef = ref() // 表单 Ref
+const formRules = reactive({
+  userId: [{ required: true, message: '分销员不能为空', trigger: 'blur' }]
+})
+
+/** 打开弹窗 */
+const open = async () => {
+  resetForm()
+  dialogVisible.value = true
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+/** 创建分销员 */
+const submitForm = async () => {
+  if (formLoading.value) return
+  // 校验表单
+  if (!formRef) return
+  const valid = await formRef.value.validate()
+  if (!valid) return
+
+  // 提交请求
+  formLoading.value = true
+  try {
+    // 发起修改
+    await BrokerageUserApi.createBrokerageUser(formData.value)
+    message.success(t('common.createSuccess'))
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formRef.value?.resetFields()
+  formData.value = {
+    userId: undefined,
+    bindUserId: undefined
+  }
+
+  userInfo.bindUser = undefined
+  userInfo.user = undefined
+}
+
+/** 查询推广员和分销员 */
+const userInfo = reactive<{
+  bindUser: BrokerageUserApi.BrokerageUserVO | undefined
+  user: BrokerageUserApi.BrokerageUserVO | undefined
+}>({
+  bindUser: undefined,
+  user: undefined
+})
+const handleGetUser = async (id: any, userType: string) => {
+  if (!id) {
+    message.warning(`请先输入${userType}编号后重试！！！`)
+    return
+  }
+  if (userType === '推广员' && formData.value.bindUserId == formData.value.userId) {
+    message.error('不能绑定自己为推广人')
+    return
+  }
+  const user =
+    userType === '推广员' ? await BrokerageUserApi.getBrokerageUser(id) : await UserApi.getUser(id)
+  userType === '推广员' ? (userInfo.bindUser = user) : (userInfo.user = user)
+  if (!user) {
+    message.warning(`${userType}不存在`)
+  }
+}
+</script>

src/views/mall/trade/brokerage/user/BrokerageUserUpdateForm.vue

@@ -43,8 +43,8 @@
 import * as BrokerageUserApi from '@/api/mall/trade/brokerage/user'
 import { formatDate } from '@/utils/formatTime'
 
-/** 修改上级推广人表单 */
-defineOptions({ name: 'UpdateBindUserForm' })
+/** 修改分销用户 */
+defineOptions({ name: 'BrokerageUserUpdateForm' })
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗

src/views/mall/trade/brokerage/user/index.vue

@@ -4,19 +4,19 @@
   <ContentWrap>
     <!-- 搜索工作栏 -->
     <el-form
-      class="-mb-15px"
-      :model="queryParams"
       ref="queryFormRef"
       :inline="true"
+      :model="queryParams"
+      class="-mb-15px"
       label-width="85px"
     >
       <el-form-item label="推广员编号" prop="bindUserId">
         <el-input
           v-model="queryParams.bindUserId"
-          placeholder="请输入推广员编号"
-          clearable
-          @keyup.enter="handleQuery"
           class="!w-240px"
+          clearable
+          placeholder="请输入推广员编号"
+          @keyup.enter="handleQuery"
         />
       </el-form-item>
       <el-form-item label="推广资格" prop="brokerageEnabled">
@@ -26,111 +26,126 @@
           clearable
           placeholder="请选择推广资格"
         >
-          <el-option label="有" :value="true" />
-          <el-option label="无" :value="false" />
+          <el-option :value="true" label="有" />
+          <el-option :value="false" label="无" />
         </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"
+          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 icon="ep:search" class="mr-5px" /> 搜索</el-button>
-        <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+        <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="['trade:brokerage-user:create']"
+          plain
+          type="primary"
+          @click="openCreateUserForm"
+        >
+          <Icon class="mr-5px" icon="ep:plus" />
+          新增
+        </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" min-width="80px" />
-      <el-table-column label="头像" align="center" prop="avatar" width="70px">
+    <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+      <el-table-column align="center" label="用户编号" min-width="80px" prop="id" />
+      <el-table-column align="center" label="头像" prop="avatar" width="70px">
         <template #default="scope">
           <el-avatar :src="scope.row.avatar" />
         </template>
       </el-table-column>
-      <el-table-column label="昵称" align="center" prop="nickname" min-width="80px" />
-      <el-table-column label="推广人数" align="center" prop="brokerageUserCount" width="80px" />
+      <el-table-column align="center" label="昵称" min-width="80px" prop="nickname" />
+      <el-table-column align="center" label="推广人数" prop="brokerageUserCount" width="80px" />
       <el-table-column
+        align="center"
         label="推广订单数量"
-        align="center"
+        min-width="110px"
         prop="brokerageOrderCount"
-        min-width="110px"
       />
       <el-table-column
+        :formatter="fenToYuanFormat"
+        align="center"
         label="推广订单金额"
-        align="center"
-        prop="brokerageOrderPrice"
         min-width="110px"
-        :formatter="fenToYuanFormat"
+        prop="brokerageOrderPrice"
       />
       <el-table-column
+        :formatter="fenToYuanFormat"
+        align="center"
         label="已提现金额"
-        align="center"
+        min-width="100px"
         prop="withdrawPrice"
-        min-width="100px"
-        :formatter="fenToYuanFormat"
       />
-      <el-table-column label="已提现次数" align="center" prop="withdrawCount" min-width="100px" />
+      <el-table-column align="center" label="已提现次数" min-width="100px" prop="withdrawCount" />
       <el-table-column
+        :formatter="fenToYuanFormat"
+        align="center"
         label="未提现金额"
-        align="center"
-        prop="price"
         min-width="100px"
-        :formatter="fenToYuanFormat"
+        prop="price"
       />
       <el-table-column
-        label="冻结中佣金"
-        align="center"
-        prop="frozenPrice"
-        min-width="100px"
         :formatter="fenToYuanFormat"
+        align="center"
+        label="冻结中佣金"
+        min-width="100px"
+        prop="frozenPrice"
       />
-      <el-table-column label="推广资格" align="center" prop="brokerageEnabled" min-width="80px">
+      <el-table-column align="center" label="推广资格" min-width="80px" prop="brokerageEnabled">
         <template #default="scope">
           <el-switch
             v-model="scope.row.brokerageEnabled"
+            :disabled="!checkPermi(['trade:brokerage-user:update-bind-user'])"
             active-text="有"
             inactive-text="无"
             inline-prompt
-            :disabled="!checkPermi(['trade:brokerage-user:update-bind-user'])"
             @change="handleBrokerageEnabledChange(scope.row)"
           />
         </template>
       </el-table-column>
       <el-table-column
+        :formatter="dateFormatter"
+        align="center"
         label="成为推广员时间"
-        align="center"
         prop="brokerageTime"
-        :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column label="上级推广员编号" align="center" prop="bindUserId" width="150px" />
+      <el-table-column align="center" label="上级推广员编号" prop="bindUserId" width="150px" />
       <el-table-column
-        label="推广员绑定时间"
-        align="center"
-        prop="bindUserTime"
         :formatter="dateFormatter"
+        align="center"
+        label="推广员绑定时间"
+        prop="bindUserTime"
         width="180px"
       />
-      <el-table-column label="操作" align="center" width="150px" fixed="right">
+      <el-table-column align="center" fixed="right" label="操作" width="150px">
         <template #default="scope">
           <el-dropdown
-            @command="(command) => handleCommand(command, scope.row)"
             v-hasPermi="[
               'trade:brokerage-user:user-query',
               'trade:brokerage-user:order-query',
               'trade:brokerage-user:update-bind-user',
               'trade:brokerage-user:clear-bind-user'
             ]"
+            @command="(command) => handleCommand(command, scope.row)"
           >
             <el-button link type="primary">
               <Icon icon="ep:d-arrow-right" />
@@ -139,28 +154,28 @@
             <template #dropdown>
               <el-dropdown-menu>
                 <el-dropdown-item
-                  command="openBrokerageUserTable"
                   v-if="checkPermi(['trade:brokerage-user:user-query'])"
+                  command="openBrokerageUserTable"
                 >
                   推广人
                 </el-dropdown-item>
                 <el-dropdown-item
-                  command="openBrokerageOrderTable"
                   v-if="checkPermi(['trade:brokerage-user:order-query'])"
+                  command="openBrokerageOrderTable"
                 >
                   推广订单
                 </el-dropdown-item>
                 <el-dropdown-item
-                  command="openUpdateBindUserForm"
                   v-if="checkPermi(['trade:brokerage-user:update-bind-user'])"
+                  command="openUpdateBindUserForm"
                 >
                   修改上级推广人
                 </el-dropdown-item>
                 <el-dropdown-item
-                  command="handleClearBindUser"
                   v-if="
                     scope.row.bindUserId && checkPermi(['trade:brokerage-user:clear-bind-user'])
                   "
+                  command="handleClearBindUser"
                 >
                   清除上级推广人
                 </el-dropdown-item>
@@ -172,28 +187,31 @@
     </el-table>
     <!-- 分页 -->
     <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
       v-model:limit="queryParams.pageSize"
+      v-model:page="queryParams.pageNo"
+      :total="total"
       @pagination="getList"
     />
   </ContentWrap>
   <!-- 修改上级推广人表单 -->
-  <UpdateBindUserForm ref="updateBindUserFormRef" @success="getList" />
+  <BrokerageUserUpdateForm ref="updateFormRef" @success="getList" />
   <!-- 推广人列表 -->
-  <BrokerageUserListDialog ref="brokerageUserListDialogRef" />
+  <BrokerageUserListDialog ref="listDialogRef" />
   <!-- 推广订单列表 -->
-  <BrokerageOrderListDialog ref="brokerageOrderListDialogRef" />
+  <BrokerageOrderListDialog ref="orderDialogRef" />
+  <!-- 创建分销员 -->
+  <BrokerageUserCreateForm ref="createFormRef" @success="getList" />
 </template>
 
-<script setup lang="ts">
+<script lang="ts" setup>
 import { dateFormatter } from '@/utils/formatTime'
 import * as BrokerageUserApi from '@/api/mall/trade/brokerage/user'
 import { checkPermi } from '@/utils/permission'
 import { fenToYuanFormat } from '@/utils/formatter'
-import UpdateBindUserForm from '@/views/mall/trade/brokerage/user/UpdateBindUserForm.vue'
+import BrokerageUserUpdateForm from '@/views/mall/trade/brokerage/user/BrokerageUserUpdateForm.vue'
 import BrokerageUserListDialog from '@/views/mall/trade/brokerage/user/BrokerageUserListDialog.vue'
 import BrokerageOrderListDialog from '@/views/mall/trade/brokerage/user/BrokerageOrderListDialog.vue'
+import BrokerageUserCreateForm from '@/views/mall/trade/brokerage/user/BrokerageUserCreateForm.vue'
 
 defineOptions({ name: 'TradeBrokerageUser' })
 
@@ -253,21 +271,27 @@ const handleCommand = (command: string, row: BrokerageUserApi.BrokerageUserVO) =
 }
 
 /** 打开推广人列表 */
-const brokerageUserListDialogRef = ref()
+const listDialogRef = ref()
 const openBrokerageUserTable = (id: number) => {
-  brokerageUserListDialogRef.value.open(id)
+  listDialogRef.value.open(id)
 }
 
 /** 打开推广订单列表 */
-const brokerageOrderListDialogRef = ref()
+const orderDialogRef = ref()
 const openBrokerageOrderTable = (id: number) => {
-  brokerageOrderListDialogRef.value.open(id)
+  orderDialogRef.value.open(id)
 }
 
 /** 打开表单：修改上级推广人 */
-const updateBindUserFormRef = ref()
+const updateFormRef = ref()
 const openUpdateBindUserForm = (row: BrokerageUserApi.BrokerageUserVO) => {
-  updateBindUserFormRef.value.open(row)
+  updateFormRef.value.open(row)
+}
+
+/** 创建分销员 */
+const createFormRef = ref<InstanceType<typeof CreateUserForm>>()
+const openCreateUserForm = () => {
+  createFormRef.value?.open()
 }
 
 /** 清除上级推广人 */