合并冲突

2020-06-09 09:40:35 +08:00
parent 391055e68a b23f9a2272
commit 3903a7f31b
14 changed files with 134 additions and 53 deletions
--- a/pages/authorization/index.vue
+++ b/pages/authorization/index.vue
@ -53,6 +53,7 @@ export default {
  methods: {
    ...mapActions(["changeAuthorization", "setUserInfo"]),
    ...mapMutations(["UPDATE_AUTHORIZATIONPAGE", "CHANGE_TABTAR"]),
+    
    back() {
      this.$yrouter.switchTab({
        path: "/pages/home/index",