26.PK红色的圈太粗糙√

27.pk4人的时候充分利用布局√

pc/src/views/courseEdit.vue

@@ -529,8 +529,6 @@
             // 确认上课
             confirmBegin() {
                 let that = this;
-                console.log(123);
-                return false
                 // 没绑心率带不能开课,预约未到的不管他
                 for (var i = 0; i < this.tableData.length; i++) {
                     if (this.tableData[i].BindId == 0 && this.tableData[i].Status != 2) {

tv/README.md

@@ -98,6 +98,8 @@ https://segmentfault.com/a/1190000021281307
 24.管理端预约查询，没有按照时间范围搜索√  
 28.空课不允许管理端提交√ 
 25.PC端兼容小pad√ 
+26.PK红色的圈太粗糙√
+27.pk4人的时候充分利用布局√
 
 
 1. 月、周卡路里总计火焰字体
@@ -110,11 +112,12 @@ https://segmentfault.com/a/1190000021281307
 19.等待页面的数字使用图片替换 todo  
 23.彩蛋和新学生接口可以合并 todo  
 
-26.PK红色的圈太粗糙
-27.pk4人的时候充分利用布局
-29首页界面和内页都给课程增加关课按钮
 
 
+29.首页界面和内页都给课程增加关课按钮
+30.tv流程写一下
+31.TV本地字典，针对不同的EQSN给出本店的转发服务器ip地址(定一下字段名的接口)
+
 
 // 上课中学生信息
 getUserListInfo

tv/src/Mock/index.js

@@ -116,9 +116,12 @@ let getUserList = function () {
 };
 
 
-let testStudent = function (num) {
+let testStudent = function (num, team) {
     let item = [];
+    let teams;
     for (var i = 0; i < num; i++) {
+        teams = team == 2 ? "@integer(1, 3)" : "@integer(1, 2)";
+        teams = 3;
         item.push({
             "SvId": "@guid",
             "UserId": "@integer(15253135600, 15253135699)",
@@ -131,8 +134,7 @@ let testStudent = function (num) {
             "Ck": "@integer(10, 100)",
             "formatCk": "@integer(10, 100)",
             "Head": "http://192.168.0.2/gc.png",
-            // "GroupNo": "@integer(1, 3)",
-            "GroupNo": "@integer(1,3)",
+            "GroupNo":teams,
             "Sex": "@integer(1, 2)",
             "IsBirthday": "@integer(1, 1)",
         })
@@ -152,9 +154,9 @@ let testStudent = function (num) {
     };
 };
 
-let getClassStat = function () {
+let getClassStat = function (ClassOn) {
     return {
-        ClassOn: 1, //   // 0: 下课 团课/私教/PK 的排名
+        ClassOn: ClassOn, //   // 0: 下课 团课/私教/PK 的排名
         Code: 0,
         Memo: "Success",
         dp: 1,
@@ -202,6 +204,68 @@ let getRecordBreak = function (code) {
         Rs: item,
     };
 };
+let testHerosRankingQuery = function (num) {
+    let item = [
+        {
+            "Title": "本周消耗卡路里英雄榜",
+            "Style": "heros",
+            "Result": [
+                {
+                    "UserName": "段长鹏",
+                    "Sex": 1,
+                    "Head": "",
+                    "Values": "4744",
+                    "Unite": "千卡",
+                    "Message": ""
+                },
+                {
+                    "UserName": "贾雨奇",
+                    "Sex": 1,
+                    "Head": "http://192.168.0.2/flyhead.png",
+                    "Values": "4034",
+                    "Unite": "千卡",
+                    "Message": ""
+                },
+                {
+                    "UserName": "郑伟",
+                    "Sex": 1,
+                    "Head": "http://192.168.0.2/flyhead.png",
+                    "Values": "2290",
+                    "Unite": "千卡",
+                    "Message": ""
+                }
+            ]
+        },
+        {
+            "Title": "单次CK值(新个人记录)",
+            "Style": "tops",
+            "Result": [
+                {
+                    "UserName": "郑伟",
+                    "Sex": 1,
+                    "Head": "",
+                    "Values": "1022",
+                    "Unite": "",
+                    "Message": "打破了历史记录100000"
+                },
+                {
+                    "UserName": "郑伟",
+                    "Sex": 1,
+                    "Head": "http://192.168.0.2/flyhead.png",
+                    "Values": "1020",
+                    "Unite": "",
+                    "Message": "打破了历史记录100000"
+                }
+            ]
+        }
+    ];
+
+    return {
+        Code: 0,
+        Memo: "Success",
+        Rs: item,
+    };
+}
 
 
 let t = 0;
@@ -211,23 +275,21 @@ if (t == 0) {
 
     Mock.mock('/api/getUserList', 'post', getUserList());
     // 学生列表
-    Mock.mock(headapi + 'UserListInfo', 'post', testStudent(12));
+    Mock.mock(headapi + 'UserListInfo', 'post', testStudent(5, 1));
     // 下课排名
-    Mock.mock(headapi + 'ClassUserRank', 'post', testStudent(1));
+    Mock.mock(headapi + 'ClassUserRank', 'post', testStudent(1, 2));
     // 英雄榜
-    Mock.mock(headapi + 'HerosRankingQuery', 'post', testStudent(1));
+    Mock.mock(headapi + 'HerosRankingQuery', 'post', testHerosRankingQuery(1));
     // 卡路里排行榜
-    Mock.mock(headapi + 'CalorieStatsQuery', 'post', testStudent(1));
+    Mock.mock(headapi + 'CalorieStatsQuery', 'post', testStudent(1, 2));
     // 用户排行榜
-    Mock.mock(headapi + 'UserRankingQuery', 'post', testStudent(1));
+    Mock.mock(headapi + 'UserRankingQuery', 'post', testStudent(1, 2));
     // 上课状态
-    Mock.mock(headapi + 'ClassStatQuery', 'post', getClassStat());
+    Mock.mock(headapi + 'ClassStatQuery', 'post', getClassStat(2));
     // 新同学 0 999
     Mock.mock(headapi + 'getNewUser', 'post', getNewUser(999));
     // 彩蛋 0 999
     Mock.mock(headapi + 'getRecordBreak', 'post', getRecordBreak(999));
-
-
 }
 
 export default Mock;

tv/src/views/2pkRank.vue

@@ -354,7 +354,7 @@
         display: block;
         margin: 0 auto;
         border: 0.04rem solid #fff;
-        border-radius: 250px;
+        border-radius: 33rem;
     }
 
 

tv/src/views/3pkRank.vue

@@ -472,7 +472,7 @@
         display: block;
         margin: 0 auto;
         border: 0.04rem solid #fff;
-        border-radius: 250px;
+        border-radius: 33rem;
     }
 
 

tv/src/views/404.vue

@@ -84,7 +84,7 @@
     }
     .row .btn {
         border: 2px solid #fff;
-        border-radius: 250px;
+        border-radius: 33rem;
         text-align: center;
         padding: 13px 47px;
         font-size: 18px;

tv/src/views/Main.vue

@@ -619,7 +619,7 @@
         display: block;
         margin: 0 auto;
         border: 2px solid #fff;
-        border-radius: 250px;
+        border-radius: 33rem;
         /*box-shadow: 0px 0px 5px #fff;*/
     }
 

tv/src/views/Rank.vue

@@ -285,7 +285,7 @@
         display: block;
         margin: 0 auto;
         border: 5px solid #fff;
-        border-radius: 250px;
+        border-radius: 33rem;
     }
 
     li .head .king {

tv/src/views/Wait.vue

@@ -627,7 +627,7 @@
         display: block;
         margin: 0 auto;
         padding: 0;
-        border-radius: 250px;
+        border-radius: 33rem;
         border: 2px solid #fff;
     }
 
@@ -718,7 +718,7 @@
         filter: drop-shadow(0px 0px 6px #bf00ff);
         border: 2px solid #fff;
         float: left;
-        border-radius: 250px;
+        border-radius: 33rem;
         margin-right: 3%;
     }
 

tv/src/views/pk.vue

@@ -909,7 +909,7 @@
         overflow: hidden;
         display: block;
         margin: 0 auto;
-        border-radius: 250px;
+        border-radius: 33rem;
         padding-top: 0.09rem;
     }
 
@@ -919,7 +919,8 @@
         overflow: hidden;
         display: block;
         margin: 0 auto;
-        border-radius: 250px;
+        /*border-radius: 33rem;*/
+        border-radius: 33rem;
         border: 0.1rem solid #B9CB01;
     }
 
@@ -1357,9 +1358,11 @@
 
 
     /*four*/
-    .four {
+    .pk_container  .four {
         width: 49%;
         float: left;
+        margin-top: 0.4rem;
+        margin-bottom: 0.5rem;
     }
 
     .four .bg {

tv/src/views/threepk.vue

@@ -116,7 +116,7 @@
             </div>
             <div class="pl_md">
                 <ul>
-                    <li :class="RedstudentsClassName" v-for="(s,i) in students.blueUnite">
+                    <li :class="BluestudentsClassName" v-for="(s,i) in students.blueUnite">
                         <div class="bg">
                             <h5>
                                 <div class="nameLt">
@@ -179,7 +179,7 @@
             </div>
             <div class="pl_rt">
                 <ul>
-                    <li :class="RedstudentsClassName" v-for="(s,i) in students.yellowUnite">
+                    <li :class="YellowstudentsClassName" v-for="(s,i) in students.yellowUnite">
                         <div class="bg">
                             <h5>
                                 <div class="nameLt">
@@ -528,7 +528,8 @@
                         numberClass = 'four';
                         break;
                     case  parseInt(res.length) <= 6 && parseInt(res.length) > 4:
-                        numberClass = 'four';
+                        console.log(123);
+                        numberClass = 'eight';
                         break;
                     case  parseInt(res.length) > 6:
                         numberClass = 'eight';
@@ -1186,7 +1187,7 @@
         overflow: hidden;
         display: block;
         margin: 0 auto;
-        border-radius: 250px;
+        border-radius: 33rem;
         padding-top: 0.09rem;
     }
 
@@ -1196,7 +1197,7 @@
         overflow: visible;
         display: block;
         margin: 0 auto;
-        border-radius: 250px;
+        border-radius: 33rem;
         border: 0.1rem solid #B9CB01;
     }
 
@@ -1535,9 +1536,11 @@
 
 
     /*four*/
-    .four {
-        width: 50%;
+    .pk_container  .four {
+        width: 49%;
         float: left;
+        margin-top: 0.4rem;
+        margin-bottom: 0.5rem;
     }
 
     .four .bg {