From 2ca94de8ede18ac07ccfd8dec7b6f6a707adde9b Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 01 Sep 2025 11:20:24 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.5' into patch_management
---
src/main.js | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/main.js b/src/main.js
index 58ae120..886400b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -30,6 +30,7 @@
import avueUeditor from 'avue-plugin-ueditor'
import basicBlock from 'components/basic-block/main.vue'
import basicContainer from 'components/basic-container/main.vue'
+import welContainer from 'components/wel-container/main.vue'
import basicMainContent from 'components/basic-main-content/main.vue'
import thirdRegister from './components/third-register/main.vue'
@@ -88,6 +89,7 @@
app.component(key, component)
}
app.component('basicContainer', basicContainer)
+app.component('welContainer', welContainer)
app.component('basicMainContent', basicMainContent)
app.component('basicBlock', basicBlock)
@@ -99,6 +101,9 @@
app.config.globalProperties.$dayjs = dayjs
app.config.globalProperties.website = website
app.config.globalProperties.getScreen = getScreen
+app.config.globalProperties.pxToVh = height => height / 10.8 + 'vh'
+app.config.globalProperties.pxToRem = width => width * 0.1 + 'rem'
+
app.use(error)
app.use(i18n)
app.use(store)
--
Gitblit v1.9.3