样式重绘

pc/src/views/Member.vue

@@ -535,7 +535,7 @@
                         this.form.sex = 1;
                         switch (parseInt(Status)) {
                             case  1:
-                                that.$message.error('手机号已存在不能重复添加');
+                                that.$message.error('用户已存在，手机号不能重复添加');
                                 that.addDisabled = true;
                                 break;
                             case  2:

tv/src/Global.js

@@ -431,18 +431,18 @@ fakeNews = function (num, team) {
             {
                 "SvId": 1,
                 "UserId": 1,
-                "Cle": i * 14,
+                "Cle": parseInt(Math.random() * 100 + 50),
                 "realHr1": parseInt(Math.random() * 100 + 50),
-                "realHr": 30,
+                "realHr": parseInt(Math.random() * 100 + 50),
                 "activePercent": parseInt(Math.random() * 100 + 50),
-                "heartRate": 90,
-                "PureCalorieNoVo2": 999,
+                "heartRate": parseInt(Math.random() * 100 + 50),
+                "PureCalorieNoVo2": parseInt(Math.random() * 100 + 50),
                 "Name": "测试人",
                 "name": "测试人",
                 "updateTime": 1604568915582,
-                "Ck": nums + i * 2.2,
+                "Ck": (nums + i + 1) * 2.2,
                 "formatCk":parseInt(Math.random() * 100 + 50),
-                "Head": "http://192.168.0.2/zw.png",
+                "Head": "http://192.168.0.2/gc.png",
                 "GroupNo": i % teamNum + 1
             }
         )

tv/src/components/Headside.vue

@@ -75,10 +75,10 @@
                 // console.log(version)
             },
             qrcode(code) {
-                this.$refs.qrCodeUrl.innerHTML="";
+                this.$refs.qrCodeUrl.innerHTML = "";
                 let qrcode = new QRCode(this.$refs.qrCodeUrl, {
-                    width: 200,
-                    height: 200, // 高度
+                    width: 100,
+                    height: 100, // 高度
                     text: code, // 二维码内容
                     image: '',
                     render: 'canvas',// 设置渲染方式（有两种方式 table和canvas，默认是canvas）
@@ -87,6 +87,7 @@
                 });
             },
             showUuid() {
+                this.eqSn = localStorage.eqSn;
                 this.dialogVisible = true;
                 this.$nextTick(function () {
                     setTimeout(() => {
@@ -176,11 +177,12 @@
     }
 
     #qrcode {
-        width: 1rem;
+        width: 100%;
         overflow: hidden;
         display: block;
         margin: 0 auto;
     }
+
     .eqSnText {
         font-size: 0.4rem;
     }

tv/src/views/2pkRank.vue

@@ -133,12 +133,10 @@
                         }
                     }, 1000)
                 }
-
             } else {
                 let Rs = fakeNews(18,2);
                 that.UniteBreak(Rs);
             }
