赛程

pages/me/index.js

@@ -18,7 +18,7 @@ Page({
     total: '4',
     //上传比分
     match: [],
-    blue_red: [],
+    match_blue: [],
     //个人信息详情
     item1: {},
     //团队列表
@@ -46,9 +46,10 @@ Page({
     })
   },
   //上传比分
-  upload: function () {
+  upload: function (e) {
+    let id = e.currentTarget.dataset.id
     wx.navigateTo({
-      url: `/pages/score/index`,
+      url: `/pages/score/index?id=${id}`,
     })
   },
   //创建团队
@@ -153,7 +154,7 @@ Page({
       wx.request({
         url: `${app.globalData.publicUrl}/courtAdmin/api/team`,
         method: "get",
-        data: {},
+        data: { create_id: id },
         header: {},
         success: res => {
           this.setData({ list: res.data.data })
@@ -189,7 +190,6 @@ Page({
       data: { red_id: id },
       header: {},
       success: res => {
-        // that.setData({ blue_red: res.data.data })
         that.setData({ match: res.data.data })
       },
       error: err => {
@@ -201,14 +201,14 @@ Page({
       data: { blue_id: id },
       header: {},
       success: res => {
-        // that.setData({ blue_red: res.data.data })
-        that.setData({ match: res.data.data })
+        that.setData({ match_blue: res.data.data })
       },
       error: err => {
       }
     })
-    // let blue_red = that.data.blue_red;
-    // that.setData({ match: that.data.blue_red})
+    let match_blue = that.data.match_blue;
+    let match = that.data.match;
+    match = [...match_blue, ...match];
   },
   // 计算高度
   searchHeight: function () {

pages/me/index.wxml

@@ -40,8 +40,8 @@
         <view class="left2">
           <text class="text4">可对正在进行的比赛上次比分</text>
         </view>
-        <view class="right2" bindtap="upload">
-          <button class="buttons" size="mini">上传比分</button>
+        <view class="right2" bindtap="upload" data-id="{{item._id}}">
+          <button class="buttons"  size="mini">上传比分</button>
         </view>
       </view>
       <image src="{{src3}}" class="huang"></image>
@@ -101,9 +101,7 @@
               <view class="dui-right1 ">
                 <text class="group" bindtap="ToDetails" data-id="{{item._id}}">{{item.name}}</text>
               </view>
-              <button class="ball" size="mini" wx:if="{{item.type=='0'}}" style="background-color:rgb(63, 127, 245);">乒乓球</button>
-              <button class="ball" size="mini" wx:if="{{item.type=='1'}}" style="background-color:rgb(245, 172, 63);">足球</button>
-              <button class="ball" size="mini" wx:if="{{item.type=='2'}}" style="background-color:rgb(241, 95, 127);">篮球</button>
+              <button class="color{{item.type}}" size="mini">{{item.type=='0'?'乒乓球':item.type=='1'?'足球':'篮球'}}</button>
             </view>
             <view class="dui-right"><text class="person">
                 共{{item.members.length||0}}人

pages/me/index.wxss

@@ -100,6 +100,33 @@
   position: relative;
   top: 10px;
 }
+ .color0 {
+  margin-top: 10px;
+  margin-right: 2px;
+  border-radius: 10px;
+  font-size: 12px !important;
+  color: #fff;
+  background: rgb(63, 127, 245);
+}
+
+.color1 {
+  margin-top: 10px;
+  margin-right: 2px;
+  border-radius: 10px;
+  font-size: 12px !important;
+  color: #fff;
+  background: rgb(245, 172, 63)
+}
+
+.color2 {
+  margin-top: 10px;
+  margin-right: 2px;
+  border-radius: 10px;
+  font-size: 12px !important;
+  color: #fff;
+  background: rgb(241, 95, 127);
+}
+
 
 .buttons {
   margin-top: 8px;