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

pages/me/index.wxml

@@ -9,7 +9,7 @@
         <view class="left1">
           <view class="left1-1">
             <view class="name">{{item1.nickname}}</view>
-            <button class="button" size="mini">{{item1.status=='0'?'管理员':item1.status=='1'?'团队创建人':'队员'}}</button>
+            <button class="button" size="mini">{{item1.type=='0'?'管理员':item1.type=='1'?'团队创建人':'队员'}}</button>
           </view>
           <view class="left11-2">
             <text class="text1">{{item1.mechanism}}</text>