Merge remote-tracking branch 'ruoyi-vue/master' into dev

疯狂的狮子li

2022-01-07 d9a0de20f89e61ca44be5a60d2344afafedad376

 ruoyi-ui/src/layout/components/Navbar.vue

@@ -102,7 +102,7 @@
        type: 'warning'
      }).then(() => {
        this.$store.dispatch('LogOut').then(() => {
          location.href = this.$router.options.base + '/index';
          location.href = process.env.VUE_APP_CONTEXT_PATH + "index";
        })
      }).catch(() => {});
    }