Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	components.d.ts
#	src/api/order.ts

components.d.ts

@@ -15,6 +15,8 @@ declare module 'vue' {
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCarousel: typeof import('element-plus/es')['ElCarousel']
     ElCarousel: typeof import('element-plus/es')['ElCarousel']
     ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
     ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
+    ElCascader: typeof import('element-plus/es')['ElCascader']
+    ElCascaderPanel: typeof import('element-plus/es')['ElCascaderPanel']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElCol: typeof import('element-plus/es')['ElCol']
@@ -37,12 +39,15 @@ declare module 'vue' {
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElLink: typeof import('element-plus/es')['ElLink']
     ElLink: typeof import('element-plus/es')['ElLink']
+    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRadio: typeof import('element-plus/es')['ElRadio']
     ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
+    ElRow: typeof import('element-plus/es')['ElRow']
+    ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElStep: typeof import('element-plus/es')['ElStep']
     ElStep: typeof import('element-plus/es')['ElStep']
     ElSteps: typeof import('element-plus/es')['ElSteps']
     ElSteps: typeof import('element-plus/es')['ElSteps']

src/main.ts

@@ -4,6 +4,7 @@ import App from './App.vue'
 import router, { registerDynamicRoutes } from './router'
 import router, { registerDynamicRoutes } from './router'
 import store from './store'
 import store from './store'
 import './styles/index.scss'
 import './styles/index.scss'
+import 'element-plus/es/components/message/style/css'
 import roleShow from './utils/roleShow'
 import roleShow from './utils/roleShow'
 import VxeUITable from 'vxe-table'
 import VxeUITable from 'vxe-table'
 import 'vxe-table/lib/style.css'
 import 'vxe-table/lib/style.css'
@@ -46,5 +47,4 @@ app
   .use(VxeUITable)
   .use(VxeUITable)
   .mount('#app')
   .mount('#app')
 
 
-
 app.config.globalProperties.$isPermissionBtn = isPermissionBtn
 app.config.globalProperties.$isPermissionBtn = isPermissionBtn

src/styles/element.scss

@@ -44,4 +44,24 @@
 }
 }
 .el-loading-mask {
 .el-loading-mask {
   z-index: 1020 !important;
   z-index: 1020 !important;
-}
+}
\ No newline at end of file
+
+/* ElMessage：兼容 Vite 预构建旧版 JS（无 is-center）与新版 CSS 的定位差异 */
+.el-message {
+  left: 50%;
+  transform: translateX(-50%);
+}
+.el-message.is-left {
+  left: 16px;
+  right: auto;
+  transform: none;
+}
+.el-message.is-right {
+  left: auto;
+  right: 16px;
+  transform: none;
+}
+.el-message.is-center {
+  left: 50%;
+  transform: translateX(-50%);
+}