Merge branch 'develop' into release-test

@@ -45,25 +45,13 @@ watch(
 
 
       }
       }
     }
     }
-    // isExist.length == 0 && list.push(newRouter);
-    // list.map(item => {
-    //   if (combPath == 'app-scenes') {
-    //     item.visible = item.fullPath == '/'
-    //   } else {
-    //     if (item.fullPath.split('/')?.[1] != combPath) {
-    //       item.visible = false
-    //     } else {
-    //       item.visible = true
-    //     }
-    //   }
-    // })
+    list.map(item => {
+      item.fullPath = decodeURIComponent(item.fullPath);
+    })
     tabbarList.value = list;
     tabbarList.value = list;
     tabbarActive.value = decodeURIComponent(newRouter.fullPath);
     tabbarActive.value = decodeURIComponent(newRouter.fullPath);
     userStore.setTabbar(tabbarList.value);
     userStore.setTabbar(tabbarList.value);
     userStore.setActiveTabbar(combPath, newRouter.fullPath);
     userStore.setActiveTabbar(combPath, newRouter.fullPath);
-    // nextTick(() => {
-    //   setTabVisible()
-    // })
   },
   },
   { immediate: true }
   { immediate: true }
 );
 );