Merge branch 'master' of http://123.60.98.226:3000/chenkainan/cgc_WeChat

pages.json

@@ -3,13 +3,13 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "大美非遗"
 			}
 		},
 		{
 			"path": "pages/user/user",
 			"style": {
-				"navigationBarTitleText": "uni-app"
+				"navigationBarTitleText": "大美非遗"
 			}
 		}
 	],

pages/index/index.vue

@@ -20,11 +20,10 @@
 	}
 </script>
 
-<style>
+<style lang="scss" scoped>
 	.content {
-		display: flex;
+		min-height: 100vh;
-		flex-direction: column;
+		background: #F9F0EA;
-		align-items: center;
+		padding: 21rpx 0 50rpx;
-		justify-content: center;
 	}
 </style>

static/css/base.css

@@ -12,6 +12,10 @@ input {
 	border: none;
 }
 
+view {
+	box-sizing: border-box;
+}
+
 .flex-between {
 	display: flex;
 	justify-content: space-between;