修复物业代理

杨泽宇
1 parent dc89eaa4
Showing 5 changed files with 16 additions and 32 deletions
src/layout/menu.vue
src/pinia/modules/login.ts
src/pinia/modules/menu.ts
src/views/property/index.vue
src/views/user/login.vue
@@ -16,7 +16,7 @@ let asyncData = reactive({
   isCollapse: null
 })
 onMounted(() => {
-  asyncData.menuData = store.family.menuStore().menuList
+  asyncData.menuData = store.family.loginStore().menuList
   asyncData.isCollapse = computed(() => {
     return store.family.appStore().isCollapse
   })
@@ -13,7 +13,8 @@ interface LoginUser {
   oName?: string,
   oLogo?: string,
   userId?: number,
-  oType?: number
+  oType?: number,
+  menuList?: any[],
 }
 const id: string = 'login'
 const state: Function = () => ({
@@ -23,7 +24,8 @@ const state: Function = () =&gt; ({
   userName: '',
   organizationType: null,
   organizationName: '',
-  organizationLogo: ''
+  organizationLogo: '',
+  menuList: []
 })
 const getters = {
   getToken() {
@@ -53,6 +55,9 @@ const getters = {
   getOlogo () {
     // 当前登陆的组织logo
     return this.organizationLogo
+  },
+  getMenuList () {
+    return this.menuList
   }
 }
 const actions = {
@@ -65,10 +70,13 @@ const actions = {
     this.organizationType = obj.organizationType? obj.organizationType: obj.oType
     this.organizationLogo = obj.organizationLogo? obj.organizationLogo: obj.oLogo
   },
+  setMenuList (data: any[]) {
+    this.menuList = data
+  },
   removeToken(msg: string | null) {
     logout()
     this.token = ''
-    window.localStorage.removeItem('store-data')
+    window.localStorage.clear()
     ElMessage.success(msg || '已退出登录');
     setTimeout(() => {
       router.replace('/login')
-const id: string = 'menu'
-const state: Function = () => ({
-  menuList: []
-})
-const getters = {
-  getMenuList() {
-    return this.menuList
-  }
-}
-const actions = {
-  setMenuList (data) {
-    this.menuList = data
-  }
-}
-
-export default {
-  namespace: true,
-  actions,
-  getters,
-  state,
-  id
-}
 \ No newline at end of file
@@ -92,15 +92,13 @@ const handleStatus = async (obj) =&gt; {
  */
 const handleProxy = (obj) => {
   userProxy({ oId: obj.id }).then((res) => {
-    console.log('代理回调')
-    console.log(res)
     if (res?.data) {
       store.family.loginStore().setUserInfo(res?.data?.data);
       globalProperties.$message.success("代理成功");
       getMenu().then(() => {
         setTimeout(() => {
-          // location.href = "/";
-        }, 2000);
+          location.href = "/";
+        }, 500);
       });
     } else {
       globalProperties.$message.error("代理失败");
@@ -113,7 +111,7 @@ const handleProxy = (obj) =&gt; {
 const getMenu = async () => {
   try {
     let res = await menuData();
-    store.family.menuStore().setMenuList(res?.data?.data);
+    store.family.loginStore().setMenuList(res?.data?.data);
   } catch (e) {
     console.log(e);
   }
@@ -56,7 +56,7 @@ const submitForm = (formEl: InstanceType&lt;typeof ElForm&gt; | undefined) =&gt; {
 const getMenu = async () => {
   try {
     let res = await menuData();
-    store.family.menuStore().setMenuList(res?.data?.data);
+    store.family.loginStore().setMenuList(res?.data?.data);
   } catch (e) {
     console.log(e);
   }