修改

pages/administration/index.js

@@ -85,18 +85,11 @@ Page({
               let datastart = []
               let dataend = []
               for (let i = 0; i < datas.length; i++) {
-                if (datas[i].status == 0) {
-                  datas[i].status = '未开始'
-                } else if (datas[i].status == 1) {
-                  datas[i].status = '报名中'
-                } else if (datas[i].status == 2) {
-                  datas[i].status = '待比赛'
+                if (datas[i].status == 2) {
                   datastart.push(datas[i])
                 } else if (datas[i].status == 3) {
-                  datas[i].status = '进行中'
                   datass.push(datas[i])
                 } else if (datas[i].status == 4) {
-                  datas[i].status = '已结束'
                   dataend.push(datas[i])
                 }
               }

pages/administration/index.wxml

@@ -24,11 +24,7 @@
         <van-tab title="进行中">
           <view class="list" wx:key="item" wx:for="{{conduct}}">
             <view class="name" data-name="{{item._id}}" bindtap="tiao">{{item.name}}</view>
-            <view class="listbut"> <button class="button" size="mini" style="background:rgb(238, 147, 28);" wx:if="{{item.status == '未开始'}}">{{item.status}}</button>
-              <button class="button" size="mini" style="background:rgb(238, 88, 28);" wx:if="{{item.status == '待比赛'}}">{{item.status}}</button>
-              <button class="button" size="mini" style="background:rgb(54, 233, 48)" wx:if="{{item.status == '报名中'}}">{{item.status}}</button>
-              <button class="button" size="mini" style="background:rgb(54, 233, 48)" wx:if="{{item.status == '进行中'}}">{{item.status}}</button>
-              <button class="button" size="mini" style="background:rgb(136, 136, 136);" wx:if="{{item.status == '已结束'}}">{{item.status}}</button>
+            <view class="listbut"> <button class="color{{item.status}}" size="mini">{{item.status=='0'?'未开始':item.status=='1'?'报名中':item.status=='2'?'待比赛':item.status=='3'?'进行中':'已结束'}}</button>
             </view>
             <view class="left1">
               <view class="otherInfos">
@@ -62,11 +58,7 @@
         <van-tab title="未开始">
           <view class="list" wx:key="item" wx:for="{{nostart}}">
             <view class="name" data-name="{{item._id}}" bindtap="tiao">{{item.name}}</view>
-            <view class="listbut"> <button class="button" size="mini" style="background:rgb(238, 147, 28);" wx:if="{{item.status == '未开始'}}">{{item.status}}</button>
-              <button class="button" size="mini" style="background:rgb(238, 88, 28);" wx:if="{{item.status == '待比赛'}}">{{item.status}}</button>
-              <button class="button" size="mini" style="background:rgb(54, 233, 48)" wx:if="{{item.status == '报名中'}}">{{item.status}}</button>
-              <button class="button" size="mini" style="background:rgb(54, 233, 48)" wx:if="{{item.status == '进行中'}}">{{item.status}}</button>
-              <button class="button" size="mini" style="background:rgb(136, 136, 136);" wx:if="{{item.status == '已结束'}}">{{item.status}}</button>
+            <view class="listbut"> <button class="color{{item.status}}" size="mini">{{item.status=='0'?'未开始':item.status=='1'?'报名中':item.status=='2'?'待比赛':item.status=='3'?'进行中':'已结束'}}</button>
             </view>
             <view class="left1">
               <view class="otherInfos">
@@ -100,7 +92,7 @@
         <van-tab title="已结束">
           <view class="list" wx:key="item" wx:for="{{complete}}">
             <view class="name" data-name="{{item._id}}" bindtap="tiao">{{item.name}}</view>
-            <button class="buttonend" size="mini">{{item.status}}</button>
+            <button class="color{{item.status}}" size="mini">{{item.status=='0'?'未开始':item.status=='1'?'报名中':item.status=='2'?'待比赛':item.status=='3'?'进行中':'已结束'}}</button>
             <view class="left1">
               <view class="otherInfos">
                 <text class="text1">{{item.single_time}}</text>

pages/administration/index.wxss

@@ -2,6 +2,25 @@
   position: relative;
   width: 100%;
 }
+.list .listbut .color0 {
+  background: rgb(238, 147, 28);
+}
+
+.list .listbut .color1 {
+  background: rgb(54, 233, 48)
+}
+
+.list .listbut .color2 {
+  background: rgb(238, 88, 28);
+}
+
+.list .listbut .color3 {
+  background: rgb(54, 233, 48)
+}
+
+.list .listbut .color4 {
+  background: rgb(136, 136, 136);
+}
 .van-tabs__wrap {
   background-color: #f1f1f1 !important;
 }
@@ -112,23 +131,8 @@
   font-size: 14px;
   color: #5e5e5e;
 }
-.button{
-  margin-top: 4px;
-  background-color: rgb(54, 233, 48);
-  border-radius: 15px;
-  font-size: 13px !important;
-  color: #fff;
-}
-.buttonstart{
-  margin-top: 4px;
-  background-color: rgb(238, 147, 28);
-  border-radius: 15px;
-  font-size: 13px !important;
-  color: #fff;
-}
-.buttonend{
+button{
   margin-top: 4px;
-  background-color: rgb(136, 136, 136);
   border-radius: 15px;
   font-size: 13px !important;
   color: #fff;

pages/home/index.js

@@ -50,19 +50,6 @@ Page({
         console.log('res', res.data);
         if (res.data.errcode == 0) {
           let datas = res.data.data
-          for (let i = 0; i < datas.length; i++) {
-            if (datas[i].status == 0) {
-              datas[i].status = '未开始'
-            } else if (datas[i].status == 1) {
-              datas[i].status = '报名中'
-            } else if (datas[i].status == 2) {
-              datas[i].status = '待比赛'
-            } else if (datas[i].status == 3) {
-              datas[i].status = '进行中'
-            }else if (datas[i].status == 4) {
-              datas[i].status = '已结束'
-            }
-          }
           that.setData({
             //getSales:temp,
             teamlist: datas,

pages/home/index.wxml

@@ -7,11 +7,7 @@
       <view class="list" wx:key="item" wx:for="{{teamlist}}">
         <view class="listtou">
           <view class="name"  bindtap="tiao" data-name="{{item._id}}">{{item.name}}</view>
-          <view class="listbut"> <button class="button" size="mini" style="background:rgb(238, 147, 28);" wx:if="{{item.status == '未开始'}}">{{item.status}}</button>
-            <button class="button" size="mini" style="background:rgb(238, 88, 28);" wx:if="{{item.status == '待比赛'}}">{{item.status}}</button>
-            <button class="button" size="mini" style="background:rgb(54, 233, 48)" wx:if="{{item.status == '报名中'}}">{{item.status}}</button>
-            <button class="button" size="mini" style="background:rgb(54, 233, 48)" wx:if="{{item.status == '进行中'}}">{{item.status}}</button>
-            <button class="button" size="mini" style="background:rgb(136, 136, 136);" wx:if="{{item.status == '已结束'}}">{{item.status}}</button>
+          <view class="listbut"> <button class="color{{item.status}}" size="mini">{{item.status=='0'?'未开始':item.status=='1'?'报名中':item.status=='2'?'待比赛':item.status=='3'?'进行中':'已结束'}}</button>
           </view>
         </view>
         <view class="left1">

pages/home/index.wxss

@@ -5,6 +5,26 @@
   overflow-y: auto;
 }
 
+.two .list .listtou .listbut .color0 {
+  background: rgb(238, 147, 28);
+}
+
+.two .list .listtou .listbut .color1 {
+  background: rgb(54, 233, 48)
+}
+
+.two .list .listtou .listbut .color2 {
+  background: rgb(238, 88, 28);
+}
+
+.two .list .listtou .listbut .color3 {
+  background: rgb(54, 233, 48)
+}
+
+.two .list .listtou .listbut .color4 {
+  background: rgb(136, 136, 136);
+}
+
 .biao {
   float: left;
   width: 10%;
@@ -55,7 +75,7 @@ listbut {
   color: #5e5e5e;
 }
 
-.button {
+button {
   margin-top: 4px;
   /* background-color: rgb(238, 147, 28); */
   border-radius: 15px;

pages/list/index.js

@@ -48,17 +48,6 @@ Page({
             console.log('res', res.data);
             if (res.data.errcode == 0) {
               let datas = res.data.data
-              if (datas.status == 0) {
-                datas.status = '未开始'
-              } else if (datas.status == 1) {
-                datas.status = '报名中'
-              } else if (datas.status == 2) {
-                datas.status = '待比赛'
-              } else if (datas.status == 3) {
-                datas.status = '进行中'
-              }else if (datas.status == 4) {
-                datas.status = '已结束'
-              }
               that.setData({
                 teamlist: datas,
               });

pages/list/index.wxml

@@ -10,11 +10,7 @@
       <view class="list">
         <view class="listtou">
           <view class="name">{{teamlist.name}}</view>
-          <view class="listbut"> <button class="button" size="mini" style="background:rgb(238, 147, 28);" wx:if="{{teamlist.status == '未开始'}}">{{teamlist.status}}</button>
-            <button class="button" size="mini" style="background:rgb(238, 88, 28);" wx:if="{{teamlist.status == '待比赛'}}">{{teamlist.status}}</button>
-            <button class="button" size="mini" style="background:rgb(54, 233, 48)" wx:if="{{teamlist.status == '报名中'}}">{{teamlist.status}}</button>
-            <button class="button" size="mini" style="background:rgb(54, 233, 48)" wx:if="{{teamlist.status == '进行中'}}">{{teamlist.status}}</button>
-            <button class="button" size="mini" style="background:rgb(136, 136, 136);" wx:if="{{teamlist.status == '已结束'}}">{{teamlist.status}}</button>
+          <view class="listbut"> <button class="color{{teamlist.status}}" size="mini">{{teamlist.status=='0'?'未开始':teamlist.status=='1'?'报名中':teamlist.status=='2'?'待比赛':teamlist.status=='3'?'进行中':'已结束'}}</button>
           </view>
         </view>
         <view class="left1">
@@ -64,29 +60,29 @@
           </view>
         </van-tab>
         <van-tab title="赛程列表">
-          <view class="root" wx:if="{{status=='未开始'}}" wx:key="item" wx:for="{{schedule}}">
+          <view class="root" wx:if="{{item.status=='0'}}" wx:key="item" wx:for="{{schedule}}">
             <image class='background-image' src='/image/huang.png'></image>
             <view class="content">
               <view class="four">
                 <view class="four-1">
                   <view class="fourleft3">
-                    <text class="fourtext5">{{item.status}}</text>
+                    <text class="fourtext5">{{item.status=='0'?'未开始':item.status=='1'?'报名中':item.status=='2'?'待比赛':item.status=='3'?'进行中':'已结束'}}</text>
                     <text class="fourtext6">{{item.match_time}}</text>
                   </view>
                   <view class="fourright4">
                     <view class="fourright1_2">
                       <view class="fourright1_2o">
-                        <image class="fourhead1" src="{{item.blue_logo}}"></image>
+                        <image class="fourhead1" src="{{item.blue_logo[0].url}}"></image>
                       </view>
                       <view class="fourright1_2t"><text>{{item.blue_name}}</text></view>
                       <view class="fourright1_2i">
-                        <text class="fourtext6-1">{{item.blue_branch}}</text>
+                        <text class="fourtext6-1">{{item.blue_branch||0}}</text>
                         <text class="fourtext8-1">:</text>
-                        <text class="fourtext7-1">{{item.red_branch}}</text>
+                        <text class="fourtext7-1">{{item.red_branch||0}}</text>
                       </view>
                       <view class="fourright1_2t"><text>{{item.red_name}}</text></view>
                       <view class="fourright1_2o">
-                        <image class="fourhead2" src="{{item.red_logo}}"></image>
+                        <image class="fourhead2" src="{{item.red_logo[0].url}}"></image>
                       </view>
                     </view>
                   </view>
@@ -94,29 +90,29 @@
               </view>
             </view>
           </view>
-          <view class="root" wx:if="{{status=='已结束'}}" wx:key="item" wx:for="{{schedule}}">
+          <view class="root" wx:if="{{item.status=='4'}}" wx:key="item" wx:for="{{schedule}}">
             <image class='background-image' src='/image/hhh.png'></image>
             <view class="content">
               <view class="four">
                 <view class="four-1">
                   <view class="fourleft3">
-                    <text class="fourtext5">{{item.status}}</text>
+                    <text class="fourtext5">{{item.status=='0'?'未开始':item.status=='1'?'报名中':item.status=='2'?'待比赛':item.status=='3'?'进行中':'已结束'}}</text>
                     <text class="fourtext6">{{item.match_time}}</text>
                   </view>
                   <view class="fourright4">
                     <view class="fourright1_2">
                       <view class="fourright1_2o">
-                        <image class="fourhead1" src="{{item.blue_logo}}"></image>
+                        <image class="fourhead1" src="{{item.blue_logo[0].url}}"></image>
                       </view>
                       <view class="fourright1_2t"><text>{{item.blue_name}}</text></view>
                       <view class="fourright1_2i">
-                        <text class="fourtext6-1">{{item.blue_branch}}</text>
+                        <text class="fourtext6-1">{{item.blue_branch||0}}</text>
                         <text class="fourtext8-1">:</text>
-                        <text class="fourtext7-1">{{item.red_branch}}</text>
+                        <text class="fourtext7-1">{{item.red_branch||0}}</text>
                       </view>
                       <view class="fourright1_2t"><text>{{item.red_name}}</text></view>
                       <view class="fourright1_2o">
-                        <image class="fourhead2" src="{{item.red_logo}}"></image>
+                        <image class="fourhead2" src="{{item.red_logo[0].url}}"></image>
                       </view>
                     </view>
                   </view>

pages/list/index.wxss

@@ -63,7 +63,7 @@
   color: #5e5e5e;
 }
 
-.button {
+button {
   margin-top: 4px;
   /* background-color: rgb(238, 147, 28); */
   border-radius: 15px;
@@ -402,8 +402,8 @@
   position: absolute;
   padding-top: 5%;
   width: 100%;
-  left: 0px;
-  top: -2px;
+  margin-top: -28%;
+  margin-left: -2%;
 }
 
 .four1 {
@@ -413,21 +413,18 @@
 
 .fourhead1 {
   margin-left: 25%;
-  width: 67%;
-  height: 33px;
+  width: 55%;
+  height: 39.2px;
   overflow: hidden;
 }
 
 .fourhead2 {
   margin-left: 5%;
   width: 55%;
-  height: 34px;
+  height: 39.2px;
   overflow: hidden;
 }
 
-.four {
-  margin-bottom: 20%;
-}
 
 .fourtext5 {
   position: absolute;
@@ -443,12 +440,14 @@
   margin-left: 2%;
   padding-top: 5%;
 }
+.four{
+  margin-top: 2%;
+}
 
 .fourtext6 {
-  padding-left: 260px;
+  padding-left: 225px;
   color: #fff;
   font-size: 13px;
-  margin-top: -1px;
 }
 
 .fourright1_2 {
@@ -460,12 +459,12 @@
   width: 20%;
   height: 36px;
   overflow: hidden;
-  margin-top: 2px;
+  margin-top: -1px;
 }
 
 .fourright1_2t {
   float: left;
-  width: 25%;
+  width: 23%;
   text-align: center;
   padding: 10px 0;
   font-size: 14px;
@@ -500,7 +499,26 @@
 
 .fourright1_2i {
   float: left;
-  width: 10%;
+  width: 13%;
   text-align: center;
   padding: 6px 0;
+}
+.two .list .listtou .listbut .color0 {
+  background: rgb(238, 147, 28);
+}
+
+.two .list .listtou .listbut .color1 {
+  background: rgb(54, 233, 48)
+}
+
+.two .list .listtou .listbut .color2 {
+  background: rgb(238, 88, 28);
+}
+
+.two .list .listtou .listbut .color3 {
+  background: rgb(54, 233, 48)
+}
+
+.two .list .listtou .listbut .color4 {
+  background: rgb(136, 136, 136);
 }