Merge branch 'master' of http://git.cc-lotus.info/ball-court/court-mobile

pages/me/index.wxml

@@ -21,6 +21,13 @@
           <image src="{{icon}}" class="tou"></image>
         </view>
         <view class="otherInfo1 textOver">
+          <view class="biao" >
+            <text class="icon iconfont icon-qi" wx:if="{{list[0].name}}"></text>
+          </view>
+          <view class="qian">
+          <text class="text3" wx:if="{{item1.type=='1'||item1.type=='2'}}"> {{list[0].name}}</text>
+
+          </view>
           <view class="icon_arrow" bindtap="modify">
             <van-icon name="arrow" color="rgb(177, 177, 177)" />
           </view>

pages/me/index.wxss

@@ -6,12 +6,14 @@
 
 .biao {
   float: left;
-  width: 3%;
+  width: 5%;
+  margin: 5px;
 }
 
 .qian {
   float: left;
   width: 80%;
+  margin: 5px;
 }
 
 .icon_arrow {
@@ -36,11 +38,10 @@
 
 .two {
   position: relative;
-  top: -50px;
-  left: 12px;
   width: 93%;
   border-radius: 15px;
   background-color: #fff;
+  margin: -36px 0 0 12px;
 }
 
 .button {
@@ -63,9 +64,9 @@
 .tou {
   border-radius: 50%;
   position: absolute;
-  width: 28%;
-  height: 100%;
-  margin-left: 60%;
+  width: 80px;
+  height: 80px;
+  margin-left: 66%;
   margin-top: -80px;
 }
 
@@ -86,6 +87,7 @@
 .onther {
   padding: 10px 10px 10px 5px;
 }
+
 .onther1 {
   padding: 10px 10px 10px 5px;
   position: relative;
@@ -109,8 +111,7 @@
 
 .thr {
   width: 85%;
-  /* height: 38px; */
-  margin: -35px 30px 0 30px;
+  margin: 12px 30px 0 30px;
   background-color: rgb(217, 235, 250);
   border-radius: 7px;
 }
@@ -294,11 +295,13 @@
 }
 
 .five {
+  position: relative;
   margin: 13px 0 0 20px;
   width: 90%;
   border-radius: 5px;
   background-color: #fff;
 }
+
 .five_1 {
   margin: -50px 0 0 20px;
   width: 90%;
@@ -451,7 +454,7 @@
 .six {
   width: 91%;
   height: 132px;
-  margin-top: 65px;
+  margin-top: 18px;
   margin-left: 5%;
   border-radius: 5px;
   background-color: #fff;