登录

config/vite.config.dev.ts

@@ -8,7 +8,7 @@ export default mergeConfig(
   {
     mode: 'development',
     server: {
-      // port: 8056,
+      port: 8150,
       open: false,
       fs: {
         strict: true,

index.html

@@ -7,7 +7,7 @@
     href="https://unpkg.byted-static.com/latest/byted/arco-config/assets/favicon.ico">
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
   <title>
-    arco-test
+    预约管理系统
   </title>
 </head>
 

src/api/types/user.ts

@@ -1,35 +1,8 @@
 export interface LoginData {
-  loginName?: string;
-  password?: string;
-  code?: string;
-  mobileNumber?: string;
-  schoolCode: string;
-  type: 'ACCOUNT' | 'PHONE';
-}
-export interface SchoolInfoRes {
-  phoneLogin: boolean;
-  accountSmsVerify: boolean;
-  name: string;
-  logo: string;
-  version: string;
-  schoolCode: string;
-}
-export interface SmsCodeData {
-  schoolCode: string;
-  loginName: string;
-  password: string;
-}
-export interface AccountSmsCodeData {
-  schoolCode: string;
-  loginName: string;
-  password: string;
-}
-export interface SmsCodeForBindData {
-  schoolCode: string;
   loginName: string;
   password: string;
-  mobileNumber: string;
 }
+
 export interface UpdatePwdData {
   id: string;
   oldPassword: string;

src/api/user.ts

@@ -1,40 +1,9 @@
 import axios from 'axios';
 import { UserState } from '@/store/modules/user/types';
-import type {
-  LoginData,
-  SchoolInfoRes,
-  SmsCodeData,
-  AccountSmsCodeData,
-  SmsCodeForBindData,
-  UpdatePwdData,
-  UserMenuRes,
-} from './types/user';
+import type { LoginData, UpdatePwdData, UserMenuRes } from './types/user';
 
 export function login(data: LoginData): Promise<UserState> {
-  return axios.post('/api/admin/common/login', data);
-}
-
-export function getSchoolInfo(code: string): Promise<SchoolInfoRes> {
-  return axios.post(
-    '/api/admin/common/school/query_by_school_code',
-    {},
-    { params: { code } }
-  );
-}
-
-interface SmsCodeRes {
-  mobileNumber: string;
-}
-export function getSmsCode(datas: SmsCodeData): Promise<SmsCodeRes> {
-  return axios.post('/api/admin/common/get_verify_code', datas);
-}
-export function getAccountSmsCode(datas: AccountSmsCodeData): Promise<string> {
-  return axios.post('/api/admin/common/get_verify_code_by_account', datas);
-}
-export function getSmsCodeForBind(
-  datas: SmsCodeForBindData
-): Promise<SmsCodeRes> {
-  return axios.post('/api/admin/common/get_verify_code_for_bind', datas);
+  return axios.post('/api/admin/sys/user/login', data);
 }
 
 export function updatePwd(datas: UpdatePwdData): Promise<UserState> {
@@ -42,9 +11,9 @@ export function updatePwd(datas: UpdatePwdData): Promise<UserState> {
 }
 
 export function userLogout() {
-  return axios.post('/api/admin/common/logout', {});
+  return axios.post('/api/admin/sys/user/logout', {});
 }
 
 export function sysMenu(): Promise<UserMenuRes> {
-  return axios.post('/api/admin/common/get_menu', {});
+  return axios.post('/api/admin/sys/user/get_menu', {});
 }

src/layout/default-layout.vue

@@ -43,9 +43,9 @@
           <img
             v-if="userStore.curSchoolInfo.logo"
             :src="userStore.curSchoolInfo.logo"
-            alt="知学知考"
+            alt="预约报名系统"
           />
-          <h1 v-else>知学知考</h1>
+          <h1 v-else>预约报名系统</h1>
         </div>
       </div>
 

src/main.ts

@@ -4,7 +4,7 @@ import ArcoVueIcon from '@arco-design/web-vue/es/icon';
 import globalComponents from '@/components';
 import router from './router';
 import store from './store';
-// import './mock';
+import './mock';
 import App from './App.vue';
 // Styles are imported via arco-plugin. See config/plugin/arcoStyleImport.ts in the directory for details
 // 样式通过 arco-plugin 插件导入。详见目录文件 config/plugin/arcoStyleImport.ts

src/mock/datas/user.ts

@@ -0,0 +1,38 @@
+export const menus = [
+  {
+    id: '1',
+    name: '考试预约管理',
+    url: 'base',
+    type: 'MENU',
+    parentId: '-1',
+    sequence: 1,
+    enable: true,
+  },
+  {
+    id: '2',
+    name: '预约任务管理',
+    url: 'OrganizationManage',
+    type: 'MENU',
+    parentId: '1',
+    sequence: 1,
+    enable: true,
+  },
+  {
+    id: '3',
+    name: '预约任务管理',
+    url: '考生信息导入',
+    type: 'MENU',
+    parentId: '1',
+    sequence: 1,
+    enable: true,
+  },
+  {
+    id: '4',
+    name: '预约名单详情',
+    url: 'OrganizationManage',
+    type: 'MENU',
+    parentId: '1',
+    sequence: 1,
+    enable: true,
+  },
+];

src/mock/index.ts

@@ -1,7 +1,6 @@
 import Mock from 'mockjs';
 
 import './user';
-import './message-box';
 
 Mock.setup({
   timeout: '600-1000',

src/mock/message-box.ts

@@ -1,85 +0,0 @@
-import Mock from 'mockjs';
-import setupMock, { successResponseWrap } from '@/utils/setup-mock';
-
-const haveReadIds: number[] = [];
-const getMessageList = () => {
-  return [
-    {
-      id: 1,
-      type: 'message',
-      title: '郑曦月',
-      subTitle: '的私信',
-      avatar:
-        '//p1-arco.byteimg.com/tos-cn-i-uwbnlip3yd/8361eeb82904210b4f55fab888fe8416.png~tplv-uwbnlip3yd-webp.webp',
-      content: '审批请求已发送，请查收',
-      time: '今天 12:30:01',
-    },
-    {
-      id: 2,
-      type: 'message',
-      title: '宁波',
-      subTitle: '的回复',
-      avatar:
-        '//p1-arco.byteimg.com/tos-cn-i-uwbnlip3yd/3ee5f13fb09879ecb5185e440cef6eb9.png~tplv-uwbnlip3yd-webp.webp',
-      content: '此处 bug 已经修复',
-      time: '今天 12:30:01',
-    },
-    {
-      id: 3,
-      type: 'message',
-      title: '宁波',
-      subTitle: '的回复',
-      avatar:
-        '//p1-arco.byteimg.com/tos-cn-i-uwbnlip3yd/3ee5f13fb09879ecb5185e440cef6eb9.png~tplv-uwbnlip3yd-webp.webp',
-      content: '此处 bug 已经修复',
-      time: '今天 12:20:01',
-    },
-    {
-      id: 4,
-      type: 'notice',
-      title: '续费通知',
-      subTitle: '',
-      avatar: '',
-      content: '您的产品使用期限即将截止，如需继续使用产品请前往购…',
-      time: '今天 12:20:01',
-      messageType: 3,
-    },
-    {
-      id: 5,
-      type: 'notice',
-      title: '规则开通成功',
-      subTitle: '',
-      avatar: '',
-      content: '内容屏蔽规则于 2021-12-01 开通成功并生效',
-      time: '今天 12:20:01',
-      messageType: 1,
-    },
-    {
-      id: 6,
-      type: 'todo',
-      title: '质检队列变更',
-      subTitle: '',
-      avatar: '',
-      content: '内容质检队列于 2021-12-01 19:50:23 进行变更，请重新…',
-      time: '今天 12:20:01',
-      messageType: 0,
-    },
-  ].map((item) => ({
-    ...item,
-    status: haveReadIds.indexOf(item.id) === -1 ? 0 : 1,
-  }));
-};
-
-setupMock({
-  setup: () => {
-    Mock.mock(new RegExp('/api/message/list'), () => {
-      return successResponseWrap(getMessageList());
-    });
-
-    Mock.mock(new RegExp('/api/message/read'), (params: { body: string }) => {
-      const { ids } = JSON.parse(params.body);
-      haveReadIds.push(...(ids || []));
-      return successResponseWrap(true);
-    });
-  },
-});

src/mock/user.ts

@@ -5,101 +5,46 @@ import setupMock, {
 } from '@/utils/setup-mock';
 
 import { MockParams } from '@/types/mock';
-import { isLogin } from '@/utils/auth';
+import { menus } from './datas/user';
 
 setupMock({
   setup() {
     // Mock.XHR.prototype.withCredentials = true;
 
-    // 用户信息
-    Mock.mock(new RegExp('/api/user/info'), () => {
-      if (isLogin()) {
-        const role = window.localStorage.getItem('userRole') || 'admin';
-        return successResponseWrap({
-          name: '王立群',
-          avatar:
-            '//lf1-xgcdn-tos.pstatp.com/obj/vcloud/vadmin/start.8e0e4855ee346a46ccff8ff3e24db27b.png',
-          email: 'wangliqun@email.com',
-          job: 'frontend',
-          jobName: '前端艺术家',
-          organization: 'Frontend',
-          organizationName: '前端',
-          location: 'beijing',
-          locationName: '北京',
-          introduction: '人潇洒，性温存',
-          personalWebsite: 'https://www.arco.design',
-          phone: '150****0000',
-          registrationDate: '2013-05-10 12:10:00',
-          accountId: '15012312300',
-          certification: 1,
-          role,
-        });
-      }
-      return failResponseWrap(null, '未登录', 50008);
-    });
-
     // 登录
-    Mock.mock(new RegExp('/api/user/login'), (params: MockParams) => {
-      const { username, password } = JSON.parse(params.body);
-      if (!username) {
+    Mock.mock(new RegExp('/api/admin/sys/user/login'), (params: MockParams) => {
+      const { loginName, password } = JSON.parse(params.body);
+      if (!loginName) {
         return failResponseWrap(null, '用户名不能为空', 50000);
       }
       if (!password) {
         return failResponseWrap(null, '密码不能为空', 50000);
       }
-      if (username === 'admin' && password === 'admin') {
-        window.localStorage.setItem('userRole', 'admin');
-        return successResponseWrap({
-          token: '12345',
-        });
-      }
-      if (username === 'user' && password === 'user') {
-        window.localStorage.setItem('userRole', 'user');
-        return successResponseWrap({
-          token: '54321',
-        });
-      }
-      return failResponseWrap(null, '账号或者密码错误', 50000);
+
+      return successResponseWrap({
+        id: 1,
+        loginName,
+        name: '张三',
+        sessionId: '123456',
+        accessToken: 'abcdef',
+        categoryInfo: {
+          name: '教学点名称',
+          categoryId: '教学点id',
+        },
+      });
     });
 
     // 登出
-    Mock.mock(new RegExp('/api/user/logout'), () => {
+    Mock.mock(new RegExp('/api/admin/sys/user/logout'), () => {
       return successResponseWrap(null);
     });
 
     // 用户的服务端菜单
-    Mock.mock(new RegExp('/api/user/menu'), () => {
-      const menuList = [
-        {
-          path: '/dashboard',
-          name: 'dashboard',
-          meta: {
-            locale: 'menu.server.dashboard',
-            requiresAuth: true,
-            icon: 'icon-dashboard',
-            order: 1,
-          },
-          children: [
-            {
-              path: 'workplace',
-              name: 'Workplace',
-              meta: {
-                locale: 'menu.server.workplace',
-                requiresAuth: true,
-              },
-            },
-            {
-              path: 'https://arco.design',
-              name: 'arcoWebsite',
-              meta: {
-                locale: 'menu.arcoWebsite',
-                requiresAuth: true,
-              },
-            },
-          ],
-        },
-      ];
-      return successResponseWrap(menuList);
+    Mock.mock(new RegExp('/api/admin/sys/user/get_menu'), () => {
+      return successResponseWrap({
+        userId: 1,
+        privileges: menus,
+      });
     });
   },
 });

src/router/guard/userLoginInfo.ts

@@ -14,25 +14,11 @@ export default function setupUserLoginInfoGuard(router: Router) {
     if (userStore.accessToken) {
       next();
     } else {
-      if (to.name === 'Login') {
-        next();
-        return;
-      }
-      const paramDomainCode = window.sessionStorage.getItem('paramDomainCode');
-      if (paramDomainCode) {
-        next({ name: 'Login', query: { code: paramDomainCode } });
-        return;
-      }
-
-      const routeDomainCode = window.sessionStorage.getItem('routeDomainCode');
-      if (routeDomainCode) {
-        next({ name: 'Login', params: { code: routeDomainCode } });
-        return;
-      }
-
-      next({
-        name: 'Login',
-      });
+      // TODO:开发放开
+      next();
+      // next({
+      //   name: 'Login',
+      // });
     }
   });
 }

src/store/modules/user/index.ts

@@ -1,5 +1,4 @@
 import { defineStore } from 'pinia';
-import ls from '@/utils/storage';
 import { removeRouteListener } from '@/utils/route-listener';
 import { userLogout } from '@/api/user';
 import { UserState } from './types';
@@ -8,25 +7,13 @@ const useUserStore = defineStore('user', {
   state: (): UserState => ({
     id: undefined,
     loginName: undefined,
-    realName: undefined,
+    name: undefined,
     sessionId: undefined,
     accessToken: undefined,
-    schoolInfo: [],
-    curSchoolInfo: {},
-    orgInfo: {},
-    roleList: [],
-    role: [],
-    time: undefined,
-    appSource: undefined,
-    pwdCount: undefined,
-    userLoginCheckResult: {
-      userId: undefined,
-      mobileNumber: undefined,
-      pwdCount: undefined,
+    categoryInfo: {
+      name: undefined,
+      categoryId: undefined,
     },
-    roleSource: [],
-    returnUrl: undefined,
-    version: undefined,
   }),
 
   getters: {
@@ -49,13 +36,6 @@ const useUserStore = defineStore('user', {
       this.resetInfo();
       removeRouteListener();
 
-      const returnUrl = ls.get('returnUrl');
-      if (returnUrl) {
-        window.location.href = returnUrl;
-        return;
-      }
-
-      ls.clear();
       window.location.reload();
     },
   },

src/store/modules/user/types.ts

@@ -1,42 +1,11 @@
-export interface UserSchoolInfoType {
-  id: string;
-  code: string;
-  name: string;
-  logo: string;
-}
-export interface UserOrgInfoType {
-  id: string;
-  code: string;
-  name: string;
-}
-export interface UserRoleSourceType {
-  roleId: string;
-  roleName: string;
-  roleCode: string;
-  roleSource: string;
-}
-
 export interface UserState {
   id: string;
   loginName: string;
-  realName: string;
+  name: string;
   sessionId: string;
   accessToken: string;
-  schoolInfo: UserSchoolInfoType[];
-  curSchoolInfo?: UserSchoolInfoType;
-  orgInfo?: UserOrgInfoType;
-  roleList: string[];
-  role: string[];
-  time: number;
-  appSource: string;
-  pwdCount: number;
-  userLoginCheckResult: {
-    userId: string;
-    mobileNumber: string;
-    pwdCount: number;
+  categoryInfo?: {
+    name: string;
+    categoryId: string;
   };
-  roleSource: UserRoleSourceType[];
-  returnUrl: string | null;
-  version: string;
-  uiSetting?: null;
 }

src/utils/setup-mock.ts

@@ -7,17 +7,19 @@ export default ({ mock, setup }: { mock?: boolean; setup: () => void }) => {
 export const successResponseWrap = (data: unknown) => {
   return {
     data,
-    status: 'ok',
-    msg: '请求成功',
-    code: 20000,
+    message: '请求成功',
+    code: 200,
   };
 };
 
-export const failResponseWrap = (data: unknown, msg: string, code = 50000) => {
+export const failResponseWrap = (
+  data: unknown,
+  message: string,
+  code = 501
+) => {
   return {
     data,
-    status: 'fail',
-    msg,
+    message,
     code,
   };
 };

src/views/admin/index.vue

@@ -22,7 +22,7 @@
     <div class="home-navs">
       <div class="head-logo">
         <div class="head-logo-content">
-          <h1>知学知考</h1>
+          <h1>预约报名系统</h1>
         </div>
       </div>
       <a-menu

src/views/login/login/index.vue

@@ -1,10 +1,9 @@
 <template>
   <div class="login login-box">
-    <div class="login-theme"><h2>知学知考</h2></div>
+    <div class="login-theme"><h2>预约报名系统</h2></div>
     <div class="login-body" @keyup.enter="submit">
       <div class="login-title">
-        <img v-if="schoolInfo.logo" :src="schoolInfo.logo" alt="学校logo" />
-        <h1 v-else>知学知考</h1>
+        <h1> 登录 </h1>
       </div>
       <div class="login-form">
         <a-form
@@ -14,81 +13,29 @@
           :label-col-props="{ span: 0, offset: 0 }"
           :wrapper-col-props="{ span: 24, offset: 0 }"
         >
-          <!-- account -->
-          <template v-if="IS_USERNAME_TYPE">
-            <a-form-item field="loginName">
-              <a-input
-                v-model.trim="formData.loginName"
-                placeholder="请输入账号"
-                allow-clear
-              >
-                <template #prefix>
-                  <icon-user />
-                </template>
-              </a-input>
-            </a-form-item>
-            <a-form-item field="password">
-              <a-input-password
-                v-model.trim="formData.password"
-                placeholder="请输入密码"
-                allow-clear
-              >
-                <template #prefix>
-                  <icon-lock />
-                </template>
-              </a-input-password>
-            </a-form-item>
-            <a-form-item v-if="schoolInfo.accountSmsVerify" field="code">
-              <div class="box-justify">
-                <a-input
-                  v-model.trim="formData.code"
-                  placeholder="请输入手机验证码"
-                  allow-clear
-                >
-                  <template #prefix>
-                    <icon-message />
-                  </template>
-                </a-input>
-                <a-button
-                  type="primary"
-                  :disabled="isFetchingCode"
-                  @click="fetchAccountSmsCode"
-                  >{{ codeContent }}</a-button
-                >
-              </div>
-            </a-form-item>
-          </template>
-          <!-- mobile -->
-          <template v-else>
-            <a-form-item field="mobileNumber">
-              <a-input
-                v-model.trim="formData.mobileNumber"
-                placeholder="请输入手机号"
-                allow-clear
-              >
-                <template #prefix> <icon-mobile /> </template>
-              </a-input>
-            </a-form-item>
-            <a-form-item field="code">
-              <div class="box-justify">
-                <a-input
-                  v-model.trim="formData.code"
-                  placeholder="请输入手机验证码"
-                  allow-clear
-                >
-                  <template #prefix>
-                    <icon-message />
-                  </template>
-                </a-input>
-                <a-button
-                  type="primary"
-                  :disabled="isFetchingCode"
-                  @click="fetchMobileSmsCode"
-                  >{{ codeContent }}</a-button
-                >
-              </div>
-            </a-form-item>
-          </template>
+          <a-form-item field="loginName">
+            <a-input
+              v-model.trim="formData.loginName"
+              placeholder="请输入账号"
+              allow-clear
+            >
+              <template #prefix>
+                <icon-user />
+              </template>
+            </a-input>
+          </a-form-item>
+          <a-form-item field="password">
+            <a-input-password
+              v-model.trim="formData.password"
+              placeholder="请输入密码"
+              allow-clear
+            >
+              <template #prefix>
+                <icon-lock />
+              </template>
+            </a-input-password>
+          </a-form-item>
+
           <a-form-item>
             <a-button type="primary" :loading="loading" long @click="submit"
               >登录</a-button
@@ -96,66 +43,28 @@
           </a-form-item>
         </a-form>
       </div>
-      <div v-if="schoolInfo.phoneLogin" class="login-action box-justify">
-        <div></div>
-        <a-button type="text" @click="switchLoginType">
-          <i>{{ switchBtnName }}</i>
-          <icon-right />
-        </a-button>
-      </div>
     </div>
-
-    <!-- ResetPwd -->
-    <ResetPwd
-      ref="ResetPwdRef"
-      :user-info="userInfo"
-      @modified="resetPwdSuccess"
-      @cancel="resetCancel"
-    />
   </div>
 </template>
 
 <script lang="ts" setup>
-  import { ref, reactive, computed, onMounted } from 'vue';
-  import { Message } from '@arco-design/web-vue';
-  import { useRoute, useRouter } from 'vue-router';
+  import { ref, reactive, onMounted } from 'vue';
+  import { useRouter } from 'vue-router';
   import type { FormInstance, FieldRule } from '@arco-design/web-vue/es/form';
-  import { omit } from 'lodash';
   import useLoading from '@/hooks/loading';
-  import useSms from '@/hooks/sms';
-  import {
-    login,
-    getSchoolInfo,
-    getAccountSmsCode,
-    getSmsCode,
-  } from '@/api/user';
-  import { getBase64 } from '@/utils/crypto';
-  import { smscode, phone } from '@/utils/formRules';
-  import { getOrgCode } from '@/constants/app';
+  import { login } from '@/api/user';
   import { useAppStore, useUserStore } from '@/store';
   import { DEFAULT_ROUTE_NAME } from '@/router/constants';
 
-  import type { SchoolInfoRes } from '@/api/types/user';
-
-  import ResetPwd from './ResetPwd.vue';
-
-  const route = useRoute();
   const router = useRouter();
   const appStore = useAppStore();
   const userStore = useUserStore();
   userStore.resetInfo();
 
-  const userInfo = ref({});
-  const schoolInfo = ref<SchoolInfoRes>({});
   const formRef = ref<FormInstance>();
-  const ResetPwdRef = ref(null);
   const formData = reactive({
     loginName: 'admin-zj',
     password: 'a12345678',
-    code: '',
-    mobileNumber: '',
-    schoolCode: 'test-school-2',
-    type: 'ACCOUNT',
   });
   const rules: Record<string, FieldRule[]> = {
     loginName: [
@@ -170,125 +79,8 @@
         message: '请输入密码',
       },
     ],
-    code: smscode,
-    mobileNumber: phone,
-    schoolCode: [
-      {
-        required: true,
-        message: '学校编码缺失',
-      },
-    ],
   };
 
-  const IS_USERNAME_TYPE = computed(() => {
-    return formData.type === 'ACCOUNT';
-  });
-  const switchBtnName = computed(() => {
-    return formData.type === 'ACCOUNT' ? '短信登录' : '账号登录';
-  });
-
-  async function getSchool() {
-    if (route.params.code) {
-      formData.schoolCode = route.params.code;
-      window.sessionStorage.setItem('routeDomainCode', route.params.code);
-    } else {
-      formData.schoolCode = getOrgCode();
-    }
-    const data = await getSchoolInfo(formData.schoolCode);
-    appStore.setInfo({ version: data.version || '' });
-    formData.schoolCode = data.schoolCode;
-    schoolInfo.value = data;
-  }
-
-  function switchLoginType() {
-    if (!schoolInfo.value.phoneLogin) return;
-    formData.type = formData.type === 'ACCOUNT' ? 'PHONE' : 'ACCOUNT';
-  }
-
-  function resetPwdSuccess(data) {
-    if (data.schoolInfo && data.schoolInfo.length) {
-      const curSchool = data.schoolInfo.find(
-        (item) => item.code === formData.schoolCode
-      );
-      data.curSchoolInfo = curSchool || {};
-    }
-    userStore.setInfo(data);
-
-    if (data.roleList && data.roleList.includes('ADMIN')) {
-      router.push({
-        name: 'SelectSchool',
-      });
-    } else {
-      router.push({
-        name: 'Home',
-      });
-    }
-  }
-
-  function resetCancel() {
-    userStore.resetInfo();
-  }
-
-  /* sms  ----start */
-  const { isFetchingCode, codeContent, changeContent } = useSms('login');
-
-  async function fetchMobileSmsCode() {
-    const unvalid = await formRef.value.validateField([
-      'mobileNumber',
-      'schoolCode',
-    ]);
-    if (unvalid) return;
-
-    isFetchingCode.value = true;
-    const res = await getSmsCode({
-      schoolCode: formData.schoolCode,
-      mobileNumber: formData.mobileNumber,
-    }).catch(() => {
-      isFetchingCode.value = false;
-    });
-    if (!res) return;
-
-    if (res.mobileNumber) {
-      Message.success(
-        `已向手机尾号【${res.mobileNumber.slice(
-          -4
-        )}】成功发送短信，请在2分钟内进行验证！`
-      );
-      changeContent();
-    } else {
-      Message.error('未绑定手机号，请先绑定！');
-    }
-  }
-
-  async function fetchAccountSmsCode() {
-    const unvalid = await formRef.value.validateField([
-      'loginName',
-      'schoolCode',
-      'password',
-    ]);
-    if (unvalid) return;
-
-    isFetchingCode.value = true;
-    const res = await getAccountSmsCode({
-      schoolCode: formData.schoolCode,
-      loginName: formData.loginName,
-      password: getBase64(formData.password),
-    }).catch(() => {
-      isFetchingCode.value = false;
-    });
-    if (!res) return;
-
-    if (res) {
-      Message.success(
-        `已向手机尾号【${res.slice(-4)}】成功发送短信，请在2分钟内进行验证！`
-      );
-      changeContent();
-    } else {
-      Message.error('未绑定手机号！');
-    }
-  }
-  /* sms  ----end */
-
   /* submit */
   const { loading, setLoading } = useLoading();
   async function submit() {
@@ -296,61 +88,22 @@
     if (err) return;
 
     setLoading(true);
-    let datas = {};
-    if (IS_USERNAME_TYPE.value) {
-      datas = omit(
-        formData,
-        schoolInfo.value.accountSmsVerify
-          ? ['mobileNumber']
-          : ['code', 'mobileNumber']
-      );
-      datas.password = getBase64(formData.password);
-    } else {
-      datas = omit(formData, ['loginName', 'password']);
-    }
-    const data = await login(datas).catch(() => {});
+    const data = await login(formData).catch(() => {});
     setLoading(false);
     if (!data) return;
 
-    if (data.schoolInfo && data.schoolInfo.length) {
-      const curSchool = data.schoolInfo.find(
-        (item) => item.code === formData.schoolCode
-      );
-      data.curSchoolInfo = curSchool || {};
-    }
-    userStore.setInfo(data);
+    console.log(data);
 
-    // 强制修改密码和绑定手机号
-    if (
-      data.userLoginCheckResult &&
-      (!data.userLoginCheckResult.pwdCount ||
-        (!data.userLoginCheckResult.mobileNumber &&
-          schoolInfo.value.phoneLogin))
-    ) {
-      userInfo.value = {
-        ...formData,
-        ...data.userLoginCheckResult,
-        phoneLogin: schoolInfo.value.phoneLogin,
-      };
-      ResetPwdRef.value?.open();
-      return;
-    }
+    userStore.setInfo(data);
 
-    if (data.roleList && data.roleList.includes('ADMIN')) {
-      router.push({
-        name: 'SchoolSelect',
-      });
-    } else {
-      router.push({
-        name: DEFAULT_ROUTE_NAME,
-      });
-    }
+    router.push({
+      name: DEFAULT_ROUTE_NAME,
+    });
   }
 
   // mounted
   onMounted(() => {
     userStore.resetInfo();
     appStore.resetInfo();
-    getSchool();
   });
 </script>