浏览代码

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

YY 2 年之前
父节点
当前提交
2877fac7ed
共有 31 个文件被更改,包括 539 次插入232 次删除
  1. 24 0
      commpents/pagesMatchs/match/match-1.js
  2. 4 0
      commpents/pagesMatchs/match/match-1.json
  3. 87 0
      commpents/pagesMatchs/match/match-1.less
  4. 57 0
      commpents/pagesMatchs/match/match-1.wxml
  5. 69 0
      commpents/pagesMatchs/match/match-1.wxss
  6. 33 0
      commpents/pagesMatchs/match/match-2.js
  7. 4 0
      commpents/pagesMatchs/match/match-2.json
  8. 63 0
      commpents/pagesMatchs/match/match-2.less
  9. 26 0
      commpents/pagesMatchs/match/match-2.wxml
  10. 47 0
      commpents/pagesMatchs/match/match-2.wxss
  11. 23 0
      commpents/pagesMatchs/match/match-3.js
  12. 4 0
      commpents/pagesMatchs/match/match-3.json
  13. 0 0
      commpents/pagesMatchs/match/match-3.less
  14. 2 0
      commpents/pagesMatchs/match/match-3.wxml
  15. 1 0
      commpents/pagesMatchs/match/match-3.wxss
  16. 23 0
      commpents/pagesMatchs/match/match-4.js
  17. 4 0
      commpents/pagesMatchs/match/match-4.json
  18. 0 0
      commpents/pagesMatchs/match/match-4.less
  19. 2 0
      commpents/pagesMatchs/match/match-4.wxml
  20. 1 0
      commpents/pagesMatchs/match/match-4.wxss
  21. 23 0
      commpents/pagesMatchs/match/match-5.js
  22. 4 0
      commpents/pagesMatchs/match/match-5.json
  23. 0 0
      commpents/pagesMatchs/match/match-5.less
  24. 2 0
      commpents/pagesMatchs/match/match-5.wxml
  25. 1 0
      commpents/pagesMatchs/match/match-5.wxss
  26. 3 5
      pagesMatch/match/info.js
  27. 10 5
      pagesMatch/match/info.json
  28. 1 89
      pagesMatch/match/info.less
  29. 19 63
      pagesMatch/match/info.wxml
  30. 1 69
      pagesMatch/match/info.wxss
  31. 1 1
      project.private.config.json

+ 24 - 0
commpents/pagesMatchs/match/match-1.js

@@ -0,0 +1,24 @@
+// commpents/pagesMatch/match/match-1.js
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        info: { type: Object },
+        fileUrl: { type: String }
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+
+    }
+})

+ 4 - 0
commpents/pagesMatchs/match/match-1.json

@@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}

+ 87 - 0
commpents/pagesMatchs/match/match-1.less

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

+ 57 - 0
commpents/pagesMatchs/match/match-1.wxml

@@ -0,0 +1,57 @@
+<view class="main">
+    <image class="image" src="{{fileUrl}}/files/court/elimg/20220729140648.png"></image>
+    <view class="one">
+        <view class="one_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="one_1 one_2">
+            <view class="one_2_1">
+                <view class="txt">报名说明:</view>
+                <view class="cont">{{info.explain||'暂无'}}</view>
+            </view>
+            <view class="one_2_1">
+                <view class="txt">赛事规程:</view>
+                <rich-text nodes="{{info.zhRegular||'暂无'}}"></rich-text>
+            </view>
+        </view>
+    </view>
+</view>

+ 69 - 0
commpents/pagesMatchs/match/match-1.wxss

