feat(shopDealerApply): 添加经销商申请功能

- 新增经销商申请相关接口和模型
- 实现经销商申请列表、搜索和编辑功能
- 添加管理员用户添加接口- 更新用户模型，增加推荐人ID字段
- 在角色接口中添加租户ID请求头
- 简化登录和注册页面代码
- 新增经销商申请相关的搜索和编辑组件

src/views/passport/dealer/register.vue

@@ -1,20 +1,20 @@
 <template>
   <div
-      :class="[
+    :class="[
       'login-wrapper',
       ['', 'login-form-right', 'login-form-left'][direction]
     ]"
-      :style="{
+    :style="{
       backgroundImage: 'url(' + config?.loginBgImg + ')'
     }"
   >
     <div class="logo-login" v-if="config?.siteName">
       <img
-          :src="
+        :src="
           config.sysLogo ||
           'https://oss.wsdns.cn/20240822/0252ad4ed46449cdafe12f8d3d96c2ea.svg'
         "
-          class="logo"
+        class="logo"
       />
       <h4>{{ config.siteName }}</h4>
     </div>
@@ -23,22 +23,23 @@
       }}
     </div>
     <a-form
-        ref="formRef"
-        :model="form"
-        :rules="rules"
-        class="login-form ele-bg-white"
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      class="login-form ele-bg-white"
     >
       <div class="login-title flex justify-center items-center px-12">
         <h4
-            class="title-btn"
-        >注册</h4
+          class="title-btn"
+        >邀请注册</h4
         >
       </div>
       <template v-if="loginType === 'account'">
         <!-- 邀请信息显示 -->
-        <div v-if="inviterId" style="margin-bottom: 16px; padding: 12px; background: #f6ffed; border: 1px solid #b7eb8f; border-radius: 4px;">
+        <div v-if="inviterId"
+             style="margin-bottom: 16px; padding: 12px; background: #f6ffed; border: 1px solid #b7eb8f; border-radius: 4px;">
           <div style="color: #52c41a; font-size: 14px;">
-            <check-circle-outlined style="margin-right: 4px;" />
+            <check-circle-outlined style="margin-right: 4px;"/>
             您正在通过邀请链接注册，注册成功后将自动建立推荐关系
           </div>
         </div>
@@ -74,53 +75,6 @@
             </a-button>
           </div>
         </a-form-item>
-        <a-form-item name="companyName">
-          <div class="flex">
-            <a-input
-              allow-clear
-              size="large"
-              placeholder="公众号|小程序名称"
-              v-model:value="form.companyName"
-            >
-            </a-input>
-            <a-button
-              class="ele-btn-icon"
-              size="large"
-              style="margin-left: 10px; width: 137px"
-              @click="openMapPicker"
-            >
-              <AimOutlined />选取
-            </a-button>
-          </div>
-        </a-form-item>
-<!--        <a-form-item name="companyName">-->
-<!--          <a-input-->
-<!--            allow-clear-->
-<!--            size="large"-->
-<!--            :maxlength="11"-->
-<!--            v-model:value="form.companyName"-->
-<!--            :placeholder="`请输入店铺名称`"-->
-<!--          />-->
-<!--        </a-form-item>-->
-<!--        <a-form-item name="email">-->
-<!--          <a-input-->
-<!--            allow-clear-->
-<!--            size="large"-->
-<!--            v-model:value="form.email"-->
-<!--            :placeholder="`(选填)请输入电子邮箱`"-->
-<!--          />-->
-<!--        </a-form-item>-->
-        <a-form-item name="category">
-          <industry-select
-            v-model:value="form.category"
-            valueField="label"
-            allow-clear
-            size="large"
-            placeholder="所属行业"
-            class="ele-fluid"
-            @change="onIndustry"
-          />
-        </a-form-item>
         <a-form-item>
           <a-checkbox v-model:checked="form.remember">
             同意 <a href="https://website.websoft.top/xieyi/01.html" target="_blank">《服务协议及隐私政策》</a>
@@ -128,26 +82,25 @@
         </a-form-item>
         <a-form-item>
           <a-button
-              block
-              size="large"
-              type="primary"
-              :disabled="!form.remember"
-              :loading="loading"
-              @click="submit"
+            block
+            size="large"
+            type="primary"
+            :disabled="!form.remember"
+            :loading="loading"
+            @click="submit"
           >
             注册
           </a-button>
-          <div class="register text-center pt-5"><a @click="push('/login')">已有账号，立即登录</a></div>
         </a-form-item>
       </template>
       <template v-if="loginType === 'sms'">
         <a-form-item name="phone">
           <a-input
