guhongwei 2 years ago
parent
commit
fe8035ebe1
3 changed files with 89 additions and 188 deletions
  1. 2 2
      pages/match/info.js
  2. 39 39
      pages/matchTeampm/index.wxml
  3. 48 147
      pages/matchTeampm/index.wxss

+ 2 - 2
pages/match/info.js

@@ -24,8 +24,8 @@ Page({
         statusList: match_status,
         // 选项卡
         tabs: {
-            active: 'a',
-            list: [{ title: '赛制信息', name: 'a' }, { title: '参赛队伍', name: 'b' }, { title: '赛程列表', name: 'c' }, { title: '队伍榜单', name: 'd' }],
+            active: 'b',
+            list: [{ title: '参赛队伍', name: 'b' }, { title: '赛程列表', name: 'c' }, { title: '队伍榜单', name: 'd' }],
         },
     },
     back: function () {

+ 39 - 39
pages/matchTeampm/index.wxml

@@ -1,45 +1,45 @@
 <mobile-main frameStyle="{{frameStyle}}" bind:back="back">
-  <view slot="info" class="main" style="height:{{infoHeight}}px;">
-    <view class="one">
-      <e-tabs tabs="{{tabs}}" bind:tabsChange="tabsChange"></e-tabs>
-      <view wx:if="{{tabs.active=='a'}}" class="a">
-        <view class="head">
-          <view class="head1"><text>排名</text></view>
-          <view class="head2"><text>战队</text></view>
-          <view class="head3"><text>胜负</text></view>
-        </view>
-        <view class="list {{index < 3 ? 'select-item' : 'dis-select-item'}}" wx:key="item" wx:for="{{winList}}">
-          <view class="item sortContent" v-for="(item,index) of list" :key="index">
-            <view class="pai {{index < 3 ? 'pai1' : 'pai'}}">{{index+1}}</view>
-            <image class="headtou1" src="{{item.logo[0].url}}"></image>
-            <view class="dui">
-              {{item.name}}
-            </view>
-            <view class="fen">
-              <text class="score1 {{index < 3 ? 'scorea' : 'scoreb'}}">{{item.win||0}}</text>/ <text>{{item.lose||0}}</text>
-            </view>
-          </view>
-        </view>
-      </view>
-      <view wx:elif="{{tabs.active=='b'}}" class="b">
-        <view class="integral">
-          <text class="integral1">排名</text>
-          <text class="integral2">队伍</text>
-          <text class="integral3">总积分</text>
-        </view>
-        <view class="lists" wx:key="item" wx:for="{{scoreList}}">
-          <view class="item sortContent" v-for="(item,index) of list" :key="index">
-            <view class="pai">{{index+1}}</view>
-            <image class="headtou2" src="{{item.logo[0].url}}"></image>
-            <view class="dui">
-              {{item.name}}
+    <view slot="info" class="main" style="height:{{infoHeight}}px;">
+        <view class="one">
+            <e-tabs tabs="{{tabs}}" bind:tabsChange="tabsChange"></e-tabs>
+            <view wx:if="{{tabs.active=='a'}}" class="a">
+                <view class="head">
+                    <text>排名</text>
+                    <text>战队</text>
+                    <text>胜负</text>
+                </view>
+                <view class="list" wx:for="{{winList}}" wx:key="item" wx:for-index="index">
+                    <view class="index">
+                        <text>{{index+1}}</text>
+                    </view>
+                    <view class="team textOver">
+                        <image src="{{item.logo[0].url}}"></image>
+                        <text>{{item.name}} </text>
+                    </view>
+                    <view class="index">
+                        <text>{{item.win||0}}</text>/<text>{{item.lose||0}}</text>
+                    </view>
+                </view>
             </view>
-            <view class="fen">
-              <text class="score1">{{item.score||0}}</text>
+            <view wx:elif="{{tabs.active=='b'}}" class="a">
+                <view class="head">
+                    <text>排名</text>
+                    <text>队伍</text>
+                    <text>总积分</text>
+                </view>
+                <view class="list" wx:for="{{scoreList}}" wx:key="item" wx:for-index="index">
+                    <view class="index">
+                        <text>{{index+1}}</text>
+                    </view>
+                    <view class="team textOver">
+                        <image src="{{item.logo[0].url}}"></image>
+                        <text>{{item.name}} </text>
+                    </view>
+                    <view class="index">
+                        <text class="score1">{{item.score||0}}</text>
+                    </view>
+                </view>
             </view>
-          </view>
         </view>
-      </view>
     </view>
-  </view>
 </mobile-main>

+ 48 - 147
pages/matchTeampm/index.wxss

@@ -1,187 +1,88 @@
 .main {
     position: relative;
     width: 100%;
+    overflow-x: hidden;
 }
 
-.one .a .head {
-    background-color: rgb(43, 43, 43);
-    color: white;
-    width: 92%;
-    margin-left: 3%;
-    border-top-left-radius: 0.5em;
-    border-top-right-radius: 0.5em;
-    border-bottom-right-radius: 0em;
-    border-bottom-left-radius: 0em;
-    padding: 0 0 32px 3.5px;
-    margin-top: 2%;
-}
-
-.one .a .head .head1 {
+.main .one {
     float: left;
-    width: 26%;
-    font-size: 14px;
-    margin-left: 19px;
-    margin-top: 6px;
+    width: 100%;
 }
 
-.one .a .head .head2 {
+.main .one .a {
     float: left;
-    width: 40%;
-    font-size: 14px;
-    margin-left: 5px;
-    margin-top: 6px;
+    width: 95%;
+    padding: 0 10px;
+    margin: 10px 0 0 0;
 }
 
-.one .a .head .head3 {
+.main .one .a .head {
     float: left;
-    width: 9%;
-    font-size: 14px;
-    margin-left: 29px;
-    margin-top: 6px;
-}
-
-.one .a .list {
-    width: 93%;
-    margin-left: 3%;
-    margin-bottom: 0.2%;
-}
-
-.select-item {
-    color: #ffff;
+    width: 100%;
+    padding: 9px 0;
+    background-color: #000;
+    color: #fff;
+    border-top-left-radius: 10px;
+    border-top-right-radius: 10px;
 }
 
-.dis-select-item {
-    margin-top: 3px;
-    background-color: white;
-    color: #000;
+.main .one .a .head text {
+    display: inline-block;
+    font-size: 14px;
+    width: 15%;
+    text-align: center;
 }
 
-.one .a .list:nth-child(2) {
-    background-color: rgba(247, 31, 67);
+.main .one .a .head text:nth-child(2) {
+    width: 70%;
+    text-align: left;
 }
 
-.one .a .list:nth-child(3) {
-    background-color: rgba(245, 96, 133);
+.main .one .a .list {
+    float: left;
+    width: 100%;
+    height: 50px;
+    overflow: hidden;
+    line-height: 50px;
+    border-bottom: 1px solid #f1f1f1;
 }
 
-.one .a .list:nth-child(4) {
-    background-color: rgb(252, 172, 198);
+.main .one .a .list:nth-child(2) {
+    background-color: #e81248;
+    color: #fff;
 }
 
-.one .a .list .sortContent {
-    width: 88%;
-    height: 50upx;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-left: 3.5%;
-    margin-bottom: 0.2%;
-    padding: 10px 10px 10px 10px;
+.main .one .a .list:nth-child(3) {
+    background-color: #f85a80;
+    color: #fff;
 }
 
-.one .a .list .sortContent .pai1 {
-    font-size: 20px;
-    font-style: italic;
+.main .one .a .list:nth-child(4) {
+    background-color: #f7a2b7;
+    color: #fff;
 }
 
-.one .a .list .sortContent .headtou1 {
+.main .one .a .list .index {
     float: left;
-    margin-left: 35px;
     width: 15%;
-    height: 46.04px;
-    overflow: hidden;
-    border-radius: 90px;
+    text-align: center;
 }
 
-.one .a .list .sortContent .dui {
+.main .one .a .list .team {
     float: left;
-    width: 50%;
-    font-size: 14px;
-    margin-left: 7px;
-}
-
-.one .a .list .sortContent .fen {
-    float: left;
-    width: 15%;
-    font-weight: 500;
-}
-
-.one .a .list .sortContent .fen .scorea {
-    color: white;
-}
-
-.one .a .list .sortContent .fen .scoreb {
-    color: red;
+    width: 70%;
 }
 
-.one .b .integral {
-    margin-top: 5px;
-    margin-bottom: 7px;
-    font-weight: 500;
-    font-size: 14px;
-}
-
-.one .b .integral {
-    margin-top: 5px;
-    margin-bottom: 7px;
-    font-weight: 500;
-    font-size: 14px;
-}
-
-.one .b .integral .integral1 {
-    padding: 0px 10px 0px 23px;
-}
-
-.one .b .integral .integral2 {
-    padding: 0px 10px 0px 43px;
-}
-
-.one .b .integral .integral3 {
-    padding: 0px 10px 0px 145px;
-}
-
-.one .b .lists {
-    font-weight: 500;
-    font-size: 14px;
-}
-
-.one .b .lists:nth-child(even) {
-    background-color: rgb(255, 250, 250);
-}
-
-.one .b .lists .sortContent {
-    width: 88%;
-    height: 50upx;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    margin-left: 3.5%;
-    margin-bottom: 0.2%;
-    padding: 10px 10px 10px 10px;
-}
-
-.one .b .lists .sortContent .pai {
-    margin-left: 5px;
-}
-
-.one .b .lists .sortContent .headtou2 {
+.main .one .a .list .team image {
     float: left;
-    margin-left: 35px;
-    width: 15%;
-    height: 49.5px;
-    overflow: hidden;
+    width: 40px;
+    height: 40px;
     border-radius: 90px;
+    margin: 5px 0;
 }
 
-.one .b .lists .sortContent .dui {
+.main .one .a .list .team text {
     float: left;
-    width: 50%;
     font-size: 14px;
-    margin-left: 7px;
-}
-
-.one .b .lists .sortContent .fen {
-    float: left;
-    width: 15%;
-    font-weight: 500;
+    margin: 0 0 0 5px;
 }