合并冲突

This commit is contained in:
gaoxs
2020-06-09 09:40:35 +08:00
14 changed files with 134 additions and 53 deletions

View File

@ -53,6 +53,7 @@ export default {
methods: {
...mapActions(["changeAuthorization", "setUserInfo"]),
...mapMutations(["UPDATE_AUTHORIZATIONPAGE", "CHANGE_TABTAR"]),
back() {
this.$yrouter.switchTab({
path: "/pages/home/index",