Merge remote-tracking branch 'origin/dev' into dev

张含笑

2025-07-21 369043d09aa7922764818094886ef2b4e5e822af

Merge remote-tracking branch 'origin/dev' into dev

 src/page/index/top/index.vue

@@ -103,10 +103,8 @@
      }).then(() => {
        this.$store.dispatch('LogOut').then(() => {
        const env = import.meta.env.VITE_APP_ENV
          console.log(env);
          const adminUrl = import.meta.env.VITE_APP_DASHBOARD_URL
           env === 'development' ? this.$router.push({ path: '/login' }):window.location.replace(`${adminUrl}#/login`)

        })
      })
    },

 src/store/modules/user.js

@@ -278,7 +278,12 @@
          commit('SET_MENU_ALL', menu);
          dispatch('GetButtons');
          resolve(menu);
        });
        }).catch(err =>{
          dispatch('LogOut').then(()=>{
            const adminUrl = import.meta.env.VITE_APP_DASHBOARD_URL
            window.location.replace(`${adminUrl}#/login`)
          })
        })
      });
    },
    GetButtons({ commit }) {