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

app.json

@@ -1,56 +1,57 @@
 {
     "pages": [
-      "pages/f6test/index",
-      "pages/index/index",
-      "pages/register/index",
-      "pages/home/index",
-      "pages/news/index",
-      "pages/news/mess",
-      "pages/news/add",
-      "pages/news/info",
-      "pages/topic/index",
-      "pages/topic/mess",
-      "pages/topic/messAdd",
-      "pages/my/index",
-      "pages/topic/info",
-      "pages/my/userInfo",
-      "pages/matchInfo/index",
-      "pages/matchInfo/sign",
-      "pages/user/index",
-      "pages/match/mess",
-      "pages/match/matchadd",
-      "pages/match/matchgroup",
-      "pages/match/sign",
-      "pages/match/shteam",
-      "pages/match/orderbook",
-      "pages/order/index",
-      "pages/usermymatch/index",
-      "pages/usermysign/index",
-      "pages/usermyteam/index",
-      "pages/usermyteam/add",
-      "pages/usermyorder/index",
-      "pages/setting/contact",
-      "pages/setting/basic",
-      "pages/setting/index",
-      "pages/dictionary/project",
-      "pages/dictionary/projectadd",
-      "pages/dictionary/address",
-      "pages/dictionary/addressAdd",
-      "pages/raceteam/index",
-      "pages/raceteam/add",
-      "pages/raceteam/auto",
-      "pages/race/index",
-      "pages/race/add",
-      "pages/race/auto",
-      "pages/agree_txt/index",
-      "pages/openMatch/index",
-      "pages/orderbook/teamautoAdd",
-      "pages/orderbook/teamAdd",
-      "pages/orderbook/raceAdd",
-      "pages/orderbook/autoAdd",
-      "pages/test/index",
-      "pages/match/index",
-      "pages/logs/index"
+        "pages/index/index",
+        "pages/register/index",
+        "pages/home/index",
+        "pages/news/index",
+        "pages/news/mess",
+        "pages/news/add",
+        "pages/news/info",
+        "pages/topic/index",
+        "pages/topic/mess",
+        "pages/topic/messAdd",
+        "pages/my/index",
+        "pages/topic/info",
+        "pages/my/userInfo",
+        "pages/matchInfo/index",
+        "pages/matchInfo/sign",
+        "pages/matchInfo/achieve",
+        "pages/user/index",
+        "pages/match/mess",
+        "pages/match/matchadd",
+        "pages/match/matchgroup",
+        "pages/match/sign",
+        "pages/match/shteam",
+        "pages/match/orderbook",
+        "pages/order/index",
+        "pages/usermymatch/index",
+        "pages/usermysign/index",
+        "pages/usermyteam/index",
+        "pages/usermyteam/add",
+        "pages/usermyorder/index",
+        "pages/setting/contact",
+        "pages/setting/basic",
+        "pages/setting/index",
+        "pages/dictionary/project",
+        "pages/dictionary/projectadd",
+        "pages/dictionary/address",
+        "pages/dictionary/addressAdd",
+        "pages/raceteam/index",
+        "pages/raceteam/add",
+        "pages/raceteam/auto",
+        "pages/race/index",
+        "pages/race/add",
+        "pages/race/auto",
+        "pages/agree_txt/index",
+        "pages/openMatch/index",
+        "pages/orderbook/teamautoAdd",
+        "pages/orderbook/teamAdd",
+        "pages/orderbook/raceAdd",
+        "pages/orderbook/autoAdd",
+        "pages/test/index",
+        "pages/match/index",
+        "pages/f6test/index",
+        "pages/logs/index"
     ],
     "usingComponents": {
         "van-sidebar": "@vant/weapp/sidebar/index",

commpents/match-achieve/achieve.js

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

commpents/match-achieve/achieve.json

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

commpents/match-achieve/achieve.wxml

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

commpents/match-achieve/achieve.wxss

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

commpents/match-achieve/eliminate.js

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

commpents/match-achieve/eliminate.json

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

commpents/match-achieve/eliminate.wxml

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

commpents/match-achieve/eliminate.wxss

@@ -0,0 +1 @@
+/* commpents/match-achieve/eliminate.wxss */

commpents/match-achieve/group,less.js

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

commpents/match-achieve/group,less.json

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

commpents/match-achieve/group,less.wxml

@@ -0,0 +1,2 @@
+<!--commpents/match-achieve/group,less.wxml-->
+<text>commpents/match-achieve/group,less.wxml</text>

commpents/match-achieve/group,less.wxss

@@ -0,0 +1 @@
+/* commpents/match-achieve/group,less.wxss */

commpents/match-achieve/group.js

@@ -0,0 +1,23 @@
+// commpents/match-achieve/group.js
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        teamintegralList: { type: Array },
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+        top: ["积分排名", "积分"],
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+
+    }
+})

commpents/match-achieve/group.json

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

commpents/match-achieve/group.wxml

@@ -0,0 +1,18 @@
+<!--commpents/match-achieve/group.wxml-->
+<view class="table">
+    <view class="tr bg-w">
+        <view class="th" wx:for="{{top}}" wx:key="index">{{item}}</view>
+    </view>
+    <block wx:for="{{teamintegralList}}" wx:key="item" wx:for-index="index">
+        <view class="tr bg-g" wx:if="{{index % 2 == 0}}">
+            <view class="td">{{item.rank}}</view>
+            <!-- <view class="td">{{item.address||'--'}}</view> -->
+            <view class="td">{{item.integral}}</view>
+        </view>
+        <view class="tr" wx:else>
+            <view class="td">{{item.rank}}</view>
+            <!-- <view class="td">{{item.address||'--'}}</view> -->
+            <view class="td">{{item.integral}}</view>
+        </view>
+    </block>
+</view>

commpents/match-achieve/group.wxss

