登录页页添加

2020-06-02 08:49:13 +08:00
parent d9ecf2144c
commit cb8eb90c15
5 changed files with 231 additions and 46 deletions
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -27,8 +27,7 @@ export default {
    justify-content: center;
 }

-<<<<<<< HEAD
-<style >
+
 	.content {
 		display: flex;
 		flex-direction: column;
@@ -36,15 +35,7 @@ export default {
 		justify-content: center;
 	}

-	.logo {
-		height: 200rpx;
-		width: 200rpx;
-		margin-top: 200rpx;
-		margin-left: auto;
-		margin-right: auto;
-		margin-bottom: 50rpx;
-	}
-=======
+
 .logo {
    height: 200rpx;
    width: 200rpx;
@@ -53,7 +44,7 @@ export default {
    margin-right: auto;
    margin-bottom: 50rpx;
 }
->>>>>>> 03442440ccd78f292b5bb9f6dce22f83d6b6ac73
+

 .text-area {
    display: flex;