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

app.json

@@ -42,13 +42,16 @@
         "pages/race/index",
         "pages/race/add",
         "pages/race/auto",
+        "pages/eliminate/index",
+        "pages/eliminate/add",
         "pages/agree_txt/index",
         "pages/openMatch/index",
         "pages/orderbook/teamautoAdd",
         "pages/orderbook/teamAdd",
         "pages/orderbook/raceAdd",
         "pages/orderbook/autoAdd",
-        "pages/referee/match",
+        "pages/referee/group",
+        "pages/referee/eliminate",
         "pages/test/index",
         "pages/match/index",
         "pages/f6test/index",

pages/eliminate/add.js

@@ -0,0 +1,72 @@
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        frameStyle: { useTop: true, name: '赛程管理', leftArrow: true, useBar: false },
+    },
+    // 跳转菜单
+    back(e) {
+        wx.navigateBack({
+            delta: 1,
+        })
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        const that = this;
+
+    },
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

pages/eliminate/add.less

@@ -0,0 +1,13 @@
+.main {
+    height: 88.8vh;
+
+    .zero {
+        width: 96vw;
+        margin: 0 0 2vw 0;
+        background-color: #ff0000;
+    }
+
+    .zero:last-child {
+        margin: 0;
+    }
+}

pages/eliminate/add.wxml

@@ -0,0 +1,7 @@
+<mobile-main frameStyle="{{frameStyle}}" bind:back="back" bind:tabPath="tabPath">
+    <view slot="info" class="container main">
+        <view class="zero one">
+            赛程管理
+        </view>
+    </view>
+</mobile-main>

pages/eliminate/add.wxss

@@ -0,0 +1,11 @@
+.main {
+  height: 88.8vh;
+}
+.main .zero {
+  width: 96vw;
+  margin: 0 0 2vw 0;
+  background-color: #ff0000;
+}
+.main .zero:last-child {
+  margin: 0;
+}

pages/eliminate/index.js

@@ -0,0 +1,75 @@
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        frameStyle: { useTop: true, name: '淘汰赛管理', leftArrow: true, useBar: false },
+    },
+    // 跳转菜单
+    back(e) {
+        wx.navigateBack({
+            delta: 1,
+        })
+    },
+    // 添加
+    toAdd: function () {
+        wx.navigateTo({ url: '/pages/eliminate/add' })
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        const that = this;
+
+    },
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

pages/eliminate/index.json

@@ -0,0 +1,6 @@
+{
+    "component": true,
+    "usingComponents": {
+      "mobile-main": "/commpents/mobile-frame/index"
+    }
+  }

pages/eliminate/index.less

@@ -0,0 +1,35 @@
+.main {
+    height: 88.8vh;
+
+    .zero {
+        width: 96vw;
+        margin: 0 0 2vw 0;
+    }
+
+    .zero:last-child {
+        margin: 0;
+    }
+
+    .one {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-around;
+        flex-wrap: wrap;
+        width: 96vw;
+        padding: 2vw 0;
+        background-color: #f1f1f1;
+
+        button {
+            width: 100%;
+            font-size: 14px;
+            margin: 0 1vw 1vw 1vw;
+            padding: 2vw 1vw;
+        }
+    }
+
+    .two {
+        flex-grow: 1;
+        position: relative;
+        background-color: #ff0000;
+    }
+}

pages/eliminate/index.wxml

@@ -0,0 +1,12 @@
+<mobile-main frameStyle="{{frameStyle}}" bind:back="back" bind:tabPath="tabPath">
+    <view slot="info" class="container main">
+        <view class="zero one">
+            <view>
+                <button type="primary" bindtap="toAdd">添加赛程</button>
+            </view>
+        </view>
+        <view class="zero two">
+            列表
+        </view>
+    </view>
+</mobile-main>

pages/eliminate/index.wxss

@@ -0,0 +1,30 @@
+.main {
+  height: 88.8vh;
+}
+.main .zero {
+  width: 96vw;
+  margin: 0 0 2vw 0;
+}
+.main .zero:last-child {
+  margin: 0;
+}
+.main .one {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-around;
+  flex-wrap: wrap;
+  width: 96vw;
+  padding: 2vw 0;
+  background-color: #f1f1f1;
+}
+.main .one button {
+  width: 100%;
+  font-size: 14px;
+  margin: 0 1vw 1vw 1vw;
+  padding: 2vw 1vw;
+}
+.main .two {
+  flex-grow: 1;
+  position: relative;
+  background-color: #ff0000;
+}

