Merge branch 'main' of github.com:hainatravel/GHHub

src/views/App.jsx

@@ -71,6 +71,10 @@ function App() {
     }
   }
 
+  // 地接和客服权限不同，产品管理页面也不同
+  const isProductPermitted = isPermitted(PERM_PRODUCTS_MANAGEMENT) || isPermitted(PERM_PRODUCTS_INFO_PUT)
+  const productLink = isPermitted(PERM_PRODUCTS_MANAGEMENT) ? '/products' : '/products/edit'
+
 	return (
 		<ConfigProvider locale={antdLng}
 			theme={{
@@ -110,8 +114,7 @@ function App() {
 										isPermitted(PERM_OVERSEA) ? { key: 'feedback', label: <Link to='/feedback'>{t('menu.Feedback')}</Link> } : null,
 										isPermitted(PERM_OVERSEA) ? { key: 'report', label: <Link to='/report'>{t('menu.Report')}</Link> } : null,
 										isPermitted(PERM_AIR_TICKET) ? { key: 'airticket', label: <Link to='/airticket'>{t('menu.Airticket')}</Link> } : null,
-										isPermitted(PERM_PRODUCTS_MANAGEMENT) ? { key: 'products', label: <Link to='/products'>{t('menu.Products')}</Link> } : null,
-										isPermitted(PERM_PRODUCTS_INFO_PUT) ? { key: 'products', label: <Link to='/products/edit'>{t('menu.Products')}</Link> } : null,
+										isProductPermitted ? { key: 'products', label: <Link to={productLink}>{t('menu.Products')}</Link> } : null,
 										{
 											key: 'notice',
 											label: (

src/views/products/Detail/ProductsTree.jsx

@@ -1,4 +1,5 @@
 import { createContext, useEffect, useState } from 'react';
+import { useLocation } from 'react-router-dom';
 import { Tree, Input, Divider } from 'antd';
 import { CaretDownOutlined } from '@ant-design/icons';
 import { useTranslation } from 'react-i18next';
@@ -42,7 +43,7 @@ const getParentKey = (key, tree) => {
 
 const ProductsTree = ({ onNodeSelect, ...props }) => {
   const { t } = useTranslation();
-
+  const location = useLocation();
   const isEditPage = location.pathname.includes('edit');
   const [agencyProducts, editingProduct, setEditingProduct] = useProductsStore((state) => [state.agencyProducts, state.editingProduct, state.setEditingProduct]);
   const [activeAgency] = useProductsStore((state) => [state.activeAgency]);