Bladeren bron

颜色修改

Changpeng Duan 5 jaren geleden
bovenliggende
commit
9efd9da617

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

@@ -358,9 +358,14 @@ if (t == 0) {
 
     let curheadapi = 'http://192.168.0.63:8080/';
 
+    // 0: 下课 团课/私教/PK 的排名
     let LessonClass = 0;
+    // 1:团课/私教
+    // 2:竞技课2PK
+    // 3:竞技课threepk
     let LessonDp = 3;
 
+
     if (LessonClass == 1) {
         // 上团课
         Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(1, 1));
@@ -373,17 +378,18 @@ if (t == 0) {
         // 上3队PK课
         Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(1, 3));
         Mock.mock(curheadapi + 'UserListInfo', 'post', testStudent(6, 3));
-    }else if(LessonClass == 0){
+    } else if (LessonClass == 0) {
         // 下课
-        if(LessonDp == 0){
+        if (LessonDp == 0) {
             Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(0, 0));
         } else if (LessonDp == 1) {
             Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(0, 1));
-        }else if (LessonDp == 2) {
+            Mock.mock(curheadapi + 'ClassUserRank', 'post', testStudent(6, 2));
+        } else if (LessonDp == 2) {
             Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(0, 2));
             // 下课排名
             Mock.mock(curheadapi + 'ClassUserRank', 'post', testStudent(6, 2));
-        }else if (LessonDp == 3) {
+        } else if (LessonDp == 3) {
             Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(0, 3));
             // 下课排名
             Mock.mock(curheadapi + 'ClassUserRank', 'post', testStudent(12, 3));

+ 2 - 2
tv/src/components/levelIcon.vue

@@ -180,8 +180,8 @@
 
     .levelIcon li:nth-child(4) em {
         background: rgba(186, 204, 1, 0.16);
-        border: 1px solid #bacc01;
-        box-shadow: 0px 0px 5px #bacc01;
+        border: 1px solid #DFB200 ;
+        box-shadow: 0px 0px 5px #DFB200 ;
     }
 
     .levelIcon li:nth-child(5) em {

+ 4 - 8
tv/src/static/img/t4.svg

@@ -1,10 +1,6 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="143.398" height="142.929" viewBox="0 0 143.398 142.929">
-  <g id="指标" transform="translate(4.479 -871.214)">
-    <g id="yuan" transform="translate(-166.044 27.55)">
-      <g id="_04" data-name="04" transform="translate(-118.808 687.246)">
-        <path id="路径_38" data-name="路径 38" d="M-15669,1794a68.561,68.561,0,0,1-26.857-5.422,68.776,68.776,0,0,1-21.933-14.787,68.781,68.781,0,0,1-14.788-21.932A68.569,68.569,0,0,1-15738,1725a68.569,68.569,0,0,1,5.422-26.858,68.781,68.781,0,0,1,14.788-21.932,68.776,68.776,0,0,1,21.933-14.787A68.561,68.561,0,0,1-15669,1656a68.564,68.564,0,0,1,26.857,5.422,68.776,68.776,0,0,1,21.933,14.787,68.762,68.762,0,0,1,14.787,21.932A68.553,68.553,0,0,1-15600,1725a68.552,68.552,0,0,1-5.423,26.858,68.762,68.762,0,0,1-14.787,21.932,68.776,68.776,0,0,1-21.933,14.787A68.564,68.564,0,0,1-15669,1794Zm0-118.284a49.341,49.341,0,0,0-49.285,49.285,49.341,49.341,0,0,0,49.285,49.285,49.341,49.341,0,0,0,49.284-49.285A49.341,49.341,0,0,0-15669,1675.714Z" transform="translate(16020.004 -1496.999)" fill="rgba(185,203,1,0.16)"/>
-        <path id="路径_54" data-name="路径 54" d="M-16231,1796h0a69.562,69.562,0,0,1-27.242-5.5,69.742,69.742,0,0,1-22.256-15.006,69.844,69.844,0,0,1-15-22.247A69.589,69.589,0,0,1-16301,1726a70.121,70.121,0,0,1,1.968-16.577l19.421,4.844A49.958,49.958,0,0,0-16281,1726a50.057,50.057,0,0,0,50,50,50.053,50.053,0,0,0,50-50,50.061,50.061,0,0,0-50-50v-20a69.564,69.564,0,0,1,27.246,5.5,69.846,69.846,0,0,1,22.255,15,69.724,69.724,0,0,1,15,22.251,69.584,69.584,0,0,1,5.5,27.25,69.593,69.593,0,0,1-5.5,27.246,69.753,69.753,0,0,1-15,22.247,69.792,69.792,0,0,1-22.255,15.006A69.562,69.562,0,0,1-16231,1796h0Z" transform="translate(16583.004 -1497.998)" fill="#b9cb01"/>
-      </g>
-    </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="140" height="139.999" viewBox="0 0 140 139.999">
+  <g id="_04" data-name="04" transform="translate(-282.002 -158.002)">
+    <path id="路径_38" data-name="路径 38" d="M-15669,1794a68.561,68.561,0,0,1-26.857-5.422,68.776,68.776,0,0,1-21.933-14.787,68.781,68.781,0,0,1-14.788-21.932A68.569,68.569,0,0,1-15738,1725a68.569,68.569,0,0,1,5.422-26.858,68.781,68.781,0,0,1,14.788-21.932,68.776,68.776,0,0,1,21.933-14.787A68.561,68.561,0,0,1-15669,1656a68.564,68.564,0,0,1,26.857,5.422,68.776,68.776,0,0,1,21.933,14.787,68.762,68.762,0,0,1,14.787,21.932A68.553,68.553,0,0,1-15600,1725a68.552,68.552,0,0,1-5.423,26.858,68.762,68.762,0,0,1-14.787,21.932,68.776,68.776,0,0,1-21.933,14.787A68.564,68.564,0,0,1-15669,1794Zm0-118.284a49.341,49.341,0,0,0-49.285,49.285,49.341,49.341,0,0,0,49.285,49.285,49.341,49.341,0,0,0,49.284-49.285A49.341,49.341,0,0,0-15669,1675.714Z" transform="translate(16020.004 -1496.999)" fill="rgba(223,178,0,0.16)"/>
+    <path id="路径_54" data-name="路径 54" d="M-16231,1796h0a69.562,69.562,0,0,1-27.242-5.5,69.742,69.742,0,0,1-22.256-15.006,69.844,69.844,0,0,1-15-22.247A69.589,69.589,0,0,1-16301,1726a70.121,70.121,0,0,1,1.968-16.577l19.421,4.844A49.958,49.958,0,0,0-16281,1726a50.057,50.057,0,0,0,50,50,50.053,50.053,0,0,0,50-50,50.061,50.061,0,0,0-50-50v-20a69.564,69.564,0,0,1,27.246,5.5,69.846,69.846,0,0,1,22.255,15,69.724,69.724,0,0,1,15,22.251,69.584,69.584,0,0,1,5.5,27.25,69.593,69.593,0,0,1-5.5,27.246,69.753,69.753,0,0,1-15,22.247,69.792,69.792,0,0,1-22.255,15.006A69.562,69.562,0,0,1-16231,1796h0Z" transform="translate(16583.004 -1497.998)" fill="#dfb200"/>
   </g>
 </svg>

+ 1 - 2
tv/src/views/3pkRank.vue

@@ -654,7 +654,6 @@
         font-size: 0.35rem;
     }
 
