feat(api): new savinng 8

src/api/sys/model/userModel.ts

@@ -8,6 +8,14 @@ import type { UserInfo } from '/#/store';
 //   captcha: string;
 // }
 
+export interface RegisterParams {
+  password: string;
+  authCode?: string;
+  companyName?: string;
+  managerPhone: string;
+  managerName: string;
+}
+
 export interface LoginParams {
   password: string;
   phoneNum?: string;

src/api/sys/user.ts

@@ -20,18 +20,32 @@ enum Api {
   GetUserInfo = '/kankan-api/api/user/getUserInfo',
   updatePassword = '/kankan-api/api/manager/user/updatePassword',
   GetPermCode = '/getPermCode',
+  getEmailAuthCode = '/kankan-api/api/sso/user/getEmailAuthCode',
 }
 
 /**
  * @description: user login api
  */
 export function loginApi(params: LoginParams, mode: ErrorMessageMode = 'modal') {
-  // const form = new FormData();
-  // const encryptPassword: string = encodeStr(window.btoa(params.password));
-  // form.append('username', params.username);
-  // form.append('password', encryptPassword);
-  // form.append('captcha', params.captcha);
+  const paramData: LoginParams = {
+    ...params,
+    password: encodeStr(window.btoa(params.password)),
+  };
 
+  return defHttp.post<LoginResultModel>(
+    {
+      url: Api.Login,
+      // params,
+      params: paramData,
+      headers: { 'Content-Type': ContentTypeEnum.JSON },
+    },
+    {
+      errorMessageMode: mode,
+    },
+  );
+}
+
+export function RegisterApi(params: LoginParams, mode: ErrorMessageMode = 'modal') {
   const paramData: LoginParams = {
     ...params,
     password: encodeStr(window.btoa(params.password)),
@@ -60,6 +74,14 @@ export function getUserInfo() {
 export function getPermCode() {
   return defHttp.get<string[]>({ url: Api.GetPermCode });
 }
+export function getEmailAuthCodeApi(email: string) {
+  return defHttp.post<boolean>({
+    url: Api.getEmailAuthCode,
+    params: {
+      email,
+    },
+  });
+}
 
 export function doLogout() {
   return defHttp.get({ url: Api.Logout });

src/locales/lang/zh-CN/sys.ts

@@ -101,8 +101,10 @@ export default {
     captcha: '验证码',
     registrationLabel: '免费注册？',
     corporationName: '企业账号',
+    // corporationName: '企业账号',
     corporationMail: '企业邮箱',
     fillMail: '请填写您的邮箱！',
     fillMailCorrect: '请正确填写您的邮箱！',
+    emailSMS: '邮箱验证码',
   },
 };

src/settings/projectSetting.ts

@@ -48,7 +48,7 @@ const setting: ProjectConfig = {
   contentMode: ContentEnum.FULL,
 
   // Whether to display the logo
-  showLogo: false,
+  showLogo: true,
 
   // Whether to show footer
   showFooter: false,

src/views/sys/login/RegisterForm.vue

@@ -2,18 +2,18 @@
   <template v-if="getShow">
     <LoginFormTitle class="enter-x" />
     <Form class="p-4 enter-x" :model="formData" :rules="getFormRules" ref="formRef">
-      <FormItem name="account" class="enter-x">
+      <FormItem name="companyName" class="enter-x">
         <Input
           class="fix-auto-fill"
           size="large"
-          v-model:value="formData.account"
+          v-model:value="formData.companyName"
           :placeholder="t('sys.login.corporationName')"
         />
       </FormItem>
-      <FormItem name="mobile" class="enter-x">
+      <FormItem name="managerPhone" class="enter-x">
         <Input
           size="large"
-          v-model:value="formData.mobile"
+          v-model:value="formData.managerPhone"
           :placeholder="t('sys.login.corporationMail')"
           class="fix-auto-fill"
         />
@@ -22,9 +22,11 @@
         <CountdownInput
           size="large"
           class="fix-auto-fill"
-          v-model:value="formData.sms"
-          :placeholder="t('sys.login.smsCode')"
+          v-model:value="formData.authCode"
+          :placeholder="t('sys.login.emailSMS')"
+          :sendCodeApi="sendEmailCode"
         />
+        <!-- :sendCodeApi="" -->
       </FormItem>
       <FormItem name="password" class="enter-x">
         <StrengthMeter
@@ -73,6 +75,7 @@
   import { CountdownInput } from '/@/components/CountDown';
   import { useI18n } from '/@/hooks/web/useI18n';
   import { useLoginState, useFormRules, useFormValid, LoginStateEnum } from './useLogin';
+  import { RegisterApi, getEmailAuthCodeApi } from '/@/api/sys/user';
 
   const FormItem = Form.Item;
   const InputPassword = Input.Password;
@@ -83,11 +86,12 @@
   const loading = ref(false);
 
   const formData = reactive({
-    account: '',
+    companyName: '',
+    managerPhone: '',
     password: '',
     confirmPassword: '',
     mobile: '',
-    sms: '',
+    authCode: '',
     policy: false,
   });
 
@@ -96,9 +100,28 @@
 
   const getShow = computed(() => unref(getLoginState) === LoginStateEnum.REGISTER);
 
+  async function sendEmailCode(): Promise<boolean> {
+    const form = unref(formRef);
+    if (!form) {
+      return Promise.resolve(false);
+    }
+    if (formData.managerPhone?.length > 0) {
+      try {
+        await getEmailAuthCodeApi(formData.managerPhone);
+        return Promise.resolve(true);
+      } catch (error) {
+        return Promise.resolve(false);
+      }
+    } else {
+      return Promise.resolve(false);
+    }
+  }
+
   async function handleRegister() {
     const data = await validForm();
     if (!data) return;
     console.log(data);
+    const res = await RegisterApi(formData);
+    console.log(res);
   }
 </script>

src/views/sys/login/useLogin.ts

@@ -44,7 +44,7 @@ export function useFormRules(formData?: Recordable) {
   const getAccountFormRule = computed(() => createRule(t('sys.login.accountPlaceholder')));
   const getPasswordFormRule = computed(() => createRule(t('sys.login.passwordPlaceholder')));
   const getSmsFormRule = computed(() => createRule(t('sys.login.smsPlaceholder')));
-  const getMobileFormRule = computed(() => createRule(t('sys.login.mobilePlaceholder')));
+  // const getMobileFormRule = computed(() => createRule(t('sys.login.fillMail')));
 
   const validatePolicy = async (_: RuleObject, value: boolean) => {
     return !value ? Promise.reject(t('sys.login.policyPlaceholder')) : Promise.resolve();
@@ -62,21 +62,33 @@ export function useFormRules(formData?: Recordable) {
     };
   };
 
+  const validateEmail = (_: RuleObject, value: string) => {
+    const mail_reg = /\S+@\S+\.\S+/;
+    if (!value) {
+      return Promise.reject(t('sys.login.fillMail'));
+    }
+    if (!value.match(mail_reg)) {
+      return Promise.reject(t('sys.login.fillMailCorrect'));
+    }
+
+    return Promise.resolve();
+  };
+
   const getFormRules = computed((): { [k: string]: ValidationRule | ValidationRule[] } => {
     const accountFormRule = unref(getAccountFormRule);
     const passwordFormRule = unref(getPasswordFormRule);
     const smsFormRule = unref(getSmsFormRule);
-    const mobileFormRule = unref(getMobileFormRule);
+    // const mobileFormRule = unref(getMobileFormRule);
 
     const mobileRule = {
-      sms: smsFormRule,
-      mobile: mobileFormRule,
+      authCode: smsFormRule,
+      managerPhone: [{ validator: validateEmail, trigger: 'change' }],
     };
     switch (unref(currentState)) {
       // register form rules
       case LoginStateEnum.REGISTER:
         return {
-          account: accountFormRule,
+          companyName: accountFormRule,
           password: passwordFormRule,
           confirmPassword: [
             { validator: validateConfirmPassword(formData?.password), trigger: 'change' },