fujunwen 4 anni fa
parent
commit
da32f849df
1 ha cambiato i file con 0 aggiunte e 4 eliminazioni
  1. 0 4
      src/router/index.js

+ 0 - 4
src/router/index.js

@@ -180,9 +180,6 @@ router.beforeEach(async (to, from, next) => {
         return
     }
 })
-<<<<<<< HEAD
-export default router
-=======
 // 跳入路由后要对发送pvuv
 router.afterEach((to) => {
     let postParams = {
@@ -240,4 +237,3 @@ function redirectGetToken (to) {
     window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
 }
 export default router
->>>>>>> 46b8e1caa12ddc83e38b76b912561997fcec7064