diff --git a/README.md b/README.md
index 9ff40f3..885d2c2 100644
--- a/README.md
+++ b/README.md
@@ -7,27 +7,29 @@ Global Highlights Hub 海外供应商平台
2. 运行开发环境:npm run dev 或者 start.bat
3. 打包代码:npm run build 或者 build.bat
+// "push:tag": "npm version patch && git push origin master",
+
## 相关文档
-需求文档 https://www.kdocs.cn/l/csZrIZlpuF2i
-dayjs https://dayjs.gitee.io/docs/zh-CN/manipulate/start-of
-antd https://ant-design.antgroup.com/components/upload-cn#uploadfile
-反馈表案例 https://www.chinahighlights.com/customerservice/feedback/PostTourSurveyFormToWLGH.asp?LGC=1&COLI_SN=988185&MEI_SN=954295&Email=jennroth18@hotmail.com&ToC=0&ShowType=&page_class=4&dei_sn=28&country=30,490
-国内供应商平台 http://p.mycht.cn/index.aspx
-文档预览 https://github.com/cyntler/react-doc-viewer
-wps的文档预览 https://wwo.wps.cn/docs/front-end/introduction/quick-start
-pdf生成 https://github.com/ivmarcos/react-to-pdf
-react-pdf https://react-pdf.org
+需求文档 https://www.kdocs.cn/l/csZrIZlpuF2i
+dayjs https://dayjs.gitee.io/docs/zh-CN/manipulate/start-of
+antd https://ant-design.antgroup.com/components/upload-cn#uploadfile
+反馈表案例 https://www.chinahighlights.com/customerservice/feedback/PostTourSurveyFormToWLGH.asp?LGC=1&COLI_SN=988185&MEI_SN=954295&Email=jennroth18@hotmail.com&ToC=0&ShowType=&page_class=4&dei_sn=28&country=30,490
+国内供应商平台 http://p.mycht.cn/index.aspx
+文档预览 https://github.com/cyntler/react-doc-viewer
+wps的文档预览 https://wwo.wps.cn/docs/front-end/introduction/quick-start
+pdf生成 https://github.com/ivmarcos/react-to-pdf
+react-pdf https://react-pdf.org
## 阿里云OSS
-Bucket 名称:global-highlights-hub
-Endpoint:oss-cn-hongkong.aliyuncs.com
-global-highlights-hub.oss-cn-hongkong.aliyuncs.com
+Bucket 名称:global-highlights-hub
+Endpoint:oss-cn-hongkong.aliyuncs.com
+global-highlights-hub.oss-cn-hongkong.aliyuncs.com
-反馈表测试链接
-http://202.103.68.111:5173/feedback/330948
+反馈表测试链接
+http://202.103.68.111:5173/feedback/330948
---
diff --git a/doc/RBAC 权限.sql b/doc/RBAC 权限.sql
index 3118103..2df36eb 100644
--- a/doc/RBAC 权限.sql
+++ b/doc/RBAC 权限.sql
@@ -86,11 +86,3 @@ VALUES ('产品管理(供应商)', 'route=/products?from', 'page')
INSERT INTO [dbo].[auth_permission] ([role_id] ,[res_id])
VALUES (1, 1)
-INSERT INTO [dbo].[auth_permission] ([role_id] ,[res_id])
-VALUES (6, 2)
-INSERT INTO [dbo].[auth_permission] ([role_id] ,[res_id])
-VALUES (6, 3)
-INSERT INTO [dbo].[auth_permission] ([role_id] ,[res_id])
-VALUES (6, 4)
-INSERT INTO [dbo].[auth_permission] ([role_id] ,[res_id])
-VALUES (6, 5)
diff --git a/doc/价格管理平台.bmpr b/doc/价格管理平台.bmpr
index de2695d..6f91c6d 100644
Binary files a/doc/价格管理平台.bmpr and b/doc/价格管理平台.bmpr differ
diff --git a/src/main.jsx b/src/main.jsx
index 3733210..2d3c53f 100644
--- a/src/main.jsx
+++ b/src/main.jsx
@@ -1,43 +1,80 @@
-import React from "react";
-import ReactDOM from "react-dom/client";
+import React from 'react'
+import ReactDOM from 'react-dom/client'
import {
createBrowserRouter,
RouterProvider,
-} from "react-router-dom";
-import "@/assets/global.css";
-import App from "@/views/App";
-import Standlone from "@/views/Standlone";
-import Login from "@/views/Login";
-import Logout from "@/views/Logout";
-import ErrorPage from "@/components/ErrorPage";
+} from 'react-router-dom'
+import '@/assets/global.css'
+import App from '@/views/App'
+import Standlone from '@/views/Standlone'
+import Login from '@/views/Login'
+import Logout from '@/views/Logout'
+import ErrorPage from '@/components/ErrorPage'
import RequireAuth from '@/components/RequireAuth'
-import ReservationNewest from "@/views/reservation/Newest";
-import ReservationDetail from "@/views/reservation/Detail";
-import ChangePassword from "@/views/account/ChangePassword";
-import AccountProfile from "@/views/account/Profile";
-import AccountManagement from "@/views/account/Management";
-import RoleList from "@/views/account/RoleList";
-import FeedbackIndex from "@/views/feedback/Index";
-import FeedbackDetail from "@/views/feedback/Detail";
-import FeedbackCustomerDetail from "@/views/feedback/CustomerDetail";
-import ReportIndex from "@/views/report/Index";
-import NoticeIndex from "@/views/notice/Index";
-import NoticeDetail from "@/views/notice/Detail";
-import InvoiceIndex from "@/views/invoice/Index";
-import InvoiceDetail from "@/views/invoice/Detail";
-import InvoicePaid from "@/views/invoice/Paid";
-import InvoicePaidDetail from "@/views/invoice/PaidDetail";
-import Airticket from "@/views/airticket/Index";
-import AirticketPlan from "@/views/airticket/Plan";
+import ReservationNewest from '@/views/reservation/Newest'
+import ReservationDetail from '@/views/reservation/Detail'
+import ChangePassword from '@/views/account/ChangePassword'
+import AccountProfile from '@/views/account/Profile'
+import AccountManagement from '@/views/account/Management'
+import RoleList from '@/views/account/RoleList'
+import FeedbackIndex from '@/views/feedback/Index'
+import FeedbackDetail from '@/views/feedback/Detail'
+import FeedbackCustomerDetail from '@/views/feedback/CustomerDetail'
+import ReportIndex from '@/views/report/Index'
+import NoticeIndex from '@/views/notice/Index'
+import NoticeDetail from '@/views/notice/Detail'
+import InvoiceIndex from '@/views/invoice/Index'
+import InvoiceDetail from '@/views/invoice/Detail'
+import InvoicePaid from '@/views/invoice/Paid'
+import InvoicePaidDetail from '@/views/invoice/PaidDetail'
+import Airticket from '@/views/airticket/Index'
+import AirticketPlan from '@/views/airticket/Plan'
import { ThemeContext } from '@/stores/ThemeContext'
import { usingStorage } from '@/hooks/usingStorage'
import { isNotEmpty } from '@/utils/commons'
-import { notifyAuth } from "./utils/lifecycle"
+import { notifyAuth } from './utils/lifecycle'
import { PERM_ACCOUNT_MANAGEMENT, PERM_ROLE_NEW, PERM_OVERSEA, PERM_AIR_TICKET } from '@/config'
-import './i18n';
+import './i18n'
+const initRouter = async () => {
+ return createBrowserRouter([
+ {
+ path: '/',
+ element: ,
+ errorElement: ,
+ children: [
+ { index: true, element: },
+ { path: 'account/change-password', element: },
+ { path: 'account/profile', element: },
+ { path: 'account/management', element: },
+ { path: 'account/role-list', element: },
+ { path: 'reservation/newest', element: },
+ { path: 'reservation/:reservationId', element: },
+ { path: 'feedback', element: },
+ { path: 'feedback/:GRI_SN/:CII_SN/:RefNo', element: },
+ { path: 'feedback/:GRI_SN/:RefNo', element: },
+ { path: 'report', element: },
+ { path: 'notice', element: },
+ { path: 'notice/:CCP_BLID', element: },
+ { path: 'invoice',element:},
+ { path: 'invoice/detail/:GMDSN/:GSN',element:},
+ { path: 'invoice/paid',element:},
+ { path: 'invoice/paid/detail/:flid', element: },
+ { path: 'airticket',element: },
+ { path: 'airticket/plan/:coli_sn',element:},
+ ]
+ },
+ {
+ element: ,
+ children: [
+ { path: '/login', element: },
+ { path: '/logout', element: },
+ ]
+ }
+ ])
+}
const initAppliction = async () => {
@@ -46,54 +83,19 @@ const initAppliction = async () => {
if (isNotEmpty(userId) && isNotEmpty(loginToken)) {
await notifyAuth()
}
-}
-await initAppliction()
-
-const router = createBrowserRouter([
- {
- path: "/",
- element: ,
- errorElement: ,
- children: [
- { index: true, element: },
- { path: "account/change-password", element: },
- { path: "account/profile", element: },
- { path: "account/management", element: },
- { path: "account/role-list", element: },
- { path: "reservation/newest", element: },
- { path: "reservation/:reservationId", element: },
- { path: "feedback", element: },
- { path: "feedback/:GRI_SN/:CII_SN/:RefNo", element: },
- { path: "feedback/:GRI_SN/:RefNo", element: },
- { path: "report", element: },
- { path: "notice", element: },
- { path: "notice/:CCP_BLID", element: },
- { path: "invoice",element:},
- { path: "invoice/detail/:GMDSN/:GSN",element:},
- { path: "invoice/paid",element:},
- { path: "invoice/paid/detail/:flid", element: },
- { path: "airticket",element: },
- { path: "airticket/plan/:coli_sn",element:},
- ]
- },
- {
- element: ,
- children: [
- { path: "/login", element: },
- { path: "/logout", element: },
- ]
- }
-])
+ const router = await initRouter()
+ ReactDOM.createRoot(document.getElementById('root')).render(
+ //
+
+ Loading...
}
+ />
+
+ //
+ )
+}
-ReactDOM.createRoot(document.getElementById("root")).render(
- //
-
- Loading...
}
- />
-
- //
-)
+initAppliction()
diff --git a/src/views/reservation/Newest.jsx b/src/views/reservation/Newest.jsx
index d9f3420..9c35592 100644
--- a/src/views/reservation/Newest.jsx
+++ b/src/views/reservation/Newest.jsx
@@ -206,10 +206,6 @@ function Newest() {