-
     .sumCK em {
         font-size: 0.35rem;
     }
@@ -668,7 +667,7 @@
         position: relative;
         top: -1rem;
         float: right;
-        right: 0;
+        right: -0.3rem;
     }
 
     .flagContainer img {

+ 4 - 2
tv/src/views/Main.vue

@@ -15,7 +15,9 @@
                                         <i class="el-icon-female" v-if="s.Sex == 2"></i>
                                     </div>
                                     <div class="nameMd">{{ s.Name }}</div>
-                                    <div class="namert"></div>
+                                    <div class="namert">
+                                          <!--<img src="../static/img/comm/isPrivate.svg" alt="" v-if="s.isPrivate" style="float: right;margin-right: 0.2rem;margin-top: 0.1rem">-->
+                                    </div>
                                 </span>
                                 <div class="head">
                                     <img :src="s.Head" alt="" v-if="s.Head">
@@ -508,7 +510,7 @@
     }
 
     .yellow .centerLi {
-        background: #B5C700;
+        background: #DFB200 ;
     }
 
     .brown .centerLi {

+ 3 - 1
tv/src/views/pk.vue

@@ -122,7 +122,9 @@
                                     <i class="el-icon-female" v-if="s.Sex == 2"></i>
                                 </div>
                                 <div class="nameMd">{{ s.Name }}</div>
-                                <div class="namert"></div>
+                                <div class="namert">
+                                    <!--<img src="../static/img/comm/isPrivate.svg" alt="" v-if="s.isPrivate" style="float: right;margin-right: 0.2rem;margin-top: 0.1rem">-->
+                                </div>
                             </h5>
                             <div class="user">
                                 <div class="ult">

+ 9 - 3
tv/src/views/threepk.vue

@@ -61,7 +61,9 @@
                                     <i class="el-icon-female" v-if="s.Sex == 2"></i>
                                 </div>
                                 <div class="nameMd">{{ s.Name }}</div>
-                                <div class="namert"></div>
+                                <div class="namert">
+                                    <!--<img src="../static/img/comm/isPrivate.svg" alt="" v-if="s.isPrivate" style="float: right;margin-right: 0.2rem;margin-top: 0.1rem">-->
+                                </div>
                             </h5>
                             <div class="user">
                                 <div class="ult">
@@ -124,7 +126,9 @@
                                     <i class="el-icon-female" v-if="s.Sex == 2"></i>
                                 </div>
                                 <div class="nameMd">{{ s.Name }}</div>
-                                <div class="namert"></div>
+                                <div class="namert">
+                                    <!--<img src="../static/img/comm/isPrivate.svg" alt="" v-if="s.isPrivate" style="float: right;margin-right: 0.2rem;margin-top: 0.1rem">-->
+                                </div>
                             </h5>
                             <div class="user">
                                 <div class="ult">
@@ -187,7 +191,9 @@
                                     <i class="el-icon-female" v-if="s.Sex == 2"></i>
                                 </div>
                                 <div class="nameMd">{{ s.Name }}</div>
-                                <div class="namert"></div>
+                                <div class="namert">
+                                    <!--<img src="../static/img/comm/isPrivate.svg" alt="" v-if="s.isPrivate" style="float: right;margin-right: 0.2rem;margin-top: 0.1rem">-->
+                                </div>
                             </h5>
                             <div class="user">
                                 <div class="ult">

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

@@ -84,7 +84,7 @@ pK颜色更换
 =================================
 
 
-2. 私有心率带角标  
+2. 私有心率带角标  todo
 23.彩蛋和新学生接口可以合并 todo