Просмотр исходного кода

6. 私有标志 有的偏大 不能压到头像上√

Changpeng Duan 5 лет назад
Родитель
Сommit
45afa944c1
5 измененных файлов с 34 добавлено и 27 удалено
  1. 4 4
      tv/src/Mock/index.js
  2. 8 5
      tv/src/views/Main.vue
  3. 11 11
      tv/src/views/pk.vue
  4. 5 5
      tv/src/views/threepk.vue
  5. 6 2
      tv/需求修改和debug.md

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

@@ -380,7 +380,7 @@ if (t == 0) {
     let curheadapi = 'http://192.168.0.63:8080/';
 
     // 0: 下课 团课/私教/PK 的排名
-    let LessonClass = 0;
+    let LessonClass = 3;
     // 1:团课/私教
     // 2:竞技课2PK
     // 3:竞技课threepk
@@ -390,15 +390,15 @@ if (t == 0) {
     if (LessonClass == 1) {
         // 上团课
         Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(1, 1));
-        Mock.mock(curheadapi + 'UserListInfo', 'post', testStudent(26, 1));
+        Mock.mock(curheadapi + 'UserListInfo', 'post', testStudent(22, 1));
     } else if (LessonClass == 2) {
         // 上2队PK课
         Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(1, 2));
-        Mock.mock(curheadapi + 'UserListInfo', 'post', testStudent(6, 2,));
+        Mock.mock(curheadapi + 'UserListInfo', 'post', testStudent(8, 2,1));
     } else if (LessonClass == 3) {
         // 上3队PK课
         Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(1, 3));
-        Mock.mock(curheadapi + 'UserListInfo', 'post', testStudent(6, 3,));
+        Mock.mock(curheadapi + 'UserListInfo', 'post', testStudent(8, 3,1));
     } else if (LessonClass == 0) {
         // 下课
         if (LessonDp == 0) {

+ 8 - 5
tv/src/views/Main.vue

@@ -1920,7 +1920,7 @@
     }
 
     .twentyFour .topLi {
-        height: 1.18rem;
+        height: 1.19rem;
     }
 
     .twentyFour .bottomLi {
@@ -2158,6 +2158,7 @@
 
     .three .isPrivate {
         top: -2.4rem;
+        left: -0.1rem;
     }
 
     .six .isPrivate {
@@ -2171,6 +2172,7 @@
 
     .nine .isPrivate {
         top: -1.4rem;
+        left: -0.1rem;
     }
 
     .nine .isPrivate i {
@@ -2188,16 +2190,17 @@
     }
 
     .twelve .isPrivate {
-        top: -1.2rem;
+        top: -1.15rem;
     }
 
     .twelve .isPrivate i {
-        width: 0.6rem !important;
-        height: 0.6rem !important;
+        width: 0.5rem !important;
+        height: 0.5rem !important;
     }
 
     .sixteen .isPrivate {
         top: -1rem;
+        left: -0.1rem;
     }
 
     .sixteen .isPrivate i {
@@ -2215,7 +2218,7 @@
     }
 
     .twentyFour .isPrivate {
-        top: -0.9rem;
+        top: -0.92rem;
     }
 
     .twentyFour .isPrivate i {

+ 11 - 11
tv/src/views/pk.vue

@@ -1666,7 +1666,7 @@
     .isPrivate {
         position: relative;
         float: right;
-        right: -0.3rem;
+        right: -0.4rem;
         width: 55%;
         height: 1px;
         display: block;
@@ -1679,8 +1679,8 @@
         display: block;
         margin: 0 auto;
         margin-top: 0.2rem;
-        width: 1rem !important;
-        height: 1rem !important;
+        width: 0.8rem !important;
+        height: 0.8rem !important;
         border: none !important;
         background: url("../static/img/privateSign.svg");
         background-size: 100% 100%;
@@ -1692,18 +1692,18 @@
     }
 
     .three .isPrivate {
-        top: -1.4rem;
-        right: -0.1rem;
+        top: -1.45rem;
+        right: -0.15rem;
     }
 
     .three .isPrivate i {
-        width: 0.6rem !important;
-        height: 0.6rem !important;
+        width: 0.5rem !important;
+        height: 0.5rem !important;
     }
 
     .four .isPrivate {
-        top: -1.1rem;
-        right: -0.2rem;
+        top: -1.25rem;
+        right: -0.27rem;
     }
 
     .four .isPrivate i {
@@ -1712,8 +1712,8 @@
     }
 
     .eight .isPrivate {
-        top: -1.1rem;
-        right: -0.2rem;
+        top: -1.25rem;
+        right: -0.22rem;
     }
 
     .eight .isPrivate i {

+ 5 - 5
tv/src/views/threepk.vue

@@ -1861,7 +1861,7 @@
     .isPrivate {
         position: relative;
         float: right;
-        right: -0.3rem;
+        right: -0.35rem;
         width: 55%;
         height: 1px;
         display: block;
@@ -1874,8 +1874,8 @@
         display: block;
         margin: 0 auto;
         margin-top: 0.2rem;
-        width: 1rem !important;
-        height: 1rem !important;
+        width: 0.8rem !important;
+        height: 0.8rem !important;
         border: none !important;
         background: url("../static/img/privateSign.svg");
         background-size: 100% 100%;
@@ -1897,8 +1897,8 @@
     }
 
     .four .isPrivate {
-        top: -1.2rem;
-        right: -0.2rem;
+        top: -1.28rem;
+        right: -0.27rem;
     }
 
     .four .isPrivate i {

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

@@ -141,9 +141,7 @@ TV版本增加当日排名内容√
 修复了临时会员无法在课中修改队伍的bug
 
 
-TODO 7.上课学生分组,改由后台进行第一次分组,每次改队上传后台处理
 
-TODO 欢迎私有心率带同学来上课
 
 私有心率带跟公共心率带颜色不一样
 
@@ -161,7 +159,13 @@ TODO 欢迎私有心率带同学来上课
 
 4.欢迎新同学新样式
 5.等待页面的新式样大屏数字
+6. 私有标志 有的偏大 不能压到头像上√
+
+TODO 翻拍特效
 
+TODO 7.上课学生分组,改由后台进行第一次分组,每次改队上传后台处理
+
+TODO 欢迎私有心率带同学来上课
 *贾雨琦的22749 IsPrivate: 1 === 可能是版本问题