@@ -0,0 +1,69 @@
+@import "/app.wxss";
+.main {
+  width: 96vw;
+  padding: 2vw;
+}
+.main .image {
+  width: 96vw;
+  height: 160px;
+}
+.main .one {
+  width: 96vw;
+  display: flex;
+  flex-direction: column;
+  background-color: var(--mainColor);
+  position: relative;
+}
+.main .one .one_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 {
+  font-size: var(--font18Szie);
+  font-weight: bold;
+  margin: 0 0 2vw 0;
+}
+.main .one .one_1 .status {
+  margin: 0 0 2vw 0;
+}
+.main .one .one_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 {
+  margin: 0 0 1vw 0;
+  font-size: var(--font16Szie);
+  color: var(--f85Color);
+  padding: 0.5vw 0;
+}
+.main .one .one_1 .other .other_1 .icon {
+  margin: 0 2vw 0 0;
+}
+.main .one .one_1 .other .other_1 .money {
+  color: var(--redColor) !important;
+  font-weight: bold;
+}
+.main .one .one_1 .other .other_1 text:last-child {
+  color: var(--blackColor);
+}
+.main .one .one_2 {
+  margin: 0;
+}
+.main .one .one_2 .one_2_1 {
+  margin: 0 0 1vw 0;
+}
+.main .one .one_2 .one_2_1 .txt {
+  font-size: var(--font16Szie);
+  margin: 0 0 1vw 0;
+}
+.main .one .one_2 .one_2_1 .cont {
+  font-size: var(--font14Szie);
+  color: var(--f85Color);
+  text-indent: 1rem;
+}

+ 33 - 0
commpents/pagesMatchs/match/match-2.js

@@ -0,0 +1,33 @@
+// commpents/pagesMatchs/match/match-2.js
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        player: { type: Object },
+        showIndex: { type: String },
+        showIndexs: { type: String }
+    },
+    /**
+     * 组件的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+        panel: function (e) {
+            const that = this;
+            let index = e.currentTarget.dataset.index;
+            that.triggerEvent('panel', index)
+        },
+        panels: function (e) {
+            const that = this;
+            let index = e.currentTarget.dataset.index;
+            that.triggerEvent('panels', index)
+        }
+    }
+})

+ 4 - 0
commpents/pagesMatchs/match/match-2.json

@@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}

+ 63 - 0
commpents/pagesMatchs/match/match-2.less

@@ -0,0 +1,63 @@
+@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;
+        }
+
+        .icon {
+            text-align: right;
+            width: 35vw;
+        }
+    }
+
+    .content {
+
+        .project {
+            margin: 3vw 0;
+            padding: 0 1vw;
+
+            .user {
+                display: flex;
+                flex-direction: row;
+                flex-wrap: wrap;
+                justify-content: space-between;
+
+
+                .user_name {
+                    text-align: center;
+                    margin: 0 0 2vw 0;
+                    width: 20vw;
+
+                    .icon {
+                        width: 18vw;
+                        height: 18vw;
+                        border-radius: 50%;
+                        border: 2px dashed var(--f1Color);
+
+
+                        image {
+                            width: 80%;
+                            height: 80%;
+                        }
+                    }
+
+                    .xm {
+                        font-size: var(--font14Size);
+                    }
+
+                }
+            }
+        }
+    }
+}

+ 26 - 0
commpents/pagesMatchs/match/match-2.wxml

@@ -0,0 +1,26 @@
+<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>
+                    </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>
+                </view>
+            </view>
+        </view>
+    </view>
+</view>

+ 47 - 0
commpents/pagesMatchs/match/match-2.wxss

@@ -0,0 +1,47 @@
+@import "/app.wxss";
+.main {
+  width: 96vw;
+  padding: 2vw;
+}
+.main .Title {
+  display: flex;
+  flex-direction: row;
+  line-height: 40px;
+  border-bottom: 1px solid var(--f1Color);
+  margin: 0 0 2vw 0;
+}
+.main .Title .name {
+  width: 60vw;
+}
+.main .Title .icon {
+  text-align: right;
+  width: 35vw;
+}
+.main .content .project {
+  margin: 3vw 0;
+  padding: 0 1vw;
+}
+.main .content .project .user {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+.main .content .project .user .user_name {
+  text-align: center;
+  margin: 0 0 2vw 0;
+  width: 20vw;
+}
+.main .content .project .user .user_name .icon {
+  width: 18vw;
+  height: 18vw;
+  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 {
+  font-size: var(--font14Size);
+}

+ 23 - 0
commpents/pagesMatchs/match/match-3.js

@@ -0,0 +1,23 @@
+// commpents/pagesMatchs/match/match-3.js
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+
+    }
+})

+ 4 - 0
commpents/pagesMatchs/match/match-3.json

@@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}

+ 0 - 0
commpents/pagesMatchs/match/match-3.less


+ 2 - 0
commpents/pagesMatchs/match/match-3.wxml

@@ -0,0 +1,2 @@
+<!--commpents/pagesMatchs/match/match-3.wxml-->
+<text>commpents/pagesMatchs/match/match-3.wxml</text>

+ 1 - 0
commpents/pagesMatchs/match/match-3.wxss

@@ -0,0 +1 @@
+/* commpents/pagesMatchs/match/match-3.wxss */

