修改动态appid

src/router/index.js

@@ -5,7 +5,7 @@ import { constantRouterMap } from './router.config.js'
 import { checkWxmpRegister, login } from '@/api/user'
 import { title } from '@/config'
 
-const whiteList = ['/login']
+const whiteList = ['/login', '/register', '/errorPage']
 const originalPush = Router.prototype.push
 Router.prototype.push = function push(location, onResolve, onReject) {
   if (onResolve || onReject) return originalPush.call(this, location, onResolve, onReject)
@@ -54,10 +54,16 @@ router.beforeEach((to, from, next) => {
   if (urlParams.appId) {
     store.commit('SET_APP_ID', urlParams.appId)
     localStorage.setItem('appId', urlParams.appId)
+    if (localStorage.getItem('appId') && urlParams.appId !== localStorage.getItem('appId')) {
+      localStorage.removeItem('token')
+      location.reload()
+    }
   } else {
     store.commit('SET_APP_ID', localStorage.getItem('appId'))
   }
-  console.log(store.state.app.appId, 'store.state.app.appId')
+  if (!localStorage.getItem('appId') && to.path !== '/errorPage') {
+    next('/errorPage')
+  } else {
     if (to.params.type) {
       document.title = to.params.type === 'edit' ? '编辑' : '注册'
     } else {
@@ -71,7 +77,12 @@ router.beforeEach((to, from, next) => {
           if (res) {
             next()
           } else {
-          next('/register')
+            if (to.path === '/register') {
+              next()
+            } else {
+              console.log(to)
+              next({ path: '/register', query: { redirect: to.path, params: JSON.stringify(to.query) } })
+            }
           }
         })
       })
@@ -103,7 +114,6 @@ router.beforeEach((to, from, next) => {
           }
         })
       } else {
-      // 账号密码登录
         if (whiteList.includes(to.path)) {
           next()
         } else {
@@ -111,6 +121,7 @@ router.beforeEach((to, from, next) => {
         }
       }
     }
+  }
 })
 
 function getQueryParams() {

src/router/router.config.js

@@ -55,5 +55,11 @@ export const constantRouterMap = [
     name: 'register',
     component: () => import('@/views/register'),
     meta: { title: '注册', keepAlive: false }
+  },
+  {
+    path: '/errorPage',
+    name: 'errorPage',
+    component: () => import('@/views/errorPage'),
+    meta: { title: '错误', keepAlive: false }
   }
 ]

src/views/errorPage/index.vue

@@ -0,0 +1,22 @@
+<template>
+  <div>
+    <p>公众号尚未完成配置，请联系管理员！</p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "errorPage"
+}
+</script>
+
+<style scoped>
+p {
+  font-size: 14px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 80vh;
+  text-align: center;
+}
+</style>

src/views/event/index.vue

@@ -35,6 +35,16 @@
         <div>{{ address }}</div>
       </van-cell>
     </div>
+    <div class="block">
+      <van-cell title="联系人" @click="$refs.map.show = true" is-link>
+        <div>{{ address }}</div>
+      </van-cell>
+    </div>
+    <div class="block">
+      <van-cell title="联系电话" @click="$refs.map.show = true" is-link>
+        <div>{{ address }}</div>
+      </van-cell>
+    </div>
     <van-button round block @click="submit" color="linear-gradient(to right, #81B5FB, #3E92FF)">提交</van-button>
 
     <Perfect />

src/views/login/index.vue

@@ -25,7 +25,7 @@ export default {
         query: this.$route.query.params ? this.$route.query.params : ''
       }
       let path = `${location.origin}${location.pathname === '/' ? '' : location.pathname}`
-      let url = `//open.weixin.qq.com/connect/oauth2/authorize?appid=${wxId}&redirect_uri=${encodeURI(
+      let url = `//open.weixin.qq.com/connect/oauth2/authorize?appid=${this.$store.state.app.appId}&redirect_uri=${encodeURI(
         path
       )}&state=${encodeURIComponent(JSON.stringify(state))}&response_type=code&scope=snsapi_userinfo#wechat_redirect`
       console.log(url)

src/views/register/index.vue

@@ -62,9 +62,9 @@ export default {
       }
       register(params).then(res => {
         localStorage.setItem('token', res.token)
-        this.$toast.success('登录成功')
-        let path = '/'
-        this.$router.replace(path)
+        this.$toast.success('注册成功')
+        let query = this.$route.query
+        this.$router.replace({ path: query.redirect, query: query.params ? JSON.parse(query.params) : {} })
       })
     },
     getCode() {