页面微调

v2tv/src/Mock/index.js

@@ -120,7 +120,7 @@ let getUserList = function () {
 let testStudent = function (num, team, mustbeTeamOne) {
     let item = [];
     let group = team == 2 ? "@integer(1, 2)" : "@integer(1, 3)";
-    group = 1;
+    // group = 2;
     if (mustbeTeamOne) {
         group = mustbeTeamOne;
     }
@@ -412,14 +412,14 @@ if (t == 1) {
         // 上团课
         Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(1, 1));
         Mock.mock(Mockapi + 'ClassStatQuery', 'post', getClassStat(1, 1));
-        Mock.mock(curheadapi + 'UserListInfo', 'post', testStudent(1, 1));//true
-        Mock.mock(Mockapi + 'UserListInfo', 'post', testStudent(1, 1)); //
+        Mock.mock(curheadapi + 'UserListInfo', 'post', testStudent(30, 1));//true
+        Mock.mock(Mockapi + 'UserListInfo', 'post', testStudent(30, 1)); //
     } else if (LessonClass == 2) {
         // 上2队PK课
         Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(1, 2));
         Mock.mock(Mockapi + 'ClassStatQuery', 'post', getClassStat(1, 2));
-        Mock.mock(curheadapi + 'UserListInfo', 'post', testStudent(1, 1,));
-        Mock.mock(Mockapi + 'UserListInfo', 'post', testStudent(8, 1,));
+        Mock.mock(curheadapi + 'UserListInfo', 'post', testStudent(16, 1,));
+        Mock.mock(Mockapi + 'UserListInfo', 'post', testStudent(16, 1,));
     } else if (LessonClass == 3) {
         // 上3队PK课
         Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(1, 3));

v2tv/src/assets/imgs/pk/icons.svg

@@ -0,0 +1,85 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="608" height="33"
+     viewBox="0 0 608 33">
+    <defs>
+        <linearGradient id="linear-gradient" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox">
+            <stop offset="0" stop-color="#007ec7"/>
+            <stop offset="0.478" stop-color="#007dc6"/>
+            <stop offset="1" stop-color="#4cbbfc"/>
+        </linearGradient>
+        <linearGradient id="linear-gradient-2" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox">
+            <stop offset="0" stop-color="#3500ac"/>
+            <stop offset="0.478" stop-color="#4300ad"/>
+            <stop offset="1" stop-color="#7766f8"/>
+        </linearGradient>
+        <linearGradient id="linear-gradient-3" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox">
+            <stop offset="0" stop-color="#0ab105"/>
+            <stop offset="0.389" stop-color="#0ab105"/>
+            <stop offset="1" stop-color="#37e06b"/>
+        </linearGradient>
+        <linearGradient id="linear-gradient-4" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox">
+            <stop offset="0" stop-color="#ffb308"/>
+            <stop offset="0.478" stop-color="#f5c600"/>
+            <stop offset="1" stop-color="#ffe61f"/>
+        </linearGradient>
+        <linearGradient id="linear-gradient-5" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox">
+            <stop offset="0" stop-color="#ff6200"/>
+            <stop offset="0.478" stop-color="#ff6200"/>
+            <stop offset="1" stop-color="#ff9d2b"/>
+        </linearGradient>
+        <linearGradient id="linear-gradient-6" x1="0.5" x2="0.5" y2="1" gradientUnits="objectBoundingBox">
+            <stop offset="0" stop-color="#d11122"/>
+            <stop offset="0.478" stop-color="#d11122"/>
+            <stop offset="1" stop-color="#ff3445"/>
+        </linearGradient>
+    </defs>
+    <g id="组_737" data-name="组 737" transform="translate(-397 -1016)">
+        <g id="组_731" data-name="组 731">
+            <rect id="矩形_122" data-name="矩形 122" width="84" height="33" rx="16.5" transform="translate(397 1016)"
+                  fill="url(#linear-gradient)"/>
+            <text id="激活放松" transform="translate(439 1038)" fill="#fff" font-size="14"
+                  font-family="PingFangSC-Regular, PingFang SC">
+                <tspan x="-28" y="0">激活放松</tspan>
+            </text>
+        </g>
+        <g id="组_732" data-name="组 732" transform="translate(105)">
+            <rect id="矩形_122-2" data-name="矩形 122" width="84" height="33" rx="16.5" transform="translate(397 1016)"
+                  fill="url(#linear-gradient-2)"/>
+            <text id="动态热身" transform="translate(439 1038)" fill="#fff" font-size="14"
+                  font-family="PingFangSC-Regular, PingFang SC">
+                <tspan x="-28" y="0">动态热身</tspan>
+            </text>
+        </g>
+        <g id="组_733" data-name="组 733" transform="translate(210)">
+            <rect id="矩形_122-3" data-name="矩形 122" width="84" height="33" rx="16.5" transform="translate(397 1016)"
+                  fill="url(#linear-gradient-3)"/>
+            <text id="脂肪燃烧" transform="translate(439 1038)" fill="#fff" font-size="14"
+                  font-family="PingFangSC-Regular, PingFang SC">
+                <tspan x="-28" y="0">脂肪燃烧</tspan>
+            </text>
+        </g>
+        <g id="组_734" data-name="组 734" transform="translate(314)">
+            <rect id="矩形_122-4" data-name="矩形 122" width="84" height="33" rx="16.5" transform="translate(397 1016)"
+                  fill="url(#linear-gradient-4)"/>
+            <text id="糖分消耗" transform="translate(439 1038)" fill="#fff" font-size="14"
+                  font-family="PingFangSC-Regular, PingFang SC">
+                <tspan x="-28" y="0">糖分消耗</tspan>
+            </text>
+        </g>
+        <g id="组_735" data-name="组 735" transform="translate(419)">
+            <rect id="矩形_122-5" data-name="矩形 122" width="84" height="33" rx="16.5" transform="translate(397 1016)"
+                  fill="url(#linear-gradient-5)"/>
+            <text id="心肺训练" transform="translate(439 1038)" fill="#fff" font-size="14"
+                  font-family="PingFangSC-Regular, PingFang SC">
+                <tspan x="-28" y="0">心肺训练</tspan>
+            </text>
+        </g>
+        <g id="组_736" data-name="组 736" transform="translate(524)">
+            <rect id="矩形_122-6" data-name="矩形 122" width="84" height="33" rx="16.5" transform="translate(397 1016)"
+                  fill="url(#linear-gradient-6)"/>
+            <text id="峰值锻炼" transform="translate(439 1038)" fill="#fff" font-size="14"
+                  font-family="PingFangSC-Regular, PingFang SC">
+                <tspan x="-28" y="0">峰值锻炼</tspan>
+            </text>
+        </g>
+    </g>
+</svg>

