Merge branch 'master' of git.beswell.com:duanchangpeng/flyLong

tv/src/Global.js

@@ -395,6 +395,10 @@ RandomBg = function () {
     let bgClassNum = parseInt(Math.random() * 4) + 1;
     return 'bgStyle' + bgClassNum + '  pages';
 };
+RandomBg2 =function(){
+    let bgClassNum = parseInt(Math.random() * 4) + 1;
+    return 'bg2Style' + bgClassNum + '  pages';
+};
 
 // 运动强度
 sportLevel = function (val) {

tv/src/assets/css/bg.css

@@ -78,6 +78,35 @@
     background-repeat: no-repeat;
 }
 
+/*bg2*/
+.bg2Style1 {
+    background-color: #028fe1;
+    background: url("../../static/img/bg/bg2_1.png");
+    background-size: 100%;
+    background-repeat: no-repeat;
+}
+
+.bg2Style2 {
+    background-color: #028fe1;
+    background: url("../../static/img/bg/bg2_2.png");
+    background-size: 100%;
+    background-repeat: no-repeat;
+}
+
+.bg2Style3 {
+    background-color: #028fe1;
+    background: url("../../static/img/bg/bg2_3.png");
+    background-size: 100%;
+    background-repeat: no-repeat;
+}
+
+.bg2Style4 {
+    background-color: #028fe1;
+    background: url("../../static/img/bg/bg2_4.png");
+    background-size: 100%;
+    background-repeat: no-repeat;
+}
+
 ul, li {
     list-style: none;
     margin: 0;

tv/src/components/sumNumber.vue

@@ -2,16 +2,16 @@
     <div class="sumNumberContainer">
         <div class="imgContainer">
                 <span v-for="n in imgNumber">
-                    <em v-if="n == 0"><img src="../static/img/num/0.png" alt=""></em>
-                    <em v-if="n == 1"><img src="../static/img/num/1.png" alt=""></em>
-                    <em v-if="n == 2"><img src="../static/img/num/2.png" alt=""></em>
-                    <em v-if="n == 3"><img src="../static/img/num/3.png" alt=""></em>
-                    <em v-if="n == 4"><img src="../static/img/num/4.png" alt=""></em>
-                    <em v-if="n == 5"><img src="../static/img/num/5.png" alt=""></em>
-                    <em v-if="n == 6"><img src="../static/img/num/6.png" alt=""></em>
-                    <em v-if="n == 7"><img src="../static/img/num/7.png" alt=""></em>
-                    <em v-if="n == 8"><img src="../static/img/num/8.png" alt=""></em>
-                    <em v-if="n == 9"><img src="../static/img/num/9.png" alt=""></em>
+                    <em v-if="n == 0"><img src="../static/img/num/0.svg" alt=""></em>
+                    <em v-if="n == 1"><img src="../static/img/num/1.svg" alt=""></em>
+                    <em v-if="n == 2"><img src="../static/img/num/2.svg" alt=""></em>
+                    <em v-if="n == 3"><img src="../static/img/num/3.svg" alt=""></em>
+                    <em v-if="n == 4"><img src="../static/img/num/4.svg" alt=""></em>
+                    <em v-if="n == 5"><img src="../static/img/num/5.svg" alt=""></em>
+                    <em v-if="n == 6"><img src="../static/img/num/6.svg" alt=""></em>
+                    <em v-if="n == 7"><img src="../static/img/num/7.svg" alt=""></em>
+                    <em v-if="n == 8"><img src="../static/img/num/8.svg" alt=""></em>
+                    <em v-if="n == 9"><img src="../static/img/num/9.svg" alt=""></em>
                 </span>
         </div>
     </div>

tv/src/views/Wait.vue

@@ -124,7 +124,7 @@
         data() {
             return {
                 eqSn: '30:9C:23:0C:8B:1E',
-                pageStyle: RandomBg(),
+                pageStyle: RandomBg2(),
                 trueDate: true,//真实数据 true false
                 autoplayStatus: false,// false
                 dialogVisible: false,// false
@@ -515,7 +515,7 @@
 
     .rankContainer .sum {
         position: relative;
-        top: 0.4rem;
+        top: 0.8rem;
         width: 100%;
         height: 35%;
         overflow: visible;
@@ -534,7 +534,7 @@
         display: block;
         margin: 0 auto;
         /*background: url("../static/img/pingtai.png") bottom center;*/
-        background: url("../static/img/black.png") bottom center;
+        /*background: url("../static/img/black.png") bottom center;*/
         background-size: 100% 100%;
         background-repeat: no-repeat;
     }

tv/需求修改和debug.md

@@ -159,6 +159,9 @@ TODO 欢迎私有心率带同学来上课
 2.跨店PK 和 跨店 3pk 测试 √
 3.电量标志 20%低电量，去掉数字 √ 
 
+4.欢迎新同学新样式
+5.等待页面的新式样大屏数字
+
 *贾雨琦的22749 IsPrivate: 1 === 可能是版本问题