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

pages/me/index.js

@@ -144,7 +144,7 @@ Page({
         success: res => {
           this.setData({ list: res.data.data })
           //查询比赛列表
-          if(res.data.data.length!=0)this.searchMatch(res.data.data);
+          if (res.data.data.length != 0) this.searchMatch(res.data.data);
         },
         error: err => {
         }
@@ -154,7 +154,7 @@ Page({
       wx.request({
         url: `${app.globalData.publicUrl}/courtAdmin/api/team/userteams`,
         method: "get",
-        data: { user_id: id },
+        data: { user_id: id, status: 1 },
         header: {},
         success: res => {
           this.setData({ list: res.data.data })

pages/team/index.js

@@ -15,7 +15,7 @@ Page({
     //团队列表
     teamlist: [],
     //判断
-    keyindex:[],
+    keyindex: [],
     //用户id
     user_id: ''
   },
@@ -52,25 +52,23 @@ Page({
         wx.request({
           url: `${app.globalData.publicUrl}/courtAdmin/api/team`, //接口地址
           method: 'get',
-          data: '',
+          data: { status: 1 },
           success(res) {
             if (res.data.errcode == 0) {
               let datas = res.data.data
               let user_id = that.data.user_id
-              that.setData({
-                teamlist: datas,
-              });
+              that.setData({teamlist: datas,});
               let arr = []
               for (let j = 0; j < datas.length; j++) {
                 for (let i = 0; i < datas[j].members.length; i++) {
                   arr.push(-1)
                   if (user_id == datas[j].members[i].id) {
-                    arr[j]= j
+                    arr[j] = j
                   }
                 }
               }
               that.setData({
-                keyindex:arr,
+                keyindex: arr,
               });
             } else {
               wx.showToast({