活动强度为0不应影响电量显示

tv/src/Mock/index.js

@@ -215,16 +215,15 @@ 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)",
-        })
-    }
+    let item = {
+        "SvId": "@guid",
+        "UserId": "@integer(15253135600, 15253135699)",
+        "UserName": "测试人",
+        "Cle": "@integer(200, 1000)",
+        "Ck": "@integer(10, 100)",
+        "CleUnit": "千卡",
+        "CkUnit": "CK",
+    };
 
     return {
         Code: code,
@@ -371,7 +370,7 @@ let getClassStat = function (ClassOn, dp) {
     };
 };
 
-let t = 1;//0 is on 1 is off
+let t = 0;//0 is on 1 is off
 if (t == 0) {
     // 列表测试
     Mock.mock('/api/testTable', 'post', testTable());
@@ -380,11 +379,11 @@ if (t == 0) {
     let curheadapi = 'http://192.168.0.63:8080/';
 
     // 0: 下课 团课/私教/PK 的排名
-    let LessonClass = 1;
+    let LessonClass = 2;
     // 1：团课/私教
     // 2：竞技课2PK
     // 3：竞技课threepk
-    let LessonDp = 1;
+    let LessonDp = 2;
 
 
     if (LessonClass == 1) {
@@ -425,7 +424,7 @@ if (t == 0) {
     // 用户排行榜
     Mock.mock(curheadapi + 'UserRankingQuery', 'post', UserRankingQuery(8));
     // 新同学 0 999
-    Mock.mock(curheadapi + 'getNewUser', 'post', getNewUser(0));
+    Mock.mock(curheadapi + 'getNewUser', 'post', getNewUser(999));
     // 彩蛋 0 999
     Mock.mock(curheadapi + 'getRecordBreak', 'post', getRecordBreak(999));
 }

tv/src/views/Main.vue

@@ -15,9 +15,8 @@
                                         <i class="el-icon-female" v-if="s.Sex == 2"></i>
                                     </div>
                                     <div class="nameMd">{{ s.Name }}</div>
-                                    <div class="namert" v-if="s.ActivePercent != 0 && s.RealHr != 0">
+                                    <div class="namert" v-if="s.RealHr != 0">
                                         <power :cur-power="s.PowerPercent"></power>
-
                                     </div>
                                 </span>
                                 <div class="head">
@@ -127,7 +126,7 @@
                 serachBtnStatus: false,
                 dialogMsg: '',
                 imgsrc: '../static/img/people/',
-                totalTime: 4,
+                totalTime: 30,
                 studentTime: 15,
                 toperInfo: {
                     dialogVisible: false,
@@ -263,6 +262,7 @@
                             console.log('正在显示彩蛋');
                             return false
                         } else {
+                            console.log(json.Rs);
                             that.OpenStudent(json.Rs);
                             // OpenStudent(json.Rs,that);
                         }

tv/src/views/Wait.vue

@@ -45,6 +45,7 @@
                                             </div>
                                         </div>
                                     </li>
+                                    <span style="font-size: 0.4rem;color: #fff" v-if="Rs.Result == ''">还没有新成果哟~</span>
                                 </ul>
                             </div>
                             <div class="heros" v-if="Rs.Style == 'heros'">
@@ -63,9 +64,7 @@
                                         </div>
                                         <span>{{ hero.Values }} {{hero.Unite}}</span>
                                     </li>
-                                    <li v-if="Rs.Result == ''">
-                                        <h5>还没有人突破记录哟~</h5>
-                                    </li>
+                                        <span style="font-size: 0.4rem;color: #fff" v-if="Rs.Result == ''">还没有人突破记录哟~</span>
                                 </ul>
                             </div>
                         </el-carousel-item>
@@ -83,9 +82,7 @@
                                 <em>{{s.UserName}}</em>
                                 <s>{{s.Values}}</s>
                             </li>
-                            <li v-if="Rs.Result == ''">
-                                <h5>还没有排行记录哟~</h5>
-                            </li>
+                            <span style="font-size: 0.4rem;color: #fff" v-if="Rs.Result == ''">还没有排行记录哟~</span>
                         </ul>
                     </el-carousel-item>
                 </el-carousel>

tv/src/views/pk.vue

@@ -22,7 +22,7 @@
                                     <i class="el-icon-female" v-if="s.Sex == 2"></i>
                                 </div>
                                 <div class="nameMd">{{ s.Name }}</div>
-                                <div class="namert" v-if="s.ActivePercent != 0 && s.RealHr != 0">
+                                <div class="namert" v-if=" s.RealHr != 0">
                                     <power :cur-power="s.PowerPercent"></power>
 
                                 </div>
@@ -127,7 +127,7 @@
                                     <i class="el-icon-female" v-if="s.Sex == 2"></i>
                                 </div>
                                 <div class="nameMd">{{ s.Name }}</div>
-                                <div class="namert" v-if="s.ActivePercent != 0 && s.RealHr != 0">
+                                <div class="namert" v-if=" s.RealHr != 0">
                                     <power :cur-power="s.PowerPercent"></power>
 
                                 </div>
@@ -233,7 +233,7 @@
                     redSum: 0,
                     blueSum: 0,
                 },
-                totalTime: 4,
+                totalTime: 30,
                 studentTime: 15,
                 toperInfo: {
                     dialogVisible: false,
@@ -396,7 +396,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/threepk.vue

@@ -61,7 +61,7 @@
                                     <i class="el-icon-female" v-if="s.Sex == 2"></i>
                                 </div>
                                 <div class="nameMd">{{ s.Name }}</div>
-                                <div class="namert" v-if="s.ActivePercent != 0 && s.RealHr != 0">
+                                <div class="namert" v-if=" s.RealHr != 0">
                                     <power :cur-power="s.PowerPercent"></power>
 
                                 </div>
@@ -131,7 +131,7 @@
                                     <i class="el-icon-female" v-if="s.Sex == 2"></i>
                                 </div>
                                 <div class="nameMd">{{ s.Name }}</div>
-                                <div class="namert" v-if="s.ActivePercent != 0 && s.RealHr != 0">
+                                <div class="namert" v-if=" s.RealHr != 0">
                                     <power :cur-power="s.PowerPercent"></power>
 
                                 </div>
@@ -201,7 +201,7 @@
                                     <i class="el-icon-female" v-if="s.Sex == 2"></i>
                                 </div>
                                 <div class="nameMd">{{ s.Name }}</div>
-                                <div class="namert" v-if="s.ActivePercent != 0 && s.RealHr != 0">
+                                <div class="namert" v-if=" s.RealHr != 0">
                                     <power :cur-power="s.PowerPercent"></power>
 
                                 </div>
@@ -313,7 +313,7 @@
                     redSum: 0,
                     blueSum: 0,
                 },
-                totalTime: 4,
+                totalTime: 30,
                 studentTime: 15,
                 toperInfo: {
                     dialogVisible: false,
@@ -691,7 +691,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/需求修改和debug.md

@@ -152,8 +152,8 @@ TV版本增加当日排名内容√
 2.跨店PK 和 跨店 3pk 测试 √
 3.电量标志 20%低电量，去掉数字 √ 
 
-4.欢迎新同学新样式
-5.等待页面的新式样大屏数字 
+4.欢迎新同学新样式√  
+5.等待页面的新式样大屏数字 √  
 6.私有标志 有的偏大 不能压到头像上√  
 
 
@@ -166,6 +166,7 @@ TV版本增加当日排名内容√
 =========================
 12/27
 1.修复了切换店铺后，课程表和预约表错误问题√  
+2.破纪录显示时间加长√