pages/match/mess.wxml

@@ -80,7 +80,7 @@
                 <canvas class="qrcode" canvas-id="myQrcode"></canvas>
             </view>
             <view class="remark">
-                用户可臊面二维码查看赛事详细信息
+                用户可扫描二维码查看赛事详细信息
             </view>
         </view>
     </view>

pages/referee/match.js

@@ -5,7 +5,7 @@ Page({
      * 页面的初始数据
      */
     data: {
-        frameStyle: { useTop: true, name: '我的赛事', leftArrow: true, useBar: false },
+        frameStyle: { useTop: true, name: '淘汰赛管理', leftArrow: true, useBar: false },
         searchInfo: {},
         list: []
     },

pages/referee/eliminate.json

@@ -0,0 +1,6 @@
+{
+    "component": true,
+    "usingComponents": {
+      "mobile-main": "/commpents/mobile-frame/index"
+    }
+  }

pages/referee/group.js

@@ -0,0 +1,90 @@
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        frameStyle: { useTop: true, name: '小组赛管理', leftArrow: true, useBar: false },
+        searchInfo: {},
+        list: []
+    },
+    // 跳转菜单
+    back(e) {
+        wx.navigateBack({ delta: 1 })
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        const that = this;
+
+    },
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+        const that = this;
+        that.watchLogin()
+    },
+    watchLogin: function () {
+        const that = this;
+        let searchInfo = that.data.searchInfo;
+        wx.getStorage({
+            key: 'user',
+            success: async (res) => {
+                let info = { skip: 0, limit: 1000, referee_id: res.data.opneid || 'oH0y05QJCvBQQpoobbtHTkpL4z4I' };
+                // if (searchInfo && searchInfo.name) info.name = searchInfo.name;
+                const arr = await app.$get(`/newCourt/api/race`, { ...info });
+                if (arr.errcode == '0') {
+                    that.setData({ list: arr.data })
+                } else { wx.showToast({ title: `${res.errMsg}`, icon: 'fail', duration: 2000 }); }
+            },
+            fail: async (res) => {
+                wx.redirectTo({ url: '/pages/index/index' });
+            },
+        });
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

pages/referee/group.json

@@ -0,0 +1,6 @@
+{
+    "component": true,
+    "usingComponents": {
+      "mobile-main": "/commpents/mobile-frame/index"
+    }
+  }

pages/referee/group.less

@@ -0,0 +1,82 @@
+.main {
+    height: 88.8vh;
+
+    .zero {
+        width: 96vw;
+        margin: 0 0 2vw 0;
+
+    }
+
+    .zero:last-child {
+        margin: 0;
+    }
+
+    .one {
+        background-color: #f1f1f1;
+        width: 92vw;
+        padding: 2vw;
+    }
+
+    .two {
+        flex-grow: 1;
+        width: 96vw;
+        position: relative;
+
+        .scroll-view {
+            position: absolute;
+            top: 0;
+            left: 0;
+            right: 0;
+            bottom: 0;
+
+            .list-scroll-view {
+                display: flex;
+                flex-direction: column;
+
+                .list {
+                    background-color: #ffffff;
+                    border-bottom: 1px solid #cccccc;
+                    width: 96vw;
+                    padding: 2vw;
+
+                    .name {
+                        font-size: 18px;
+                        margin: 0 0 1vw 0;
+                        font-weight: bold;
+                    }
+
+                    .other {
+                        margin: 0 0 1vw 0;
+
+                        .other_1 {
+                            margin: 0 0 1vw 0;
+                            font-size: 15px;
+
+                            text {
+                                color: #000000;
+                            }
+
+                            text:nth-child(1) {
+                                color: #858585;
+                            }
+
+                        }
+                    }
+
+                    .btn {
+                        text-align: center;
+
+                        button {
+                            margin: 0 2vw;
+                            font-size: 14px;
+                        }
+                    }
+                }
+
+                .list:last-child {
+                    border-bottom: none;
+                }
+            }
+        }
+    }
+}

pages/referee/group.wxml

@@ -0,0 +1,41 @@
+<mobile-main frameStyle="{{frameStyle}}" bind:back="back" bind:tabPath="tabPath">
+    <view slot="info" class="container main">
+        <view class="zero one">
+            <input type="text" value="{{searchInfo.name}}" bindconfirm="search" placeholder="请输入关键词" />
+        </view>
+        <view class="zero two">
+            <scroll-view scroll-y="true" class="scroll-view">
+                <view class="list-scroll-view">
+                    <view class="list" wx:for="{{list}}" wx:key="item">
+                        <view class="name">{{item.match_time}}</view>
+                        <view class="other">
+                            <view class="other_1">
+                                <text>赛事名称：</text>
+                                <text>{{item.match_name}}</text>
+                            </view>
+                            <view class="other_1">
+                                <text>赛事组别：</text>
+                                <text>{{item.grouping_name}}</text>
+                            </view>
+                            <view class="other_1">
+                                <text>组内项目：</text>
+                                <text>{{item.project_name}}</text>
+                            </view>
+                            <view class="other_1">
+                                <text>赛事场地：</text>
+                                <text>{{item.ground_name}}</text>
+                            </view>
+                            <view class="other_1">
+                                <text>比赛状态：</text>
+                                <text>{{item.status=='0'?'已安排':item.status=='1'?'待开赛':item.status=='2'?'已开赛':item.status=='3'?'已结束':'暂无'}}</text>
+                            </view>
+                        </view>
+                        <view class="btn">
+                            <button type="primary" size="mini">赛事比分</button>
+                        </view>
+                    </view>
+                </view>
+            </scroll-view>
+        </view>
+    </view>
+</mobile-main>

pages/referee/group.wxss

@@ -0,0 +1,65 @@
+.main {
+  height: 88.8vh;
+}
+.main .zero {
+  width: 96vw;
+  margin: 0 0 2vw 0;
+}
+.main .zero:last-child {
+  margin: 0;
+}
+.main .one {
+  background-color: #f1f1f1;
+  width: 92vw;
+  padding: 2vw;
+}
+.main .two {
+  flex-grow: 1;
+  width: 96vw;
+  position: relative;
+}
+.main .two .scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.main .two .scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+}
+.main .two .scroll-view .list-scroll-view .list {
+  background-color: #ffffff;
+  border-bottom: 1px solid #cccccc;
+  width: 96vw;
+  padding: 2vw;
+}
+.main .two .scroll-view .list-scroll-view .list .name {
+  font-size: 18px;
+  margin: 0 0 1vw 0;
+  font-weight: bold;
+}
+.main .two .scroll-view .list-scroll-view .list .other {
+  margin: 0 0 1vw 0;
+}
+.main .two .scroll-view .list-scroll-view .list .other .other_1 {
+  margin: 0 0 1vw 0;
+  font-size: 15px;
+}
+.main .two .scroll-view .list-scroll-view .list .other .other_1 text {
+  color: #000000;
+}
+.main .two .scroll-view .list-scroll-view .list .other .other_1 text:nth-child(1) {
+  color: #858585;
+}
+.main .two .scroll-view .list-scroll-view .list .btn {
+  text-align: center;
+}
+.main .two .scroll-view .list-scroll-view .list .btn button {
+  margin: 0 2vw;
+  font-size: 14px;
+}
+.main .two .scroll-view .list-scroll-view .list:last-child {
+  border-bottom: none;
+}

