Merge branch 'zwxt_hn' of http://39.99.224.27:9022/changchao/founder_vue into zwxt_hn

369754f5 · 米嘉伟 · bc5f0d7e · 6c48cfe8 · 369754f5 · 369754f5
Commit 369754f5 authored Aug 19, 2022 by 米嘉伟
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

src/App.vue
+8 -4

src/assets/styles/main.scss
+0 -0

No files found.
--- a/src/App.vue
+++ b/src/App.vue
 <!--
 * @Author: your name
 * @Date: 2021-06-15 15:12:19
- * @LastEditTime: 2022-08-18 17:43:00
+ * @LastEditTime: 2022-08-19 09:38:40
 * @LastEditors: zhangchaojun 893499851@qq.com
 * @Description: In User Settings Edit
 * @FilePath: \founder_vue\src\App.vue
@@ -52,7 +52,11 @@ export default {
    /*每个页面公共css */
    // @import url("assets/styles/iconfont.css");
    // @import "assets/styles/main.scss";
-    #app {
+  #app {
-      height: 100vh;
+    height: 100vh;
-    }
+  }
+  * {
+    margin: 0;
+    padding: 0;
+  }
 </style>
--- a/src/assets/styles/main.scss
+++ b/src/assets/styles/main.scss