暂存

tv/README.md

@@ -69,11 +69,17 @@ http://192.168.0.162:9000/Hello
 16.先选教练后开始上课   √ 
 
 
+
+
+
 5.生日的时候学生有个生日小帽子     IsBirthday 1 过生日 0 不过生日
 10.新学员上课时有个倒数15秒的欢迎页面  -欢迎入伙  
 
 
 
+1等待页面怎么体现学生是当天生日？
+2.排名页面怎么体现学生是当天生日？
+
  
 
 

tv/src/Global.js

@@ -435,18 +435,17 @@ fakeNews = function (num, team) {
                 "realHr1": parseInt(Math.random() * 100 + 50),
                 "activePercent": parseInt(Math.random() * 100 + 50),
                 "realHr": parseInt(Math.random() * 100 + 50),
-                // "activePercent":0,
-                // "realHr": 0,
                 "heartRate": parseInt(Math.random() * 100 + 50),
                 "PureCalorieNoVo2": parseInt(Math.random() * 100 + 50),
                 "Name": "测试人",
                 "name": "测试人",
                 "updateTime": 1604568915582,
                 "Ck": (nums + i + 1) * 2.2,
-                "formatCk":parseInt(Math.random() * 100 + 50),
+                "formatCk": parseInt(Math.random() * 100 + 50),
                 "Head": "http://192.168.0.2/gc.png",
                 "GroupNo": i % teamNum + 1,
-                "Sex": i % 2 + 1
+                "Sex": i % 2 + 1,
+                "IsBirthday": 1
             }
         )
     }

tv/src/views/Index.vue

@@ -59,7 +59,7 @@
                         that.curVersion = inf.version;
 
                         //首发版本 '1.1.0' 在线版不需要自动升级
-                        // that.checkUpdate(that.curVersion); //开启自动升级
+                        that.checkUpdate(that.curVersion); //开启自动升级
                     });
 
                     //   获取手机UUID

tv/src/views/Main.vue

@@ -17,8 +17,15 @@
                                     <div class="nameMd">{{ s.Name }}</div>
                                     <div class="namert"></div>
                                 </span>
-                                <img :src="s.Head" alt="" v-if="s.Head">
-                                <img src="../static/img/people/flyhead.png" alt="" v-if="!s.Head">
+                                <div class="head">
+                                    <img :src="s.Head" alt="" v-if="s.Head">
+                                    <img src="../static/img/people/flyhead.png" alt="" v-if="!s.Head">
+                                    <!-- 生日快乐 -->
+                                    <div class="birth" v-if="s.IsBirthday == 1">
+                                        <img src="../assets/img/birth/birthCrow.png" class="birthCrow"/>
+                                        <img src="../assets/img/birth/birthText.png" class="birthText"/>
+                                    </div>
+                                </div>
                             </div>
                             <div class="cla">
                                 <em v-if="s.realHr != 0">{{ s.activePercent |max100 }}</em>
@@ -98,7 +105,7 @@
             return {
                 eqSn: '30:9C:23:0C:8B:1E',
                 pageStyle: RandomBg(),
-                trueDate: true,//真实数据 true false
+                trueDate: false,//真实数据 true false
                 totalTime: 4,
                 times: 1,
                 thisClassName: '',
@@ -119,14 +126,13 @@
                         "UserId": 0,
                         "UserName": "郑伟",
                         "Sex": 1,
-                        // "Head": "http://192.168.0.2/zw.png",
                         "Head": "https://img-operation.csdnimg.cn/csdn/silkroad/img/1604989753379.png",
                         "Cle": 400,
                         "CleTitle": "个人单次卡路里记录",
                         "CleUnit": "千卡",
                         "CkTitle": "个人单次CK记录",
                         "Ck": 99.9,
-                        "CkUnit": "CK值"
+                        "CkUnit": "CK值",
                     }
                 },
                 mainTimer: null,
@@ -152,7 +158,8 @@
             } else {
                 // 彩蛋
                 // this.OpenEgg(this.fakeEgg);
-                let Rs = fakeNews(1);
+                // 1 2 4 6 9
+                let Rs = fakeNews(11);
                 this.giveClassName(Rs);
                 this.students = Rs;
                 // this.mainTimer = setInterval(() => {
@@ -1899,4 +1906,71 @@
     .twentyFour .bottomLi .step img {
         margin-top: 0.16rem;
     }
+
+
+    .birth {
+        position: relative;
+        top: -3.3rem;
+        width: 40%;
+        height: 1px;
+        display: block;
+        margin: 0 auto;
+    }
+
+    .birth img.birthCrow {
+        position: relative;
+        top: -0.1rem;
+        width: 1.2rem;
+        height: 0.7rem;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        border: none;
+    }
+
+    .birth img.birthText {
+        position: relative;
+        top: 1.8rem;
+        width: 1.8rem;
+        height: 0.8rem;
+        overflow: hidden;
+        display: block;
+        margin: 0 auto;
+        border: none;
+    }
+
+    .two .birth img.birthCrow {
+        top: 0.1rem;
+    }
+
+    .three .birth img.birthCrow {
+        top: 0.8rem;
+    }
+    .six .birth {
+        top: -3.1rem;
+    }
+    .six .birth img.birthCrow {
+        width: 0.8rem;
+        height: 0.5rem;
+        top: 1.2rem;
+    }
+    .six .birth img.birthText {
+        top: 2rem;
+        width: 1.5rem;
+        height: 0.6rem;
+    }
+    .nine  .birth {
+        top: -3.1rem;
+    }
+    .nine .birth img.birthCrow {
+        width: 0.8rem;
+        height: 0.5rem;
+        top: 1.6rem;
+    }
+    .nine .birth img.birthText {
+        top: 2.1rem;
+        width: 1.2rem;
+        height: 0.5rem;
+    }
+
 </style>