合并冲突

2020-06-15 10:00:43 +08:00
parent 3903a7f31b 204ea408b8
commit 4c076bbe2f
18 changed files with 396 additions and 116 deletions
--- a/pages/authorization/index.vue
+++ b/pages/authorization/index.vue
@ -52,7 +52,7 @@ export default {
  },
  methods: {
    ...mapActions(["changeAuthorization", "setUserInfo"]),
-    ...mapMutations(["UPDATE_AUTHORIZATIONPAGE", "CHANGE_TABTAR"]),
+    ...mapMutations(["updateAuthorizationPage",]),
    
    back() {
      this.$yrouter.switchTab({