guhongwei 2 rokov pred
rodič
commit
107326f339
35 zmenil súbory, kde vykonal 553 pridanie a 205 odobranie
  1. 5 1
      app.json
  2. 3 0
      app.wxss
  3. 2 1
      commpents/mobile-frame/top.less
  4. 1 1
      commpents/mobile-frame/top.wxml
  5. 2 1
      commpents/mobile-frame/top.wxss
  6. 23 0
      commpents/pagesMatchs/achieve/achieve-1.js
  7. 4 0
      commpents/pagesMatchs/achieve/achieve-1.json
  8. 21 0
      commpents/pagesMatchs/achieve/achieve-1.less
  9. 9 0
      commpents/pagesMatchs/achieve/achieve-1.wxml
  10. 16 0
      commpents/pagesMatchs/achieve/achieve-1.wxss
  11. 23 0
      commpents/pagesMatchs/achieve/achieve-2.js
  12. 4 0
      commpents/pagesMatchs/achieve/achieve-2.json
  13. 21 0
      commpents/pagesMatchs/achieve/achieve-2.less
  14. 9 0
      commpents/pagesMatchs/achieve/achieve-2.wxml
  15. 16 0
      commpents/pagesMatchs/achieve/achieve-2.wxss
  16. 23 0
      commpents/pagesMatchs/achieve/achieve-3.js
  17. 4 0
      commpents/pagesMatchs/achieve/achieve-3.json
  18. 93 0
      commpents/pagesMatchs/achieve/achieve-3.less
  19. 12 0
      commpents/pagesMatchs/achieve/achieve-3.wxml
  20. 59 0
      commpents/pagesMatchs/achieve/achieve-3.wxss
  21. 1 57
      commpents/pagesMatchs/match/match-1.wxml
  22. 5 0
      commpents/pagesMatchs/match/match-3.js
  23. 1 1
      commpents/pagesMatchs/match/match-3.wxml
  24. 5 0
      commpents/pagesMatchs/match/match-5.js
  25. 1 1
      commpents/pagesMatchs/match/match-5.wxml
  26. 97 0
      pagesMatch/match/achieve.js
  27. 10 0
      pagesMatch/match/achieve.json
  28. 28 0
      pagesMatch/match/achieve.less
  29. 18 0
      pagesMatch/match/achieve.wxml
  30. 23 0
      pagesMatch/match/achieve.wxss
  31. 11 0
      pagesMatch/match/info.js
  32. 0 81
      pagesMatch/match/info.less
  33. 2 2
      pagesMatch/match/info.wxml
  34. 0 58
      pagesMatch/match/info.wxss
  35. 1 1
      project.private.config.json

+ 5 - 1
app.json

@@ -11,7 +11,10 @@
         "pages/setting/basic",
         "pages/setting/contact",
         "pages/test/index",
