冲突

ybf_admin/src/router/index.js

@@ -32,7 +32,7 @@ const router = new VueRouter({
  * 路由拦截
  * 权限验证
  */
-router.beforeEach(async (to, from, next) => {
+ router.beforeEach(async (to, from, next) => {
   // 确认已经加载多标签页数据 https://github.com/d2-projects/d2-admin/issues/201
   await store.dispatch('d2admin/page/isLoaded')
   // 确认已经加载组件尺寸设置 https://github.com/d2-projects/d2-admin/issues/198

ybf_admin/src/views/system/login/page.vue

@@ -159,7 +159,8 @@ export default {
             .then(() => {
               // 重定向对象不存在则返回顶层路径
               // this.$router.replace(this.$route.query.redirect || '/homeMain')
-              this.$router.replace(this.$route.query.redirect || '/homeMain')
+              // this.$router.replace(this.$route.query.redirect || '/homeMain')
+              this.$router.replace(this.$route.query.redirect || '/home/main')
             })
         } else {
           // 登录表单校验失败

ybf_wx/src/views/home.vue

@@ -17,8 +17,10 @@
           </div>
         </div>
       </div>
+    <button class="testButton">Test</button>
     </div>
 
+
     <div class="menus">
       <div class="menu" @click="buttonMainMarketingClick">精准营销</div>
       <div class="menu activeMenu" @click="buttonSingleMarketingClick">一对一营销侧边栏</div>
@@ -184,3 +186,12 @@ export default {
   color: lightcoral;
 }
 </style>
+
+<style scoped>
+.testButton{
+  border: 1px solid gray;
+  width: 140px;
+  font-size: 14px;
+  
+}
+</style>
\ No newline at end of file