@@ -0,0 +1,34 @@
+/* commpents/match-achieve/group.wxss */
+.table {
+    border: 0px solid darkgray;
+  }
+  .tr {
+    display: flex;
+    width: 96vw;
+    justify-content: center;
+    height: 3rem;
+    align-items: center;
+  }
+  .td {
+    width: 48vw;
+    justify-content: center;
+    text-align: center;
+    font-size: 14px;
+  }
+  .bg-w {
+    background: snow;
+  }
+  .bg-g {
+    background: #E6F3F9;
+  }
+  .th {
+    width: 48vw;
+    justify-content: center;
+    background: #3366FF;
+    color: #fff;
+    display: flex;
+    height: 3rem;
+    font-size: 14px;
+    align-items: center;
+  }
+  

commpents/match-achieve/personal.js

@@ -0,0 +1,23 @@
+// commpents/match-achieve/personal.js
+Component({
+    /**
+     * 组件的属性列表
+     */
+    properties: {
+        ownintegralList: { type: Array },
+    },
+
+    /**
+     * 组件的初始数据
+     */
+    data: {
+        top: ["参赛选手", "本场积分", "本场积分排名"],
+    },
+
+    /**
+     * 组件的方法列表
+     */
+    methods: {
+
+    }
+})

commpents/match-achieve/personal.json

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

commpents/match-achieve/personal.wxml

@@ -0,0 +1,24 @@
+<!--commpents/match-achieve/personal.wxml-->
+<view class="table">
+    <view class="tr bg-w">
+        <view class="th" wx:for="{{top}}" wx:key="index">{{item}}</view>
+    </view>
+    <block wx:for="{{ownintegralList}}" wx:key="item" wx:for-index="index">
+        <view class="tr bg-g" wx:if="{{index % 2 == 0}}">
+            <view class="td">
+                <text wx:for="{{item.person}}" wx:for-item="person">{{person.name}}/</text>
+            </view>
+            <!-- <view class="td">{{item.address||'--'}}</view> -->
+            <view class="td">{{item.integral}}</view>
+            <view class="td">{{item.rank}}</view>
+        </view>
+        <view class="tr" wx:else>
+            <view class="td">
+                <text wx:for="{{item.person}}" wx:for-item="person">{{person.name}}/</text>
+            </view>
+            <!-- <view class="td">{{item.address||'--'}}</view> -->
+            <view class="td">{{item.integral}}</view>
+            <view class="td">{{item.rank}}</view>
+        </view>
+    </block>
+</view>

commpents/match-achieve/personal.wxss

@@ -0,0 +1,32 @@
+.table {
+  border: 0px solid darkgray;
+}
+.tr {
+  display: flex;
+  width: 96vw;
+  justify-content: center;
+  height: 3rem;
+  align-items: center;
+}
+.td {
+  width: 32vw;
+  justify-content: center;
+  text-align: center;
+  font-size: 14px;
+}
+.bg-w {
+  background: snow;
+}
+.bg-g {
+  background: #E6F3F9;
+}
+.th {
+  width: 32vw;
+  justify-content: center;
+  background: #3366FF;
+  color: #fff;
+  display: flex;
+  height: 3rem;
+  font-size: 14px;
+  align-items: center;
+}

commpents/match-achieve/ranking.js

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

commpents/match-achieve/ranking.json

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

commpents/match-achieve/ranking.less

@@ -0,0 +1,38 @@
+.list {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    padding: 5px;
+    background-color: #fff;
+    height: 50px;
+    margin: 0 0 4px 0;
+
+    .rank {
+        width: 50px;
+        height: 50px;
+        border-radius: 50%;
+        background-color: #cccccc;
+        text-align: center;
+        line-height: 50px;
+        color: #fff;
+        font-size: 18px;
+        font-weight: 700;
+    }
+
+    .rank_1 {
+        background-color: rgb(255, 196, 0);
+    }
+
+    .rank_2 {
+        background-color: rgb(219, 151, 48);
+    }
+
+    .rank_3 {
+        background-color: rgb(255, 114, 79);
+    }
+
+    .name {
+        width: 75vw;
+        line-height: 50px;
+    }
+}

commpents/match-achieve/ranking.wxml

@@ -0,0 +1,4 @@
+<view class="list" wx:for="{{list}}" wx:key="item">
+    <view class=" rank {{index == '0' ? 'rank_1' : index=='1'? 'rank_2' :index=='2'?'rank_3':'rank'}}">{{index+1}}</view>
+    <view class="name">{{item.name}}</view>
+</view>

commpents/match-achieve/ranking.wxss

@@ -0,0 +1,33 @@
+.list {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  padding: 5px;
+  background-color: #fff;
+  height: 50px;
+  margin: 0 0 4px 0;
+}
+.list .rank {
+  width: 50px;
+  height: 50px;
+  border-radius: 50%;
+  background-color: #cccccc;
+  text-align: center;
+  line-height: 50px;
+  color: #fff;
+  font-size: 18px;
+  font-weight: 700;
+}
+.list .rank_1 {
+  background-color: #ffc400;
+}
+.list .rank_2 {
+  background-color: #db9730;
+}
+.list .rank_3 {
+  background-color: #ff724f;
+}
+.list .name {
+  width: 75vw;
+  line-height: 50px;
+}

pages/home/index.wxml

@@ -2,7 +2,6 @@
     <view slot="info" class="container main">
         <view class="zero one">
             <input type="text" value="{{searchInfo.name}}" bindconfirm="search" placeholder="请输入比赛名称" />
-            <button bindtap="test">测试</button>
         </view>
         <view class="zero two">
             <scroll-view scroll-y="true" class="scroll-view">

pages/index/index.js

