Browse Source

电量标志 20%低电量,去掉数字 √

Changpeng Duan 5 years ago
parent
commit
1ed2e00015

+ 5 - 5
tv/src/Mock/index.js

@@ -141,8 +141,8 @@ let testStudent = function (num, team, mustbeTeamOne) {
             IsBreaking: 0,
             IsNewUser: 0,
             MaxHr: 80,
-            // PowerPercent: "@integer(1, 100)",
-            PowerPercent: "100",
+            PowerPercent: "@integer(1, 100)",
+            // PowerPercent: "100",
             // Name: "@cname",
             Name: "西门吹雪",
             PkSucessnum: '1',//胜场数
@@ -371,7 +371,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());
@@ -391,11 +391,11 @@ if (t == 0) {
     if (LessonClass == 1) {
         // 上团课
         Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(1, 1));
-        Mock.mock(curheadapi + 'UserListInfo', 'post', testStudent(31, 1));
+        Mock.mock(curheadapi + 'UserListInfo', 'post', testStudent(26, 1));
     } else if (LessonClass == 2) {
         // 上2队PK课
         Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(1, 2));
-        Mock.mock(curheadapi + 'UserListInfo', 'post', testStudent(3, 2,));
+        Mock.mock(curheadapi + 'UserListInfo', 'post', testStudent(6, 2,));
     } else if (LessonClass == 3) {
         // 上3队PK课
         Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(1, 3));

+ 5 - 4
tv/src/components/power.vue

@@ -2,9 +2,10 @@
     <div class="powerContainer" v-if="parseInt(curPower) > 0">
         <img src="../static/img/power/power_full.svg" alt="" v-if="parseInt(curPower) >= 81">
         <img src="../static/img/power/power_half.svg" alt="" v-if="parseInt(curPower) >= 41 && parseInt(curPower) < 81">
-        <img src="../static/img/power/power_low.svg" alt="" v-if="parseInt(curPower) <= 40">
-        <span>{{curPower}}
-        <em>%</em>
+        <img src="../static/img/power/power_low.svg" alt=""  v-if="parseInt(curPower) >= 21 && parseInt(curPower) < 40">
+        <img src="../static/img/power/power_none.svg" alt="" v-if="parseInt(curPower) <= 20">
+        <!--<span>{{curPower}}-->
+        <!--<em>%</em>-->
         </span>
     </div>
 </template>
@@ -21,7 +22,7 @@
         float: right!important;
         color: #fff;
         font-size: 0.23rem;
-        width: 1.2rem!important;
+        width: 0.55rem!important;
         overflow: hidden;
     }
     .powerContainer img {

+ 3 - 3
tv/src/static/img/power/power_full.svg

@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="27" height="18" viewBox="0 0 27 18">
-  <g id="组_176" data-name="组 176" transform="translate(-557 -105)">
-    <path id="路径_15" data-name="路径 15" d="M4.571,7.571V20.429h18V7.571ZM3.286,5H23.857a1.286,1.286,0,0,1,1.286,1.286V21.714A1.286,1.286,0,0,1,23.857,23H3.286A1.286,1.286,0,0,1,2,21.714V6.286A1.286,1.286,0,0,1,3.286,5Zm23.143,5.143H29v7.714H26.429Z" transform="translate(555 100)" fill="#fff"/>
-    <rect id="矩形_118" data-name="矩形 118" width="15" height="10" transform="translate(561 109)" fill="#fff"/>
+  <g id="电量" transform="translate(-554 -108)">
+    <path id="路径_15" data-name="路径 15" d="M4.571,7.571V20.429h18V7.571ZM3.286,5H23.857a1.286,1.286,0,0,1,1.286,1.286V21.714A1.286,1.286,0,0,1,23.857,23H3.286A1.286,1.286,0,0,1,2,21.714V6.286A1.286,1.286,0,0,1,3.286,5Zm23.143,5.143H29v7.714H26.429Z" transform="translate(552 103)" fill="#fff"/>
+    <rect id="矩形_118" data-name="矩形 118" width="15" height="10" transform="translate(558 112)" fill="#fff"/>
   </g>
 </svg>

+ 1 - 1
tv/src/static/img/power/power_half.svg

@@ -1,5 +1,5 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="27" height="18" viewBox="0 0 27 18">
-  <g id="组_177" data-name="组 177" transform="translate(-554 -108)">
+  <g id="电量" transform="translate(-554 -108)">
     <path id="路径_15" data-name="路径 15" d="M4.571,7.571V20.429h18V7.571ZM3.286,5H23.857a1.286,1.286,0,0,1,1.286,1.286V21.714A1.286,1.286,0,0,1,23.857,23H3.286A1.286,1.286,0,0,1,2,21.714V6.286A1.286,1.286,0,0,1,3.286,5Zm23.143,5.143H29v7.714H26.429Z" transform="translate(552 103)" fill="#fff"/>
     <rect id="矩形_118" data-name="矩形 118" width="12" height="10" transform="translate(558 112)" fill="#fff"/>
   </g>

+ 2 - 2
tv/src/static/img/power/power_low.svg

@@ -1,6 +1,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="27" height="18" viewBox="0 0 27 18">
-  <g id="组_178" data-name="组 178" transform="translate(-554 -108)">
+  <g id="电量" transform="translate(-554 -108)">
     <path id="路径_15" data-name="路径 15" d="M4.571,7.571V20.429h18V7.571ZM3.286,5H23.857a1.286,1.286,0,0,1,1.286,1.286V21.714A1.286,1.286,0,0,1,23.857,23H3.286A1.286,1.286,0,0,1,2,21.714V6.286A1.286,1.286,0,0,1,3.286,5Zm23.143,5.143H29v7.714H26.429Z" transform="translate(552 103)" fill="#fff"/>
-    <rect id="矩形_118" data-name="矩形 118" width="6" height="10" transform="translate(558 112)" fill="#fff"/>
+    <rect id="矩形_118" data-name="矩形 118" width="7.5" height="10" transform="translate(558 112)" fill="#fff"/>
   </g>
 </svg>

+ 6 - 0
tv/src/static/img/power/power_none.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="27" height="18" viewBox="0 0 27 18">
+  <g id="电量" transform="translate(-554 -108)">
+    <path id="路径_15" data-name="路径 15" d="M4.571,7.571V20.429h18V7.571ZM3.286,5H23.857a1.286,1.286,0,0,1,1.286,1.286V21.714A1.286,1.286,0,0,1,23.857,23H3.286A1.286,1.286,0,0,1,2,21.714V6.286A1.286,1.286,0,0,1,3.286,5Zm23.143,5.143H29v7.714H26.429Z" transform="translate(552 103)" fill="#fff"/>
+    <rect id="矩形_118" data-name="矩形 118" width="3" height="10" transform="translate(558 112)" fill="#ff0017"/>
+  </g>
+</svg>

+ 1 - 0
tv/src/views/Wait.vue

@@ -610,6 +610,7 @@
     .topOne li {
         width: 33.3%;
         float: left;
+        margin-left: 0.05rem;
     }
 
     .topOne .dgCenter {

+ 2 - 0
tv/需求修改和debug.md

@@ -157,7 +157,9 @@ TODO 欢迎私有心率带同学来上课
 12/25
 1.回档PK模式 √ 
 2.跨店PK 和 跨店 3pk 测试
+电量标志 20%低电量,去掉数字 √ 
 
 *贾雨琦的22749 IsPrivate: 1
 在龙奥店没有标志
 
+