init:修复一些bug

platform/base/mock/user.ts

@@ -39,23 +39,9 @@ export default [
  url: `/mock/user/info`,
  method: 'post',
  response: ({ body }) => {
- const { token } = body
- const info = users.find(user => {
- return user.token === token
- }).info
- if (info) {
- return {
- code: 200,
- data: {
- info: info
- },
- };
- } else {
- return {
- code: 403,
- data: {},
- msg: '无访问权限'
- };
+ return {
+ code: 200,
+ data: users[0],
  }
  
  }

platform/base/src/main.ts

@@ -1,6 +1,5 @@
 import { createApp,App as Vue } from 'vue'
 import ElementPlus from 'element-plus'
-console.log(store.state.user.token)
 // import 'virtual:svg-icons-register'
 import 'element-plus/lib/theme-chalk/index.css'
 import 'element-plus/lib/theme-chalk/display.css' // 引入基于断点的隐藏类
@@ -9,17 +8,13 @@ import './assets/style/common.scss' // 公共css
 import './theme/modules/chinese/index.scss'
 import { ElMessage } from "element-plus";
 import App from './App.vue'
-console.log(store.state.user.token)
 import store from './store'
 import router from './router'
 import md5 from 'js-md5';
 import i18n from './locale'
-console.log(store.state.user.token)
 import SvgIcon from './components/svgIcon.vue'
 import draggable from 'vuedraggable'
 import {renderWithQiankun,qiankunWindow,QiankunProps} from "vite-plugin-qiankun/dist/helper"
-import app from "@/store/modules/app";
-console.log(store.state.user.token)
 let instance:any = null
 const render = (props:QiankunProps={})=>{
  const {container} = props
@@ -58,7 +53,7 @@ const initQianKun = ()=>{
 
 qiankunWindow.__POWERED_BY_QIANKUN__ ? initQianKun() : render()
 console.log('__POWERED_BY_QIANKUN__：',qiankunWindow.__POWERED_BY_QIANKUN__);
-export function mount(props){
+export function mount(props:any){
  console.log('基座下发的能力：', props);
  render(props)
  // return new Promise(((resolve, reject) => {

platform/base/src/router/index.ts

@@ -43,8 +43,7 @@ const asyncRoutes: RouteRecordRaw[] = [
  ...Component,
  ...Pages,
  ...SystemManage,
- ...Print,
- ...routess
+ ...Print
 ];
 // 动态路由的权限新增，供登录后调用
 export async function addRoutes() {

platform/base/src/router/modules/system.ts

@@ -27,14 +27,14 @@ const route = [
  },
  ],
  },
+ // {
+ // path: "/login",
+ // component: createNameComponent(() => import("@/views/system/login.vue")),
+ // hideMenu: true,
+ // meta: { title: "message.system.login", hideTabs: true },
+ // },
  {
  path: "/login",
- component: createNameComponent(() => import("@/views/system/login.vue")),
- hideMenu: true,
- meta: { title: "message.system.login", hideTabs: true },
- },
- {
- path: "/userlogin",
  component: createNameComponent(() => import("@/views/system/userLogin.vue")),
  hideMenu: true,
  meta: { title: "message.system.login", hideTabs: true },

platform/base/src/store/index.ts

@@ -18,7 +18,6 @@ Object.keys(files).forEach((c: string) => {
  const moduleName: string = c.replace(/^\.\/(.*)\/(.*)\.\w+$/, "$2");
  modules[moduleName] = module;
 });
-
 // 这是一个vuex本地存储插件，默认把vuex所有数据都做存储了
 // local代表存储在localStorage里面，进行永久存储
 // session代表存储在sessionStorage里面，进行临时存储
@@ -32,7 +31,6 @@ const persistent = Persistent({
  session: [],
  },
 });
-
 export default createStore<RootState>({
  modules: {
  ...modules,
@@ -40,3 +38,4 @@ export default createStore<RootState>({
  strict: debug,
  plugins: debug ? [createLogger(), persistent] : [persistent],
 });
+console.log(modules.user.token)

platform/base/src/store/modules/user.ts

@@ -1,4 +1,4 @@
-import { loginApi, getInfoApi, loginOutApi } from "@/api/user";
+import {loginApi, getInfoApi, loginOutApi, login} from "@/api/user";
 import { ActionContext } from "vuex";
 
 export interface userState {
@@ -21,7 +21,6 @@ const getters = {
 // mutations
 const mutations = {
  tokenChange(state: userState, token: string) {
- debugger
  state.token = token;
  },
  infoChange(state: userState, info: object) {
@@ -37,8 +36,7 @@ const actions = {
  params: any
  ) {
  return new Promise((resolve, reject) => {
- debugger
- loginApi(params)
+ login(params)
  .then((res) => {
  console.log(res)
  commit("tokenChange", res.data.token);
@@ -53,7 +51,6 @@ const actions = {
  },
  // get user info after user logined
  getInfo({ commit }: ActionContext<userState, userState>, params: any) {
- debugger
  return new Promise((resolve, reject) => {
  getInfoApi(params).then((res) => {
  commit("infoChange", res.data.info);

platform/base/src/views/system/userLogin.vue

@@ -235,6 +235,8 @@ import banner from "@/assets/images/banner.png";
 import {login} from "@/api/user";
 import router, {addRoutes} from "@/router";
 import {RouteLocationRaw, useRoute} from "vue-router";
+import {ElMessage} from "element-plus";
+import store from "@/store";
 // import verify from './verify.png'
 export default defineComponent({
  components: {
@@ -353,7 +355,6 @@ export default defineComponent({
  const isMssages: any = ref(false)
  const setState = (state: Boolean) => {
  isLogin.value = state
- console.log(isLogin)
  }
  const setMssages = (state: Boolean) => {
  isMssages.value = state
@@ -365,21 +366,27 @@ export default defineComponent({
  formWrap.validate((valid: boolean) => {
  console.log(valid)
  if (valid) {
- login({
- type: "user",
- password: formSubmit.form.password,
- name: formSubmit.form.name,
- // code: formSubmit.register.code
- }).then(async (res: any) => {
- console.log(res)
- await addRoutes();
- await router.push(
- (route.query.redirect as RouteLocationRaw) || "/"
- );
- })
+ store
+ .dispatch("user/login", {
+ type: "user",
+ password: formSubmit.form.password,
+ name: formSubmit.form.name,
+ // code: formSubmit.register.code
+ })
+ .then(async () => {
+ ElMessage.success({
+ message: "登录成功",
+ type: "success",
+ showClose: true,
+ duration: 1000,
+ });
+ await addRoutes();
+ await router.push(
+ (route.query.redirect as RouteLocationRaw) || "/"
+ );
+ })
  }
  })
- console.log(11111111)
  }
  const submitForm = (formEl: InstanceType<typeof ElForm> | undefined) => {
  if (!formEl) return