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

pages/administration/details.js

@@ -41,7 +41,6 @@ Page({
           success(res) {
             if (res.data.errcode == 0) {
               let datas = res.data.data
-
               that.setData({
                 teamlist: datas,
               });

pages/administration/index.js

@@ -53,11 +53,6 @@ Page({
       url: `/pages/manage/index`,
     })
   },
-  //标签页
-  setup() {
-    const activeName = ref('a');
-    return { activeName };
-  },
   /**
    * 生命周期函数--监听页面加载
    */

pages/administration/index.wxss

@@ -18,7 +18,26 @@
   background: rgb(54, 233, 48)
 }
 
-.list .listbut .color4 {
+.list .color4 {
+  background: rgb(136, 136, 136);
+}
+.list .color0 {
+  background: rgb(238, 147, 28);
+}
+
+.list .color1 {
+  background: rgb(54, 233, 48)
+}
+
+.list .color2 {
+  background: rgb(238, 88, 28);
+}
+
+.list .color3 {
+  background: rgb(54, 233, 48)
+}
+
+.list .color4 {
   background: rgb(136, 136, 136);
 }
 .van-tabs__wrap {

pages/home/index.js

@@ -12,12 +12,14 @@ Page({
     infoHeight: '',
     teamlist: [],
   },
+  //跳转详情
   tiao: function (e) {
-    let id = e.currentTarget.dataset.name;
+    let id = e.currentTarget.dataset.id;
     wx.navigateTo({
       url: '/pages/list/index?id=' + id,
     })
   },
+  //跳转循环赛
   xun: function () {
     wx.navigateTo({
       url: '/pages/match/detail',

pages/home/index.wxml

@@ -6,7 +6,7 @@
     <view class="two">
       <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="name"  bindtap="tiao" data-id="{{item._id}}">{{item.name}}</view>
           <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>

pages/list/index.wxml

@@ -81,7 +81,7 @@
                         <text class="fourtext7-1">{{item.red_branch||0}}</text>
                       </view>
                       <view class="fourright1_2t"><text>{{item.red_name}}</text></view>
-                      <view class="fourright1_2o">
+                      <view class="fourright1_2oi">
                         <image class="fourhead2" src="{{item.red_logo[0].url}}"></image>
                       </view>
                     </view>

pages/list/index.wxss

@@ -181,7 +181,6 @@ button {
 
 .thr-left {
   width: 79%;
-  height: 56.31px;
 }
 
 .img {
@@ -323,7 +322,7 @@ button {
 .headtou {
   float: left;
   margin-left: 20px;
-  width: 17%;
+  width: 20%;
   height: 33px;
   overflow: hidden;
 }
@@ -457,9 +456,10 @@ button {
 .fourright1_2o {
   float: left;
   width: 20%;
-  height: 36px;
-  overflow: hidden;
-  margin-top: -1px;
+}
+.fourright1_2oi {
+  float: left;
+  width: 20%;
 }
 
 .fourright1_2t {

pages/maintain/index.js

@@ -196,7 +196,7 @@ Page({
               let timedate = timer.substring(0, 10)
               let time = timer.substring(11, 16)
               let starttime = date.substring(0, 10)
-              let endtime = date.substring(12, 23)
+              let endtime = date.substring(12, 28)
               that.setData({
                 form: datas,
                 timedate: timedate,
@@ -205,9 +205,7 @@ Page({
                 endtime: endtime,
                 cateIndex: status,
                 szList: szList
-              });
-
-              // single_time
+              });  
             } else {
               wx.showToast({
                 title: res.data.errmsg,

pages/maintain/index.wxml

@@ -16,7 +16,7 @@
             </view>
           </picker>
           <text>—</text>
-          <picker mode="date" value="{{endtime}}" start="{{starttime}}" end="2050-01-01" bindchange="bindDateChange2">
+          <picker mode="date" value="{{endtime}}" start="{{starttime}}" bindchange="bindDateChange2">
             <view class="picker">
               {{endtime}}
             </view>

pages/manage/index.js

@@ -173,17 +173,6 @@ Page({
           success(res) {
             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 = '已结束'
-                }
-              }
               that.setData({
                 dissolution: datas,
               });

pages/manage/index.wxml

@@ -45,7 +45,7 @@
                   <view class="time"><text class="date">申请时间：{{item.apply_time}}</text></view>
                   <view class="time"><text class="date">解散团队原因：{{item.resaon}}</text></view>
                 </view>
-                <view class="right">
+                <view class="right" >
                   <button class="buttons" wx:if="{{item.status=='0'}}" data-name="{{item._id}}" bindtap='out'>通过</button>
                 </view>
               </view>

pages/ranking/index.wxss

@@ -89,8 +89,8 @@
 .headtou {
   float: left;
   margin-left: 35px;
-  width: 9%;
-  height: 33px;
+  width: 15%;
+  height: 46.05px;
   overflow: hidden;
 }
 

pages/search/index.wxml

@@ -25,7 +25,7 @@
             <view class="beijing1" wx:key="item" wx:for="{{listend}}">
               <view class="list1">
                 <view class="names" data-name="{{item._id}}" bindtap="tiao">{{item.name}}</view>
-                <button class="buttonend" size="mini">{{item.status}}</button>
+                <button class="buttonend" size="mini">{{item.status=='0'?'未开始':item.status=='1'?'报名中':item.status=='2'?'待比赛':item.status=='3'?'进行中':'已结束'}}</button>
                 <view class="leftmueen">
                   <view class="otherInfos">
                     <text class="text9">{{item.single_time}}</text>

pages/search/index.wxss

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