merge

router/index.js

@@ -22,9 +22,9 @@ const router = createRouter({
 //全局路由前置守卫
 router.beforeEach((to, from, next) => {
 	if(to.name === 'Auth' && store.getters.getToken != '' && uni.getStorageSync('token') != ''){
-		if(store.getters.getIsNew === 0 && uni.getStorageSync('isnew') === 0){
+		if(store.getters.getIsNew === 0 || uni.getStorageSync('isnew') === 0){
 			next({
-				name: 'Role',
+				name: 'AuthRole',
 				NAVTYPE: 'replace'
 			})
 			return