Merge branch 'dev' into feature/roles

src/api/sys/user.ts

@@ -1,6 +1,7 @@
 import { defHttp } from '/@/utils/http/axios';
 import {
   LoginParams,
+  RegisterParams,
   LoginResultModel,
   GetUserInfoModel,
   updateUserInfoPasswordParam,
@@ -21,6 +22,7 @@ enum Api {
   updatePassword = '/kankan-api/api/manager/user/updatePassword',
   GetPermCode = '/getPermCode',
   getEmailAuthCode = '/kankan-api/api/sso/user/getEmailAuthCode',
+  registerCompany = '/kankan-api//api/sso/user/registerCompany',
 }
 
 /**
@@ -45,15 +47,19 @@ export function loginApi(params: LoginParams, mode: ErrorMessageMode = 'modal')
   );
 }
 
-export function RegisterApi(params: LoginParams, mode: ErrorMessageMode = 'modal') {
-  const paramData: LoginParams = {
-    ...params,
+export function RegisterApi(params: RegisterParams, mode: ErrorMessageMode = 'modal') {
+  const paramData: RegisterParams = {
+    // ...params,
     password: encodeStr(window.btoa(params.password)),
+    authCode: params.authCode,
+    companyName: params.companyName,
+    managerPhone: params.managerPhone,
+    managerName: params.managerName,
   };
 
   return defHttp.post<LoginResultModel>(
     {
-      url: Api.Login,
+      url: Api.registerCompany,
       // params,
       params: paramData,
       headers: { 'Content-Type': ContentTypeEnum.JSON },

src/views/sys/login/RegisterForm.vue

@@ -76,12 +76,13 @@
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useLoginState, useFormRules, useFormValid, LoginStateEnum } from './useLogin';
   import { RegisterApi, getEmailAuthCodeApi } from '/@/api/sys/user';
+  import { useMessage } from '/@/hooks/web/useMessage';
 
   const FormItem = Form.Item;
   const InputPassword = Input.Password;
   const { t } = useI18n();
   const { handleBackLogin, getLoginState } = useLoginState();
-
+  const { createMessage } = useMessage();
   const formRef = ref();
   const loading = ref(false);
 
@@ -121,7 +122,12 @@
     const data = await validForm();
     if (!data) return;
     console.log(data);
-    const res = await RegisterApi(formData);
-    console.log(res);
+    try {
+      await RegisterApi(formData);
+      createMessage.success(t('common.optSuccess'));
+      handleBackLogin();
+    } catch (error) {
+      // createMessage.error(error || t('common.optFail'));
+    }
   }
 </script>