@@ -7,10 +7,17 @@ Page({
     /**
      * 生命周期函数--监听页面加载
      */
-    onLoad: function (options) {
+    onLoad: async function (options) {
         const that = this;
         // 监听用户是否登录
         that.watchLogin();
+        // const aee = await app.$get('/newCourt/api/enroll', { status: '-3' });
+        // let user = [];
+        // for (const val of aee.data) {
+        //     const arr = await app.$get(`/newCourt/api/user/${val.openid}`);
+        //     user.push({ name: arr.data.name, phone: arr.data.phone })
+        // }
+        // console.log(user);
     },
     // 监听用户是否登录
     watchLogin: async function () {

pages/matchInfo/achieve.js

@@ -0,0 +1,128 @@
+const app = getApp()
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        frameStyle: { useTop: true, name: '赛事信息', leftArrow: true, useBar: false },
+        tabs: {
+            active: 'c',
+            list: [
+                { title: '小组赛', name: 'a' },
+                { title: '淘汰赛', name: 'b' },
+                { title: '名次', name: 'c' },
+                { title: '个人积分', name: 'd' },
+                { title: '团体积分', name: 'e' },
+            ],
+        },
+        options: {},
+        info: {},
+        // 个人积分
+        ownintegralList: [
+            {
+                person: [{ name: '李四' }, { name: '张三' }, { name: '刘二' }],
+                integral: '48',
+                rank: '1'
+            },
+            {
+                person: [{ name: '李四' }, { name: '张三' }, { name: '刘二' }],
+                integral: '28',
+                rank: '2'
+            }
+        ],
+        // 团体积分
+        teamintegralList: [
+            {
+                address: '龙伟羽校',
+                integral: '488',
+                rank: '1'
+            },
+            {
+                address: '龙伟羽校',
+                integral: '200',
+                rank: '2'
+            }
+        ],
+        list: [
+            { name: '张三' },
+            { name: '李四' },
+            { name: '王二麻子' },
+            { name: '孙二' },
+            { name: '赵五' },
+        ]
+    },
+    // 跳转菜单
+    back(e) {
+        wx.navigateBack({ delta: 1 })
+    },
+    // 选项卡
+    tabsChange: function (e) {
+        const that = this;
+        const { name } = e.detail;
+        that.setData({ 'tabs.active': name });
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        const that = this;
+        that.setData({ options: { match_id: options.match_id || '62e388d4fd61d871861b80af', grouping_id: options.grouping_id || '62e601db2dc7343e137fff76', project_id: options.project_id || '62e5ffba2dc7343e137ffee9' } })
+        that.search()
+    },
+    search: async function () {
+        const that = this;
+        const options = that.data.options;
+        let arr;
+        arr = await app.$get(`/newCourt/api/match/${options.match_id}`);
+        if (arr.errcode == '') { that.setData({ info: arr.data }) }
+    },
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

pages/matchInfo/achieve.json

@@ -0,0 +1,12 @@
+{
+    "component": true,
+    "usingComponents": {
+        "mobile-main": "/commpents/mobile-frame/index",
+        "e-tabs": "/commpents/tabs/index",
+        "achieve-1": "/commpents/match-achieve/achieve",
+        "achieve-2": "/commpents/match-achieve/eliminate",
+        "achieve-3": "/commpents/match-achieve/ranking",
+        "achieve-4": "/commpents/match-achieve/personal",
+        "achieve-5": "/commpents/match-achieve/group"
+    }
+}

pages/matchInfo/achieve.less

@@ -0,0 +1,30 @@
+.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;
+            }
+        }
+    }
+}

pages/matchInfo/achieve.wxml

@@ -0,0 +1,29 @@
+<mobile-main frameStyle="{{frameStyle}}" bind:back="back" bind:tabPath="tabPath">
+    <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">
+                        <achieve-1></achieve-1>
+                    </view>
+                    <view wx:elif="{{tabs.active=='b'}}" class="b">
+                        <achieve-2></achieve-2>
+                    </view>
+                    <view wx:elif="{{tabs.active=='c'}}" class="c">
+                        <achieve-3 list="{{list}}"></achieve-3>
+                    </view>
+                    <view wx:elif="{{tabs.active=='d'}}" class="d">
+                        <achieve-4 ownintegralList="{{ownintegralList}}"></achieve-4>
+                    </view>
+                    <view wx:elif="{{tabs.active=='e'}}" class="e">
+                        <achieve-5 teamintegralList="{{teamintegralList}}"></achieve-5>
+                    </view>
+                </view>
+            </scroll-view>
+
+        </view>
+    </view>
+</mobile-main>

pages/matchInfo/achieve.wxss

@@ -0,0 +1,25 @@
+.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;
+}

pages/matchInfo/index.js

