diff --git a/components.d.ts b/components.d.ts
index aaa6be2..676560d 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -7,7 +7,6 @@ export {}
declare module '@vue/runtime-core' {
export interface GlobalComponents {
- _index: typeof import('./src/components/abnormal/_index.vue')['default']
Abnormal: typeof import('./src/components/abnormal/index.vue')['default']
HelloWorld: typeof import('./src/components/HelloWorld.vue')['default']
IconAndText: typeof import('./src/components/abnormal/iconAndText.vue')['default']
diff --git a/config/index.ts b/config/index.ts
index a73bc9f..1c2a657 100644
--- a/config/index.ts
+++ b/config/index.ts
@@ -1,6 +1,4 @@
-const appName = "协同办公XX管理后台";
-
-const passid = "paasid";
+const appName = "头牌派对";
const ENV: any = import.meta.env || process.env;
const VITE_APP_ENV: string = ENV.VITE_APP_ENV;
@@ -34,6 +32,5 @@ const injectScriptStr = ``;
export {
appName,
proxyTarget,
- passid,
injectScriptStr
};
\ No newline at end of file
diff --git a/src/installComponents.ts b/src/installComponents.ts
index a1b015b..8532550 100644
--- a/src/installComponents.ts
+++ b/src/installComponents.ts
@@ -1,8 +1,8 @@
-import { Button, Empty } from "vant";
+import { Button } from "vant";
const install = function (app: any) {
app.use(Button);
- app.use(Empty);
+ // app.use(Empty);
};
export {
diff --git a/src/main.ts b/src/main.ts
index c510f31..6f36d1e 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,12 +1,12 @@
import { createApp } from "vue";
// import routes from "./routes";
import App from "./App.vue";
-import pinia from "./store/pinia";
+// import pinia from "./store/pinia";
import { install } from "./installComponents";
import "./styles/index.less";
const app = createApp(App);
-app.use(pinia);
+// app.use(pinia);
// app.use(routes);
install(app);
app.mount("#app");
diff --git a/src/pages/Home.vue b/src/pages/Home.vue
index f80873f..28cca5d 100644
--- a/src/pages/Home.vue
+++ b/src/pages/Home.vue
@@ -7,13 +7,32 @@ import appWeb from "./web.vue";
\ No newline at end of file
+
+.app-web {
+ display: none;
+}
+
+.app-h5 {
+ display: block;
+}
+
+@media only screen and (min-width: 1280px) {
+ .app-web {
+ display: block;
+ }
+
+ .app-h5 {
+ display: none;
+ }
+}
\ No newline at end of file
diff --git a/src/pages/web.vue b/src/pages/web.vue
index a877881..ac10ebe 100644
--- a/src/pages/web.vue
+++ b/src/pages/web.vue
@@ -26,8 +26,7 @@
width: 100%;
height: 100%;
min-width: 1280px;
- min-height: 1000px;
- overflow: auto;
+ min-height: 940px;
&-main {
width: 100%;
height: 100%;
@@ -37,8 +36,6 @@
background-repeat: no-repeat;
padding: 20px;
box-sizing: border-box;
- max-width: 1920px;
- margin: 0 auto;
&-middle {
width: 1280px;
@@ -75,15 +72,18 @@
&-footer {
width: 100%;
- height: 28.3vh;
+ height: 100px;
background-color: #222222;
position: fixed;
left: 0;
bottom: 0;
&-text {
- margin-top: 6vh;
- height: 16px;
+ width: 100%;
+ height: 100%;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
font-size: 16px;
font-family: PingFang SC;
font-weight: 500;
@@ -92,5 +92,13 @@
text-align: center;
}
}
+
+
+
+}
+@media only screen and (min-height: 1000px) {
+ .web-footer {
+ height: calc(100vh - 940px);
+ }
}
diff --git a/src/styles/global.less b/src/styles/global.less
index 219b7c6..c7ae967 100644
--- a/src/styles/global.less
+++ b/src/styles/global.less
@@ -36,7 +36,6 @@
}
#app {
- background-color: #fff;
color: #000;
font-size: 14px;
font-family: "Helvetica", "Helvetica Neue", "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", SimSun, sans-serif;
diff --git a/vite.config.ts b/vite.config.ts
index f75b4f1..4fff350 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -81,11 +81,12 @@ export default (opt: any) => {
}
},
postcss: {
- // plugins: [
- // postcsspxtoviewport({
- // viewportWidth: 375
- // })
- // ]
+ plugins: [
+ // postcsspxtoviewport({
+ // viewportWidth: 375,
+ // selectorBlackList: [""]
+ // })
+ ]
}
},
server: {