Merge branch 'company_server' of https://gitee.com/doc_wei01/skyeye into company_server

README.md

@@ -17,7 +17,9 @@
 
 > 客官可以点个收藏，后续功能会同步更新发布。
 
+- [OA](https://www.zhixi.com/tpl/2a4dcfd466e8dc0cc9ea38a682fc2da0?shared=true)
 - [CRM](https://www.zhixi.com/tpl/f9f4d2f7d4fb9a8c2d67da36ab8250cf?shared=true)
+- [ERP](https://www.zhixi.com/tpl/7e7427378acb3e9a77112c8a66437fee?shared=true)
 - [云售后工单](https://www.zhixi.com/tpl/09cc45d926714da461b51df8a435bc6b?shared=true)
 
 

web/src/main/resources/template/assets/lib/winui/css/customer/systemStyle.css

@@ -104,7 +104,7 @@
 }
 
 .white-3c8dbc .tradition-right-top .desktop-menu-box .select {
-    background-color: #3c8dbc !important;
+    background-color: #367faa !important;
 }
 
 .white-3c8dbc .tradition-left-top span,
@@ -175,7 +175,7 @@
 }
 
 .white-605ca8 .tradition-right-top .desktop-menu-box .select {
-    background-color: #605ca8 !important;
+    background-color: #524e93 !important;
 }
 
 .white-605ca8 .tradition-left-top span,
@@ -246,7 +246,7 @@
 }
 
 .white-EEA9B8 .tradition-right-top .desktop-menu-box .select {
-    background-color: #EEA9B8 !important;
+    background-color: #e197a7 !important;
 }
 
 .white-EEA9B8 .tradition-left-top span,
@@ -299,7 +299,7 @@
 }
 
 .white-1995dc-bl .tradition-right-top .desktop-menu-box .select {
-    background-color: #1995dc !important;
+    background-color: #0b7fc0 !important;
 }
 
 .white-1995dc-bl .tradition-left-top span,
@@ -347,7 +347,7 @@
 }
 
 .white-605ca8-bl .tradition-right-top .desktop-menu-box .select {
-    background-color: #605ca8 !important;
+    background-color: #55529f !important;
 }
 
 .white-605ca8-bl .tradition-left-top span,
@@ -395,7 +395,7 @@
 }
 
 .white-00a65a-bl .tradition-right-top .desktop-menu-box .select {
-    background-color: #00a65a !important;
+    background-color: #008047 !important;
 }
 
 .white-00a65a-bl .tradition-left-top span,
@@ -443,7 +443,7 @@
 }
 
 .white-e08e0b-bl .tradition-right-top .desktop-menu-box .select {
-    background-color: #e08e0b !important;
+    background-color: #c47904 !important;
 }
 
 .white-e08e0b-bl .tradition-left-top span,
@@ -491,7 +491,7 @@
 }
 
 .white-d73925-bl .tradition-right-top .desktop-menu-box .select {
-    background-color: #d73925 !important;
+    background-color: #b72713 !important;
 }
 
 .white-d73925-bl .tradition-left-top span,
@@ -557,7 +557,7 @@
 }
 
 .white-d73925 .tradition-right-top .desktop-menu-box .select {
-    background-color: #d73925 !important;
+    background-color: #b02916 !important;
 }
 
 .white-d73925 .tradition-left-top span,

web/src/main/resources/template/json/skyeyeClassEnum.json

@@ -217,8 +217,8 @@
 
     "reportDataFromType": {"name": "报表-数据来源类型", "className": "skyeye-report#com.skyeye.datafrom.classenum.ReportDataFromType"},
 
-    "storeOnlineBookType": {"name": "商城-门店线上预约类型", "className": "skyeye-shop#com.skyeye.classenum.StoreOnlineBookType"},
-    "shopMealType": {"name": "商城-套餐类型", "className": "skyeye-shop#com.skyeye.classenum.ShopMealType"},
+    "storeOnlineBookType": {"name": "商城-门店线上预约类型", "className": "skyeye-shop#com.skyeye.store.classenum.StoreOnlineBookType"},
+    "shopMealType": {"name": "商城-套餐类型", "className": "skyeye-shop#com.skyeye.meal.classenum.ShopMealType"},
 
     "studentStateEnum": {"name": "表白墙-学生审核状态", "className": "skyeye-wall#com.skyeye.certification.classenum.StateEnum"},
     "studentStateEnum2": {