10. PK课显示教练√

tv/README.md

@@ -80,22 +80,22 @@ http://192.168.0.162:9000/Hello
 27.PC课后详情CK有小数，卡路里取整数 √
 28.团课改色 √
 
+
 https://developer.qiniu.com/kodo/sdk/1283/javascript
 https://segmentfault.com/a/1190000021281307
 
-
-
 12/15
+3. 活动强度的黄色，改色√
+4. 排名跳转√
+6. 彩蛋显示30S√
+
 1. 月、周卡路里总计火焰字体
 2. 私有心率带角标
-3. 活动强度的黄色，改色√
-4. 排名跳转
 5. 小pad样式兼容
-6. 彩蛋显示30S
 7. 测试在线升级
 8. 管理端图片裁切
 9. 胜率显示从后台取胜率数据
-10. PK课显示教练
+10. PK课显示教练√
 
 29.PC图片上传进行压缩 todo
 19.等待页面的数字使用图片替换 todo  

tv/src/Mock/index.js

@@ -141,6 +141,7 @@ let testStudent = function (num) {
     let Dp = {
         PlanName: '测试课程',
         BeginTime: '19:30',
+        Teacher: '测试教练',
     };
 
     return {
@@ -153,7 +154,7 @@ let testStudent = function (num) {
 
 let getClassStat = function () {
     return {
-        ClassOn: 0, //   // 0: 下课 团课/私教/PK 的排名
+        ClassOn: 1, //   // 0: 下课 团课/私教/PK 的排名
         Code: 0,
         Memo: "Success",
         dp: 1,
@@ -182,6 +183,26 @@ let getNewUser = function (code) {
     };
 };
 
+let getRecordBreak = function (code) {
+
+    let item = [];
+    for (var i = 0; i < 1; i++) {
+        item.push({
+            "SvId": "@guid",
+            "UserId": "@integer(15253135600, 15253135699)",
+            "UserName": "测试人",
+            "Cle": "@integer(200, 1000)",
+            "Ck": "@integer(10, 100)",
+        })
+    }
+
+    return {
+        Code: code,
+        Memo: "Success",
+        Rs: item,
+    };
+}
+
 
 let t = 0;
 if (t == 0) {
@@ -203,6 +224,8 @@ if (t == 0) {
     Mock.mock(headapi + 'ClassStatQuery', 'post', getClassStat());
     // 新同学 0 999
     Mock.mock(headapi + 'getNewUser', 'post', getNewUser(999));
+    // 彩蛋 0 999
+    Mock.mock(headapi + 'getRecordBreak', 'post', getRecordBreak(999));
 
 
 }

tv/src/views/Main.vue

@@ -202,7 +202,7 @@
 
                 this.timer2 = setInterval(() => {
                     this.createEgg();
-                }, 5000);
+                }, 31000);
 
                 this.timer3 = setInterval(() => {
                     this.createNewStudent();
@@ -268,7 +268,7 @@
                 this.toperInfo.dialogVisible = true;
                 // 倒计时5秒自动关闭
                 let that = this;
-                this.totalTime = 4;
+                this.totalTime = 30;
                 let clock = window.setInterval(() => {
                     this.totalTime--;
                     if (parseInt(this.totalTime) < 0) {

tv/src/views/pk.vue

@@ -102,8 +102,8 @@
                         {{PlanName}}
                     </span>
                     <div class="teacher">
-                        <br>
-                        <span>人数：{{num}}</span>
+                        <span v-if="Teacher"> 教练：{{Teacher}}</span>
+                        <span>人数：{{num}} </span>
                     </div>
                     <div class="classTime">
                         {{classInfo.endTime}}
@@ -209,6 +209,7 @@
                 BluestudentsClassName: '',
                 PlanName: '',
                 num: 0,
+                Teacher: '',
                 classInfo: {
                     name: '竞技课程',
                     num: '0',
@@ -318,7 +319,7 @@
 
                 this.timer2 = setInterval(() => {
                     this.createEgg();
-                }, 5000);
+                }, 31000);
 
                 this.timer3 = setInterval(() => {
                     this.createNewStudent();
@@ -411,6 +412,7 @@
             ReadLessonInfo(Dp) {
                 this.PlanName = Dp.PlanName;
                 this.BeginTime = Dp.BeginTime;
+                this.Teacher = Dp.Teacher;
             },
             // 分队展示
             UniteBreak(Rs) {

tv/src/views/threepk.vue

@@ -18,6 +18,7 @@
                         {{PlanName}}
                     </span>
                     <div class="teacher">
+                        <span v-if="Teacher"> 教练：{{Teacher}}</span>
                         <span>人数：{{num}}</span>
                     </div>
 
@@ -280,6 +281,7 @@
                     yellowUnite: [],
                 },
                 PlanName: '',
+                Teacher: '',
                 num: 0,
                 classInfo: {
                     name: '竞技课程',
@@ -387,7 +389,7 @@
 
                 this.timer2 = setInterval(() => {
                     this.createEgg();
-                }, 5000);
+                }, 31000);
 
                 this.timer3 = setInterval(() => {
                     this.createNewStudent();
@@ -397,6 +399,7 @@
             ReadLessonInfo(Dp) {
                 this.PlanName = Dp.PlanName;
                 this.BeginTime = Dp.BeginTime;
+                this.Teacher = Dp.Teacher;
             },
             // 分队展示
             UniteBreak(Rs) {