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

icon/icon.wxss

@@ -1,8 +1,9 @@
 @font-face {
-  font-family: "iconfont"; /* Project id 3244772 */
-  src: url('//at.alicdn.com/t/font_3244772_nf56w3hc789.woff2?t=1648012472511') format('woff2'),
-       url('//at.alicdn.com/t/font_3244772_nf56w3hc789.woff?t=1648012472511') format('woff'),
-       url('//at.alicdn.com/t/font_3244772_nf56w3hc789.ttf?t=1648012472511') format('truetype');
+  font-family: "iconfont";
+  /* Project id 3244772 */
+  src: url('//at.alicdn.com/t/font_3244772_i1xnf3btn.woff2?t=1648689795959') format('woff2'),
+    url('//at.alicdn.com/t/font_3244772_i1xnf3btn.woff?t=1648689795959') format('woff'),
+    url('//at.alicdn.com/t/font_3244772_i1xnf3btn.ttf?t=1648689795959') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +14,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-bisaiguanli:before {
+  content: "\e6a5";
+}
+
 .icon-tuichudenglu:before {
   content: "\e66f";
 }

pages/me/index.wxml

@@ -174,7 +174,18 @@
           <text class="six-text">退出登录</text>
         </view>
       </view>
+<<<<<<< HEAD
 
+=======
+      <view class="six-5">
+        <view class="six-left">
+          <text class=" icon iconfont icon-bisaiguanli"></text>
+        </view>
+        <view class="six-right">
+          <text class="six-text">比赛管理</text>
+        </view>
+      </view>
+>>>>>>> 0d189578e8fcc3dd7665d62dbf75c1246d379dba
       <view class="mask" catchtouchmove="preventTouchMove" wx:if="{{showModal}}"></view>
       <view class="modalDlg" wx:if="{{showModal}}">
         <text class="modal_text1">解散团队</text>

pages/me/index.wxss

@@ -488,6 +488,11 @@
   float: left;
   width: 24%;
 }
+.six-5 {
+  margin-top: 2%;
+  float: left;
+  width: 24%;
+}
 
 
 .six-left {

pages/search/index.wxss

@@ -123,7 +123,7 @@
 
 button {
   margin-top: 5px;
-  background-color: rgb(238, 88, 28);
+  background-color: rgb(238, 147, 28);
   border-radius: 15px;
   font-size: 13px !important;
   color: #fff;

pages/team/apply.wxml

@@ -15,7 +15,7 @@
       </view>
     </view>
     <view class="one-3">
-      <view class="group">{{list.name}}<text class=" icon iconfont icon-C1" wx:if="{{list.type}}"></text></view>
+      <view class="group">{{list.name}}</view>
       <view class="person">共{{list.members.length||0}}人</view>
     </view>
     <view class="two">

pages/team/index.wxml

@@ -12,7 +12,7 @@
       </view>
     </view>
     <view wx:if="{{list.length!=0}}">
-    <view class="one"><text>请加入一个团队</text></view>
+    <view class="one"></view>
     <view class="list" wx:key="item" wx:for="{{list}}">
       <view class="two">
         <view class="left">