Merge branch 'feature/zl' into feature/wxl

src/router/index.js

@@ -79,13 +79,26 @@ const routerConfig = [
 
 router.beforeEach(async (to, from, next) => {
   headerConfigByMeta(to);
-  vueApp.$rocNative.getUserInfo &&
-    vueApp.$rocNative.getUserInfo().then((params) => {
+
+  if (vueApp.$rocNative?.getUserInfo) {
+    try {
+      const params = await vueApp.$rocNative.getUserInfo();
       delCookie('conslToken');
       setCookie('conslToken', params.userToken);
-      next();
-    });
-  // next();
+    } catch (err) {
+      console.warn('getUserInfo error:', err);
+    }
+  } else {
+    console.warn('getUserInfo method not available');
+  }
+
+  next();
+  // vueApp.$rocNative.getUserInfo &&
+  //   vueApp.$rocNative.getUserInfo().then((params) => {
+  //     delCookie('conslToken');
+  //     setCookie('conslToken', params.userToken);
+  //     next();
+  //   });
 });
 
 router.addRoutes(routerConfig);