merge

src/pages/login/login.vue

@@ -120,10 +120,6 @@ export default {
       }
     },
     wechatLogin() {
-<<<<<<< HEAD
-      if (this.$route.query.t) { return false }
-=======
->>>>>>> 692bee4e3ffffd3425e9f36018cd8a7d9adaa976
       const appId = 'wx451c01d40d090d7a'
       // 回调地址
       const redirectURI = `https://passport.ezijing.com/rest/wechat/oauth-callback?needCheck=false&identity=transport&redirectUrl=${window.location.href}`
@@ -141,13 +137,6 @@ export default {
       )
     }
   },
-<<<<<<< HEAD
-  created() {
-    if (this.isWechat) {
-      this.redirectUrl = `${window.location.origin}/login?t=1`
-      this.wechatLogin()
-    }
-=======
   beforeMount() {
     this.$store.dispatch('checkLogin').then(isLogin => {
       if (isLogin) {
@@ -158,7 +147,6 @@ export default {
         }
       }
     })
->>>>>>> 692bee4e3ffffd3425e9f36018cd8a7d9adaa976
   }
 }
 </script>