-
         },
         watch: {
             '$route': function (val) {
@@ -499,7 +497,7 @@
     }
 
     li .CKscore {
-        width: 2rem;
+        /*width: 2rem;*/
         float: left;
         font-size: 0.6rem;
         margin-left: 5%;

tv/src/views/3pkRank.vue

@@ -171,7 +171,7 @@
                 redSum: 0,
                 blueSum: 0,
                 yellowSum: 0,
-                totalTime:60
+                totalTime: 60
             }
         },
         mounted() {
@@ -197,13 +197,14 @@
                     }, 1000)
                 }
             } else {
-                let Rs = fakeNews(18,3);
+                let Rs = fakeNews(27, 3);
                 that.UniteBreak(Rs);
             }
 
         },
         watch: {
             '$route': function (val) {
+                let that = this;
                 if (val.path == '/3pkRank') {
                     if (this.trueDate) {
                         this.getClassUserRank();
@@ -228,7 +229,7 @@
                         }
 
                     } else {
-                        let Rs = fakeNews(18,3);
+                        let Rs = fakeNews(18, 3);
                         that.UniteBreak(Rs);
                     }
 
@@ -306,12 +307,12 @@
             },
             // 结果排序
             getUnitRank(res) {
-                 let that = this;
+                let that = this;
                 let sum = res.sort(function (a, b) {
                     return b.val - a.val;
                 });
                 sum.map(function (item, i) {
-                    eval("that."+item['name']+".rank = i+1");
+                    eval("that." + item['name'] + ".rank = i+1");
                 });
             },
             getClassUserRank() {
@@ -383,6 +384,7 @@
     * {
         font-family: vista;
     }
+
     .pages {
         position: absolute;
         top: 0;
@@ -550,17 +552,17 @@
     }
 
     .mineUniteName {
-        width: 65%;
+        width: 67%;
         overflow: visible;
         display: block;
         margin: 0 auto;
         text-align: left;
-        font-size: 0.4rem;
+        font-size: 0.35rem;
     }
 
 
     .sumCK em {
-        font-size: 0.4rem;
+        font-size: 0.35rem;
     }
 
     .sumCK i {
@@ -639,7 +641,7 @@
     }
 
     li .CKscore {
-        width: 1.6rem;
+        /*width: 1.6rem;*/
         float: left;
         font-size: 0.4rem;
         margin-left: 2%;

tv/src/views/Index.vue

@@ -55,7 +55,7 @@
 
                         //首发版本1.0.1
                         console.log(localStorage.version);
-                        that.checkUpdate(that.curVersion); //开启自动升级
+                        // that.checkUpdate(that.curVersion); //开启自动升级
 
                     });
 
@@ -73,9 +73,10 @@
                             // });
                             // 8e501b0bde9ce600
                             // 打印uuid
-                            alert('getDeviceInfo success: ' + JSON.stringify(e.uuid));
-                            alert('clientWidth:' + document.documentElement.clientWidth);
-                            alert('devicePixelRatio:' + window.devicePixelRatio);
+                            // alert('getDeviceInfo success: ' + JSON.stringify(e.uuid));
+                            // alert('clientWidth:' + document.documentElement.clientWidth);
+                            // alert('clientWidth:' + document.documentElement.clientHeight);
+                            // alert('devicePixelRatio:' + window.devicePixelRatio);
                             console.log('getDeviceInfo success: ' + JSON.stringify(e.uuid));
                         },
                         fail: function (e) {

tv/src/views/Main.vue

@@ -146,7 +146,7 @@
             } else {
                 // 彩蛋
                 // this.OpenEgg(this.fakeEgg);
-                let Rs = fakeNews(21);
+                let Rs = fakeNews(24);
                 this.giveClassName(Rs);
                 this.students = Rs;
                 // this.mainTimer = setInterval(() => {
@@ -247,6 +247,7 @@
                 })
             },
             curgetClassStat() {
+                console.log(123);
                 let that = this;
                 let param = {
                     token: localStorage.token,

tv/src/views/Rank.vue

@@ -97,6 +97,7 @@
                 this.totalTime = 60;
                 let clock = window.setInterval(() => {
                     this.totalTime--;
+                    console.log(this.totalTime);
                     if (parseInt(this.totalTime) < 0) {
                         // 前往等待页面
                         that.$router.push({path: '/'});

tv/src/views/Wait.vue

@@ -131,7 +131,9 @@
             }
         },
         mounted() {
-            // this.$router.push({path: '/2pkRank'});
+            // for test
+            this.$router.push({path: '/3pkRank'});
+
             if (this.trueDate) {
                 this.waitTimer = setInterval(() => {
                     // this.GetgetUserList();
@@ -664,7 +666,7 @@
         text-align: center;
         color: #fff;
         margin: 0;
-        margin-bottom: 0.6rem;
+        margin-bottom: 0.3rem;
         text-indent: 0.2rem;
     }
 

tv/src/views/pk.vue

@@ -228,7 +228,7 @@
                 let Dp = json.Dp;
                 that.ReadLessonInfo(Dp);
                 // 载入学生信息
-                let Rs = fakeNews(16, 2);
+                let Rs = fakeNews(14, 2);
                 that.UniteBreak(Rs);
 
                 // 人口总数
@@ -1040,9 +1040,7 @@
         -webkit-animation-timing-function: ease-in-out; /*动画的速度曲线*/
     }
 
-
     /*two*/
-
     .pk_container li.two {
         width: 90%;
         overflow: hidden;
@@ -1101,6 +1099,10 @@
         height: 0.5rem;
         margin-top: 0.12rem;
     }
+    .two .urt img {
+        width: 0.3rem;
+        height: 0.3rem;
+    }
 
     /*three*/
 
@@ -1210,13 +1212,13 @@
 
     .four .user .ult em div {
         width: 90%;
-        margin-right: 0.05rem;
         font-size: 0.5rem;
         line-height: 1rem;
+        padding-right: 0.2rem;
     }
 
     .four .user .ult s {
-        font-size: 0.1rem;
+        font-size: 0.2rem;
         line-height: 1rem;
     }
 
@@ -1231,8 +1233,8 @@
     }
 
     .four .urt img {
-        width: 0.2rem;
-        height: 0.2rem;
+        width: 0.15rem;
+        height: 0.15rem;
         top: -0.8rem;
     }
 
@@ -1289,13 +1291,14 @@
 
     .eight .user .ult em div {
         width: 90%;
-        margin-right: 0.05rem;
+        margin-right:0rem;
         font-size: 0.5rem;
         line-height: 1rem;
+        padding-right: 0.2rem;
     }
 
     .eight .user .ult s {
-        font-size: 0.1rem;
+        font-size: 0.2rem;
         line-height: 1rem;
     }
 
@@ -1310,8 +1313,8 @@
     }
 
     .eight .urt img {
-        width: 0.2rem;
-        height: 0.2rem;
+        width: 0.15rem;
+        height: 0.15rem;
         top: -0.8rem;
     }
 

tv/src/views/threepk.vue

@@ -262,35 +262,32 @@
                 // }, 6000);
 
             } else {
-                this.PkTimer = setInterval(() => {
-                    // 虚假的数据
-                    let json = {
-                        "Code": "0",
-                        "Memo": "Success",
-                        "Dp": {
-                            "PlanId": 182,
-                            "ShopId": 1,
-                            "SvId": 1,
-                            "PlanName": "齐源大厦浏览器显示2020-12-02日08:40开始的竞技游戏",
-                            "Status": 2,
-                            "BeginTime": "17:15:18",
-                            "EndTime": 0,
-                            "ClassType": 2,
-                            "PkNum": 2
-                        }
-                    };
-                    // 载入课程信息
-                    let Dp = json.Dp;
-                    that.ReadLessonInfo(Dp);
-                    // 载入学生信息
-                    let Rs = fakeNews(14, 3);
-                    that.UniteBreak(Rs);
-
-                    // 人口总数
-                    that.num = Rs ? Rs.length + 1 : 0;
-                    this.ClacClassTime();
-                    // this.calcSumCK(Rs);
-                }, 1000);
+                // 虚假的数据
+                let json = {
+                    "Code": "0",
+                    "Memo": "Success",
+                    "Dp": {
+                        "PlanId": 182,
+                        "ShopId": 1,
+                        "SvId": 1,
+                        "PlanName": "齐源大厦浏览器显示2020-12-02日08:40开始的竞技游戏",
+                        "Status": 2,
+                        "BeginTime": "17:15:18",
+                        "EndTime": 0,
+                        "ClassType": 2,
+                        "PkNum": 2
+                    }
+                };
+                // 载入课程信息
+                let Dp = json.Dp;
+                that.ReadLessonInfo(Dp);
+                // 载入学生信息
+                let Rs = fakeNews(24, 3);
+                that.UniteBreak(Rs);
+
+                // 人口总数
+                that.num = Rs ? Rs.length + 1 : 0;
+                this.ClacClassTime();
             }
         },
         watch: {
@@ -838,19 +835,21 @@
     }
 
     .lessonInfo .teamScore div {
-        width: 20%;
+        width: 25%;
         float: left;
-        text-align: center;
         color: #fff;
         font-size: 0.4rem;
+        text-align: left;
     }
 
     .lessonInfo .teamScore .md {
-        width: 60%;
+        width: 50%;
+        text-align: center;
     }
 
     .lessonInfo .teamScore .rt {
         float: right;
+        text-align: right;
     }
 
     .lessonInfo .teamScore em {
@@ -1391,7 +1390,7 @@
     }
 
     .four .user .ult s {
-        font-size: 0.1rem;
+        font-size: 0.2rem;
         line-height: 1rem;
     }
 
@@ -1406,8 +1405,8 @@
     }
 
     .four .urt img {
-        width: 0.2rem;
-        height: 0.2rem;
+        width: 0.15rem;
+        height: 0.15rem;
         top: -0.8rem;
     }
 
@@ -1471,7 +1470,7 @@
     }
 
     .eight .user .ult s {
-        font-size: 0.1rem;
+        font-size: 0.2rem;
         line-height: 1.3rem;
     }