zs 2 年之前
父節點
當前提交
3d5a2f5286
共有 3 個文件被更改,包括 10 次插入3 次删除
  1. 0 1
      app.json
  2. 5 1
      pages/referee/eliminate.js
  3. 5 1
      pages/referee/group.js

+ 0 - 1
app.json

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

+ 5 - 1
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' } })

+ 5 - 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' } })