1

commpents/pagesMatchs/match/match-1.js

@@ -1,18 +1,18 @@
 // commpents/pagesMatch/match/match-1.js
+const app = getApp()
 Component({
     /**
      * 组件的属性列表
      */
     properties: {
         info: { type: Object },
-        fileUrl: { type: String }
     },
 
     /**
      * 组件的初始数据
      */
     data: {
-
+        fileUrl: app.globalData.fileUrl,
     },
 
     /**

commpents/pagesMatchs/match/match-1.less

@@ -1,22 +1,21 @@
 @import (css) "/app.wxss";
 
 .main {
-    width: 96vw;
-    padding: 2vw;
-
-    .image {
+    .one {
+        padding: 2vw;
         width: 96vw;
-        height: 160px;
+
+        .image {
+            width: 100%;
+            height: 160px;
+        }
     }
 
-    .one {
+    .two {
+        padding: 0 2vw;
         width: 96vw;
-        display: flex;
-        flex-direction: column;
-        background-color: var(--mainColor);
-        position: relative;
 
-        .one_1 {
+        .two_1 {
             background-color: var(--mainColor);
             margin: 0 0 3vw 0;
             border-radius: 5px;
@@ -65,10 +64,10 @@
             }
         }
 
-        .one_2 {
+        .two_2 {
             margin: 0;
 
-            .one_2_1 {
+            .two_2_1 {
                 margin: 0 0 1vw 0;
 
                 .txt {
@@ -84,4 +83,17 @@
             }
         }
     }
+}
+
+.scroll-view {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+
+    .list-scroll-view {
+        display: flex;
+        flex-direction: column;
+    }
 }

commpents/pagesMatchs/match/match-1.wxml

@@ -1,4 +1,4 @@
-<view class="main">
+<!-- <view class="main">
     <image class="image" src="{{fileUrl}}/files/court/elimg/20220729140648.png"></image>
     <view class="one">
         <view class="one_1">
@@ -54,4 +54,67 @@
             </view>
         </view>
     </view>
+</view> -->
+<view class="main">
+    <scroll-view scroll-y="true" class="scroll-view">
+        <view class="list-scroll-view">
+            <view class="one">
+                <image class="image" src="{{fileUrl}}/files/court/elimg/20220729140648.png"></image>
+            </view>
+            <view class="two">
+                <view class="two_1">
+                    <view class="name">{{info.name||'暂无'}}</view>
+                    <view class="status"><text>{{info.zhStatus||'暂无'}}</text></view>
+                    <view class="other">
+                        <view class="other_1">
+                            <text>赛事类别：</text>
+                            <text>{{info.zhtype||'暂无'}}</text>
+                        </view>
+                        <view class="other_1">
+                            <text>比赛时间：</text>
+                            <text>{{info.start_time||'暂无'}}至{{info.end_time||'暂无'}}</text>
+                        </view>
+                        <view class="other_1">
+                            <text>赛事赛制：</text>
+                            <text>{{info.zhFormat||'暂无'}}</text>
+                        </view>
+                        <view class="other_1">
+                            <text>报名截止时间：</text>
+                            <text>{{info.sign_time||'暂无'}}</text>
+                        </view>
+                        <view class="other_1">
+                            <text>比赛地点：</text>
+                            <text>{{info.address||'暂无'}}</text>
+                        </view>
+                        <view class="other_1">
+                            <text>报名费用(元)：</text>
+                            <text class="money">{{info.money||'暂无'}}</text>
+                        </view>
+                        <view class="other_1">
+                            <text>报名费用说明：</text>
+                            <text>{{info.money_remark||'暂无'}}</text>
+                        </view>
+                        <view class="other_1">
+                            <text>付款方式：</text>
+                            <text>{{info.money_mode||'暂无'}}</text>
+                        </view>
+                        <view class="other_1">
+                            <text>联系方式：</text>
+                            <text>{{info.contact||'暂无'}}</text>
+                        </view>
+                    </view>
+                </view>
+                <view class="two_1 two_2">
+                    <view class="two_2_1">
+                        <view class="txt">报名说明：</view>
+                        <view class="cont">{{info.explain||'暂无'}}</view>
+                    </view>
+                    <view class="two_2_1">
+                        <view class="txt">赛事规程：</view>
+                        <rich-text nodes="{{info.zhRegular||'暂无'}}"></rich-text>
+                    </view>
+                </view>
+            </view>
+        </view>
+    </scroll-view>
 </view>

commpents/pagesMatchs/match/match-1.wxss

@@ -1,69 +1,77 @@
 @import "/app.wxss";
-.main {
-  width: 96vw;
+.main .one {
   padding: 2vw;
-}
-.main .image {
   width: 96vw;
+}
+.main .one .image {
+  width: 100%;
   height: 160px;
 }
-.main .one {
+.main .two {
+  padding: 0 2vw;
   width: 96vw;
-  display: flex;
-  flex-direction: column;
-  background-color: var(--mainColor);
-  position: relative;
 }
-.main .one .one_1 {
+.main .two .two_1 {
   background-color: var(--mainColor);
   margin: 0 0 3vw 0;
   border-radius: 5px;
   padding: 2vw;
   box-shadow: 0 0 1vw var(--fcColor);
 }
-.main .one .one_1 .name {
+.main .two .two_1 .name {
   font-size: var(--font18Szie);
   font-weight: bold;
   margin: 0 0 2vw 0;
 }
-.main .one .one_1 .status {
+.main .two .two_1 .status {
   margin: 0 0 2vw 0;
 }
-.main .one .one_1 .status text {
+.main .two .two_1 .status text {
   display: inline-block;
   background-color: var(--redColor);
   color: var(--whiteColor);
   padding: 1vw 3vw;
   border-radius: 5px;
 }
-.main .one .one_1 .other .other_1 {
+.main .two .two_1 .other .other_1 {
   margin: 0 0 1vw 0;
   font-size: var(--font16Szie);
   color: var(--f85Color);
   padding: 0.5vw 0;
 }
-.main .one .one_1 .other .other_1 .icon {
+.main .two .two_1 .other .other_1 .icon {
   margin: 0 2vw 0 0;
 }
-.main .one .one_1 .other .other_1 .money {
+.main .two .two_1 .other .other_1 .money {
   color: var(--redColor) !important;
   font-weight: bold;
 }
-.main .one .one_1 .other .other_1 text:last-child {
+.main .two .two_1 .other .other_1 text:last-child {
   color: var(--blackColor);
 }
-.main .one .one_2 {
+.main .two .two_2 {
   margin: 0;
 }
-.main .one .one_2 .one_2_1 {
+.main .two .two_2 .two_2_1 {
   margin: 0 0 1vw 0;
 }
-.main .one .one_2 .one_2_1 .txt {
+.main .two .two_2 .two_2_1 .txt {
   font-size: var(--font16Szie);
   margin: 0 0 1vw 0;
 }
-.main .one .one_2 .one_2_1 .cont {
+.main .two .two_2 .two_2_1 .cont {
   font-size: var(--font14Szie);
   color: var(--f85Color);
   text-indent: 1rem;
 }
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+}

commpents/pagesMatchs/match/match-2.js

@@ -4,9 +4,9 @@ Component({
      * 组件的属性列表
      */
     properties: {
-        player: { type: Object },
-        showIndex: { type: String },
-        showIndexs: { type: String }
+        playerList: { type: Object },
+        playerIndex: { type: String },
+        playerIndexs: { type: String }
     },
     /**
      * 组件的初始数据
@@ -19,15 +19,15 @@ Component({
      * 组件的方法列表
      */
     methods: {
-        panel: function (e) {
+        onePayer: function (e) {
             const that = this;
             let index = e.currentTarget.dataset.index;
-            that.triggerEvent('panel', index)
+            that.triggerEvent('onePayer', index)
         },
-        panels: function (e) {
+        twoPayer: function (e) {
             const that = this;
             let index = e.currentTarget.dataset.index;
-            that.triggerEvent('panels', index)
+            that.triggerEvent('twoPayer', index)
         }
     }
 })

commpents/pagesMatchs/match/match-2.less

@@ -1,63 +1,81 @@
 @import (css) "/app.wxss";
 
 .main {
-    width: 96vw;
-    padding: 2vw;
-
-    .Title {
-        display: flex;
-        flex-direction: row;
-        line-height: 40px;
-        border-bottom: 1px solid var(--f1Color);
-        margin: 0 0 2vw 0;
-
-        .name {
-            width: 60vw;
-        }
+    .one {
+        .list {
+            .list_1 {
+                display: flex;
+                justify-content: space-between;
+                padding: 2vw;
+                margin: 0 0 1vw 0;
+                background-color: var(--whiteColor);
+                border-bottom: 1px solid var(--f1Color);
 
-        .icon {
-            text-align: right;
-            width: 35vw;
-        }
-    }
+                .name {
+                    font-size: var(--font16Size);
+                }
 
-    .content {
+            }
 
-        .project {
-            margin: 3vw 0;
-            padding: 0 1vw;
+            .list_2 {
+                .project {
+                    .project_1 {
+                        display: flex;
+                        justify-content: space-between;
+                        padding: 2vw 4vw;
+                        margin: 0 0 1vw 0;
+                        background-color: var(--whiteColor);
+                        border-bottom: 1px solid var(--f1Color);
 
-            .user {
-                display: flex;
-                flex-direction: row;
-                flex-wrap: wrap;
-                justify-content: space-between;
+                        .name {
+                            font-size: var(--font16Size);
+                        }
+                    }
 
+                    .project_2 {
+                        .personal {
+                            display: flex;
+                            flex-direction: row;
+                            justify-content: space-between;
+                            flex-wrap: wrap;
 
-                .user_name {
-                    text-align: center;
-                    margin: 0 0 2vw 0;
-                    width: 20vw;
+                            .user {
+                                background-color: var(--f1Color);
+                                width: 21vw;
+                                text-align: center;
+                                margin: 0 2vw 2vw 2vw;
+                                border-radius: 4px;
 
-                    .icon {
-                        width: 18vw;
-                        height: 18vw;
-                        border-radius: 50%;
-                        border: 2px dashed var(--f1Color);
+                                .icon {
+                                    width: 15vw;
+                                    height: 15vw;
+                                    margin: 2vw 0 1vw 0;
+                                    border-radius: 50%;
 
+                                }
 
-                        image {
-                            width: 80%;
-                            height: 80%;
+                                .name {
+                                    font-size: var(--font14Size);
+                                    padding: 0 0 2vw 0;
+                                }
+                            }
                         }
                     }
-
-                    .xm {
-                        font-size: var(--font14Size);
-                    }
-
                 }
             }
         }
     }
+}
+
+.scroll-view {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+
+    .list-scroll-view {
+        display: flex;
+        flex-direction: column;
+    }
 }

commpents/pagesMatchs/match/match-2.wxml

@@ -1,26 +1,34 @@
 <view class="main">
-    <view wx:for="{{player.group}}" wx:key="item">
-        <view class="Title" bindtap="panel" data-index="{{ index }}">
-            <view class="name">{{item.name}}({{item.age}}岁)</view>
-            <view class="icon">
-                <iconfont class="iconfont {{showIndex == index ? 'icon-jiantou_liebiaozhankai' : 'icon-jiantou_liebiaoxiangyou'}}"></iconfont>
-            </view>
-        </view>
-        <view class="content" wx:if="{{showIndex == index}}">
-            <view class='project ' wx:for="{{item.project}}" wx:key="item" bindtap="panels" data-index="{{ index }}">
-                <view class="Title">
-                    <view class='name'>{{item.name}}( {{item.user.length||'0'}}人)</view>
-                    <view class="icon">
-                        <iconfont class="iconfont {{showIndexs == index ? 'icon-jiantou_liebiaozhankai' : 'icon-jiantou_liebiaoxiangyou'}}"></iconfont>
+    <scroll-view scroll-y="true" class="scroll-view">
+        <view class="list-scroll-view">
+            <view class="one">
+                <view class="list" wx:for="{{playerList.group}}" wx:key="item">
+                    <view class="list_1" bindtap="onePayer" data-index="{{ index }}">
+                        <view class="name">{{item.name}}({{item.age}}岁)</view>
+                        <view class="icon">
+                            <text class="iconfont {{playerIndex == index ? 'icon-jiantou_liebiaozhankai' : 'icon-jiantou_liebiaoxiangyou'}}"></text>
+                        </view>
                     </view>
-                </view>
-                <view class="user " wx:if="{{showIndexs == index}}">
-                    <view class="user_name" wx:for="{{item.user }}" wx:key="item">
-                        <image class="icon" src="{{item.icon&&item.icon.length>0?item.icon[0].url:''}}"></image>
-                        <view class="xm textOver">{{ item.name }}</view>
+                    <view class="list_2" wx:if="{{playerIndex == index}}">
+                        <view class='project' wx:for="{{item.project}}" wx:key="item" bindtap="twoPayer" data-index="{{ index }}">
+                            <view class="project_1">
+                                <view class='name'>{{item.name}}( {{item.user.length||'0'}}人)</view>
+                                <view class="icon">
+                                    <text class="iconfont {{playerIndexs == index ? 'icon-jiantou_liebiaozhankai' : 'icon-jiantou_liebiaoxiangyou'}}"></text>
+                                </view>
+                            </view>
+                            <view class="project_2" wx:if="{{playerIndexs == index}}">
+                                <view class="personal">
+                                    <view class="user" wx:for="{{item.user}}" wx:key="item">
+                                        <image class="icon" src="{{item.icon&&item.icon.length>0?item.icon[0].url:''}}"></image>
+                                        <view class="name textOver">{{ item.name }}</view>
+                                    </view>
+                                </view>
+                            </view>
+                        </view>
                     </view>
                 </view>
             </view>
         </view>
-    </view>
+    </scroll-view>
 </view>

commpents/pagesMatchs/match/match-2.wxss

@@ -1,47 +1,57 @@
 @import "/app.wxss";
-.main {
-  width: 96vw;
-  padding: 2vw;
-}
-.main .Title {
+.main .one .list .list_1 {
   display: flex;
-  flex-direction: row;
-  line-height: 40px;
+  justify-content: space-between;
+  padding: 2vw;
+  margin: 0 0 1vw 0;
+  background-color: var(--whiteColor);
   border-bottom: 1px solid var(--f1Color);
-  margin: 0 0 2vw 0;
 }
-.main .Title .name {
-  width: 60vw;
+.main .one .list .list_1 .name {
+  font-size: var(--font16Size);
 }
-.main .Title .icon {
-  text-align: right;
-  width: 35vw;
+.main .one .list .list_2 .project .project_1 {
+  display: flex;
+  justify-content: space-between;
+  padding: 2vw 4vw;
+  margin: 0 0 1vw 0;
+  background-color: var(--whiteColor);
+  border-bottom: 1px solid var(--f1Color);
 }
-.main .content .project {
-  margin: 3vw 0;
-  padding: 0 1vw;
+.main .one .list .list_2 .project .project_1 .name {
+  font-size: var(--font16Size);
 }
-.main .content .project .user {
+.main .one .list .list_2 .project .project_2 .personal {
   display: flex;
   flex-direction: row;
-  flex-wrap: wrap;
   justify-content: space-between;
+  flex-wrap: wrap;
 }
-.main .content .project .user .user_name {
+.main .one .list .list_2 .project .project_2 .personal .user {
+  background-color: var(--f1Color);
+  width: 21vw;
   text-align: center;
-  margin: 0 0 2vw 0;
-  width: 20vw;
+  margin: 0 2vw 2vw 2vw;
+  border-radius: 4px;
 }
-.main .content .project .user .user_name .icon {
-  width: 18vw;
-  height: 18vw;
+.main .one .list .list_2 .project .project_2 .personal .user .icon {
+  width: 15vw;
+  height: 15vw;
+  margin: 2vw 0 1vw 0;
   border-radius: 50%;
-  border: 2px dashed var(--f1Color);
-}
-.main .content .project .user .user_name .icon image {
-  width: 80%;
-  height: 80%;
 }
-.main .content .project .user .user_name .xm {
+.main .one .list .list_2 .project .project_2 .personal .user .name {
   font-size: var(--font14Size);
+  padding: 0 0 2vw 0;
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
 }

commpents/pagesMatchs/match/match-3.js

@@ -4,8 +4,8 @@ Component({
      * 组件的属性列表
      */
     properties: {
-        cList: { type: Array },
         cType: { type: String },
+        cList: { type: Array },
     },
     /**
      * 组件的初始数据
@@ -17,15 +17,15 @@ Component({
      */
     methods: {
         // 秩序册
-        orderChange: function (e) {
+        cChange: function (e) {
             const that = this;
             const { ctype } = e.currentTarget.dataset;
-            that.triggerEvent('orderChange', ctype)
+            that.triggerEvent('cChange', ctype)
         },
-        cSearch: function (e) {
+        cinputSearch: function (e) {
             const that = this;
             let name = e.detail.value
-            that.triggerEvent('cSearch', name)
+            that.triggerEvent('cinputSearch', name)
         },
     }
 })

commpents/pagesMatchs/match/match-3.less

@@ -1,131 +1,176 @@
 @import (css) "/app.wxss";
 
-.c {
-    width: 96vw;
-    display: flex;
-    flex-direction: column;
-
-    .c_1 {
+.main {
+    .one {
+        display: flex;
         width: 96vw;
         padding: 2vw;
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-        background-color: var(--f1Color);
-        margin: 0 0 2vw 0;
+        background: #f1f1f1;
+        margin: 0 0 1vw 0;
 
-        .c_1btn {
+        .one_1 {
             width: 25vw;
 
             button {
                 width: 100%;
+                padding: 2vw 1vw;
                 font-size: 14px;
-                padding: 2vw;
             }
         }
 
-        .c_1inp {
-            width: 66vw;
+        .one_2 {
+            flex-grow: 1;
 
             input {
-                text-align: left;
-                border: 1px solid var(--fcColor);
-                padding: 1vw;
+                width: 96%;
+                border: 1px solid #858585;
+                padding: 1.5vw 1vw;
                 border-radius: 5px;
             }
         }
     }
 
-    .c_2 {
-        width: 94vw;
-        position: relative;
+    .two {
         flex-grow: 1;
+        width: 96vw;
         height: 74.5vh;
-        margin: 0 3vw;
+        position: relative;
+        margin: 0 2vw;
 
-        .cList {
-            background-color: #328d26;
+        .list {
+            background-color: green;
             margin: 0 0 2vw 0;
             padding: 2vw;
-
-            .cList_0 {
-                .name {
-                    padding: 1vw 0;
-                    color: var(--whiteColor);
-                    margin: 0 0 1vw 0;
-
-                    text {
-                        padding: 0 2vw 0 0;
-                    }
-                }
-
-                .pk {
-                    display: flex;
-                    flex-direction: row;
-                    justify-content: space-around;
-                    background-color: var(--whiteColor);
-
-                    .pk_1 {
-                        width: 30vw;
-                        text-align: center;
-                        padding: 2vw;
-                        line-height: 28px;
-                    }
-
-                    .pk_2 {
-                        text-align: center;
-                        box-shadow: 0 0 5px var(--fcColor);
-
-                        .time {
-                            background-color: #328d26;
-                            color: var(--whiteColor);
-                            padding: 1vw 0;
-                            font-size: var(--font14Size);
-                        }
-
-                        .score {
-                            font-size: var(--font20Szie);
-                            padding: 1vw 0;
-                            font-weight: bold;
-                        }
-                    }
-                }
-            }
-
-            .cList_1 {
-                text {
-                    padding: 0 1vw;
-                    color: var(--whiteColor);
-                }
-
-                .person {
-                    margin: 2vw 0 1vw 0;
-                    display: flex;
-                    flex-direction: row;
-                    justify-content: space-between;
-                    flex-wrap: wrap;
-                    background-color: var(--whiteColor);
-
-                    .user_name {
-                        width: 22vw;
-                        margin: 1vw;
-                        padding: 2vw;
-                        text-align: center;
-                        color: #328d26;
-                        font-weight: 700;
-                        border: 1px solid var(--f85Color);
-                        border-radius: 2px;
-                    }
-                }
-            }
-        }
-
-        .cList:last-child {
-            margin: 0;
         }
     }
 }
 
+// .c {
+//     width: 96vw;
+//     display: flex;
+//     flex-direction: column;
+
+//     .c_1 {
+//         width: 96vw;
+//         padding: 2vw;
+//         display: flex;
+//         flex-direction: row;
+//         justify-content: space-between;
+//         background-color: var(--f1Color);
+//         margin: 0 0 2vw 0;
+
+//         .c_1btn {
+//             width: 25vw;
+
+//             button {
+//                 width: 100%;
+//                 font-size: 14px;
+//                 padding: 2vw;
+//             }
+//         }
+
+//         .c_1inp {
+//             width: 66vw;
+
+//             input {
+//                 text-align: left;
+//                 border: 1px solid var(--fcColor);
+//                 padding: 1vw;
+//                 border-radius: 5px;
+//             }
+//         }
+//     }
+
+//     .c_2 {
+//         width: 94vw;
+//         position: relative;
+//         flex-grow: 1;
+//         height: 74.5vh;
+//         margin: 0 3vw;
+
+//         .cList {
+//             background-color: #328d26;
+//             margin: 0 0 2vw 0;
+//             padding: 2vw;
+
+//             .cList_0 {
+//                 .name {
+//                     padding: 1vw 0;
+//                     color: var(--whiteColor);
+//                     margin: 0 0 1vw 0;
+
+//                     text {
+//                         padding: 0 2vw 0 0;
+//                     }
+//                 }
+
+//                 .pk {
+//                     display: flex;
+//                     flex-direction: row;
+//                     justify-content: space-around;
+//                     background-color: var(--whiteColor);
+
+//                     .pk_1 {
+//                         width: 30vw;
+//                         text-align: center;
+//                         padding: 2vw;
+//                         line-height: 28px;
+//                     }
+
+//                     .pk_2 {
+//                         text-align: center;
+//                         box-shadow: 0 0 5px var(--fcColor);
+
+//                         .time {
+//                             background-color: #328d26;
+//                             color: var(--whiteColor);
+//                             padding: 1vw 0;
+//                             font-size: var(--font14Size);
+//                         }
+
+//                         .score {
+//                             font-size: var(--font20Szie);
+//                             padding: 1vw 0;
+//                             font-weight: bold;
+//                         }
+//                     }
+//                 }
+//             }
+
+//             .cList_1 {
+//                 text {
+//                     padding: 0 1vw;
+//                     color: var(--whiteColor);
+//                 }
+
+//                 .person {
+//                     margin: 2vw 0 1vw 0;
+//                     display: flex;
+//                     flex-direction: row;
+//                     justify-content: space-between;
+//                     flex-wrap: wrap;
+//                     background-color: var(--whiteColor);
+
+//                     .user_name {
+//                         width: 22vw;
+//                         margin: 1vw;
+//                         padding: 2vw;
+//                         text-align: center;
+//                         color: #328d26;
+//                         font-weight: 700;
+//                         border: 1px solid var(--f85Color);
+//                         border-radius: 2px;
+//                     }
+//                 }
+//             }
+//         }
+
+//         .cList:last-child {
+//             margin: 0;
+//         }
+//     }
+// }
+
 .scroll-view {
     position: absolute;
     top: 0;

commpents/pagesMatchs/match/match-3.wxml

@@ -1,18 +1,18 @@
-<view class="c">
-    <view class="c_1">
-        <view class="c_1btn">
-            <button type="primary" bindtap="orderChange" wx:if="{{cType=='1'}}" data-ctype="{{0}}">查看场次表</button>
-            <button type="primary" bindtap="orderChange" wx:if="{{cType=='0'}}" data-ctype="{{1}}">查看对阵表</button>
+<view class="main">
+    <view class="one">
+        <view class="one_1">
+            <button type="primary" bindtap="cChange" wx:if="{{cType=='1'}}" data-ctype="{{0}}">查看场次表</button>
+            <button type="primary" bindtap="cChange" wx:if="{{cType=='0'}}" data-ctype="{{1}}">查看对阵表</button>
         </view>
-        <view class="c_1inp">
-            <input type="text" value="{{cSearch.name}}" bindinput="cSearch" placeholder="{{cType=='0'?'请输入队友姓名':'请输入项目名称'}}" />
+        <view class="one_2">
+            <input type="text" value="{{cSearch}}" bindinput="cinputSearch" placeholder="{{cType=='0'?'请输入队友姓名':'请输入项目名称'}}" />
         </view>
     </view>
-    <view class="c_2">
+    <view class="two">
         <scroll-view scroll-y="true" class="scroll-view">
             <view class="list-scroll-view">
-                <view class="cList" wx:for="{{cList}}" wx:key="item" data-item="{{item}}">
-                    <view class="cList_0" wx:if="{{cType=='0'}}">
+                <view class="list" wx:for="{{cList}}" wx:key="item" data-item="{{item}}">
+                    <view class="list_1" wx:if="{{cType=='0'}}">
                         <view class="name">
                             <text>{{item.group_id_name}}</text>
                             <text>{{item.project_id_name}}</text>
@@ -34,9 +34,9 @@
                             </view>
                         </view>
                     </view>
-                    <view class="cList_1" wx:elif="{{cType=='1'}}">
-                        <text>{{item.group_id_name}}({{item.age}}周岁)</text>
-                        <text>{{item.project_id_name}}({{item.zhGender}})</text>
+                    <view class="list_2" wx:elif="{{cType=='1'}}">
+                        <text>{{item.group_id_name}}({{item.age}}岁)</text>
+                        <text>{{item.project_id_name}}({{item.projectAge}},{{item.pojectGender}})</text>
                         <text>{{item.name}}</text>
                         <view class="person">
                             <view wx:for="{{item.person}}" wx:key="item">

commpents/pagesMatchs/match/match-3.wxss

@@ -1,107 +1,40 @@
 @import "/app.wxss";
-.c {
-  width: 96vw;
+.main .one {
   display: flex;
-  flex-direction: column;
-}
-.c .c_1 {
   width: 96vw;
   padding: 2vw;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  background-color: var(--f1Color);
-  margin: 0 0 2vw 0;
+  background: #f1f1f1;
+  margin: 0 0 1vw 0;
 }
-.c .c_1 .c_1btn {
+.main .one .one_1 {
   width: 25vw;
 }
-.c .c_1 .c_1btn button {
+.main .one .one_1 button {
   width: 100%;
+  padding: 2vw 1vw;
   font-size: 14px;
-  padding: 2vw;
 }
-.c .c_1 .c_1inp {
-  width: 66vw;
+.main .one .one_2 {
+  flex-grow: 1;
 }
-.c .c_1 .c_1inp input {
-  text-align: left;
-  border: 1px solid var(--fcColor);
-  padding: 1vw;
+.main .one .one_2 input {
+  width: 96%;
+  border: 1px solid #858585;
+  padding: 1.5vw 1vw;
   border-radius: 5px;
 }
-.c .c_2 {
-  width: 94vw;
-  position: relative;
+.main .two {
   flex-grow: 1;
+  width: 96vw;
   height: 74.5vh;
-  margin: 0 3vw;
+  position: relative;
+  margin: 0 2vw;
 }
-.c .c_2 .cList {
-  background-color: #328d26;
+.main .two .list {
+  background-color: green;
   margin: 0 0 2vw 0;
   padding: 2vw;
 }
-.c .c_2 .cList .cList_0 .name {
-  padding: 1vw 0;
-  color: var(--whiteColor);
-  margin: 0 0 1vw 0;
-}
-.c .c_2 .cList .cList_0 .name text {
-  padding: 0 2vw 0 0;
-}
-.c .c_2 .cList .cList_0 .pk {
-  display: flex;
-  flex-direction: row;
-  justify-content: space-around;
-  background-color: var(--whiteColor);
-}
-.c .c_2 .cList .cList_0 .pk .pk_1 {
-  width: 30vw;
-  text-align: center;
-  padding: 2vw;
-  line-height: 28px;
-}
-.c .c_2 .cList .cList_0 .pk .pk_2 {
-  text-align: center;
-  box-shadow: 0 0 5px var(--fcColor);
-}
-.c .c_2 .cList .cList_0 .pk .pk_2 .time {
-  background-color: #328d26;
-  color: var(--whiteColor);
-  padding: 1vw 0;
-  font-size: var(--font14Size);
-}
-.c .c_2 .cList .cList_0 .pk .pk_2 .score {
-  font-size: var(--font20Szie);
-  padding: 1vw 0;
-  font-weight: bold;
-}
-.c .c_2 .cList .cList_1 text {
-  padding: 0 1vw;
-  color: var(--whiteColor);
-}
-.c .c_2 .cList .cList_1 .person {
-  margin: 2vw 0 1vw 0;
-  display: flex;
-  flex-direction: row;
-  justify-content: space-between;
-  flex-wrap: wrap;
-  background-color: var(--whiteColor);
-}
-.c .c_2 .cList .cList_1 .person .user_name {
-  width: 22vw;
-  margin: 1vw;
-  padding: 2vw;
-  text-align: center;
-  color: #328d26;
-  font-weight: 700;
-  border: 1px solid var(--f85Color);
-  border-radius: 2px;
-}
-.c .c_2 .cList:last-child {
-  margin: 0;
-}
 .scroll-view {
   position: absolute;
   top: 0;

commpents/pagesMatchs/match/match-4.js

@@ -4,9 +4,8 @@ Component({
      * 组件的属性列表
      */
     properties: {
-        fieldtabs: { type: Object },
-        matchList: { type: Array },
-        active: { type: String }
+        dTabs: { type: Object },
+        dList: { type: Array }
     },
 
     /**
@@ -20,15 +19,10 @@ Component({
      * 组件的方法列表
      */
     methods: {
-        fieldtabsChange: function (e) {
+        dtabsChange: function (e) {
             const that = this;
             const { active } = e.detail;
-            that.triggerEvent('fieldtabsChange', active)
-        },
-        toCommon: function (e) {
-            const that = this;
-            const { item } = e.currentTarget.dataset;
-            that.triggerEvent('toCommon', item)
+            that.triggerEvent('dtabsChange', active)
         },
     }
 })

commpents/pagesMatchs/match/match-4.less

@@ -11,7 +11,7 @@
         position: relative;
         flex-grow: 1;
         height: 74.5vh;
-        margin: 0 3vw;
+        margin: 0 2vw;
 
         .list {
             background-color: #328d26;

commpents/pagesMatchs/match/match-4.wxml

@@ -1,11 +1,11 @@
 <view class="main">
     <view class="one">
-        <s-tab tabs="{{fieldtabs}}" bind:tabsChange="fieldtabsChange"></s-tab>
+        <s-tab tabs="{{dTabs}}" bind:tabsChange="dtabsChange"></s-tab>
     </view>
-    <view wx:if="{{fieldtabs.active==active}}" class="two">
+    <view class="two" wx:if="{{fieldtabs.active==active}}">
         <scroll-view scroll-y="true" class="scroll-view">
             <view class="list-scroll-view">
-                <view class="list" wx:for="{{matchList}}" wx:key="item" bindtap="toCommon" data-item="{{item}}">
+                <view class="list" wx:for="{{dList}}" wx:key="item">
                     <view class="list_0">
                         <view class="name">
                             <text>{{item.group_id_name}}</text>

commpents/pagesMatchs/match/match-4.wxss

@@ -8,7 +8,7 @@
   position: relative;
   flex-grow: 1;
   height: 74.5vh;
-  margin: 0 3vw;
+  margin: 0 2vw;
 }
 .main .two .list {
   background-color: #328d26;

commpents/pagesMatchs/match/match-5.js

@@ -4,7 +4,7 @@ Component({
      * 组件的属性列表
      */
     properties: {
-        projectList: { type: Array },
+        achieveList: { type: Array },
     },
 
     /**

commpents/pagesMatchs/match/match-5.less

@@ -1,27 +1,35 @@
 @import (css) "/app.wxss";
 
 .main {
-    width: 96vw;
-    margin: 2vw;
-
     .one {
-        .title {
+        width: 100vw;
+        background-color: var(--whiteColor);
+
+        .list {
             display: flex;
             flex-direction: row;
-            line-height: 40px;
-            border-bottom: 1px solid var(--f1Color);
-            margin: 0 0 2vw 0;
+            justify-content: space-between;
+            padding: 2vw;
+            background-color: var(--f1Color);
+            border-bottom: 1px solid var(--whiteColor);
 
             .name {
-                width: 60vw;
-                color: var(--f85Color);
+                font-size: var(--font16Size);
             }
 
-            .icon {
-                text-align: right;
-                width: 35vw;
-            }
         }
     }
+}
 
+.scroll-view {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+
+    .list-scroll-view {
+        display: flex;
+        flex-direction: column;
+    }
 }

commpents/pagesMatchs/match/match-5.wxml

@@ -1,10 +1,16 @@
 <view class="main">
-    <view class="one">
-        <view class="title" wx:for="{{projectList}}" wx:key="item" bindtap="toCommon" data-item="{{item}}">
-            <view class="name">{{item.name}}({{item.age}}岁)</view>
-            <view class="icon">
-                <text class="iconfont icon-jiantou_liebiaoxiangyou"></text>
+    <scroll-view scroll-y="true" class="scroll-view">
+        <view class="list-scroll-view">
+            <view class="one">
+                <view class="list" wx:for="{{achieveList}}" wx:key="item">
+                    <view class="name">
+                        {{item.name}}({{item.age}}岁)
+                    </view>
+                    <view class="icon">
+                        <text class="iconfont icon-jiantou_liebiaoxiangyou"></text>
+                    </view>
+                </view>
             </view>
         </view>
-    </view>
+    </scroll-view>
 </view>

commpents/pagesMatchs/match/match-5.wxss

@@ -1,20 +1,27 @@
 @import "/app.wxss";
-.main {
-  width: 96vw;
-  margin: 2vw;
+.main .one {
+  width: 100vw;
+  background-color: var(--whiteColor);
 }
-.main .one .title {
+.main .one .list {
   display: flex;
   flex-direction: row;
-  line-height: 40px;
-  border-bottom: 1px solid var(--f1Color);
-  margin: 0 0 2vw 0;
+  justify-content: space-between;
+  padding: 2vw;
+  background-color: var(--f1Color);
+  border-bottom: 1px solid var(--whiteColor);
 }
-.main .one .title .name {
-  width: 60vw;
-  color: var(--f85Color);
+.main .one .list .name {
+  font-size: var(--font16Size);
 }
-.main .one .title .icon {
-  text-align: right;
-  width: 35vw;
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
 }

pagesMatch/match/info.js

@@ -2,10 +2,6 @@ const app = getApp();
 Page({
     data: {
         frameStyle: { useTop: true, name: '赛事信息', leftArrow: true, useBar: false },
-        fileUrl: app.globalData.fileUrl,
-        id: '',
-        info: {},
-        user: {},
         // 选项卡
         tabs: {
             active: 'a',
@@ -17,35 +13,70 @@ Page({
                 { title: '成绩册', active: 'e' },
             ],
         },
-        // 场地选项卡
-        fieldtabs: {
-            active: 0,
-            menu: [],
+        // 用户信息
+        user: {},
+        // 赛事id
+        id: '',
+        // 赛事信息
+        info: {},
+        // 赛事选手
+        playerList: [],
+        // 第一层手风琴
+        playerIndex: null,
+        // 第二层手风琴
+        playerIndexs: null,
+        // 秩序册
+        cType: '0',
+        cList: [],
+        cSearchname: '',
+        raceteamList: [],
+        raceList: [],
+        // 赛况
+        dTabs: {
+            active: '0',
+            menu: []
         },
-        // 赛况列表
-        matchList: [],
-        //成绩册项目列表
-        projectList: [],
-        active: '',
-        // 状态
+        dList: [],
+        // 成绩册
+        achieveList: [],
+        //赛事状态
         statusList: [],
-        // 赛事类别
+        //赛事类别
         typeList: [],
-        // 赛制列表
+        //赛制列表
         formatList: [],
-        // 性别
+        //性别列表
         genderList: [],
-        // 选手
-        player: {},
-        showIndex: 10000, //默认不显示
-        showIndexs: 10000, //默认不显示
-        // 秩序册
-        cType: '0',
-        cList: [],
-        raceList: [],
-        raceteamList: [],
-        //查询条件
-        searchInfo: {},
+
+        // // 场地选项卡
+        // fieldtabs: {
+        //     active: 0,
+        //     menu: [],
+        // },
+        // // 赛况列表
+        // matchList: [],
+        // //成绩册项目列表
+        // projectList: [],
+        // active: '',
+        // // 状态
+        // statusList: [],
+        // // 赛事类别
+        // typeList: [],
+        // // 赛制列表
+        // formatList: [],
+        // // 性别
+        // genderList: [],
+        // // 选手
+        // player: {},
+        // showIndex: 10000, //默认不显示
+        // showIndexs: 10000, //默认不显示
+        // // 秩序册
+        // cType: '0',
+        // cList: [],
+        // raceList: [],
+        // raceteamList: [],
+        // //查询条件
+        // searchInfo: {},
     },
     // 返回
     back: function () { wx.navigateBack({ delta: 1 }) },
@@ -54,57 +85,94 @@ Page({
         const that = this;
         that.setData({ 'tabs.active': e.detail.active });
     },
-    // 场地选项卡
-    fieldtabsChange: async function (e) {
+    // 第一层手风琴
+    onePayer: function (e) {
         const that = this;
-        let match = that.data.info;
-        if (e.detail) var active = e.detail;
-        if (e.detail == 0) var active = 0;
-        that.setData({ 'fieldtabs.active': active });
-        that.setData({ active: active });
-        let address = that.data.fieldtabs.menu.find((i) => i.active == active);
-        if (address && address.menu != 0) {
-            let arr;
-            if (address._id == '') arr = await app.$get(`/msgs`, { match_id: match._id }, 'race');
-            else arr = await app.$get(`/msgs`, { match_id: match._id, address_id: address._id }, 'race');
-            if (arr.errcode == '0') that.setData({ matchList: arr.data });
-            else wx.showToast({ title: `${arr.errmsg}`, icon: 'fail', duration: 2000 });
-        }
-    },
-    // 赛况详情
-    toCommon: function (e) {
-        wx.navigateTo({ url: `/pagesMatch/userAdmin/schedule/sinfo?id=${e.detail._id}` })
-    },
-    //比赛报名
-    toSign: function (e) {
-        const { item } = e.currentTarget.dataset;
-        wx.navigateTo({ url: `/pagesMatch/match/sign?id=${item._id}` })
+        if (e.detail != that.data.playerIndex) that.setData({ playerIndex: e.detail })
+        else that.setData({ playerIndex: null })
     },
-    // 手风琴1
-    panel: function (e) {
+    // 第二层手风琴
+    twoPayer: function (e) {
         const that = this;
-        if (e.detail != that.data.showIndex) that.setData({ showIndex: e.detail })
-        else that.setData({ showIndex: 10000 })
+        if (e.detail != that.data.playerIndexs) that.setData({ playerIndexs: e.detail })
+        else that.setData({ playerIndexs: null })
     },
-    // 手风琴2
-    panels: function (e) {
-        const that = this;
-        if (e.detail != that.data.showIndexs) that.setData({ showIndexs: e.detail })
-        else that.setData({ showIndexs: 10000 })
-    },
-    // 秩序册
-    orderChange: function (e) {
+    // 秩序册选择
+    cChange: function (e) {
         const that = this;
         const ctype = e.detail;
         that.setData({ cType: ctype })
         that.setData({ cList: that.data.cType == '0' ? that.data.raceList : that.data.raceteamList })
     },
     // 秩序册查询
-    cSearch: async function (e) {
+    cinputSearch: function (e) {
         const that = this;
-        that.setData({ 'searchInfo.name': e.detail });
+        that.setData({ 'cSearchname': e.detail });
         that.searchOrderBook();
     },
+    // 赛况场地选择
+    dtabsChange: function (e) {
+        const that = this;
+        let raceList = that.data.raceList;
+        let data = that.data.dTabs.menu[e.detail];
+        let list = []
+        if (data._id) list = raceList.filter(i => i.address_id == data._id);
+        else list = raceList;
+        that.setData({ dList: list })
+        that.setData({ 'dTabs.active': e.detail })
+
+    },
+    // // 场地选项卡
+    // fieldtabsChange: async function (e) {
+    //     const that = this;
+    //     let match = that.data.info;
+    //     if (e.detail) var active = e.detail;
+    //     if (e.detail == 0) var active = 0;
+    //     that.setData({ 'fieldtabs.active': active });
+    //     that.setData({ active: active });
+    //     let address = that.data.fieldtabs.menu.find((i) => i.active == active);
+    //     if (address && address.menu != 0) {
+    //         let arr;
+    //         if (address._id == '') arr = await app.$get(`/msgs`, { match_id: match._id }, 'race');
+    //         else arr = await app.$get(`/msgs`, { match_id: match._id, address_id: address._id }, 'race');
+    //         if (arr.errcode == '0') that.setData({ matchList: arr.data });
+    //         else wx.showToast({ title: `${arr.errmsg}`, icon: 'fail', duration: 2000 });
+    //     }
+    // },
+    // // 赛况详情
+    // toCommon: function (e) {
+    //     wx.navigateTo({ url: `/pagesMatch/userAdmin/schedule/sinfo?id=${e.detail._id}` })
+    // },
+    // //比赛报名
+    // toSign: function (e) {
+    //     const { item } = e.currentTarget.dataset;
+    //     wx.navigateTo({ url: `/pagesMatch/match/sign?id=${item._id}` })
+    // },
+    // // 手风琴1
+    // panel: function (e) {
+    //     const that = this;
+    //     if (e.detail != that.data.showIndex) that.setData({ showIndex: e.detail })
+    //     else that.setData({ showIndex: 10000 })
+    // },
+    // // 手风琴2
+    // panels: function (e) {
+    //     const that = this;
+    //     if (e.detail != that.data.showIndexs) that.setData({ showIndexs: e.detail })
+    //     else that.setData({ showIndexs: 10000 })
+    // },
+    // // 秩序册
+    // orderChange: function (e) {
+    //     const that = this;
+    //     const ctype = e.detail;
+    //     that.setData({ cType: ctype })
+    //     that.setData({ cList: that.data.cType == '0' ? that.data.raceList : that.data.raceteamList })
+    // },
+    // // 秩序册查询
+    // cSearch: async function (e) {
+    //     const that = this;
+    //     that.setData({ 'searchInfo.name': e.detail });
+    //     that.searchOrderBook();
+    // },
     /**
      * 生命周期函数--监听页面加载
      */
@@ -140,52 +208,52 @@ Page({
      * 生命周期函数--监听页面显示
      */
     onShow: async function () { },
-
     // 监听用户是否登录
     watchLogin: async function () {
         const that = this;
         const statusList = that.data.statusList;
+        const typeList = that.data.typeList;
+        const formatList = that.data.formatList;
         wx.getStorage({
             key: 'user',
             success: async res => {
                 that.setData({ user: res.data })
                 let arr;
-                // 比赛信息
+                // 赛事信息
                 arr = await app.$get(`/match/${that.data.id}`, {}, 'race');
                 if (arr.errcode == '0') {
+                    let info = arr.data;
                     // 赛事状态
-                    let status = statusList.find(i => i.value == arr.data.status)
-                    if (status) arr.data.zhStatus = status.label;
+                    let status = statusList.find(i => i.value == info.status)
+                    if (status) info.zhStatus = status.label;
                     // 赛事类别
-                    let type = that.data.typeList.find(i => i.value == arr.data.type)
-                    if (type) arr.data.zhtype = type.label;
+                    let type = typeList.find(i => i.value == info.type)
+                    if (type) info.zhtype = type.label;
                     // 赛事赛制
-                    let format = that.data.formatList.find(i => i.value == arr.data.format)
-                    if (format) arr.data.zhFormat = format.label;
+                    let format = formatList.find(i => i.value == info.format)
+                    if (format) info.zhFormat = format.label;
                     let regular = arr.data.regular.replace(/\<img/gi, '<img style="width:100%;height:auto;margin: 5px 0"');
-                    if (regular) arr.data.zhRegular = regular;
-                    that.setData({ info: arr.data })
-                    // 选手
-                    let getAll = await app.$get(`/match/getAll/${arr.data._id}`, {}, 'race');
-                    if (getAll.errcode == '0') that.setData({ player: getAll.data })
-                    // 秩序册
-                    that.searchOrderBook();
-                    // 场地
-                    let address = await app.$get(`/matchAddress`, { is_use: '0', belong_id: arr.data.belong_id }, 'race');
-                    if (address.errcode == '0') {
-                        let groundList = []
-                        address.data.unshift({ _id: '', title: '全部场地', active: 0 });
-                        for (const [index, val] of address.data.entries()) {
-                            groundList.push({ _id: val._id, title: val.title || val.name, active: index })
-                        }
-                        that.setData({ 'fieldtabs.menu': groundList })
-                    }
-                    // 成绩册项目列表
-                    let project = await app.$get(`/matchProject`, { match_id: arr.data._id }, 'race');
-                    if (project.errcode == '0') {
-                        that.setData({ projectList: project.data })
+                    if (regular) info.zhRegular = regular;
+                    that.setData({ info })
+                } else { wx.showToast({ title: `${arr.errmsg}`, icon: 'fail', duration: 2000 }); }
+                // 赛事选手
+                arr = await app.$get(`/match/getAll/${arr.data._id}`, {}, 'race');
+                if (arr.errcode == '0') that.setData({ playerList: arr.data })
+                // 秩序册
+                that.searchOrderBook();
+                // 场地
+                arr = await app.$get(`/matchAddress`, { is_use: '0', belong_id: that.data.info.belong_id }, 'race');
+                if (arr.errcode == '0') {
+                    let addressList = []
+                    arr.data.unshift({ _id: '', title: '全部场地', active: 0 });
+                    for (const [index, val] of arr.data.entries()) {
+                        addressList.push({ _id: val._id, title: val.title || val.name, active: index })
                     }
-                } else { wx.showToast({ title: `${res.errmsg}`, icon: 'fail', duration: 2000 }); }
+                    that.setData({ 'dTabs.menu': addressList })
+                }
+                // 成绩册列表
+                arr = await app.$get(`/matchProject`, { match_id: that.data.info._id }, 'race');
+                if (arr.errcode == '0') { that.setData({ achieveList: arr.data }) }
 
             },
             fail: async res => {
@@ -195,38 +263,35 @@ Page({
     },
     // 查询秩序册
     searchOrderBook: async function (e) {
-        wx.showLoading({ title: '加载中', mask: true })
         const that = this;
+        let genderList = that.data.genderList;
         let type = that.data.cType;
         let match = that.data.info;
-        let searchInfo = that.data.searchInfo;
-        let info = { match_id: match._id, };
-        if (type == '0') if (searchInfo && searchInfo.name) info.user_name = searchInfo.name;
-        if (type == '1') if (searchInfo && searchInfo.name) info.project_name = searchInfo.name;
+        let cSearch = that.data.cSearchname;
+        let info = { match_id: match._id };
+        if (type == '0') { if (cSearch) info.user_name = cSearch; }
+        else { if (cSearch) info.project_name = cSearch; }
         let arr;
         //小组赛组--场次表
         arr = await app.$get(`/matchTeamGroup`, { ...info }, 'race');
         if (arr.errcode == '0') {
-            for (const val of arr.data) {
-                const project = await app.$get(`/matchProject`, { id: val.project_id, group_id: val.group_id, match_id: match._id }, 'race');
-                if (project.errcode == '0' && project.total > 0) {
-                    // 年龄限制
-                    let age = project.data.find(i => i._id == val.project_id)
-                    if (age) val.age = age.age;
-                    // 性别限制
-                    let genders = project.data.find(i => i._id == val.project_id)
-                    if (genders) val.gender = genders.gender;
-                    let gender = that.data.genderList.find(i => i.value == genders.gender)
-                    if (gender) val.zhGender = gender.label;
-                }
-                for (const p1 of val.person) {
-                    p1.one = p1.name.split("-")[0];
-                    p1.two = p1.name.split("-")[1];
+            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; }
+                // 查询项目
+                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)
+                    if (gender) val.pojectGender = gender.label;
                 }
+                // 名字分割
+                for (const p1 of val.person) { p1.one = p1.name.split("-")[0]; p1.two = p1.name.split("-")[1]; }
             }
-            that.setData({ raceteamList: arr.data });
+            that.setData({ raceteamList: list })
         }
-        else wx.showToast({ title: `${arr.errmsg}`, icon: 'fail', duration: 2000 });
         //小组赛赛程--对阵表
         arr = await app.$get(`/msgs`, { ...info }, 'race');
         if (arr.errcode == '0') {
@@ -236,12 +301,10 @@ Page({
                 val.two_one = val.player_two_name.split("-")[0];
                 val.two_two = val.player_two_name.split("-")[1];
             }
-            that.setData({ raceList: arr.data, matchList: arr.data });
+            that.setData({ raceList: arr.data });
+            that.setData({ dList: that.data.raceList })
         }
-        else wx.showToast({ title: `${arr.errmsg}`, icon: 'fail', duration: 2000 });
-        // 合并信息
-        that.setData({ cList: type == '0' ? that.data.raceList : that.data.raceteamList })
-        wx.hideLoading();
+        that.setData({ cList: that.data.cType == '0' ? that.data.raceList : that.data.raceteamList })
     },
 
     /**

pagesMatch/match/info.wxml

@@ -5,47 +5,22 @@
         </view>
         <view class="two">
             <view wx:if="{{tabs.active=='a'}}" class="a">
-                1
-                <!-- <scroll-view scroll-y="true" class="scroll-view">
-                    <view class="list-scroll-view">
-                        <match-1 info="{{info}}" fileUrl="{{fileUrl}}"></match-1>
-                        <view class="inMatch" wx:if="{{user.type=='-1'}}">
-                            <text class="btn" bindtap="toSign" data-item="{{info}}">比赛报名</text>
-                        </view>
-                    </view>
-                </scroll-view> -->
+                <match-1 info="{{info}}"></match-1>
+                <view class="inMatch" wx:if="{{user.type=='0'}}">
+                    <text class="btn" bindtap="toSign" data-item="{{info}}">比赛报名</text>
+                </view>
             </view>
             <view wx:if="{{tabs.active=='b'}}" class="b">
-                2
-                <!-- <scroll-view scroll-y="true" class="scroll-view">
-                    <view class="list-scroll-view">
-                        <match-2 player="{{player}}" showIndex="{{showIndex}}" showIndexs="{{showIndexs}}" bind:panel="panel" bind:panels="panels"></match-2>
-                    </view>
-                </scroll-view> -->
+                <match-2 playerList="{{playerList}}" playerIndex="{{playerIndex}}" bind:onePayer="onePayer" playerIndexs="{{playerIndexs}}" bind:twoPayer="twoPayer"></match-2>
             </view>
             <view wx:if="{{tabs.active=='c'}}" class="c">
-                3
-                <!-- <scroll-view scroll-y="true" class="scroll-view">
-                    <view class="list-scroll-view">
-                        <match-3 cList="{{cList}}" cType="{{cType}}" bind:orderChange="orderChange" bind:cSearch="cSearch"></match-3>
-                    </view>
-                </scroll-view> -->
+                <match-3 cType="{{cType}}" cList="{{cList}}" bind:cChange="cChange" bind:cinputSearch="cinputSearch"></match-3>
             </view>
             <view wx:if="{{tabs.active=='d'}}" class="d">
-                4
-                <!-- <scroll-view scroll-y="true" class="scroll-view">
-                    <view class="list-scroll-view">
-                        <match-4 active="{{active}}" fieldtabs="{{fieldtabs}}" matchList="{{matchList}}" bind:fieldtabsChange="fieldtabsChange" bind:toCommon="toCommon"></match-4>
-                    </view>
-                </scroll-view> -->
+                <match-4 dTabs="{{dTabs}}" dList="{{dList}}" bind:dtabsChange="dtabsChange"></match-4>
             </view>
             <view wx:if="{{tabs.active=='e'}}" class="e">
-                5
-                <!-- <scroll-view scroll-y="true" class="scroll-view">
-                    <view class="list-scroll-view">
-                        <match-5 projectList="{{projectList}}"></match-5>
-                    </view>
-                </scroll-view> -->
+                <match-5 achieveList="{{achieveList}}"></match-5>
             </view>
         </view>
     </view>