浏览代码

各种小BUG修复

Changpeng Duan 5 年之前
父节点
当前提交
553a753019
共有 3 个文件被更改,包括 34 次插入24 次删除
  1. 3 6
      tv/src/views/Main.vue
  2. 10 6
      tv/src/views/pk.vue
  3. 21 12
      tv/src/views/threepk.vue

+ 3 - 6
tv/src/views/Main.vue

@@ -306,9 +306,8 @@
                     let json = res;
                     if (json.Code == 0) {
                         // 没开课
-                        console.log(json.ClassOn);
                         if (json.ClassOn == 0) {
-                            console.log("xiakele ");
+                            console.log("下课了");
                             // 0: 下课 团课/私教 排名
                             // 1:团课/私教 todo
                             // 2:竞技课2PK
@@ -321,7 +320,6 @@
                                     that.$router.push({path: '/'});
                                     break;
                                 case 2:
-                                    console.log(123);
                                     that.$router.push({path: '/pk'});
                                     break;
                                 case 3:
@@ -426,9 +424,8 @@
                 if (val == 0) {
                     return '0'
                 } else {
-                    return parseFloat(val).toFixed(2);
-                    // return parseInt(val);
-                    // return parseFloat(val).toFixed(3);
+                    // return parseFloat(val).toFixed(2);
+                    return parseInt(val);
                 }
             },
         },

+ 10 - 6
tv/src/views/pk.vue

@@ -38,9 +38,9 @@
                                     </div>
                                 </div>
                                 <div class="urt">
-                                    <em class="fastJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) > 100">{{
+                                    <em class="fastJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) > 120">{{
                                         s.realHr }}</em>
-                                    <em class="slowJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) <= 100">{{
+                                    <em class="slowJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) <= 120">{{
                                         s.realHr }}</em>
                                     <em class="plus" v-if="s.realHr == 0"> --- </em>
                                     <img src="../static/img/heart.svg" class=""/>
@@ -128,9 +128,9 @@
                                     </div>
                                 </div>
                                 <div class="urt">
-                                    <em class="fastJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) > 100">{{
+                                    <em class="fastJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) > 120">{{
                                         s.realHr }}</em>
-                                    <em class="slowJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) <= 100">{{
+                                    <em class="slowJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) <= 120">{{
                                         s.realHr }}</em>
                                     <em class="plus" v-if="s.realHr == 0"> --- </em>
                                     <img src="../static/img/heart.svg" class=""/>
@@ -350,8 +350,12 @@
                 getHello(postdata).then(res => {
                     let json = res;
                     if (json.Code == 0) {
-
-                        that.ReadLessonInfo(json.Dp);
+                        if (!json.Dp) {
+                            // that.$message.error('没有获取到课程信息');
+                            return false
+                        } else {
+                            that.ReadLessonInfo(json.Dp);
+                        }
                         that.UniteBreak(json.Rs);
 
                         // 人口总数

+ 21 - 12
tv/src/views/threepk.vue

@@ -70,13 +70,14 @@
                                 <div class="umd">
                                     <div class="circle">
                                         <img :class="s.sportLevel" :src="s.Head" alt="" v-if="s.Head">
-                                        <img :class="s.sportLevel" src="../static/img/people/flyhead.png" alt="" v-if="!s.Head">
+                                        <img :class="s.sportLevel" src="../static/img/people/flyhead.png" alt=""
+                                             v-if="!s.Head">
                                     </div>
                                 </div>
                                 <div class="urt">
-                                    <em class="fastJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) > 100">{{
+                                    <em class="fastJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) > 120">{{
                                         s.realHr }}</em>
-                                    <em class="slowJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) <= 100">{{
+                                    <em class="slowJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) <= 120">{{
                                         s.realHr }}</em>
                                     <em class="plus" v-if="s.realHr == 0"> --- </em>
                                     <img src="../static/img/heart.svg" class=""/>
@@ -120,13 +121,14 @@
                                 <div class="umd">
                                     <div class="circle">
                                         <img :class="s.sportLevel" :src="s.Head" alt="" v-if="s.Head">
-                                        <img :class="s.sportLevel" src="../static/img/people/flyhead.png" alt="" v-if="!s.Head">
+                                        <img :class="s.sportLevel" src="../static/img/people/flyhead.png" alt=""
+                                             v-if="!s.Head">
                                     </div>
                                 </div>
                                 <div class="urt">
-                                    <em class="fastJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) > 100">{{
+                                    <em class="fastJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) > 120">{{
                                         s.realHr }}</em>
-                                    <em class="slowJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) <= 100">{{
+                                    <em class="slowJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) <= 120">{{
                                         s.realHr }}</em>
                                     <em class="plus" v-if="s.realHr == 0"> --- </em>
                                     <img src="../static/img/heart.svg" class=""/>
@@ -170,13 +172,14 @@
                                 <div class="umd">
                                     <div class="circle">
                                         <img :class="s.sportLevel" :src="s.Head" alt="" v-if="s.Head">
-                                        <img :class="s.sportLevel" src="../static/img/people/flyhead.png" alt="" v-if="!s.Head">
+                                        <img :class="s.sportLevel" src="../static/img/people/flyhead.png" alt=""
+                                             v-if="!s.Head">
                                     </div>
                                 </div>
                                 <div class="urt">
-                                    <em class="fastJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) > 100">{{
+                                    <em class="fastJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) > 120">{{
                                         s.realHr }}</em>
-                                    <em class="slowJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) <= 100">{{
+                                    <em class="slowJump" v-if="s.realHr != 0" v-show="parseInt(s.realHr) <= 120">{{
                                         s.realHr }}</em>
                                     <em class="plus" v-if="s.realHr == 0"> --- </em>
                                     <img src="../static/img/heart.svg" class=""/>
@@ -280,7 +283,7 @@
                     let Dp = json.Dp;
                     that.ReadLessonInfo(Dp);
                     // 载入学生信息
-                    let Rs = fakeNews(14,3);
+                    let Rs = fakeNews(14, 3);
                     that.UniteBreak(Rs);
 
                     // 人口总数
@@ -306,7 +309,7 @@
                         // }, 6000);
 
                     } else {
-                        let Rs = fakeNews(16,3);
+                        let Rs = fakeNews(16, 3);
                         that.UniteBreak(Rs);
 
                     }
@@ -420,7 +423,13 @@
                 getHello(postdata).then(res => {
                     let json = res;
                     if (json.Code == 0) {
-                        that.ReadLessonInfo(json.Dp);
+                        if (!json.Dp) {
+                            // that.$message.error('没有获取到课程信息');
+                            return false
+                        } else {
+                            that.ReadLessonInfo(json.Dp);
+                        }
+
                         that.UniteBreak(json.Rs);
                         // 人口总数
                         that.num = json.Rs.length ? json.Rs.length : 0;