-              allow-clear
-              size="large"
-              :maxlength="11"
-              v-model:value="form.phone"
-              :placeholder="`请输入手机号码`"
+            allow-clear
+            size="large"
+            :maxlength="11"
+            v-model:value="form.phone"
+            :placeholder="`请输入手机号码`"
           >
             <template #addonBefore> +86</template>
           </a-input>
@@ -155,17 +108,17 @@
         <a-form-item name="code">
           <div class="login-input-group">
             <a-input
-                placeholder="请输入验证码"
-                v-model:value="form.code"
-                size="large"
-                :maxlength="6"
-                allow-clear
-                @pressEnter="onLoginBySms"
+              placeholder="请输入验证码"
+              v-model:value="form.code"
+              size="large"
+              :maxlength="6"
+              allow-clear
+              @pressEnter="onLoginBySms"
             />
             <a-button
-                class="login-captcha"
-                :disabled="!!countdownTime"
-                @click="openImgCodeModal"
+              class="login-captcha"
+              :disabled="!!countdownTime"
+              @click="openImgCodeModal"
             >
               <span v-if="!countdownTime">发送验证码</span>
               <span v-else>已发送 {{ countdownTime }} s</span>
@@ -174,11 +127,11 @@
         </a-form-item>
         <a-form-item>
           <a-button
-              block
-              size="large"
-              type="primary"
-              :loading="loading"
-              @click="onLoginBySms"
+            block
+            size="large"
+            type="primary"
+            :loading="loading"
+            @click="onLoginBySms"
           >
             {{ loading ? t('login.loading') : t('login.login') }}
           </a-button>
@@ -193,30 +146,30 @@
     </div>
     <!-- 编辑弹窗 -->
     <a-modal
-        :width="340"
-        :footer="null"
-        title="发送验证码"
-        v-model:visible="visible"
+      :width="340"
+      :footer="null"
+      title="发送验证码"
+      v-model:visible="visible"
     >
       <div class="login-input-group" style="margin-bottom: 16px">
         <a-input
-            v-model:value="imgCode"
-            :maxlength="5"
-            size="large"
-            placeholder="请输入图形验证码"
-            allow-clear
-            @pressEnter="sendCode"
+          v-model:value="imgCode"
+          :maxlength="5"
+          size="large"
+          placeholder="请输入图形验证码"
+          allow-clear
+          @pressEnter="sendCode"
         />
         <a-button class="login-captcha">
           <img alt="" :src="captcha" @click="changeCaptcha"/>
         </a-button>
       </div>
       <a-button
-          block
-          size="large"
-          type="primary"
-          :loading="codeLoading"
-          @click="sendCode"
+        block
+        size="large"
+        type="primary"
+        :loading="codeLoading"
+        @click="sendCode"
       >
         立即发送
       </a-button>
@@ -240,11 +193,10 @@ import {useI18n} from 'vue-i18n';
 import {useRouter} from 'vue-router';
 import {getTenantId} from '@/utils/domain';
 import {Form, message} from 'ant-design-vue';
-import { AimOutlined, CheckCircleOutlined, CloseCircleOutlined } from '@ant-design/icons-vue';
-import { storeToRefs } from 'pinia';
+import {CheckCircleOutlined} from '@ant-design/icons-vue';
+import {storeToRefs} from 'pinia';
 import {goHomeRoute, cleanPageTabs} from '@/utils/page-tab-util';
 import {loginBySms, getCaptcha} from '@/api/passport/login';
-import { CenterPoint } from 'ele-admin-pro/es/ele-map-picker/types';
 import {TEMPLATE_ID, THEME_STORE_NAME} from '@/config/setting';
 import {sendSmsCaptcha} from '@/api/passport/login';
 import useFormData from '@/utils/use-form-data';
@@ -252,16 +204,16 @@ import {FormInstance} from 'ant-design-vue/es/form';
 import {configWebsiteField} from '@/api/cms/cmsWebsiteField';
 import {Config} from '@/api/cms/cmsWebsiteField/model';
 import {phoneReg} from 'ele-admin-pro';
-import {push} from "@/utils/common";
 import {useThemeStore} from "@/store/modules/theme";
 import {CmsWebsite} from "@/api/cms/cmsWebsite/model";
-import {createCmsWebSite} from "@/api/layout";
-import { bindUserReferee } from '@/api/user/referee';
+import {addAdminUser} from "@/api/system/user";
+import {User} from "@/api/system/user/model";
+import {listRoles} from "@/api/system/role";
 
 const useForm = Form.useForm;
 const {currentRoute} = useRouter();
 const {t} = useI18n();
-const { locale } = useI18n();
+const {locale} = useI18n();
 
 // 登录框方向, 0 居中, 1 居右, 2 居左
 const direction = ref(0);
@@ -273,106 +225,12 @@ const loginType = ref('account');
 const config = ref<Config>();
 // 是否开启响应式布局
 const themeStore = useThemeStore();
