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

pagesMatch/match/info.js

@@ -36,6 +36,10 @@ Page({
         dList: [],
         // 成绩册
         achieveList: [],
+        // 赛事组别
+        groupList: [],
+        // 赛事项目
+        projectList: [],
         //赛事状态
         statusList: [],
         //赛事类别
@@ -157,6 +161,12 @@ Page({
     searchOther: async function () {
         const that = this;
         let arr;
+        // 赛事组别
+        arr = await app.$get(`/matchGroup`, { match_id: that.data.id }, 'race');
+        if (arr.errcode == '0') { that.setData({ groupList: arr.data }) };
+        // 赛事项目
+        arr = await app.$get(`/matchProject`, { match_id: that.data.id }, 'race');
+        if (arr.errcode == '0') { that.setData({ projectList: arr.data }) };
         // 赛事状态
         arr = await app.$get(`/dict`, { code: "match_status" });
         if (arr.errcode == '0' && arr.total > 0) that.setData({ statusList: arr.data[0].list });
@@ -208,6 +218,7 @@ Page({
                 } else { wx.showToast({ title: `${arr.errmsg}`, icon: 'fail', duration: 2000 }); }
                 // 赛事选手
                 arr = await app.$get(`/match/getAll/${arr.data._id}`, {}, 'race');
+                console.log(arr);
                 if (arr.errcode == '0') that.setData({ playerList: arr.data })
                 // 秩序册
                 that.searchOrderBook();
@@ -237,6 +248,8 @@ Page({
         let genderList = that.data.genderList;
         let type = that.data.cType;
         let match = that.data.info;
+        let groupList = that.data.groupList;
+        let projectList = that.data.projectList;
         let cSearch = that.data.cSearchname;
         let info = { match_id: match._id };
         if (type == '0') { if (cSearch) info.user_name = cSearch; }
@@ -248,13 +261,13 @@ Page({
             let list = arr.data;
             for (const val of list) {
                 // 查询组
-                const group = await app.$get(`/matchGroup/${val.group_id}`, {}, 'race');
-                if (group.errcode == '0') { val.age = group.data.age; }
+                let group = groupList.find(i => i.id == val.group_id);
+                if (group) val.age = group.age;
                 // 查询项目
-                const project = await app.$get(`/matchProject/${val.project_id}`, {}, 'race');
-                if (project.errcode == '0') {
-                    val.projectAge = project.data.age;
-                    let gender = genderList.find(i => i.value == project.data.gender)
+                let project = projectList.find(i => i.id == val.project_id);
+                if (project) {
+                    val.projectAge = project.age;
+                    let gender = genderList.find(i => i.value == project.gender);
                     if (gender) val.pojectGender = gender.label;
                 }
                 // 名字分割

pagesMatch/system/index.js

@@ -49,7 +49,7 @@ Page({
                     const aee = await app.$get(`/user/${arr.data.user_id}`);
                     if (aee.errcode == '0') { arr.data.user_id = aee.data; }
                     that.setData({ user: arr.data })
-                    let btnData = match_menu.find((i) => i.type == arr.data.type);
+                    let btnData = match_menu.find((i) => i.type == '2');
                     that.setData({ list: [...btnData.menu, ...school_sysmenu] })
                 }
                 else { wx.showToast({ title: `${arr.errmsg}`, icon: 'error', duration: 2000 }); }