Merge branch 'master' of https://gitlab.ezijing.com/ezijing/transport-weapp-h5

src/pages/login/login.vue

@@ -124,8 +124,12 @@ export default {
     },
     wechatLogin() {
       const appId = 'wxc6044475caf2805a'
+      const wechatRedirectURL =
+        webConf.isDev === 'production'
+          ? 'https://passport.ezijing.com'
+          : 'https://passport2.ezijing.com'
       // 回调地址
-      const redirectURI = `https://passport.ezijing.com/rest/wechat/oauth-callback?needCheck=false&identity=transport&redirectUrl=${window.location.href}`
+      const redirectURI = `${wechatRedirectURL}/rest/wechat/oauth-callback?needCheck=false&identity=transport&redirectUrl=${window.location.href}`
       // 微信的地址
       const wechatUrl = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appId}&redirect_uri=${encodeURIComponent(
         redirectURI
@@ -141,6 +145,7 @@ export default {
     }
   },
   created() {
+    console.log(process.env, webConf)
     this.$store.dispatch('checkLogin').then(isLogin => {
       if (isLogin) {
         this.loginSuccess({ code: 0, data: { TGC: Cookies.get('TGC') } }, 1)