merge: 解决冲突

src/components/AuthButton/index.tsx

@@ -17,10 +17,9 @@ const AuthButton = (props: AuthButtonProps) => {
   } = props
   const userBtn = require('../../../config/router.config.json')
   const path = menuCode.split(".")[0];
-<<<<<<< HEAD
-  let AuthRoutes = userBtn.filter((item: any) => item.path === `/${path}`);
-  let AuthButton = AuthRoutes[0].routes;
-  let AuthCode: any = [];
+  const AuthRoutes = userBtn.filter((item: any) => item.path === `/${path}`);
+  const AuthButton = AuthRoutes[0].routes;
+  const AuthCode: any = [];
   for (let i = 0; i < AuthButton.length; i++) {
     if (AuthButton[i].btns.length != 0) {
       for (let j = 0; j < AuthButton[i].btns.length; j++) {
@@ -29,13 +28,6 @@ const AuthButton = (props: AuthButtonProps) => {
           break;
         }
       }
-=======
-  const AuthButton = userBtn.filter((item: any) => item.path === `/${path}`);
-  const AuthUrl = AuthButton[0].routes.filter((item: any) => item.path === "/commodity/productWillCheck")
-  AuthUrl[0].btn = [
-    {
-      btnCode: 'commodity.productWillCheck1',
->>>>>>> 12bba00593096a8c67d8a47bdffaac8cf09b1daa
     }
   }
   console.log(AuthCode, 'AuthCode');