修改首页

pages/home/index.js

@@ -21,16 +21,16 @@ Page({
   //跳转详情
   tiao: function (e) {
     let id = e.currentTarget.dataset.id;
-    wx.navigateTo({
-      url: '/pages/list/index?id=' + id,
-    })
-  },
-  //跳转循环赛
-  xun: function (e) {
-    let id = e.currentTarget.dataset.id;
-    wx.navigateTo({
-      url: '/pages/match/detail?id=' + id,
-    })
+    let type = e.currentTarget.dataset.type;
+    if(type==1){
+      wx.navigateTo({
+        url: '/pages/list/index?id=' + id,
+      })
+    }else{
+      wx.navigateTo({
+        url: '/pages/match/detail?id=' + id,
+      })
+    }
   },
   /**
    * 生命周期函数--监听页面加载

pages/home/index.wxml

@@ -6,7 +6,7 @@
     <view class="two">
       <view class="list" wx:for="{{teamlist}}" wx:key="item">
         <view class="listtou">
-          <view class="name" bindtap="tiao" data-id="{{item._id}}">{{item.name}}</view>
+          <view class="name" bindtap="tiao" data-id="{{item._id}}" data-type="1">{{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>
@@ -17,7 +17,7 @@
           <view class="otherInfo textOver"><text class="text3">{{item.address}}</text></view>
         </view>
         <view class="right1" wx:for="{{item.schedulelist}}" wx:for-item="tag" wx:key="{{tag}}">
-          <view class="right1_2" bindtap="xun" data-id="{{tag._id}}">
+          <view class="right1_2" bindtap="tiao" data-id="{{tag._id}}" data-type="2">
             <view class="right1_2o">
               <image class="head1" src="{{tag.blue_logo[0].url}}"></image>
             </view>

pages/list/index.js

@@ -28,11 +28,11 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) {
-    this.setData({ids:options.id});
+    this.setData({ ids: options.id });
+    // 计算高度
+    this.searchHeight();
     // 监听用户是否登录
     this.watchLogin();
-    // 计算高度
-    this.searchHeight()
   },
   // 监听用户是否登录
   watchLogin: function () {
@@ -65,17 +65,18 @@ Page({
         })
       },
       fail: res => {
-       return wx.redirectTo({ url: '/pages/login/index', })
+        return wx.redirectTo({ url: '/pages/login/index', })
       }
     })
   },
   // 查询参赛队伍数据
   ranks: function () {
     var that = this;
+    let match_id =that.data.ids;
     wx.request({
       url: `${app.globalData.publicUrl}/courtAdmin/api/matchteam`, //接口地址
       method: 'get',
-      data: {},
+      data: { match_id:match_id},
       success(res) {
         if (res.data.errcode == 0) {
           let datacan = res.data.data
@@ -96,10 +97,11 @@ Page({
   // 查询赛程列表数据
   course: function () {
     var that = this;
+    let match_id =that.data.ids;
     wx.request({
       url: `${app.globalData.publicUrl}/courtAdmin/api/schedule`, //接口地址
       method: 'get',
-      data: {},
+      data: { match_id:match_id},
       success(res) {
         if (res.data.errcode == 0) {
           let datasai = res.data.data