From 269c3d89d63cbd38800247145131114eaf196454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B9=E8=AF=9A=E8=AF=9A?= <ycc@hainatravel.com>
Date: Mon, 26 Sep 2022 14:26:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=A1=E7=94=A8=E5=8D=A1=E8=B4=A6=E5=8D=95?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.js                  | 20 ++++++++++++++------
 src/stores/CustomerStore.js |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/App.js b/src/App.js
index 9506f19..c990e07 100644
--- a/src/App.js
+++ b/src/App.js
@@ -6,6 +6,9 @@ import {
     DashboardOutlined,
     FileProtectOutlined,
     CustomerServiceTwoTone,
+    DollarOutlined,
+    AreaChartOutlined,
+    WechatOutlined,
     UserOutlined
 } from '@ant-design/icons';
 import {Layout, Menu, Image, Spin} from 'antd';
@@ -34,10 +37,15 @@ const App = () => {
 
     const menu_items = [
         {key: 1, label: <NavLink to="/">主页</NavLink>, icon: <HomeOutlined/>},
-        {key: 2, label: <NavLink to="/orders">订单数据</NavLink>, icon: <FileProtectOutlined/>,},
-        {key: 5, label: <NavLink to="/dashboard">仪表盘</NavLink>, icon: <DashboardOutlined/>},
         {
-            key: 3, label: '客运', icon: <CustomerServiceTwoTone/>,
+            key: 2, label: '市场', icon: <AreaChartOutlined/>,
+            children: [
+                {key: 21, label: <NavLink to="/orders">订单数据</NavLink>, icon: <FileProtectOutlined/>,},
+                {key: 22, label: <NavLink to="/dashboard">仪表盘</NavLink>, icon: <DashboardOutlined/>},
+            ]
+        },
+        {
+            key: 3, label: '客运', icon: <WechatOutlined/>,
             children: [
                 {key: 31, label: <NavLink to="/customer_care_potential">潜力客户</NavLink>},
                 {key: 32, label: <NavLink to="/customer_care_regular">老客户</NavLink>},
@@ -49,7 +57,7 @@ const App = () => {
         {
             key: 4,
             label: '财务',
-            icon: <TeamOutlined/>,
+            icon: <DollarOutlined/>,
             children: [
                 {key: 41, label: <NavLink to="/credit_card_bill">信用卡账单</NavLink>},
             ]
@@ -68,7 +76,7 @@ const App = () => {
                 <Sider collapsible={false} defaultCollapsed={false} breakpoint="lg"
                        collapsedWidth="0">
                     <Image src={Logo} preview={false}/>
-                    <Menu theme="dark" defaultSelectedKeys={['1']} defaultOpenKeys={['3']} mode="inline"
+                    <Menu theme="dark" defaultSelectedKeys={['1']} defaultOpenKeys={['2', '3','4']} mode="inline"
                           items={menu_items}/>
                 </Sider>
                 <Layout className="site-layout">
@@ -78,7 +86,7 @@ const App = () => {
                     }}>
                         <Routes>
                             <Route path="/" element={<Home/>}/>
-                            <Route element={<ProtectedRoute auth={['admin', 'director_bu']}/>}>
+                            <Route element={<ProtectedRoute auth={['admin', 'director_bu', 'marketing']}/>}>
                                 <Route path="/orders" element={<Orders/>}/>
                                 <Route path="/orders_sub/:ordertype/:ordertype_sub/:ordertype_title"
                                        element={<Orders_sub/>}/>
diff --git a/src/stores/CustomerStore.js b/src/stores/CustomerStore.js
index 7f97e75..2044ac8 100644
--- a/src/stores/CustomerStore.js
+++ b/src/stores/CustomerStore.js
@@ -154,7 +154,7 @@ class CustomerStore {
     inchina_customer_order(get_detail = false) {
         this.inchina_data.loading = true;
         const date_picker_store = this.rootStore.date_picker_store;
-        let url = '/service-tourdesign/RegularCusOrder'
+        let url = '/service-tourdesign/RegularCusInChinaOrder'
         url += '?Website=' + this.inchina_data.webcode + '&DEI_SNList=' + this.inchina_data.groups.toString();
         if (this.inchina_data.date_type == 'applyDate') {
             url += '&ApplydateCheck=1&EntrancedateCheck=0';