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

pages/administration/index.js

@@ -33,14 +33,16 @@ Page({
           let dataend = []
           for (let i = 0; i < datas.length; i++) {
             if (datas[i].status == 0) {
-              datas[i].status = '待比赛'
+              datas[i].status = '未开始'
               datastart.push(datas[i])
             } else if (datas[i].status == 1) {
-              datas[i].status = '进行中'
-              datass.push(datas[i])
-            } else if (datas[i].status == 2) {
               datas[i].status = '报名中'
+            } else if (datas[i].status == 2) {
+              datas[i].status = '待比赛'
             } 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

@@ -20,7 +20,7 @@
       </view>
     </view>
     <view class="four">
-      <van-tabs v-model:active="activeName">
+      <van-tabs v-model:active="activeName" sticky>
         <van-tab title="进行中">
           <view class="list" wx:key="item" wx:for="{{list}}">
             <view class="name" data-name="{{item._id}}" bindtap="tiao">{{item.name}}</view>

pages/administration/index.wxss

@@ -17,12 +17,11 @@
 }
 
 .two {
-  position: absolute;
-  top: 20%;
+  margin-top: -20%;
+  position: relative;
   width: 100%;
   border-radius: 15px;
 }
-
 .themes {
   position: absolute;
   margin-top: 10%;
@@ -45,14 +44,13 @@
   background-color: #eeeeee;
 }
 .thr{
-  position: absolute;
-  top: 40%;
-  left: 1.5%;
+  position: relative;
+  margin-top: 2%;
+  left: 2%;
   float: left;
-  width: 98%;
+  width: 97%;
   border-radius: 15px;
 }
-
 .left {
   float: left;
   width: 46%;
@@ -86,16 +84,16 @@
   width: 21%;
 }
 .four{
-  margin-top: 34%;
+  margin-top: 20%;
   position: absolute;
-  top: 32%;
   left: 3.5%;
   width: 93%;
   border-radius: 10%;
 }
+
 .name {
   float: left;
-  width: 40%;
+  /* width: 40%; */
   margin: 6px;
   margin-left: 10px;
   font-size: 16px;
@@ -109,20 +107,21 @@
 }
 
 .text1 {
+  font-weight: 500;
   margin-right: 3px;
   font-size: 14px;
   color: #5e5e5e;
 }
 .button{
   margin-top: 4px;
-  background-color: rgb(238, 147, 28);
+  background-color: rgb(54, 233, 48);
   border-radius: 15px;
   font-size: 13px !important;
   color: #fff;
 }
 .buttonstart{
   margin-top: 4px;
-  background-color: rgb(238, 88, 28);
+  background-color: rgb(238, 147, 28);
   border-radius: 15px;
   font-size: 13px !important;
   color: #fff;
@@ -148,6 +147,7 @@
   padding-top: 5px;
 }
 .text3 {
+  font-weight: 500;
   font-size: 13px;
   color: #adadad;
 }
@@ -216,4 +216,4 @@
 }
 .right1_1{
   text-align: center;
-}
+}

pages/home/index.js

@@ -25,12 +25,14 @@ Page({
           let datas = res.data.data
           for (let i = 0; i < datas.length; i++) {
             if (datas[i].status == 0) {
-              datas[i].status = '待比赛'
+              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 == 2) {
+              datas[i].status = '待比赛'
             } else if (datas[i].status == 3) {
+              datas[i].status = '进行中'
+            }else if (datas[i].status == 4) {
               datas[i].status = '已结束'
             }
           }

pages/home/index.wxml

@@ -7,9 +7,10 @@
       <view class="list" wx:key="item" wx:for="{{list}}">
         <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>
+          <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>
         </view>

pages/home/index.wxss

@@ -11,9 +11,9 @@
 }
 
 .two {
+  margin-top: -15%;
+  margin-left: 2.5%;
   position: absolute;
-  top: 28%;
-  left: 2.5%;
   width: 95%;
 }
 
@@ -24,7 +24,7 @@
 
 .name {
   float: left;
-  width: 38%;
+  /* width: 38%; */
   margin: 6px;
   margin-left: 10px;
   font-size: 16px;
@@ -42,6 +42,7 @@ listbut{
 }
 
 .text1 {
+  font-weight: 500;
   margin-right: 3px;
   font-size: 14px;
   color: #5e5e5e;
@@ -63,6 +64,7 @@ listbut{
 }
 
 .text3 {
+  font-weight: 500;
   font-size: 13px;
   color: #adadad;
 }

pages/list/index.js

@@ -42,7 +42,6 @@ Page({
                 datas.status = '已结束'
               }
               that.setData({
-                //getSales:temp,
                 list: datas,
               });
               // 查询参赛队伍数据

pages/list/index.wxss

@@ -26,9 +26,9 @@
 }
 
 .two {
+  margin-top: -20%;
+  margin-left: 2.5%;
   position: absolute;
-  top: 25%;
-  left: 2.5%;
   width: 95%;
 }
 

pages/search/index.js

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

pages/search/index.wxml

@@ -6,8 +6,10 @@
           <van-tab title="待参加" name="a" style="font-weight: 500;">
             <view class="beijing1" wx:key="item" wx:for="{{list}}">
               <view class="list1">
-                <view class="names" data-name="{{item._id}}" bindtap="tiao">{{item.name}}</view>
+              <view>
+               <view class="names" data-name="{{item._id}}" bindtap="tiao">{{item.name}}</view>
                 <button class="button" size="mini">{{item.status}}</button>
+              </view>
                 <view class="leftmueen">
                   <view class="otherInfos">
                     <text class="text9">{{item.single_time}}</text>

pages/search/index.wxss

@@ -6,7 +6,6 @@
 
 .one {
   margin-top: 32px;
-  font-weight: 500;
 }
 
 .one-2 {
@@ -18,11 +17,13 @@
   width: 38.800003px !important;
   background-color: blue !important;
 }
+
 .list1 {
   background-color: white;
   padding-top: 5px;
 }
-.beijing1{
+
+.beijing1 {
   margin-bottom: 1.5%;
 }
 
@@ -70,12 +71,17 @@
 }
 
 .text9 {
-  font-size: 14px;
-  margin-left: 10px;
+  font-weight: 500;
   margin-right: 3px;
+  font-size: 14px;
   color: #5e5e5e;
 }
 
+.leftmueen {
+  margin: 5px;
+  border-radius: 25px;
+}
+
 .text10 {
   font-size: 14px;
   margin-left: 2px;
@@ -113,7 +119,7 @@
 
 .names {
   float: left;
-  width: 35%;
+  /* width: 35%; */
   margin: 6px;
   margin-left: 10px;
   font-size: 16px;
@@ -141,14 +147,17 @@ button {
   float: left;
   width: 50%;
 }
+
 .otherInfo {
   text-align: left;
-  padding: 0 0 15px 0px;
+  padding: 0 0 15px 5px;
+}
+.otherInfos {
+  padding: 0 0 0px 5px;
 }
 
 .text3 {
-  margin-left: 10px;
-  margin-bottom: 10px;
+  font-weight: 500;
   font-size: 13px;
   color: #adadad;
 }