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

app.json

@@ -1,6 +1,5 @@
 {
     "pages": [
-  
         "pages/index/index",
         "pages/register/index",
         "pages/home/index",

commpents/match-achieve/achieve.less

@@ -0,0 +1,58 @@
+.ranking {
+    margin: 0 0 2vw 0;
+
+    .name {
+        font-size: 14px;
+        font-weight: bold;
+        padding: 2vw;
+        background-color: #39434d;
+        color: #fff;
+        text-align: center;
+    }
+
+    .view_1 {
+        width: 96vw;
+        margin: 0 0 2vw 0;
+    }
+}
+
+/* 表格代码   */
+.table {
+    border: 1px solid #dadada;
+    border-right: 0;
+    border-bottom: 0;
+    width: 95.6vw;
+}
+
+.tr {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    overflow-x: scroll;
+}
+
+.th,
+.td {
+    padding: 10px;
+    border-bottom: 1px solid #dadada;
+    border-right: 1px solid #dadada;
+    border-left: 1px solid #dadada;
+    text-align: center;
+    width: 100%;
+}
+
+.th1,
+.th2,
+.td1,
+.td2 {
+    width: 50%;
+}
+
+.th {
+    font-size: 13px;
+    font-weight: 800;
+}
+
+.td {
+    font-size: 13px;
+}

commpents/match-achieve/achieve.wxml

@@ -1,8 +1,7 @@
 <view class='history-table-wrap'>
-    <view wx:for="{{ranking}}" wx:for-item="t" wx:key="team_id">
-        <view>{{t.team_name}}</view>
-
-        <view>
+    <view class="ranking" wx:for="{{ranking}}" wx:for-item="t" wx:key="team_id">
+        <view class="name">{{t.team_name}}</view>
+        <view class="view_1">
             <view class="tr">
                 <view class="th th1"></view>
                 <view class="th th1" wx:for="{{raceList[index].playerList}}" wx:for-item="player" wx:key="player_id">{{player.player_name}}</view>

commpents/match-achieve/achieve.wxss

@@ -1,43 +1,50 @@
-.history-table-wrap{
-    position: absolute;
-    width: 668rpx;
-    left: 50%;
-    margin-left: -334rpx;
-    top: 70rpx;
-    overflow-y: scroll;
-    overflow-x: hidden;
-  }
-  /* 表格代码   */
-  .table{
-    border:1px solid #dadada;
-    border-right:0;
-    border-bottom: 0;
-    width: 98%;
-    margin-left: 1%;
-  }
-  .tr{
-    width:100%;
-    display: flex;
-    justify-content: space-between;
-    overflow-x: scroll;
-  }
-  .th,.td{
-    padding: 10px;
-    border-bottom: 1px solid #dadada;
-    border-right: 1px solid #dadada;
-    text-align: center;
-    width: 100%;
-  }
-  .th1,.th2,.td1,.td2{
-    width: 50%;
-  }
-  .th{
-    font-weight: 800;
-    background-color: #dadada;
-    font-size: 12rpx;
-    color: #330e0e;
-  }
-  .td{
-    font-size: 14rpx;
-    /* color: #ec9480; */
-  }
+.ranking {
+  margin: 0 0 2vw 0;
+}
+.ranking .name {
+  font-size: 14px;
+  font-weight: bold;
+  padding: 2vw;
+  background-color: #39434d;
+  color: #fff;
+  text-align: center;
+}
+.ranking .view_1 {
+  width: 96vw;
+  margin: 0 0 2vw 0;
+}
+/* 表格代码   */
+.table {
+  border: 1px solid #dadada;
+  border-right: 0;
+  border-bottom: 0;
+  width: 95.6vw;
+}
+.tr {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  overflow-x: scroll;
+}
+.th,
+.td {
+  padding: 10px;
+  border-bottom: 1px solid #dadada;
+  border-right: 1px solid #dadada;
+  border-left: 1px solid #dadada;
+  text-align: center;
+  width: 100%;
+}
+.th1,
+.th2,
+.td1,
+.td2 {
+  width: 50%;
+}
+.th {
+  font-size: 13px;
+  font-weight: 800;
+}
+.td {
+  font-size: 13px;
+}

pages/referee/eliminate.js

@@ -26,7 +26,11 @@ Page({
         if (arr.errcode == '0') {
             if (arr.data.winner) {
                 const user = await app.$get(`/newCourt/api/user/${arr.data.winner}`);
-                if (user.errcode == '0') { arr.data.winner_name = user.data.name }
+                if (user.errcode == '0' && user.data) { arr.data.winner_name = user.data.name; }
+                else {
+                    const team = await app.$get(`/newCourt/api/teamApply/${arr.data.winner}`);
+                    if (team.errcode == '0' && team.data) { arr.data.winner_name = team.data.applyuser_name + '-' + team.data.teammate_name; }
+                }
             }
             that.setData({ info: arr.data });
             that.setData({ dialog: { title: '详细信息', show: true, type: '1' } })

pages/referee/group.js

@@ -26,7 +26,11 @@ Page({
         if (arr.errcode == '0') {
             if (arr.data.winner) {
                 const user = await app.$get(`/newCourt/api/user/${arr.data.winner}`);
-                if (user.errcode == '0') { arr.data.winner_name = user.data.name }
+                if (user.errcode == '0' && user.data) { arr.data.winner_name = user.data.name; }
+                else {
+                    const team = await app.$get(`/newCourt/api/teamApply/${arr.data.winner}`);
+                    if (team.errcode == '0' && team.data) { arr.data.winner_name = team.data.applyuser_name + '-' + team.data.teammate_name; }
+                }
             }
             that.setData({ info: arr.data });
             that.setData({ dialog: { title: '详细信息', show: true, type: '1' } })