-        "pages/logs/logs"
+        "pages/logs/logs",
+        "commpents/pagesMatchs/achieve/achieve-1",
+        "commpents/pagesMatchs/achieve/achieve-2",
+        "commpents/pagesMatchs/achieve/achieve-3"
     ],
     "subPackages": [
         {
@@ -100,6 +103,7 @@
                 "system/index",
                 "match/info",
                 "match/sign",
+                "match/achieve",
                 "matchAdmin/profit/list",
                 "matchAdmin/referee/list",
                 "matchAdmin/referee/info",

+ 3 - 0
app.wxss

@@ -43,8 +43,11 @@ page {
     --font12Size: 12px;
     /* 颜色 */
     --f1Color: #f1f1f1;
+    --f2Color: #f2f2f2;
+
     --f9Color: #f9f9f9;
     --f85Color: #858585;
+    --f9Color: #999999;
     --fcColor: #cccccc;
     --blackColor: #000000;
     --whiteColor: #ffffff;

+ 2 - 1
commpents/mobile-frame/top.less

@@ -1,3 +1,4 @@
+@import (css) "/app.wxss";
 .top {
     float: left;
     width: 100%;
@@ -20,7 +21,7 @@
 
     .cen {
         float: left;
-        width: 70%;
+        width: 60%;
         text-align: center;
         font-size: 36rpx;
         color: #000000;

+ 1 - 1
commpents/mobile-frame/top.wxml

@@ -2,6 +2,6 @@
     <view class="left" style='margin: {{client.getMenu.top}}px 0 0 0;'>
         <cover-image src='/image/back.png' mode='aspectFill' class="back" bindtap='_navback' wx:if="{{frameStyle.leftArrow}}"></cover-image>
     </view>
-    <view class="cen" style='margin: {{client.getMenu.top}}px 0 0 0;'>{{frameStyle.name}}</view>
+    <view class="cen textOver" style='margin: {{client.getMenu.top}}px 0 0 0;'>{{frameStyle.name}}</view>
     <view class="right" style="display: none">右侧</view>
 </view>

+ 2 - 1
commpents/mobile-frame/top.wxss

@@ -1,3 +1,4 @@
+@import "/app.wxss";
 .top {
   float: left;
   width: 100%;
@@ -16,7 +17,7 @@
 }
 .top .cen {
   float: left;
-  width: 70%;
+  width: 60%;
   text-align: center;
   font-size: 36rpx;
   color: #000000;

+ 23 - 0
commpents/pagesMatchs/achieve/achieve-1.js

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

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

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

+ 21 - 0
commpents/pagesMatchs/achieve/achieve-1.less

@@ -0,0 +1,21 @@
+@import (css) "/app.wxss";
+
+.main {
+    .one {
+        padding: 2vw;
+        background-color: var(--f1Color);
+    }
+}
+
+.scroll-view {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+
+    .list-scroll-view {
+        display: flex;
+        flex-direction: column;
+    }
+}

+ 9 - 0
commpents/pagesMatchs/achieve/achieve-1.wxml

@@ -0,0 +1,9 @@
+<view class="main">
+    <scroll-view scroll-y="true" class="scroll-view">
+        <view class="list-scroll-view">
+            <view class="one">
+                小组赛
+            </view>
+        </view>
+    </scroll-view>
+</view>

+ 16 - 0
commpents/pagesMatchs/achieve/achieve-1.wxss

@@ -0,0 +1,16 @@
+@import "/app.wxss";
+.main .one {
+  padding: 2vw;
+  background-color: var(--f1Color);
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+}

+ 23 - 0
commpents/pagesMatchs/achieve/achieve-2.js

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

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

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

+ 21 - 0
commpents/pagesMatchs/achieve/achieve-2.less

@@ -0,0 +1,21 @@
+@import (css) "/app.wxss";
+
+.main {
+    .one {
+        padding: 2vw;
+        background-color: var(--f1Color);
+    }
+}
+
+.scroll-view {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+
+    .list-scroll-view {
+        display: flex;
+        flex-direction: column;
+    }
+}

+ 9 - 0
commpents/pagesMatchs/achieve/achieve-2.wxml

@@ -0,0 +1,9 @@
+<view class="main">
+    <scroll-view scroll-y="true" class="scroll-view">
+        <view class="list-scroll-view">
+            <view class="one">
+                淘汰赛
+            </view>
+        </view>
+    </scroll-view>
+</view>

+ 16 - 0
commpents/pagesMatchs/achieve/achieve-2.wxss

@@ -0,0 +1,16 @@
+@import "/app.wxss";
+.main .one {
+  padding: 2vw;
+  background-color: var(--f1Color);
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+}

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

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

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

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

+ 93 - 0
commpents/pagesMatchs/achieve/achieve-3.less

@@ -0,0 +1,93 @@
+@import (css) "/app.wxss";
+
+.main {
+    .one {
+        padding: 2vw;
+        background-color: var(--f1Color);
+
+        .cList {
+            display: flex;
+            flex-direction: row;
+            background-color: var(--whiteColor);
+            margin: 0 0 2vw 0;
+            padding: 2vw;
+            border-radius: 5px;
+
+            .num {
+                text {
+                    display: inline-block;
+                    width: 12vw;
+                    height: 12vw;
+                    text-align: center;
+                    line-height: 12vw;
+                    border-radius: 50%;
+                    background-color: var(--f2Color);
+                    color: var(--f9Color);
+                    font-size: var(--font16Size);
+                    font-weight: bold;
+                    margin: 0 2vw 0;
+                }
+            }
+
+            .name {
+                text {
+                    display: inline-block;
+                    font-size: var(--font16Size);
+                    padding: 3vw 0;
+                }
+            }
+        }
+
+        .cList:nth-child(1),
+        .cList:nth-child(2),
+        .cList:nth-child(3) {
+            .num {
+                text {
+
+                    color: var(--whiteColor);
+                }
+            }
+        }
+
+        .cList:nth-child(1) {
+            .num {
+                text {
+                    background-color: #FACE30;
+                }
+            }
+        }
+
+        .cList:nth-child(2) {
+            .num {
+                text {
+                    background-color: #CAD0D7;
+                }
+            }
+        }
+
+        .cList:nth-child(3) {
+            .num {
+                text {
+                    background-color: #F9996E;
+                }
+            }
+        }
+
+        .cList:last-child {
+            margin: 0;
+        }
+    }
+}
+
+.scroll-view {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+
+    .list-scroll-view {
+        display: flex;
+        flex-direction: column;
+    }
+}

+ 12 - 0
commpents/pagesMatchs/achieve/achieve-3.wxml

@@ -0,0 +1,12 @@
+<view class="main">
+    <scroll-view scroll-y="true" class="scroll-view">
+        <view class="list-scroll-view">
+            <view class="one">
+                <view class="cList" wx:for="{{cList}}" wx:key="item">
+                    <view class="num"><text>{{item.num}}</text></view>
+                    <view class="name"><text>{{item.name}}</text></view>
+                </view>
+            </view>
+        </view>
+    </scroll-view>
+</view>

+ 59 - 0
commpents/pagesMatchs/achieve/achieve-3.wxss

@@ -0,0 +1,59 @@
+@import "/app.wxss";
+.main .one {
+  padding: 2vw;
+  background-color: var(--f1Color);
+}
+.main .one .cList {
+  display: flex;
+  flex-direction: row;
+  background-color: var(--whiteColor);
+  margin: 0 0 2vw 0;
+  padding: 2vw;
+  border-radius: 5px;
+}
+.main .one .cList .num text {
+  display: inline-block;
+  width: 12vw;
+  height: 12vw;
+  text-align: center;
+  line-height: 12vw;
+  border-radius: 50%;
+  background-color: var(--f2Color);
+  color: var(--f9Color);
+  font-size: var(--font16Size);
+  font-weight: bold;
+  margin: 0 2vw 0;
+}
+.main .one .cList .name text {
+  display: inline-block;
+  font-size: var(--font16Size);
+  padding: 3vw 0;
+}
+.main .one .cList:nth-child(1) .num text,
+.main .one .cList:nth-child(2) .num text,
+.main .one .cList:nth-child(3) .num text {
+  color: var(--whiteColor);
+}
+.main .one .cList:nth-child(1) .num text {
+  background-color: #FACE30;
+}
+.main .one .cList:nth-child(2) .num text {
+  background-color: #CAD0D7;
+}
+.main .one .cList:nth-child(3) .num text {
+  background-color: #F9996E;
+}
+.main .one .cList:last-child {
+  margin: 0;
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+}

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

@@ -1,60 +1,4 @@
-<!-- <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> -->
+
 <view class="main">
     <scroll-view scroll-y="true" class="scroll-view">
         <view class="list-scroll-view">

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

@@ -27,5 +27,10 @@ Component({
             let name = e.detail.value
             that.triggerEvent('cinputSearch', name)
         },
+        toAchieve: function (e) {
+            const that = this;
+            const { item } = e.currentTarget.dataset;
+            that.triggerEvent('toAchieve', item)
+        },
     }
 })

+ 1 - 1
commpents/pagesMatchs/match/match-3.wxml

@@ -35,7 +35,7 @@
                         </view>
                     </view>
                     <view class="list_2" wx:elif="{{cType=='1'}}">
-                        <view class="name">
+                        <view class="name" bindtap="toAchieve" data-item="{{item}}">
                             <text>{{item.group_id_name}}({{item.age}}岁)</text>
                             <text>{{item.project_id_name}}({{item.projectAge}},{{item.pojectGender}})</text>
                             <text>{{item.name}}</text>

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

@@ -17,5 +17,10 @@ Component({
      * 组件的方法列表
      */
     methods: {
+        toAchieve: function (e) {
+            const that = this;
+            const { item } = e.currentTarget.dataset;
+            that.triggerEvent('toAchieve', item)
+        },
     }
 })

+ 1 - 1
commpents/pagesMatchs/match/match-5.wxml

@@ -2,7 +2,7 @@
     <scroll-view scroll-y="true" class="scroll-view">
         <view class="list-scroll-view">
             <view class="one">
-                <view class="list" wx:for="{{achieveList}}" wx:key="item">
+                <view class="list" wx:for="{{achieveList}}" wx:key="item" bindtap="toAchieve" data-item="{{item}}">
                     <view class="name">
                         {{item.name}}({{item.age}}岁)
                     </view>

+ 97 - 0
pagesMatch/match/achieve.js

@@ -0,0 +1,97 @@
+const app = getApp();
+Page({
+    data: {
+        frameStyle: { useTop: true, name: '赛事信息', leftArrow: true, useBar: false },
+        options: {},
+        // 选项卡
+        tabs: {
+            active: 'a',
+            menu: [
+                { title: '小组赛', active: 'a' },
+                { title: '淘汰赛', active: 'b' },
+                { title: '名次', active: 'c' },
+            ],
+        },
+        // 赛事信息
+        info: {},
+        // 名次
+        cList: [
+            { num: 1, name: '顾红伟' },
+            { num: 2, name: '顾红伟' },
+            { num: 3, name: '顾红伟' },
+            { num: 4, name: '顾红伟' },
+        ]
+    },
+    // 返回
+    back: function () { wx.navigateBack({ delta: 1 }) },
+    // 选项卡
+    tabsChange: function (e) {
+        const that = this;
+        that.setData({ 'tabs.active': e.detail.active });
+    },
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: async function (options) {
+        const that = this;
+        that.setData({ options: { match_id: options && options.match_id || '630ec4700a92b0a015ccfd14', group_id: options && options.group_id || '631060da75c1cd7fa923b8df', project_id: options && options.project_id || '631060f775c1cd7fa923b8ef' } });
+        // 监听用户是否登录
+        await that.watchLogin();
+    },
+    watchLogin: async function () {
+        const that = this;
+        const { match_id, group_id, project_id } = that.data.options
+        wx.getStorage({
+            key: 'user',
+            success: async res => {
+                // 赛事信息
+                let arr = await app.$get(`/match/${match_id}`, {}, 'race');
+                if (arr.errcode == '0') {
+                    that.setData({ info: arr.data });
+                    that.setData({ 'frameStyle.name': arr.data.name })
+                }
+            },
+            fail: async res => {
+                wx.redirectTo({ url: '/pages/index/index' })
+            }
+        })
+    },
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () { },
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () { },
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    }
+})

+ 10 - 0
pagesMatch/match/achieve.json

@@ -0,0 +1,10 @@
+{
+    "component": true,
+    "usingComponents": {
+        "mobile-main": "/commpents/mobile-frame/index",
+        "achieve-1": "/commpents/pagesMatchs/achieve/achieve-1",
+        "achieve-2": "/commpents/pagesMatchs/achieve/achieve-2",
+        "achieve-3": "/commpents/pagesMatchs/achieve/achieve-3",
+        "s-tab": "/commpents/tabs/index"
+    }
+}

+ 28 - 0
pagesMatch/match/achieve.less

@@ -0,0 +1,28 @@
+@import (css) "/app.wxss";
+
+.main {
+    height: var(--twoHeight);
+    background-color: var(--mainColor);
+
+    .one {
+        width: 100vw;
+    }
+
+    .two {
+        position: relative;
+        flex-grow: 1;
+    }
+}
+
+.scroll-view {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+
+    .list-scroll-view {
+        display: flex;
+        flex-direction: column;
+    }
+}

+ 18 - 0
pagesMatch/match/achieve.wxml

@@ -0,0 +1,18 @@
+<mobile-main frameStyle="{{frameStyle}}" bind:back="back">
+    <view slot="info" class="container main">
+        <view class="one">
+            <s-tab tabs="{{tabs}}" bind:tabsChange="tabsChange"></s-tab>
+        </view>
+        <view class="two">
+            <view wx:if="{{tabs.active=='a'}}" class="a">
+                <achieve-1></achieve-1>
+            </view>
+            <view wx:elif="{{tabs.active=='b'}}" class="a b">
+                <achieve-2></achieve-2>
+            </view>
+            <view wx:elif="{{tabs.active=='c'}}" class="a c">
+                <achieve-3 cList="{{cList}}"></achieve-3>
+            </view>
+        </view>
+    </view>
+</mobile-main>

+ 23 - 0
pagesMatch/match/achieve.wxss

@@ -0,0 +1,23 @@
+@import "/app.wxss";
+.main {
+  height: var(--twoHeight);
+  background-color: var(--mainColor);
+}
+.main .one {
+  width: 100vw;
+}
+.main .two {
+  position: relative;
+  flex-grow: 1;
+}
+.scroll-view {
+  position: absolute;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
+.scroll-view .list-scroll-view {
+  display: flex;
+  flex-direction: column;
+}

+ 11 - 0
pagesMatch/match/info.js

@@ -47,6 +47,17 @@ Page({
     },
     // 返回
     back: function () { wx.navigateBack({ delta: 1 }) },
+    //比赛报名
+    toSign: function (e) {
+        const { item } = e.currentTarget.dataset;
+        wx.navigateTo({ url: `/pagesMatch/match/sign?id=${item._id}` })
+    },
+    // 赛事项目详细信息
+    toAchieve: function (e) {
+        const { match_id, group_id } = e.detail;
+        let project_id = e.detail.project_id || e.detail._id;
+        wx.navigateTo({ url: `/pagesMatch/match/achieve?match_id=${match_id}&group_id=${group_id}&project_id=${project_id}` })
+    },
     // 选项卡
     tabsChange: function (e) {
         const that = this;

+ 0 - 81
pagesMatch/match/info.less

@@ -11,87 +11,6 @@
     .two {
         position: relative;
         flex-grow: 1;
-
-        .a {
-            height: 83vh;
-        }
-
-        .b {
-            height: 83vh;
-
-            .b_1 {
-                width: 96vw;
-                display: flex;
-                flex-direction: column;
-                background-color: var(--mainColor);
-                position: relative;
-                margin: 2vw;
-
-                .Title {
-                    display: flex;
-                    flex-direction: row;
-                    line-height: 40px;
-                    border-bottom: 1px solid var(--f1Color);
-
-                    .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;
-
-
-                            .user_name {
-                                margin: 2vw;
-                                text-align: center;
-
-                                .icon {
-                                    width: 18vw;
-                                    height: 18vw;
-                                    border-radius: 50%;
-                                    border: 2px dashed var(--f1Color);
-
-
-                                    image {
-                                        width: 80%;
-                                        height: 80%;
-                                    }
-                                }
-
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        .c {
-            width: 96vw;
-            display: flex;
-            flex-direction: column;
-
-
-
-
-        }
-
-        .d {
-            height: 83vh;
-        }
     }
 }
 

+ 2 - 2
pagesMatch/match/info.wxml

@@ -14,13 +14,13 @@
                 <match-2 playerList="{{playerList}}" playerIndex="{{playerIndex}}" bind:onePayer="onePayer" playerIndexs="{{playerIndexs}}" bind:twoPayer="twoPayer"></match-2>
             </view>
             <view wx:if="{{tabs.active=='c'}}" class="c">
-                <match-3 cType="{{cType}}" cList="{{cList}}" bind:cChange="cChange" bind:cinputSearch="cinputSearch"></match-3>
+                <match-3 cType="{{cType}}" cList="{{cList}}" bind:cChange="cChange" bind:cinputSearch="cinputSearch" bind:toAchieve="toAchieve"></match-3>
             </view>
             <view wx:if="{{tabs.active=='d'}}" class="d">
                 <match-4 dTabs="{{dTabs}}" dList="{{dList}}" bind:dtabsChange="dtabsChange"></match-4>
             </view>
             <view wx:if="{{tabs.active=='e'}}" class="e">
-                <match-5 achieveList="{{achieveList}}"></match-5>
+                <match-5 achieveList="{{achieveList}}" bind:toAchieve="toAchieve"></match-5>
             </view>
         </view>
     </view>

+ 0 - 58
pagesMatch/match/info.wxss

@@ -10,64 +10,6 @@
   position: relative;
   flex-grow: 1;
 }
-.main .two .a {
-  height: 83vh;
-}
-.main .two .b {
-  height: 83vh;
-}
-.main .two .b .b_1 {
-  width: 96vw;
-  display: flex;
-  flex-direction: column;
-  background-color: var(--mainColor);
-  position: relative;
-  margin: 2vw;
-}
-.main .two .b .b_1 .Title {
-  display: flex;
-  flex-direction: row;
-  line-height: 40px;
-  border-bottom: 1px solid var(--f1Color);
-}
-.main .two .b .b_1 .Title .name {
-  width: 60vw;
-}
-.main .two .b .b_1 .Title .icon {
-  text-align: right;
-  width: 35vw;
-}
-.main .two .b .b_1 .content .project {
-  margin: 3vw 0;
-  padding: 0 1vw;
-}
-.main .two .b .b_1 .content .project .user {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
-}
-.main .two .b .b_1 .content .project .user .user_name {
-  margin: 2vw;
-  text-align: center;
-}
-.main .two .b .b_1 .content .project .user .user_name .icon {
-  width: 18vw;
-  height: 18vw;
-  border-radius: 50%;
-  border: 2px dashed var(--f1Color);
-}
-.main .two .b .b_1 .content .project .user .user_name .icon image {
-  width: 80%;
-  height: 80%;
-}
-.main .two .c {
-  width: 96vw;
-  display: flex;
-  flex-direction: column;
-}
-.main .two .d {
-  height: 83vh;
-}
 .scroll-view {
   position: absolute;
   top: 0;

+ 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": false
+        "compileHotReLoad": true
     },
     "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档:https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
 }