v2tv/src/components/pkstudent.vue

@@ -817,7 +817,6 @@ ul {
       font-size: 0.2rem;
     }
   }
-
   /deep/ .powerContainer img {
     width: 0.25rem;
   }

v2tv/src/views/Main.vue

@@ -380,4 +380,10 @@ export default {
   overflow-y: scroll;
 }
 
+/*响应式调整*/
+@media(min-width: 320px) and (max-width: 1025px) {
+  .userList {
+    max-height: inherit;
+  }
+}
 </style>

v2tv/src/views/Rank.vue

@@ -333,7 +333,6 @@ export default {
       background-position: top center;
       background-size: 100% 100%;
       line-height: 0.7rem;
-
       span {
         @include cube;
         position: relative;
@@ -360,7 +359,6 @@ export default {
   .rt {
     width: 47%;
     float: right;
-
     .ltTitle span {
       margin-right: 0.3rem;
     }

v2tv/src/views/Wait.vue

@@ -231,7 +231,7 @@ export default {
   },
   mounted() {
     // test
-    // this.$router.push({path: '/rank'});
+    this.$router.push({path: '/pk'});
 
     this.init();
     this.grpcServe();

v2tv/src/views/pk.vue

@@ -47,7 +47,7 @@
       </div>
     </div>
     <div class="icons">
-      <img src="../assets/imgs/pk/icons.png" alt="">
+      <img src="../assets/imgs/pk/icons.svg" alt="">
     </div>
     <!--    突破纪录-->
     <newRecord :toper-info="toperInfo"></newRecord>
@@ -308,7 +308,10 @@ export default {
       } else {
         // 限制最大
         that.Redflag = parseInt((redFmtSum / sumMax) * 100) > 100 ? 100 : parseInt((redFmtSum / sumMax) * 100);
-        that.RedProgress = that.Redflag + 18
+        that.RedProgress = that.Redflag + 18;
+        if (that.RedProgress > 90) {
+          that.RedProgress = 90
+        }
       }
 
       if (blueFmtSum == 0) {
@@ -317,7 +320,10 @@ export default {
       } else {
         // 限制最大
         that.BlueFlag = parseInt((blueFmtSum / sumMax) * 100) > 100 ? 100 : parseInt((blueFmtSum / sumMax) * 100);
-        that.BlueProgress = that.BlueFlag + 18
+        that.BlueProgress = that.BlueFlag + 18;
+        if (that.BlueProgress > 90) {
+          that.BlueProgress = 90
+        }
       }
 
     },
@@ -615,6 +621,9 @@ export default {
       width: 4rem;
       float: left;
       background: linear-gradient(to left, #4cbbfc 0%, rgba(0, 125, 198, 0.17) 100%);
+      position: relative;
+      top: 0.0rem;
+      height: 0.485rem !important;
     }
 
     em {
@@ -631,7 +640,7 @@ export default {
   }
 
   span {
-    height: 0.5rem;
+    height: 0.48rem;
   }
 }
 
@@ -699,4 +708,18 @@ export default {
     width: 40%;
   }
 }
+
+/*响应式调整*/
+@media(min-width: 320px) and (max-width: 1025px) {
+  .progressContainer {
+    margin-top: 0.9rem;
+  }
+  .userPart {
+    height: 10rem;
+    overflow-y: scroll;
+  }
+  /deep/ .twentyFive .names {
+    bottom: 0.4rem !important;
+  }
+}
 </style>

v2tv/src/views/threepk.vue

@@ -59,7 +59,7 @@
       </div>
     </div>
     <div class="icons">
-      <img src="../assets/imgs/pk/icons.png" alt="">
+      <img src="../assets/imgs/pk/icons.svg" alt="">
     </div>
     <!--    突破纪录-->
     <newRecord :toper-info="toperInfo"></newRecord>
@@ -801,4 +801,18 @@ export default {
     width: 40%;
   }
 }
+
+/*响应式调整*/
+@media(min-width: 320px) and (max-width: 1025px) {
+  .progressContainer {
+    margin-top: 0.9rem;
+  }
+  .userPart {
+    height: 10rem;
+    overflow-y: scroll;
+  }
+  /deep/ .twentyFive .names {
+    bottom: 0.4rem !important;
+  }
+}
 </style>