@@ -24,7 +24,14 @@ Page({
         },
         // 选手
         bActive: '0',
-        groupList: []
+        groupList: [],
+        // 秩序册
+        cType: '0',
+        cList: [],
+        raceList: [],
+        raceteamList: [],
+        // 赛况
+        dtabs: { active: 0, list: [] }
     },
     // 跳转菜单
     back(e) {
@@ -34,11 +41,7 @@ Page({
     tabsChange: function (e) {
         const that = this;
         const { name } = e.detail;
-        if (name == 'c' || name == "d" || name == "e") {
-            wx.showToast({ title: `暂无发布`, icon: 'error', duration: 2000 });
-        } else {
-            that.setData({ 'tabs.active': e.detail.name });
-        }
+        that.setData({ 'tabs.active': e.detail.name });
     },
     // 更多
     toCommon: function (e) {
@@ -55,6 +58,35 @@ Page({
         const that = this;
         that.setData({ bActive: e.detail })
     },
+    // 秩序册
+    orderChange: function (e) {
+        const that = this;
+        const { ctype } = e.currentTarget.dataset;
+        that.setData({ cType: ctype == '0' ? '1' : '0' })
+        that.setData({ cList: that.data.cType == '0' ? that.data.raceList : that.data.raceteamList })
+    },
+    // 赛况
+    dtabsChange: async function (e) {
+        const that = this;
+        let info = that.data.info;
+        const { name } = e.detail;
+        that.setData({ 'dtabs.active': name });
+        let data = that.data.dtabs.list[name];
+        let searchInfo = { match_id: info._id, limit: 1000 };
+        if (data._id) { searchInfo.ground_id = data._id }
+        const arr = await app.$get(`/newCourt/api/race`, { ...searchInfo });
+        if (arr.errcode == '0') { that.setData({ raceList: arr.data }) }
+    },
+    // 赛况
+    toAchieve: function (e) {
+        const that = this;
+        let type = that.data.cType;
+        const { item, ctype } = e.currentTarget.dataset;
+        if (type == '1' || ctype == '1') {
+            wx.navigateTo({ url: `/pages/matchInfo/achieve?match_id=${item.match_id}&grouping_id=${item.grouping_id}&project_id=${item.project_id}` })
+        }
+
+    },
     /**
      * 生命周期函数--监听页面加载
      */
@@ -72,13 +104,26 @@ Page({
                 that.setData({ user: res.data })
                 if (that.data.id) {
                     let arr;
+                    // 比赛信息
                     arr = await app.$get(`/newCourt/api/match/${that.data.id}`);
                     if (arr.errcode == '0') {
                         arr.data.statusZh = that.getStatusZh(arr.data.status);
                         that.setData({ info: arr.data })
-                    } else { wx.showToast({ title: `${res.errMsg}`, icon: 'fail', duration: 2000 }); }
+                    } else { wx.showToast({ title: `${res.errmsg}`, icon: 'fail', duration: 2000 }); }
+                    // 选手信息
                     arr = await app.$get(`/newCourt/api/view/groupProjectUser?match_id=${that.data.id}`);
-                    if (arr.errcode == '0') { that.setData({ groupList: arr.data }) }
+                    if (arr.errcode == '0') { that.setData({ groupList: arr.data }) };
+                    // 查询场地信息
+                    arr = await app.$get(`/newCourt/api/ground`, { is_use: '0' });
+                    let ground = [{ title: '全部场地', name: 0 }]
+                    if (arr.errcode == '0') {
+                        for (const [index, val] of arr.data.entries()) {
+                            ground.push({ title: val.name, name: index + 1, _id: val._id })
+                        }
+                    }
+                    that.setData({ 'dtabs.list': ground })
+                    // 赛程信息
+                    that.searchOrder();
                 }
             },
             fail: async (res) => {
@@ -86,6 +131,26 @@ Page({
             },
         });
     },
+    // 查询赛程信息
+    searchOrder: async function () {
+        wx.showLoading({ title: '加载中', mask: true })
+        const that = this;
+        let type = that.data.cType;
+        let info = that.data.info;
+        let arr;
+        // 赛程信息
+        arr = await app.$get(`/newCourt/api/race`, { match_id: info._id, limit: 1000 });
+        if (arr.errcode == '0') { that.setData({ raceList: arr.data }); }
+        else wx.showToast({ title: `${arr.errmsg}`, icon: 'fail', duration: 2000 });
+        // 组信息
+        arr = await app.$get(`/newCourt/api/raceTeam`, { match: info._id });
+        if (arr.errcode == '0') { that.setData({ raceteamList: arr.data }); }
+        else wx.showToast({ title: `${arr.errmsg}`, icon: 'fail', duration: 2000 });
+        // 合并信息
+        that.setData({ cList: type == '0' ? that.data.raceList : that.data.raceteamList })
+        wx.hideLoading();
+
+    },
     getStatusZh(status) {
         let word = "未知"
         let data = match_status.find((i) => i.label == status);

pages/matchInfo/index.less

@@ -9,168 +9,352 @@
         flex-grow: 1;
         width: 96vw;
 
+        .scroll-view {
+            position: absolute;
+            top: 0;
+            left: 0;
+            right: 0;
+            bottom: 0;
+
+            .list-scroll-view {
+                display: flex;
+                flex-direction: column;
+            }
+        }
+
         .a {
             display: flex;
             flex-direction: column;
-            height: 74vh;
             background-color: #ffffff;
             position: relative;
             margin: 2vw 0 0 0;
 
-            .scroll-view {
-                position: absolute;
-                top: 0;
-                left: 0;
-                right: 0;
-                bottom: 0;
-
-                .list-scroll-view {
-                    display: flex;
-                    flex-wrap: wrap;
-                    align-content: flex-start;
-                    justify-content: space-between;
-
-                    .a_1 {
-                        width: 96vw;
-                        position: relative;
-
-                        .image {
-                            width: 96vw;
-                            height: 160px;
+            .a_1 {
+                width: 96vw;
+                position: relative;
+
+                .image {
+                    width: 96vw;
+                    height: 160px;
+                }
+
+                .a_1_info {
+                    position: absolute;
+                    top: 30vw;
+                    width: 92vw;
+                    margin: 0 2vw;
+
+                    .a_1_1 {
+                        background-color: #ffffff;
+                        margin: 0 0 3vw 0;
+                        border-radius: 5px;
+                        padding: 2vw;
+                        box-shadow: 0 0 1vw #cccccc;
+
+                        .name {
+                            font-size: 18px;
+                            font-weight: bold;
+                            margin: 0 0 2vw 0;
                         }
 
-                        .a_1_info {
-                            position: absolute;
-                            top: 30vw;
-                            width: 92vw;
-                            margin: 0 2vw;
+                        .status {
+                            margin: 0 0 2vw 0;
 
-                            .a_1_1 {
-                                background-color: #ffffff;
-                                margin: 0 0 3vw 0;
-                                border-radius: 5px;
-                                padding: 2vw;
-                                box-shadow: 0 0 1vw #cccccc;
+                            text {
+                                font-size: 16px;
+                                color: #ffffff;
+                                padding: 1vw 2vw;
+                                background-color: #ff0000;
+                                border-radius: 10px;
+                            }
+                        }
 
-                                .name {
-                                    font-size: 18px;
-                                    font-weight: bold;
-                                    margin: 0 0 2vw 0;
-                                }
+                        .other {
+                            .other_1 {
+                                margin: 0 0 1vw 0;
+                                font-size: 16px;
+                                color: #858585;
 
-                                .status {
-                                    margin: 0 0 2vw 0;
+                                .icon {
+                                    margin: 0 2vw 0 0;
+                                }
 
-                                    text {
-                                        font-size: 16px;
-                                        color: #ffffff;
-                                        padding: 1vw 2vw;
-                                        background-color: #ff0000;
-                                        border-radius: 10px;
-                                    }
+                                text:nth-child(3) {
+                                    color: #000000;
                                 }
+                            }
+                        }
+                    }
 
-                                .other {
-                                    .other_1 {
-                                        margin: 0 0 1vw 0;
-                                        font-size: 16px;
-                                        color: #858585;
+                    .a_1_2 {
+                        .a_1_2t {
+                            margin: 0 0 1vw 0;
 
-                                        .icon {
-                                            margin: 0 2vw 0 0;
-                                        }
+                            .txt {
+                                font-size: 16px;
+                                margin: 0 0 1vw 0;
+                            }
 
-                                        text:nth-child(3) {
-                                            color: #000000;
-                                        }
-                                    }
+                            .cont {
+                                font-size: 14px;
+                                color: #858585;
+                                text-indent: 1rem;
+                            }
+                        }
+                    }
+
+                }
+
+            }
+
+        }
+
+        .b {
+            .b_1 {
+                width: 96vw;
+
+                .groupList {
+                    .title {
+                        display: flex;
+                        flex-direction: row;
+                        justify-content: space-between;
+                        font-size: 14px;
+                    }
+
+                    .project {
+                        .projectList {
+                            margin: 0 0 2vw 0;
+                            border-bottom: 1px solid #cccccc;
+
+                            .project_1 {
+                                display: flex;
+                                flex-direction: row;
+                                justify-content: space-between;
+                                margin: 0 0 2vw 0;
+
+                                .project_1_1 {
+                                    color: #000000;
+                                    font-size: 15px;
                                 }
+
                             }
 
-                            .a_1_2 {
-                                .a_1_2t {
-                                    margin: 0 0 1vw 0;
+                            .user {
+                                display: flex;
+                                flex-direction: row;
+                                justify-content: space-between;
+                                flex-wrap: wrap;
 
-                                    .txt {
-                                        font-size: 16px;
-                                        margin: 0 0 1vw 0;
+                                .userList {
+                                    text-align: center;
+                                    border: 1px solid #cccccc;
+                                    margin: 0 0 2vw 0;
+                                    padding: 2vw;
+                                    border-radius: 5px;
+                                    box-shadow: 0 0 1vw #cccccc;
+                                    width: 22vw;
+
+                                    .icon {
+                                        width: 50px;
+                                        height: 50px;
+                                        border-radius: 5px;
                                     }
 
-                                    .cont {
-                                        font-size: 14px;
-                                        color: #858585;
-                                        text-indent: 1rem;
+                                    .name {
+                                        text-align: center;
+                                        font-size: 15px;
                                     }
                                 }
                             }
-
                         }
+                    }
+                }
+            }
+        }
+
+        .c {
+            width: 96vw;
+            display: flex;
+            flex-direction: column;
+
+
+            .c_1 {
+                width: 92vw;
+                padding: 2vw;
+                display: flex;
+                flex-direction: row;
+                justify-content: space-between;
+                background-color: #f1f1f1;
+                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 #ccc;
+                        padding: 1vw;
+                        border-radius: 5px;
                     }
+                }
+            }
 
-                    .b_1 {
-                        width: 96vw;
+            .c_2 {
+                width: 96vw;
+                position: relative;
+                flex-grow: 1;
 
-                        .groupList {
-                            .title {
-                                display: flex;
-                                flex-direction: row;
-                                justify-content: space-between;
-                                font-size: 14px;
+                .cList {
+                    background-color: #328d26;
+                    margin: 0 0 2vw 0;
+                    padding: 2vw;
+
+                    .cList_0 {
+                        .name {
+                            padding: 1vw 0;
+                            color: #ffffff;
+                            margin: 0 0 1vw 0;
+
+                            text {
+                                padding: 0 2vw 0 0;
                             }
+                        }
 
-                            .project {
-                                .projectList {
-                                    margin: 0 0 2vw 0;
-                                    border-bottom: 1px solid #cccccc;
+                        .pk {
+                            display: flex;
+                            flex-direction: row;
+                            justify-content: space-around;
+                            background-color: #fff;
 
-                                    .project_1 {
-                                        display: flex;
-                                        flex-direction: row;
-                                        justify-content: space-between;
-                                        margin: 0 0 2vw 0;
+                            .pk_1 {
+                                width: 30vw;
+                                text-align: center;
+                                padding: 2vw;
+                            }
 
-                                        .project_1_1 {
-                                            color: #000000;
-                                            font-size: 15px;
-                                        }
+                            .pk_2 {
+                                text-align: center;
+                                box-shadow: 0 0 5px #cccccc;
 
-                                    }
+                                .time {
+                                    background-color: #328d26;
+                                    color: #ffffff;
+                                    padding: 1vw 0;
+                                    font-size: 14px;
+                                }
 
-                                    .user {
-                                        display: flex;
-                                        flex-direction: row;
-                                        justify-content: space-between;
-                                        flex-wrap: wrap;
-
-                                        .userList {
-                                            text-align: center;
-                                            border: 1px solid #cccccc;
-                                            margin: 0 0 2vw 0;
-                                            padding: 2vw;
-                                            border-radius: 5px;
-                                            box-shadow: 0 0 1vw #cccccc;
-                                            width: 22vw;
-
-                                            .icon {
-                                                width: 50px;
-                                                height: 50px;
-                                                border-radius: 5px;
-                                            }
-
-                                            .name {
-                                                text-align: center;
-                                                font-size: 15px;
-                                            }
-                                        }
-                                    }
+                                .score {
+                                    font-size: 20px;
+                                    padding: 1vw 0;
+                                    font-weight: bold;
                                 }
                             }
                         }
                     }
 
+                    .cList_1 {
+                        text {
+                            padding: 0 1vw;
+                            color: #ffffff;
+                        }
+                    }
+                }
+
+                .cList:last-child {
+                    margin: 0;
+                }
+            }
+        }
+
+        .d {
+            .d_1 {
+                margin: 0 0 2vw 0;
+            }
+
+            .d_2 {
+                flex-grow: 1;
+                position: relative;
+
+                .dList {
+                    background-color: #328d26;
+                    margin: 0 0 2vw 0;
+                    padding: 2vw;
+
+                    .name {
+                        padding: 1vw 0;
+                        color: #ffffff;
+                        margin: 0 0 1vw 0;
+
+                        text {
+                            padding: 0 2vw 0 0;
+                        }
+                    }
+
+                    .pk {
+                        display: flex;
+                        flex-direction: row;
+                        justify-content: space-around;
+                        background-color: #fff;
+
+                        .pk_1 {
+                            width: 30vw;
+                            text-align: center;
+                            padding: 2vw;
+                        }
+
+                        .pk_2 {
+                            text-align: center;
+                            box-shadow: 0 0 5px #cccccc;
+
+                            .time {
+                                background-color: #328d26;
+                                color: #ffffff;
+                                padding: 1vw 0;
+                                font-size: 14px;
+                            }
+
+                            .score {
+                                font-size: 20px;
+                                padding: 1vw 0;
+                                font-weight: bold;
+                            }
+                        }
+                    }
+                }
+
+                .dList:last-child {
+                    margin: 0;
+                }
+            }
+
+
+        }
+
+        .e {
+            .eList {
+                background-color: #328d26;
+                margin: 0 0 2vw 0;
+                padding: 2vw;
+
+                text {
+                    padding: 0 1vw;
+                    color: #ffffff;
                 }
             }
+
+            .eList:last-child {
+                margin: 0;
+            }
         }
     }
 

pages/matchInfo/index.wxml

@@ -2,7 +2,7 @@
     <view slot="info" class="container main">
         <view class="zero one">
             <e-tabs tabs="{{tabs}}" bind:tabsChange="tabsChange"></e-tabs>
-            <view wx:if="{{tabs.active=='a'}}" class="a" style="height: {{user.type=='0'?74:82}}vh;">
+            <view wx:if="{{tabs.active=='a'}}" class="a" style="height: {{user.type=='0'?74:81}}vh;">
                 <scroll-view scroll-y="true" class="scroll-view">
                     <view class="list-scroll-view">
                         <view class="a_1">
@@ -54,7 +54,7 @@
                     </view>
                 </scroll-view>
             </view>
-            <view wx:elif="{{tabs.active=='b'}}" class="a b">
+            <view wx:elif="{{tabs.active=='b'}}" class="a b" style="height: 81vh !important;">
                 <scroll-view scroll-y="true" class="scroll-view">
                     <view class="list-scroll-view">
                         <view class="b_1">
@@ -84,24 +84,90 @@
                     </view>
                 </scroll-view>
             </view>
-            <view wx:elif="{{tabs.active=='c'}}" class="a c">
-                <scroll-view scroll-y="true" class="scroll-view">
-                    <view class="list-scroll-view">
-                        秩序册
+            <view wx:elif="{{tabs.active=='c'}}" class="a c" style="height: 81vh !important;">
+                <view class="c_1">
+                    <view class="c_1btn">
+                        <button type="primary" bindtap="orderChange" data-ctype="{{cType}}">{{cType=='0'?'查看对阵表':'查看场次表'}}</button>
                     </view>
-                </scroll-view>
+                    <view class="c_1inp">
+                        <input type="text" value="{{cSearch.name}}" bindconfirm="cSearch" placeholder="{{cType=='0'?'请输入队友姓名':'请输入项目名称'}}" />
+                    </view>
+                </view>
+                <view class="c_2">
+                    <scroll-view scroll-y="true" class="scroll-view">
+                        <view class="list-scroll-view">
+                            <view class="cList" wx:for="{{cList}}" wx:key="item" bindtap="toAchieve" data-item="{{item}}">
+                                <view class="cList_0" wx:if="{{cType=='0'}}">
+                                    <view class="name">
+                                        <text>{{item.grouping_name}}</text>
+                                        <text>{{item.project_name}}</text>
+                                        <text>{{item.team_name}}</text>
+                                        <text>{{item.ground_name}}</text>
+                                    </view>
+                                    <view class="pk">
+                                        <view class="pk_1">
+                                            <text>{{item.player_one_name}}</text>
+                                        </view>
+                                        <view class="pk_2">
+                                            <view class="time">{{item.match_time}}</view>
+                                            <view class="score"><text>{{item.score_one||0}}</text>-{{item.score_two||0}}</view>
+                                        </view>
+                                        <view class="pk_1">
+                                            <text>{{item.player_two_name}}</text>
+                                        </view>
+                                    </view>
+                                </view>
+                                <view class="cList_1" wx:elif="{{cType=='1'}}">
+                                    <text>{{item.grouping_name}}</text>
+                                    <text>{{item.project_name}}</text>
+                                    <text>{{item.name}}</text>
+                                </view>
+                            </view>
+                        </view>
+                    </scroll-view>
+                </view>
             </view>
-            <view wx:elif="{{tabs.active=='d'}}" class="a d">
-                <scroll-view scroll-y="true" class="scroll-view">
-                    <view class="list-scroll-view">
-                        赛况
+            <view wx:elif="{{tabs.active=='d'}}" class="a d" style="height: 81vh !important;">
+                <view class="d_1">
+                    <e-tabs tabs="{{dtabs}}" bind:tabsChange="dtabsChange"></e-tabs>
+                </view>
+                <view class="d_2">
+                    <view wx:if="{{dtabs.active==dtabs.list[dtabs.active].name}}">
+                        <scroll-view scroll-y="true" class="scroll-view">
+                            <view class="list-scroll-view">
+                                <view class="dList" wx:for="{{raceList}}" wx:key="item">
+                                    <view class="name">
+                                        <text>{{item.grouping_name}}</text>
+                                        <text>{{item.project_name}}</text>
+                                        <text>{{item.team_name}}</text>
+                                        <text>{{item.ground_name}}</text>
+                                    </view>
+                                    <view class="pk">
+                                        <view class="pk_1">
+                                            <text>{{item.player_one_name}}</text>
+                                        </view>
+                                        <view class="pk_2">
+                                            <view class="time">{{item.match_time}}</view>
+                                            <view class="score"><text>{{item.score_one||0}}</text>-{{item.score_two||0}}</view>
+                                        </view>
+                                        <view class="pk_1">
+                                            <text>{{item.player_two_name}}</text>
+                                        </view>
+                                    </view>
+                                </view>
+                            </view>
+                        </scroll-view>
                     </view>
-                </scroll-view>
+                </view>
             </view>
-            <view wx:elif="{{tabs.active=='e'}}" class="a e">
+            <view wx:elif="{{tabs.active=='e'}}" class="a e" style="height: 81vh !important;">
                 <scroll-view scroll-y="true" class="scroll-view">
                     <view class="list-scroll-view">
-                        成绩册
+                        <view class="eList" wx:for="{{raceteamList}}" wx:key="item" bindtap="toAchieve" data-item="{{item}}" data-ctype="1">
+                            <text>{{item.grouping_name}}</text>
+                            <text>{{item.project_name}}</text>
+                            <text>{{item.name}}</text>
+                        </view>
                     </view>
                 </scroll-view>
             </view>

pages/matchInfo/index.wxss

@@ -8,116 +8,113 @@
   flex-grow: 1;
   width: 96vw;
 }
-.main .one .a {
-  display: flex;
-  flex-direction: column;
-  height: 74vh;
-  background-color: #ffffff;
-  position: relative;
-  margin: 2vw 0 0 0;
-}
-.main .one .a .scroll-view {
+.main .one .scroll-view {
   position: absolute;
   top: 0;
   left: 0;
   right: 0;
   bottom: 0;
 }
-.main .one .a .scroll-view .list-scroll-view {
+.main .one .scroll-view .list-scroll-view {
   display: flex;
-  flex-wrap: wrap;
-  align-content: flex-start;
-  justify-content: space-between;
+  flex-direction: column;
+}
+.main .one .a {
+  display: flex;
+  flex-direction: column;
+  background-color: #ffffff;
+  position: relative;
+  margin: 2vw 0 0 0;
 }
-.main .one .a .scroll-view .list-scroll-view .a_1 {
+.main .one .a .a_1 {
   width: 96vw;
   position: relative;
 }
-.main .one .a .scroll-view .list-scroll-view .a_1 .image {
+.main .one .a .a_1 .image {
   width: 96vw;
   height: 160px;
 }
-.main .one .a .scroll-view .list-scroll-view .a_1 .a_1_info {
+.main .one .a .a_1 .a_1_info {
   position: absolute;
   top: 30vw;
   width: 92vw;
   margin: 0 2vw;
 }
-.main .one .a .scroll-view .list-scroll-view .a_1 .a_1_info .a_1_1 {
+.main .one .a .a_1 .a_1_info .a_1_1 {
   background-color: #ffffff;
   margin: 0 0 3vw 0;
   border-radius: 5px;
   padding: 2vw;
   box-shadow: 0 0 1vw #cccccc;
 }
-.main .one .a .scroll-view .list-scroll-view .a_1 .a_1_info .a_1_1 .name {
+.main .one .a .a_1 .a_1_info .a_1_1 .name {
   font-size: 18px;
   font-weight: bold;
   margin: 0 0 2vw 0;
 }
-.main .one .a .scroll-view .list-scroll-view .a_1 .a_1_info .a_1_1 .status {
+.main .one .a .a_1 .a_1_info .a_1_1 .status {
   margin: 0 0 2vw 0;
 }
-.main .one .a .scroll-view .list-scroll-view .a_1 .a_1_info .a_1_1 .status text {
+.main .one .a .a_1 .a_1_info .a_1_1 .status text {
   font-size: 16px;
   color: #ffffff;
   padding: 1vw 2vw;
   background-color: #ff0000;
   border-radius: 10px;
 }
-.main .one .a .scroll-view .list-scroll-view .a_1 .a_1_info .a_1_1 .other .other_1 {
+.main .one .a .a_1 .a_1_info .a_1_1 .other .other_1 {
   margin: 0 0 1vw 0;
   font-size: 16px;
   color: #858585;
 }
-.main .one .a .scroll-view .list-scroll-view .a_1 .a_1_info .a_1_1 .other .other_1 .icon {
+.main .one .a .a_1 .a_1_info .a_1_1 .other .other_1 .icon {
   margin: 0 2vw 0 0;
 }
-.main .one .a .scroll-view .list-scroll-view .a_1 .a_1_info .a_1_1 .other .other_1 text:nth-child(3) {
+.main .one .a .a_1 .a_1_info .a_1_1 .other .other_1 text:nth-child(3) {
   color: #000000;
 }
-.main .one .a .scroll-view .list-scroll-view .a_1 .a_1_info .a_1_2 .a_1_2t {
+.main .one .a .a_1 .a_1_info .a_1_2 .a_1_2t {
   margin: 0 0 1vw 0;
 }
-.main .one .a .scroll-view .list-scroll-view .a_1 .a_1_info .a_1_2 .a_1_2t .txt {
+.main .one .a .a_1 .a_1_info .a_1_2 .a_1_2t .txt {
   font-size: 16px;
   margin: 0 0 1vw 0;
 }
-.main .one .a .scroll-view .list-scroll-view .a_1 .a_1_info .a_1_2 .a_1_2t .cont {
+.main .one .a .a_1 .a_1_info .a_1_2 .a_1_2t .cont {
   font-size: 14px;
   color: #858585;
   text-indent: 1rem;
 }
-.main .one .a .scroll-view .list-scroll-view .b_1 {
+.main .one .b .b_1 {
   width: 96vw;
 }
-.main .one .a .scroll-view .list-scroll-view .b_1 .groupList .title {
+.main .one .b .b_1 .groupList .title {
   display: flex;
   flex-direction: row;
   justify-content: space-between;
   font-size: 14px;
 }
-.main .one .a .scroll-view .list-scroll-view .b_1 .groupList .project .projectList {
+.main .one .b .b_1 .groupList .project .projectList {
   margin: 0 0 2vw 0;
   border-bottom: 1px solid #cccccc;
 }
-.main .one .a .scroll-view .list-scroll-view .b_1 .groupList .project .projectList .project_1 {
+.main .one .b .b_1 .groupList .project .projectList .project_1 {
   display: flex;
   flex-direction: row;
   justify-content: space-between;
   margin: 0 0 2vw 0;
 }
-.main .one .a .scroll-view .list-scroll-view .b_1 .groupList .project .projectList .project_1 .project_1_1 {
+.main .one .b .b_1 .groupList .project .projectList .project_1 .project_1_1 {
   color: #000000;
   font-size: 15px;
 }
-.main .one .a .scroll-view .list-scroll-view .b_1 .groupList .project .projectList .user {
+.main .one .b .b_1 .groupList .project .projectList .user {
   display: flex;
   flex-direction: row;
   justify-content: space-between;
   flex-wrap: wrap;
 }
-.main .one .a .scroll-view .list-scroll-view .b_1 .groupList .project .projectList .user .userList {
+.main .one .b .b_1 .groupList .project .projectList .user .userList {
   text-align: center;
   border: 1px solid #cccccc;
   margin: 0 0 2vw 0;
@@ -126,15 +123,158 @@
   box-shadow: 0 0 1vw #cccccc;
   width: 22vw;
 }
-.main .one .a .scroll-view .list-scroll-view .b_1 .groupList .project .projectList .user .userList .icon {
+.main .one .b .b_1 .groupList .project .projectList .user .userList .icon {
   width: 50px;
   height: 50px;
   border-radius: 5px;
 }
-.main .one .a .scroll-view .list-scroll-view .b_1 .groupList .project .projectList .user .userList .name {
+.main .one .b .b_1 .groupList .project .projectList .user .userList .name {
   text-align: center;
   font-size: 15px;
 }
+.main .one .c {
+  width: 96vw;
+  display: flex;
+  flex-direction: column;
+}
+.main .one .c .c_1 {
+  width: 92vw;
+  padding: 2vw;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  background-color: #f1f1f1;
+  margin: 0 0 2vw 0;
+}
+.main .one .c .c_1 .c_1btn {
+  width: 25vw;
+}
+.main .one .c .c_1 .c_1btn button {
+  width: 100%;
+  font-size: 14px;
+  padding: 2vw;
+}
+.main .one .c .c_1 .c_1inp {
+  width: 66vw;
+}
+.main .one .c .c_1 .c_1inp input {
+  text-align: left;
+  border: 1px solid #ccc;
+  padding: 1vw;
+  border-radius: 5px;
+}
+.main .one .c .c_2 {
+  width: 96vw;
+  position: relative;
+  flex-grow: 1;
+}
+.main .one .c .c_2 .cList {
+  background-color: #328d26;
+  margin: 0 0 2vw 0;
+  padding: 2vw;
+}
+.main .one .c .c_2 .cList .cList_0 .name {
+  padding: 1vw 0;
+  color: #ffffff;
+  margin: 0 0 1vw 0;
+}
+.main .one .c .c_2 .cList .cList_0 .name text {
+  padding: 0 2vw 0 0;
+}
+.main .one .c .c_2 .cList .cList_0 .pk {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-around;
+  background-color: #fff;
+}
+.main .one .c .c_2 .cList .cList_0 .pk .pk_1 {
+  width: 30vw;
+  text-align: center;
+  padding: 2vw;
+}
+.main .one .c .c_2 .cList .cList_0 .pk .pk_2 {
+  text-align: center;
+  box-shadow: 0 0 5px #cccccc;
+}
+.main .one .c .c_2 .cList .cList_0 .pk .pk_2 .time {
+  background-color: #328d26;
+  color: #ffffff;
+  padding: 1vw 0;
+  font-size: 14px;
+}
+.main .one .c .c_2 .cList .cList_0 .pk .pk_2 .score {
+  font-size: 20px;
+  padding: 1vw 0;
+  font-weight: bold;
+}
+.main .one .c .c_2 .cList .cList_1 text {
+  padding: 0 1vw;
+  color: #ffffff;
+}
+.main .one .c .c_2 .cList:last-child {
+  margin: 0;
+}
+.main .one .d .d_1 {
+  margin: 0 0 2vw 0;
+}
+.main .one .d .d_2 {
+  flex-grow: 1;
+  position: relative;
+}
+.main .one .d .d_2 .dList {
+  background-color: #328d26;
+  margin: 0 0 2vw 0;
+  padding: 2vw;
+}
+.main .one .d .d_2 .dList .name {
+  padding: 1vw 0;
+  color: #ffffff;
+  margin: 0 0 1vw 0;
+}
+.main .one .d .d_2 .dList .name text {
+  padding: 0 2vw 0 0;
+}
+.main .one .d .d_2 .dList .pk {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-around;
+  background-color: #fff;
+}
+.main .one .d .d_2 .dList .pk .pk_1 {
+  width: 30vw;
+  text-align: center;
+  padding: 2vw;
+}
+.main .one .d .d_2 .dList .pk .pk_2 {
+  text-align: center;
+  box-shadow: 0 0 5px #cccccc;
+}
+.main .one .d .d_2 .dList .pk .pk_2 .time {
+  background-color: #328d26;
+  color: #ffffff;
+  padding: 1vw 0;
+  font-size: 14px;
+}
+.main .one .d .d_2 .dList .pk .pk_2 .score {
+  font-size: 20px;
+  padding: 1vw 0;
+  font-weight: bold;
+}
+.main .one .d .d_2 .dList:last-child {
+  margin: 0;
+}
+.main .one .e .eList {
+  background-color: #328d26;
+  margin: 0 0 2vw 0;
+  padding: 2vw;
+}
+.main .one .e .eList text {
+  padding: 0 1vw;
+  color: #ffffff;
+}
+.main .one .e .eList:last-child {
+  margin: 0;
+}
 .main .two {
   display: flex;
   flex-direction: row;

pages/orderbook/autoAdd.json

@@ -0,0 +1,3 @@
+{
+  "usingComponents": {}
+}

pages/orderbook/autoAdd.wxss

@@ -0,0 +1 @@
+/* pages/orderbook/autoAdd.wxss */

utils/httpUtil.js

@@ -1,4 +1,4 @@
-let serverUrl = "http://192.168.1.197:15000";//http://127.0.0.1:15000
+let serverUrl = "https://broadcast.waityou24.cn";//http://127.0.0.1:15000
 let wechatUrl = 'https://broadcast.waityou24.cn';
 
 const getDomain = (uri) => {