+ 23 - 0
commpents/pagesMatchs/match/match-4.js

@@ -0,0 +1,23 @@
+// commpents/pagesMatchs/match/match-4.js
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+
+    }
+})

+ 4 - 0
commpents/pagesMatchs/match/match-4.json

@@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}

+ 0 - 0
commpents/pagesMatchs/match/match-4.less


+ 2 - 0
commpents/pagesMatchs/match/match-4.wxml

@@ -0,0 +1,2 @@
+<!--commpents/pagesMatchs/match/match-4.wxml-->
+<text>commpents/pagesMatchs/match/match-4.wxml</text>

+ 1 - 0
commpents/pagesMatchs/match/match-4.wxss

@@ -0,0 +1 @@
+/* commpents/pagesMatchs/match/match-4.wxss */

+ 23 - 0
commpents/pagesMatchs/match/match-5.js

@@ -0,0 +1,23 @@
+// commpents/pagesMatchs/match/match-5.js
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+
+    }
+})

+ 4 - 0
commpents/pagesMatchs/match/match-5.json

@@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}

+ 0 - 0
commpents/pagesMatchs/match/match-5.less


+ 2 - 0
commpents/pagesMatchs/match/match-5.wxml

@@ -0,0 +1,2 @@
+<!--commpents/pagesMatchs/match/match-5.wxml-->
+<text>commpents/pagesMatchs/match/match-5.wxml</text>

+ 1 - 0
commpents/pagesMatchs/match/match-5.wxss

@@ -0,0 +1 @@
+/* commpents/pagesMatchs/match/match-5.wxss */

+ 3 - 5
pagesMatch/match/info.js

