1

pagesMatch/match/info.js

@@ -266,10 +266,12 @@ Page({
         arr = await app.$get(`/msgs`, { ...info }, 'race');
         if (arr.errcode == '0') {
             for (const val of arr.data) {
-                val.one_one = val.player_one_name.split("-")[0];
-                val.one_two = val.player_one_name.split("-")[1];
-                val.two_one = val.player_two_name.split("-")[0];
-                val.two_two = val.player_two_name.split("-")[1];
+                if (val.player_type == 'Race.TeamApply') {
+                    val.one_one = val.player_one_name.split("-")[0];
+                    val.one_two = val.player_one_name.split("-")[1];
+                    val.two_one = val.player_two_name.split("-")[0];
+                    val.two_two = val.player_two_name.split("-")[1];
+                }
             }
             that.setData({ raceList: arr.data });
             that.setData({ dList: that.data.raceList })

pagesMatch/matchAdmin/mtgroup/add.js

@@ -132,6 +132,7 @@ Page({
                         // 组内人员
                         const sign = await app.$get(`/matchTeamGroup/fgps?project_id=${arr.data.project_id}&person_type=${arr.data.person_type}&team_id=${that.data.id}`, {}, 'race');
                         if (sign.errcode == '0') {
+                            
                             for (const val of sign.data) {
                                 if (arr.data.person_type == 'Race.TeamApply') {
                                     let user_name = arr.data.person.find(i => i.id == val._id);

pagesMatch/matchAdmin/mtgroup/auto.wxml

@@ -12,10 +12,10 @@
                     <view><button type="primary" size="mini" bindtap="toEdit" data-item="{{item}}">修改</button> </view>
                 </view>
                 <view class="person">
-                    <view class="tagname" wx:for="{{item.person}}" wx:for-item="tag" wx:key="tag" wx:if="{{item.person_type=='User'}}">
+                    <view class="tagname" wx:for="{{item.person}}" wx:for-item="tag" wx:key="tag" wx:if="{{item.person_type=='Race.User'}}">
                         {{tag.user_name}} <text class="iconfont icon-shanchu" bindtap="toDel" data-name="{{item.name}}" data-tag="{{tag}}"></text>
                     </view>
-                    <view class="tagteam" wx:for="{{item.person}}" wx:for-item="tag" wx:key="tag" wx:if="{{item.person_type=='TeamApply'}}">
+                    <view class="tagteam" wx:for="{{item.person}}" wx:for-item="tag" wx:key="tag" wx:if="{{item.person_type=='Race.TeamApply'}}">
                         {{tag.one_member_name}}- {{tag.two_member_name}}
                         <view><text class="iconfont icon-shanchu" bindtap="toDel" data-name="{{item.name}}" data-tag="{{tag}}"></text></view>
                     </view>
@@ -88,10 +88,10 @@
                     <view class="value">
                         <checkbox-group bindchange="checkboxChange">
                             <label class="checkbox">
-                                <view class="member" wx:for="{{form.member}}" wx:key="{{item.user_id}}" wx:if="{{form.person_type=='User'}}">
+                                <view class="member" wx:for="{{form.member}}" wx:key="{{item.user_id}}" wx:if="{{form.person_type=='Race.User'}}">
                                     <checkbox value="{{item.user_id}}" checked="{{item.checked}}" />{{item.user_name}}
                                 </view>
-                                <view class="memberTeam" wx:for="{{form.member}}" wx:key="{{item.id}}" wx:if="{{form.person_type=='TeamApply'}}">
+                                <view class="memberTeam" wx:for="{{form.member}}" wx:key="{{item.id}}" wx:if="{{form.person_type=='Race.TeamApply'}}">
                                     <checkbox value="{{item.id}}" checked="{{item.checked}}" />{{item.one_member_name}}-{{item.two_member_name}}
                                 </view>
                             </label>

pagesMatch/matchAdmin/mtschedule/add.js

@@ -24,7 +24,7 @@ Page({
         statusList: []
     },
     initValidate() {
-        const rules = { match_id: { required: true }, group_id: { required: true }, project_id: { required: true }, team_id: { required: true }, address_id: { required: true }, referee_id: { required: true }, match_time: { required: true }, player_type: { required: true }, player_one: { required: true }, player_two: { required: true } }
+        const rules = { match_id: { required: true }, group_id: { required: true }, project_id: { required: true }, team_id: { required: true }, address_id: { required: false }, referee_id: { required: false }, match_time: { required: true }, player_type: { required: true }, player_one: { required: true }, player_two: { required: true } }
         // 验证字段的提示信息，若不传则调用默认的信息
         const messages = { match_id: { required: '比赛赛事' }, group_id: { required: '赛事分组' }, project_id: { required: '组内项目' }, team_id: { required: '小组名称' }, address_id: { required: '场地名称' }, referee_id: { required: '裁判名称' }, match_time: { required: '比赛时间' }, player_type: { required: '选手类型' }, player_one: { required: '选手一' }, player_two: { required: '选手二' } };
         this.WxValidate = new WxValidate(rules, messages)
@@ -68,6 +68,7 @@ Page({
         if (data) {
             that.setData({ 'form.team_id': data._id, 'form.team_id_name': data.name });
             const arr = await app.$get(`/matchTeamGroup/${data._id}`, {}, 'race');
+            console.log(arr);
             if (arr.errcode == '0') {
                 if (arr.data.person_type == 'Race.User') { that.setData({ 'form.player_type': 'Race.User', 'form.type_name': '单打' }) }
                 if (arr.data.person_type == 'Race.TeamApply') { that.setData({ 'form.player_type': 'Race.TeamApply', 'form.type_name': '双打' }) }

pagesMatch/matchAdmin/mtschedule/list.js

@@ -159,6 +159,7 @@ Page({
                 let arr;
                 arr = await app.$get(`/match`, { belong_id: res.data._id }, 'race');  
                 if (arr.errcode == '0') { that.setData({ matchList: arr.data }) }
+                if(that.data.match&&that.data.match.id)that.search();
             },
             fail: async res => {
                 wx.redirectTo({ url: '/pages/index/index' })