pages/topic/info.wxml

@@ -28,7 +28,7 @@
                 </view>
             </scroll-view>
         </view>
-        <view class="foot" wx:if="{{user.type=='-1'}}">
+        <view class="foot" wx:if="{{user.type=='0'}}">
             <text class="mymatch" bindtap="toDialog">我要发帖</text>
         </view>
     </view>

pages/usermymatch/index.js

@@ -6,12 +6,119 @@ Page({
      */
     data: {
         frameStyle: { useTop: true, name: '我的赛事', leftArrow: true, useBar: false },
+        dialog: { title: '详细信息', show: false, type: '1' },
+        // 选项卡
+        tabs: {
+            active: 'a',
+            list: [
+                { title: '小组赛', name: 'a' },
+                { title: '淘汰赛', name: 'b' },
+
+            ],
+        },
+        list: [
+            {
+                match_time: '比赛时间',
+                match_name: '比赛名称',
+                grouping_name: '赛事组别',
+                project_name: '组内项目',
+                ground_name: '比赛场地',
+            },
+            {
+                match_time: '比赛时间',
+                match_name: '比赛名称',
+                grouping_name: '赛事组别',
+                project_name: '组内项目',
+                ground_name: '比赛场地',
+            },
+            {
+                match_time: '比赛时间',
+                match_name: '比赛名称',
+                grouping_name: '赛事组别',
+                project_name: '组内项目',
+                ground_name: '比赛场地',
+            },
+            {
+                match_time: '比赛时间',
+                match_name: '比赛名称',
+                grouping_name: '赛事组别',
+                project_name: '组内项目',
+                ground_name: '比赛场地',
+            },
+            {
+                match_time: '比赛时间',
+                match_name: '比赛名称',
+                grouping_name: '赛事组别',
+                project_name: '组内项目',
+                ground_name: '比赛场地',
+            },
+            {
+                match_time: '比赛时间',
+                match_name: '比赛名称',
+                grouping_name: '赛事组别',
+                project_name: '组内项目',
+                ground_name: '比赛场地',
+            },
+            {
+                match_time: '比赛时间',
+                match_name: '比赛名称',
+                grouping_name: '赛事组别',
+                project_name: '组内项目',
+                ground_name: '比赛场地',
+            },
+            {
+                match_time: '比赛时间',
+                match_name: '比赛名称',
+                grouping_name: '赛事组别',
+                project_name: '组内项目',
+                ground_name: '比赛场地',
+            },
+            {
+                match_time: '比赛时间',
+                match_name: '比赛名称',
+                grouping_name: '赛事组别',
+                project_name: '组内项目',
+                ground_name: '比赛场地',
+            }, {
+                match_time: '比赛时间',
+                match_name: '比赛名称',
+                grouping_name: '赛事组别',
+                project_name: '组内项目',
+                ground_name: '比赛场地',
+            },
+            {
+                match_time: '比赛时间',
+                match_name: '比赛名称',
+                grouping_name: '赛事组别',
+                project_name: '组内项目',
+                ground_name: '比赛场地',
+            },
+        ],
+        // 详细信息
+        info: {},
     },
     // 跳转菜单
     back(e) {
         wx.navigateBack({ delta: 1 })
     },
-
+    // 选项卡
+    tabsChange: function (e) {
+        const that = this;
+        const { name } = e.detail;
+        that.setData({ 'tabs.active': name });
+    },
+    // 详细信息
+    toView: async function (e) {
+        const { item } = e.currentTarget.dataset;
+        const that = this;
+        that.setData({ info: item })
+        that.setData({ dialog: { title: '详细信息', show: true, type: '1' } })
+    },
+    // 关闭弹框
+    toClose: function () {
+        const that = this;
+        that.setData({ dialog: { title: '详细信息', show: false, type: '1' } })
+    },
     /**
      * 生命周期函数--监听页面加载
      */

pages/usermymatch/index.json

@@ -2,6 +2,7 @@
   "component": true,
   "usingComponents": {
     "mobile-main": "/commpents/mobile-frame/index",
+    "e-tabs": "/commpents/tabs/index",
     "e-dialog": "/commpents/dialog/index"
   }
 }

pages/usermymatch/index.less

@@ -1,3 +1,105 @@
 .main {
     height: 88.8vh;
+
+    .zero {
+        width: 96vw;
+        margin: 0 0 2vw 0;
+
+    }
+
+    .zero:last-child {
+        margin: 0;
+    }
+
+    .two {
+        flex-grow: 1;
+        position: relative;
+
+        .scroll-view {
+            position: absolute;
+            top: 0;
+            left: 0;
+            right: 0;
+            bottom: 0;
+
+            .list-scroll-view {
+                display: flex;
+                flex-direction: column;
+
+                .list {
+                    background-color: #ffffff;
+                    border-bottom: 1px solid #cccccc;
+                    width: 96vw;
+                    padding: 2vw;
+
+                    .name {
+                        font-size: 18px;
+                        margin: 0 0 1vw 0;
+                        font-weight: bold;
+                    }
+
+                    .other {
+                        margin: 0 0 1vw 0;
+
+                        .other_1 {
+                            margin: 0 0 1vw 0;
+                            font-size: 15px;
+
+                            text {
+                                color: #000000;
+                            }
+
+                            text:nth-child(1) {
+                                color: #858585;
+                            }
+
+                        }
+                    }
+
+                    .btn {
+                        text-align: center;
+
+                        button {
+                            margin: 0 2vw;
+                            font-size: 14px;
+                        }
+                    }
+                }
+
+                .list:last-child {
+                    border-bottom: none;
+                }
+            }
+        }
+    }
+}
+
+.dialog_one {
+    margin: 10px 0 0 0;
+
+    .one_1 {
+        display: flex;
+        flex-direction: row;
+        justify-content: space-between;
+        border: 1px solid #ccc;
+        border-radius: 5px;
+        margin: 0 0 10px 0;
+        padding: 10px;
+
+        .text {
+            width: 22vw;
+            color: #666;
+            font-size: 16px;
+        }
+
+        .text1 {
+            font-size: 16px;
+            color: #000;
+        }
+
+        .image {
+            width: 15vw;
+            height: 15vw;
+        }
+    }
 }

pages/usermymatch/index.wxml

@@ -1,5 +1,103 @@
 <mobile-main frameStyle="{{frameStyle}}" bind:back="back">
     <view slot="info" class="container main">
-        我的赛事
+        <view class="zero one">
+            <e-tabs tabs="{{tabs}}" bind:tabsChange="tabsChange"></e-tabs>
+        </view>
+        <view class="zero two">
+            <scroll-view scroll-y="true" class="scroll-view">
+                <view class="list-scroll-view">
+                    <view wx:if="{{tabs.active=='a'}}" class="a">
+                        <view class="list" wx:for="{{list}}" wx:key="item">
+                            <view class="name">{{item.match_time}}</view>
+                            <view class="other">
+                                <view class="other_1">
+                                    <text>赛事名称：</text>
+                                    <text>{{item.match_name}}</text>
+                                </view>
+                                <view class="other_1">
+                                    <text>赛事组别：</text>
+                                    <text>{{item.grouping_name}}</text>
+                                </view>
+                                <view class="other_1">
+                                    <text>组内项目：</text>
+                                    <text>{{item.project_name}}</text>
+                                </view>
+                                <view class="other_1">
+                                    <text>赛事场地：</text>
+                                    <text>{{item.ground_name}}</text>
+                                </view>
+                                <view class="other_1">
+                                    <text>比赛状态：</text>
+                                    <text>{{item.status=='0'?'已安排':item.status=='1'?'待开赛':item.status=='2'?'已开赛':item.status=='3'?'已结束':'暂无'}}</text>
+                                </view>
+                            </view>
+                            <view class="btn">
+                                <button type="primary" size="mini" bindtap="toView" data-item="{{item}}">详细信息</button>
+                            </view>
+                        </view>
+                    </view>
+                    <view wx:elif="{{tabs.active=='b'}}" class="a b">
+                        <view class="list" wx:for="{{list}}" wx:key="item">
+                            <view class="name">{{item.match_time}}</view>
+                            <view class="other">
+                                <view class="other_1">
+                                    <text>赛事名称：</text>
+                                    <text>{{item.match_name}}</text>
+                                </view>
+                                <view class="other_1">
+                                    <text>赛事组别：</text>
+                                    <text>{{item.grouping_name}}</text>
+                                </view>
+                                <view class="other_1">
+                                    <text>组内项目：</text>
+                                    <text>{{item.project_name}}</text>
+                                </view>
+                                <view class="other_1">
+                                    <text>赛事场地：</text>
+                                    <text>{{item.ground_name}}</text>
+                                </view>
+                                <view class="other_1">
+                                    <text>比赛状态：</text>
+                                    <text>{{item.status=='0'?'已安排':item.status=='1'?'待开赛':item.status=='2'?'已开赛':item.status=='3'?'已结束':'暂无'}}</text>
+                                </view>
+                            </view>
+                            <view class="btn">
+                                <button type="primary" size="mini" bindtap="toView" data-item="{{item}}">详细信息</button>
+                            </view>
+                        </view>
+                    </view>
+                </view>
+            </scroll-view>
+        </view>
     </view>
-</mobile-main>
+</mobile-main>
+<e-dialog dialog="{{dialog}}" bind:toClose="toClose">
+    <view slot="info">
+        <view class="dialog_one" wx:if="{{dialog.type=='1'}}">
+            <view class="one_1">
+                <text class="text">赛事名称：</text>
+                <text class="text1">{{info.match_name||'暂无'}}</text>
+            </view>
+            <view class="one_1">
+                <text class="text">比赛时间：</text>
+                <text class="text1">{{info.match_time||'暂无'}}</text>
+            </view>
+            <view class="one_1">
+                <text class="text">赛事组别：</text>
+                <text class="text1">{{info.grouping_name||'暂无'}}</text>
+            </view>
+            <view class="one_1">
+                <text class="text">组内项目：</text>
+                <text class="text1">{{info.project_name||'暂无'}}</text>
+            </view>
+            <view class="one_1">
+                <text class="text">赛事场地：</text>
+                <text class="text1">{{info.ground_name||'暂无'}}</text>
+            </view>
+            <view class="one_1">
+                <text class="text">比赛状态：</text>
+                <text class="text1">{{info.status=='0'?'已安排':info.status=='1'?'待开赛':info.status=='2'?'已开赛':info.status=='3'?'已结束':'暂无'}}</text>
+            </view>
+        </view>
+    </view>
+</e-dialog>

pages/usermymatch/index.wxss

@@ -1,3 +1,84 @@
 .main {
   height: 88.8vh;
 }
+.main .zero {
+  width: 96vw;
+  margin: 0 0 2vw 0;
+}
+.main .zero:last-child {
+  margin: 0;
+}
+.main .two {
+  flex-grow: 1;
+  position: relative;
+}
+.main .two .scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.main .two .scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+}
+.main .two .scroll-view .list-scroll-view .list {
+  background-color: #ffffff;
+  border-bottom: 1px solid #cccccc;
+  width: 96vw;
+  padding: 2vw;
+}
+.main .two .scroll-view .list-scroll-view .list .name {
+  font-size: 18px;
+  margin: 0 0 1vw 0;
+  font-weight: bold;
+}
+.main .two .scroll-view .list-scroll-view .list .other {
+  margin: 0 0 1vw 0;
+}
+.main .two .scroll-view .list-scroll-view .list .other .other_1 {
+  margin: 0 0 1vw 0;
+  font-size: 15px;
+}
+.main .two .scroll-view .list-scroll-view .list .other .other_1 text {
+  color: #000000;
+}
+.main .two .scroll-view .list-scroll-view .list .other .other_1 text:nth-child(1) {
+  color: #858585;
+}
+.main .two .scroll-view .list-scroll-view .list .btn {
+  text-align: center;
+}
+.main .two .scroll-view .list-scroll-view .list .btn button {
+  margin: 0 2vw;
+  font-size: 14px;
+}
+.main .two .scroll-view .list-scroll-view .list:last-child {
+  border-bottom: none;
+}
+.dialog_one {
+  margin: 10px 0 0 0;
+}
+.dialog_one .one_1 {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  border: 1px solid #ccc;
+  border-radius: 5px;
+  margin: 0 0 10px 0;
+  padding: 10px;
+}
+.dialog_one .one_1 .text {
+  width: 22vw;
+  color: #666;
+  font-size: 16px;
+}
+.dialog_one .one_1 .text1 {
+  font-size: 16px;
+  color: #000;
+}
+.dialog_one .one_1 .image {
+  width: 15vw;
+  height: 15vw;
+}

utils/dict.js

@@ -40,10 +40,7 @@ export const myBtn = [
                     { title: '组队信息管理', route: 'match/shteam' },
                     { title: '赛事组管理', route: 'raceteam/index' },
                     { title: '小组赛管理', route: 'race/index' },
-
-
-                    // { title: '秩序册管理', route: 'match/orderbook' },
-
+                    { title: '淘汰赛管理', route: 'eliminate/index' },
                 ]
             },
             {
@@ -111,8 +108,10 @@ export const myBtn = [
         btn: [
             {
                 title: '我的赛事',
-                route: 'referee/match',
-                routeList: []
+                routeList: [
+                    { title: '小组赛管理', route: 'referee/group' },
+                    { title: '淘汰赛管理', route: 'referee/eliminate' },
+                ]
             },
             {
                 title: '账号管理',