@@ -83,15 +83,13 @@ Page({
     // 手风琴1
     panel: function (e) {
         const that = this;
-        let index = e.currentTarget.dataset.index;
-        if (index != that.data.showIndex) that.setData({ showIndex: index })
+        if (e.detail != that.data.showIndex) that.setData({ showIndex: e.detail })
         else that.setData({ showIndex: 10000 })
     },
     // 手风琴2
     panels: function (e) {
         const that = this;
-        let index = e.currentTarget.dataset.index;
-        if (index != that.data.showIndexs) that.setData({ showIndexs: index })
+        if (e.detail != that.data.showIndexs) that.setData({ showIndexs: e.detail })
         else that.setData({ showIndexs: 10000 })
     },
     // 秩序册
@@ -118,7 +116,7 @@ Page({
      */
     onLoad: async function (options) {
         const that = this;
-        that.setData({ id: options.id || '' });
+        that.setData({ id: options && options.id || '630ec4700a92b0a015ccfd14' });
         // 查询其他信息
         await that.searchOther();
         // 监听用户是否登录

+ 10 - 5
pagesMatch/match/info.json

@@ -1,7 +1,12 @@
 {
-  "component": true,
-  "usingComponents": {
-    "mobile-main": "/commpents/mobile-frame/index",
-    "s-tab": "/commpents/tabs/index"
-  }
+    "component": true,
+    "usingComponents": {
+        "mobile-main": "/commpents/mobile-frame/index",
+        "match-1": "/commpents/pagesMatchs/match/match-1",
+        "match-2": "/commpents/pagesMatchs/match/match-2",
+        "match-3": "/commpents/pagesMatchs/match/match-3",
+        "match-4": "/commpents/pagesMatchs/match/match-4",
+        "match-5": "/commpents/pagesMatchs/match/match-5",
+        "s-tab": "/commpents/tabs/index"
+    }
 }

+ 1 - 89
pagesMatch/match/info.less

@@ -14,94 +14,6 @@
 
         .a {
             height: 83vh;
-
-            .a_1 {
-                width: 96vw;
-                display: flex;
-                flex-direction: column;
-                background-color: var(--mainColor);
-                position: relative;
-                margin: 2vw;
-
-                .image {
-                    width: 96vw;
-                    height: 160px;
-                }
-
-                .a_1_info {
-                    position: absolute;
-                    top: 30vw;
-                    width: 92vw;
-                    margin: 0 2vw;
-
-                    .a_1_1 {
-                        background-color: var(--mainColor);
-                        margin: 0 0 3vw 0;
-                        border-radius: 5px;
-                        padding: 2vw;
-                        box-shadow: 0 0 1vw var(--fcColor);
-
-                        .name {
-                            font-size: var(--font18Szie);
-                            font-weight: bold;
-                            margin: 0 0 2vw 0;
-                        }
-
-                        .status {
-                            margin: 0 0 2vw 0;
-
-                            text {
-                                display: inline-block;
-                                background-color: var(--redColor);
-                                color: var(--whiteColor);
-                                padding: 1vw 3vw;
-                                border-radius: 5px;
-                            }
-                        }
-
-                        .other {
-                            .other_1 {
-                                margin: 0 0 1vw 0;
-                                font-size: var(--font16Szie);
-                                color: var(--f85Color);
-                                padding: 0.5vw 0;
-
-                                .icon {
-                                    margin: 0 2vw 0 0;
-                                }
-
-                                .money {
-                                    color: var(--redColor) !important;
-                                    font-weight: bold;
-                                }
-
-                                text:last-child {
-                                    color: var(--blackColor);
-                                }
-
-                            }
-                        }
-                    }
-
-                    .a_1_2 {
-                        .a_1_2t {
-                            margin: 0 0 1vw 0;
-
-                            .txt {
-                                font-size: var(--font16Szie);
-                                margin: 0 0 1vw 0;
-                            }
-
-                            .cont {
-                                font-size: var(--font14Szie);
-                                color: var(--f85Color);
-                                text-indent: 1rem;
-                            }
-                        }
-                    }
-                }
-            }
-
         }
 
         .b {
@@ -388,7 +300,7 @@
     position: fixed;
     width: 96vw;
     bottom: 8vh;
-    right: 2vw;
+    right: 4vw;
     text-align: right;
 
     .btn {

+ 19 - 63
pagesMatch/match/info.wxml

@@ -7,64 +7,8 @@
             <view wx:if="{{tabs.active=='a'}}" class="a">
                 <scroll-view scroll-y="true" class="scroll-view">
                     <view class="list-scroll-view">
-                        <view class="a_1">
-                            <image class="image" src="{{fileUrl}}/files/court/elimg/20220729140648.png"></image>
-                            <view class="a_1_info">
-                                <view class="a_1_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="a_1_1 a_1_2">
-                                    <view class="a_1_2t">
-                                        <view class="txt">报名说明:</view>
-                                        <view class="cont">{{info.explain||'暂无'}}</view>
-                                    </view>
-                                    <view class="a_1_2t">
-                                        <view class="txt">赛事规程:</view>
-                                        <rich-text nodes="{{info.zhRegular||'暂无'}}"></rich-text>
-                                    </view>
-                                </view>
-                            </view>
-                        </view>
-                        <view class="inMatch" wx:if="{{user.type=='0'}}">
+                        <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>
@@ -73,7 +17,8 @@
             <view wx:if="{{tabs.active=='b'}}" class="b">
                 <scroll-view scroll-y="true" class="scroll-view">
                     <view class="list-scroll-view">
-                        <view class="b_1">
+                        <match-2 player="{{player}}" showIndex="{{showIndex}}" showIndexs="{{showIndexs}}" bind:panel="panel" bind:panels="panels"></match-2>
+                        <!-- <view class="b_1">
                             <view wx:for="{{player.group}}" wx:key="item">
                                 <view class="Title" bindtap="panel" data-index="{{ index }}">
                                     <view class="name">{{item.name}}({{item.age}}岁)</view>
@@ -98,7 +43,7 @@
                                     </view>
                                 </view>
                             </view>
-                        </view>
+                        </view> -->
                     </view>
                 </scroll-view>
             </view>
@@ -156,7 +101,12 @@
                 </view>
             </view>
             <view wx:if="{{tabs.active=='d'}}" class="d">
-                <view class="d_1">
+                <scroll-view scroll-y="true" class="scroll-view">
+                    <view class="list-scroll-view">
+                        <match-4></match-4>
+                    </view>
+                </scroll-view>
+                <!-- <view class="d_1">
                     <s-tab tabs="{{fieldtabs}}" bind:tabsChange="fieldtabsChange"></s-tab>
                 </view>
                 <view wx:if="{{fieldtabs.active==active}}" class="d_2">
@@ -186,9 +136,15 @@
                             </view>
                         </view>
                     </scroll-view>
-                </view>
+                </view> -->
+            </view>
+            <view wx:if="{{tabs.active=='e'}}" class="e">
+                <scroll-view scroll-y="true" class="scroll-view">
+                    <view class="list-scroll-view">
+                        <match-5></match-5>
+                    </view>
+                </scroll-view>
             </view>
-            <view wx:if="{{tabs.active=='e'}}" class="e">成绩册</view>
         </view>
     </view>
 </mobile-main>

+ 1 - 69
pagesMatch/match/info.wxss

@@ -13,74 +13,6 @@
 .main .two .a {
   height: 83vh;
 }
-.main .two .a .a_1 {
-  width: 96vw;
-  display: flex;
-  flex-direction: column;
-  background-color: var(--mainColor);
-  position: relative;
-  margin: 2vw;
-}
-.main .two .a .a_1 .image {
-  width: 96vw;
-  height: 160px;
-}
-.main .two .a .a_1 .a_1_info {
-  position: absolute;
-  top: 30vw;
-  width: 92vw;
-  margin: 0 2vw;
-}
-.main .two .a .a_1 .a_1_info .a_1_1 {
-  background-color: var(--mainColor);
-  margin: 0 0 3vw 0;
-  border-radius: 5px;
-  padding: 2vw;
-  box-shadow: 0 0 1vw var(--fcColor);
-}
-.main .two .a .a_1 .a_1_info .a_1_1 .name {
-  font-size: var(--font18Szie);
-  font-weight: bold;
-  margin: 0 0 2vw 0;
-}
-.main .two .a .a_1 .a_1_info .a_1_1 .status {
-  margin: 0 0 2vw 0;
-}
-.main .two .a .a_1 .a_1_info .a_1_1 .status text {
-  display: inline-block;
-  background-color: var(--redColor);
-  color: var(--whiteColor);
-  padding: 1vw 3vw;
-  border-radius: 5px;
-}
-.main .two .a .a_1 .a_1_info .a_1_1 .other .other_1 {
-  margin: 0 0 1vw 0;
-  font-size: var(--font16Szie);
-  color: var(--f85Color);
-  padding: 0.5vw 0;
-}
-.main .two .a .a_1 .a_1_info .a_1_1 .other .other_1 .icon {
-  margin: 0 2vw 0 0;
-}
-.main .two .a .a_1 .a_1_info .a_1_1 .other .other_1 .money {
-  color: var(--redColor) !important;
-  font-weight: bold;
-}
-.main .two .a .a_1 .a_1_info .a_1_1 .other .other_1 text:last-child {
-  color: var(--blackColor);
-}
-.main .two .a .a_1 .a_1_info .a_1_2 .a_1_2t {
-  margin: 0 0 1vw 0;
-}
-.main .two .a .a_1 .a_1_info .a_1_2 .a_1_2t .txt {
-  font-size: var(--font16Szie);
-  margin: 0 0 1vw 0;
-}
-.main .two .a .a_1 .a_1_info .a_1_2 .a_1_2t .cont {
-  font-size: var(--font14Szie);
-  color: var(--f85Color);
-  text-indent: 1rem;
-}
 .main .two .b {
   height: 83vh;
 }
@@ -305,7 +237,7 @@
   position: fixed;
   width: 96vw;
   bottom: 8vh;
-  right: 2vw;
+  right: 4vw;
   text-align: right;
 }
 .inMatch .btn {

+ 1 - 1
project.private.config.json

@@ -1,7 +1,7 @@
 {
     "projectname": "%E7%BE%BD%E6%A0%A1%E7%AE%A1%E7%90%86%E5%B9%B3%E5%8F%B0",
     "setting": {
-        "compileHotReLoad": true
+        "compileHotReLoad": false
     },
     "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
 }