Browse Source

处理冲突

Rorschach 6 years ago
parent
commit
85d3c5a95c
2 changed files with 8 additions and 2 deletions
  1. 2 1
      app.wxss
  2. 6 1
      component/my/my.wxss

+ 2 - 1
app.wxss

@@ -6,8 +6,9 @@ page {
 
 .container {
   height: 100%;
+  
   padding-top: 80rpx;
-  box-sizing: border-box;
+ 
 } 
 ::-webkit-scrollbar{
   width: 0;

+ 6 - 1
component/my/my.wxss

@@ -3,6 +3,11 @@
   height: 1116rpx;
   background: #F0F1F5;
   position: relative;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: space-between;
+  box-sizing: border-box;
 }
 
 .mine-center{
@@ -11,7 +16,7 @@
 }
 
 .mine-info{
-  /* margin-top: 80rpx; */
+  margin-top: 80rpx;
   width: 100%;
   height: 344rpx;
   background: #FFFFFF;