Merge remote-tracking branch 'origin/master'

# Conflicts:
#	package-lock.json

src/assets/style.css

+
+* {
+  margin: 0;
+  padding: 0;
+  box-sizing: border-box;
+  outline: none!important
+}
+
+html,body,#app {
+  margin: 0;
+  padding: 0;
+  width: 100%;
+  height: 100%;
+  font-family: Helvetica Neue,Helvetica,PingFang SC,Hiragino Sans GB,Microsoft YaHei,SimSun,sans-serif;
+  font-weight: 400;
+  -webkit-font-smoothing: antialiased;
+  -webkit-tap-highlight-color: transparent;
+  background-color: var(--ba-bg-color);
+  font-size: 14px;
+  overflow: hidden;
+  position: relative
+}
\ No newline at end of file

src/main.ts

@@ -3,6 +3,7 @@ import ElementPlus from 'element-plus'
 import 'element-plus/dist/index.css'
 import App from './App.vue'
 import router from './router'
+import './assets/style.css'
 // import store from './store'
 
 const app = createApp(App)