-const { darkMode } = storeToRefs(themeStore);
+const {darkMode} = storeToRefs(themeStore);
 
 // 配置信息
-const {form} = useFormData<CmsWebsite>({
-// 站点ID
-  websiteId: undefined,
-  // 网站名称
-  websiteName: undefined,
-  // 网站标识
-  websiteCode: undefined,
-  // 网站LOGO
-  websiteIcon: undefined,
-  // 网站LOGO
-  websiteLogo: undefined,
-  // 网站LOGO(深色模式)
-  websiteDarkLogo: undefined,
-  // 网站类型
-  websiteType: undefined,
-  // 网站关键词
-  keywords: undefined,
-  // 域名前缀
-  prefix: undefined,
-  // 绑定域名
-  domain: undefined,
-  // 全局样式
-  style: undefined,
-  // 后台管理地址
-  adminUrl: undefined,
-  // 应用版本 10标准版 20专业版 30永久授权
-  version: undefined,
-  // 服务到期时间
-  expirationTime: undefined,
-  // 模版ID
-  templateId: TEMPLATE_ID,
-  // 行业类型(父级)
-  industryParent: undefined,
-  // 行业类型(子级)
-  industryChild: undefined,
-  // 企业ID
-  companyId: undefined,
-  // 所在国家
-  country: undefined,
-  // 所在省份
-  province: undefined,
-  // 所在城市
-  city: undefined,
-  // 所在辖区
-  region: undefined,
-  // 经度
-  longitude: undefined,
-  // 纬度
-  latitude: undefined,
-  // 街道地址
-  address: undefined,
-  // 联系电话
-  phone: undefined,
-  // 电子邮箱
-  email: undefined,
-  // ICP备案号
-  icpNo: undefined,
-  // 公安备案
-  policeNo: undefined,
-  // 备注
-  comments: undefined,
-  // 是否推荐
-  recommend: undefined,
-  // 是否运行中
-  running: undefined,
-  // 状态 0未开通 1运行中 2维护中 3已关闭 4已欠费停机 5违规关停
-  status: undefined,
-  // 维护说明
-  statusText: undefined,
-  // 关闭说明
-  statusClose: undefined,
-  // 全局样式
-  styles: undefined,
-  // 语言
-  lang: undefined,
-  // 排序号
-  sortNumber: undefined,
-  // 用户ID
-  userId: undefined,
-  // 是否删除, 0否, 1是
-  deleted: undefined,
-  // 租户id
-  tenantId: undefined,
-  // 创建时间
-  createTime: undefined,
-  // 修改时间
-  updateTime: undefined,
-  // 网站配置
-  config: undefined,
-  // 短信验证码
-  smsCode: undefined,
-  // 短信验证码
-  code: undefined,
-  // 是否管理员
-  isSuperAdmin: true,
-  // 企业名称
-  companyName: undefined,
+const {form} = useFormData<User>({
+  phone: '',
+  isAdmin: true
 });
 
 // 验证码 base64 数据
@@ -498,105 +356,88 @@ const goHome = () => {
   localStorage.removeItem(THEME_STORE_NAME);
 };
 
-const onIndustry = (item: any) => {
-  form.industryParent = item[0];
-  form.industryChild = item[1];
-  form.category = `${item[0]}/${item[1]}`;
-};
-
-/* 打开位置选择 */
-const openMapPicker = () => {
-  showMap.value = true;
-};
-
-/* 地图选择后回调 */
-const onDone = (location: CenterPoint) => {
-  if (location) {
-    console.log(location);
-    form.companyName = `${location.name}`;
-    form.province = `${location.city?.province}`;
-    form.city = `${location.city?.city}`;
-    form.region = `${location.city?.district}`;
-    form.address = `${location.address}`;
-    form.longitude = `${location.lng}`;
-    form.latitude = `${location.lat}`;
-  }
-  showMap.value = false;
-};
 
 const onLoginBySms = () => {
   if (!formRef.value) {
     return;
   }
   formRef.value
-      .validate()
-      .then(() => {
-        loading.value = true;
-        form.code = form.smsCode?.toLowerCase();
-        loginBySms(form)
-            .then((msg) => {
-              message.success(msg);
-              loading.value = false;
-              resetFields();
-              cleanPageTabs();
-              goHome();
-            })
-            .catch((e: Error) => {
-              message.error(e.message);
-              loading.value = false;
-            });
-      })
-      .catch(() => {
-      });
+    .validate()
+    .then(() => {
+      loading.value = true;
+      form.code = form.smsCode?.toLowerCase();
+      loginBySms(form)
+        .then((msg) => {
+          message.success(msg);
+          loading.value = false;
+          resetFields();
+          cleanPageTabs();
+          goHome();
+        })
+        .catch((e: Error) => {
+          message.error(e.message);
+          loading.value = false;
+        });
+    })
+    .catch(() => {
+    });
 };
 
 /* 保存编辑 */
-const submit = () => {
+const submit = async () => {
+
   if (!formRef.value) {
     return;
   }
+
+
   formRef.value
-      .validate()
-      .then(() => {
-        loading.value = true;
+    .validate()
+    .then(() => {
+      loading.value = true;
+      // addShopDealerUser({
+      //   ...form,
+      //   dealerId: Number(dealerId.value),
+      // }).then((data) => {
+      //   console.log(data);
+      // });
 
-        // 普通注册流程
-        createCmsWebSite(form)
-            .then(async (msg) => {
-              // 如果有邀请人，注册成功后建立推荐关系
-              if (inviterId.value) {
-                try {
-                  const userId = localStorage.getItem('UserId');
-                  if (userId) {
-                    await bindUserReferee({
-                      dealerId: inviterId.value,
-                      userId: Number(userId),
-                      level: 1
-                    });
-                    message.success('注册成功，已建立推荐关系');
-                  }
-                } catch (e) {
-                  console.error('建立推荐关系失败:', e);
-                  // 不影响注册流程，只是推荐关系建立失败
-                }
-              }
-
-              setTimeout(() => {
-                // 登录成功
-                message.success(msg);
-                loading.value = false;
-                resetFields();
-                cleanPageTabs();
-                goHome();
-              }, 2000)
-            })
-            .catch(() => {
-              message.error('该手机号码已经被注册');
-              loading.value = false;
-            });
-      })
-      .catch(() => {
-      });
+      // createCmsWebSite(form)
+      //     .then(async (msg) => {
+      //       // 如果有邀请人，注册成功后建立推荐关系
+      //       if (inviterId.value) {
+      //         try {
+      //           const userId = localStorage.getItem('UserId');
+      //           if (userId) {
+      //             await bindUserReferee({
+      //               dealerId: inviterId.value,
+      //               userId: Number(userId),
+      //               level: 1
+      //             });
+      //             message.success('注册成功，已建立推荐关系');
+      //           }
+      //         } catch (e) {
+      //           console.error('建立推荐关系失败:', e);
+      //           // 不影响注册流程，只是推荐关系建立失败
+      //         }
+      //       }
+      //
+      //       setTimeout(() => {
+      //         // 登录成功
+      //         message.success(msg);
+      //         loading.value = false;
+      //         resetFields();
+      //         cleanPageTabs();
+      //         goHome();
+      //       }, 2000)
+      //     })
+      //     .catch(() => {
+      //       message.error('该手机号码已经被注册');
+      //       loading.value = false;
+      //     });
+    })
+    .catch(() => {
+    });
 };
 
 /* 获取图形验证码 */
@@ -608,17 +449,17 @@ const changeCaptcha = () => {
   });
   // 这里演示的验证码是后端返回base64格式的形式, 如果后端地址直接是图片请参考忘记密码页面
   getCaptcha()
-      .then((data) => {
-        captcha.value = data.base64;
-        // 实际项目后端一般会返回验证码的key而不是直接返回验证码的内容, 登录用key去验证, 你可以根据自己后端接口修改
-        text.value = data.text;
-        // 自动回填验证码, 实际项目去掉这个
-        // form.code = data.text;
-        // resetFields();
-      })
-      .catch((e) => {
-        message.error(e.message);
-      });
+    .then((data) => {
+      captcha.value = data.base64;
+      // 实际项目后端一般会返回验证码的key而不是直接返回验证码的内容, 登录用key去验证, 你可以根据自己后端接口修改
+      text.value = data.text;
+      // 自动回填验证码, 实际项目去掉这个
+      // form.code = data.text;
+      // resetFields();
+    })
+    .catch((e) => {
+      message.error(e.message);
+    });
 };
 
 // 首次加载
@@ -634,21 +475,21 @@ onMounted(() => {
 });
 
 watch(
-    currentRoute,
-    () => {
-      // 解析二级域名获取租户ID
-      const tenantId = getTenantId();
-      if (tenantId) {
-        form.tenantId = Number(tenantId);
-        showTenantId.value = false;
-      }
-      const tid = localStorage.getItem('TenantId');
-      if (tid) {
-        form.tenantId = Number(tid);
-        showTenantId.value = false;
-      }
-    },
-    {immediate: true}
+  currentRoute,
+  () => {
+    // 解析二级域名获取租户ID
+    const tenantId = getTenantId();
+    if (tenantId) {
+      form.tenantId = Number(tenantId);
+      showTenantId.value = false;
+    }
+    const tid = localStorage.getItem('TenantId');
+    if (tid) {
+      form.tenantId = Number(tid);
+      showTenantId.value = false;
+    }
+  },
+  {immediate: true}
 );
 </script>