From 6371f1e6dbfd8c1a9b02ffff4887d2572d32449c Mon Sep 17 00:00:00 2001 From: chenghongxing <1126263215@qq.com> Date: Sun, 6 Dec 2020 10:26:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=BC=82=E6=AD=A5?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E9=85=8D=E7=BD=AE=E5=85=BC=E5=AE=B9=EF=BC=9B?= =?UTF-8?q?:star:=20optimize:=20the=20configuration=20format=20of=20asynch?= =?UTF-8?q?ronous=20routing=20is=20compatible;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/routerUtil.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/utils/routerUtil.js b/src/utils/routerUtil.js index 2f46a7f..5d31ef2 100644 --- a/src/utils/routerUtil.js +++ b/src/utils/routerUtil.js @@ -50,10 +50,10 @@ function parseRoutes(routesConfig, routerMap) { component: router.component, redirect: routeCfg.redirect || router.redirect, meta: { - authority: routeCfg.authority || router.authority || '*', - icon: routeCfg.icon || router.icon, - page: routeCfg.page || router.page, - link: routeCfg.link || router.link + authority: routeCfg.authority || router.authority || routeCfg.meta?.authority || router.meta?.authority || '*', + icon: routeCfg.icon || router.icon || routeCfg.meta?.icon || router.meta?.icon, + page: routeCfg.page || router.page || routeCfg.meta?.page || router.meta?.page, + link: routeCfg.link || router.link || routeCfg.meta?.link || router.meta?.link } } if (routeCfg.invisible || router.invisible) {