现场修改

hbuild/GoAllOutTv/GoAllOutTv/manifest.json

@@ -3,8 +3,8 @@
     "id" : "H5BB8BEB3", /*应用的标识*/
     "name" : "小飞龙", /*应用名称，程序桌面图标名称*/
     "version" : {
-        "name" : "1.0.2", /*应用版本名称*/
-        "code" : 101
+        "name" : "1.1.0", /*应用版本名称*/
+        "code" : 1
     },
     "description" : "小飞龙TV平台", /*应用描述信息*/
     "icons" : {
@@ -131,7 +131,8 @@
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
-                ]
+                ],
+                "targetSdkVersion" : 26
             },
             /*使用Native.js调用原生安卓API需要使用到的系统权限*/
             "orientation" : [ "portrait-primary" ], /*应用支持的方向，portrait-primary：竖屏正方向；portrait-secondary：竖屏反方向；landscape-primary：横屏正方向；landscape-secondary：横屏反方向*/
@@ -167,10 +168,10 @@
                 "android" : {
                     "mdpi" : "", /*普通屏程序图标，分辨率：48x48*/
                     "ldpi" : "", /*大屏程序图标，分辨率：48x48*/
-                    "hdpi" : "D:\\wwwroot\\flyong\\icon/72.png", /*高分屏程序图标，分辨率：72x72*/
-                    "xhdpi" : "D:\\wwwroot\\flyong\\icon/96.png", /*720P高分屏程序图标，分辨率：96x96*/
-                    "xxhdpi" : "D:\\wwwroot\\flyong\\icon/144.png", /*1080P 高分屏程序图标，分辨率：144x144*/
-                    "xxxhdpi" : "D:\\wwwroot\\flyong\\icon/192.png"
+                    "hdpi" : "D:/wwwroot/flyong/icon/1024.png", /*高分屏程序图标，分辨率：72x72*/
+                    "xhdpi" : "D:/wwwroot/flyong/icon/1024.png", /*720P高分屏程序图标，分辨率：96x96*/
+                    "xxhdpi" : "D:/wwwroot/flyong/icon/1024.png", /*1080P 高分屏程序图标，分辨率：144x144*/
+                    "xxxhdpi" : "D:/wwwroot/flyong/icon/1024.png"
                 }
             },
             "splashscreen" : {

tv/src/Global.js

@@ -7,7 +7,7 @@ companyInfo = {
 
 // headapi = process.env.NODE_ENV === 'development' ? '/api/' : '../';
 // headapi = 'http://192.168.0.110:8080/';//从郑伟那里获得数据源
-headapi = 'http://192.168.0.74:8080/';//从郑伟那里获得数据源
+headapi = 'http://192.168.0.10:8080/';//从郑伟那里获得数据源
 
 // 七牛云imgsrc
 imgUrl = "http://qjzpcd34v.hb-bkt.clouddn.com";

tv/src/views/2pkRank.vue

@@ -40,11 +40,11 @@
                                 {{s.Name}}
                             </div>
                             <div class="CLEscore">
-                                <em>cal</em>
+                                <em>Cal</em>
                                 {{s.Cle|fmtInt}}
                             </div>
                             <div class="CKscore">
-                                <em>ck</em>
+                                <em>CK</em>
                                 {{s.Ck|fmtFloat}}
                             </div>
                             <div class="record">
@@ -69,11 +69,11 @@
                                 {{s.Name}}
                             </div>
                             <div class="CLEscore">
-                                <em>cal</em>
+                                <em>Cal</em>
                                 {{s.Cle|fmtInt}}
                             </div>
                             <div class="CKscore">
-                                <em>ck</em>
+                                <em>CK</em>
                                 {{s.Ck|fmtFloat}}
                             </div>
                             <div class="record">
@@ -100,7 +100,7 @@
             return {
                 eqSn: '30:9C:23:0C:8B:1E',
                 pageStyle: RandomBg(),
-                trueDate: false,//真实数据 true false
+                trueDate: true,//真实数据 true false
                 autoJump: true,//开启自动跳走
                 students: {
                     redUnite: [],
@@ -194,10 +194,12 @@
                 });
                 // 排序
                 that.students.redUnite = that.students.redUnite.sort(function (a, b) {
-                    return b.Cle - a.Cle;
+                    // return b.Cle - a.Cle;
+                    return b.Ck - a.Ck;
                 });
                 that.students.blueUnite = that.students.blueUnite.sort(function (a, b) {
-                    return b.Cle - a.Cle;
+                    // return b.Cle - a.Cle;
+                    return b.Ck - a.Ck;
                 });
 
                 that.calcSumCK(that.students);

tv/src/views/3pkRank.vue

@@ -65,11 +65,11 @@
                                 {{s.Name}}
                             </div>
                             <div class="CLEscore">
-                                <em>cal</em>
+                                <em>Cal</em>
                                 {{s.Cle|fmtInt}}
                             </div>
                             <div class="CKscore">
-                                <em>ck</em>
+                                <em>CK</em>
                                 {{s.Ck|fmtFloat}}
                             </div>
                             <div class="record">
@@ -91,11 +91,11 @@
                                 {{s.Name}}
                             </div>
                             <div class="CLEscore">
-                                <em>cal</em>
+                                <em>Cal</em>
                                 {{s.Cle|fmtInt}}
                             </div>
                             <div class="CKscore">
-                                <em>ck</em>
+                                <em>CK</em>
                                 {{s.Ck|fmtFloat}}
                             </div>
                             <div class="record">
@@ -117,11 +117,11 @@
                                 {{s.Name}}
                             </div>
                             <div class="CLEscore">
-                                <em>cal</em>
+                                <em>Cal</em>
                                 {{s.Cle|fmtInt}}
                             </div>
                             <div class="CKscore">
-                                <em>ck</em>
+                                <em>CK</em>
                                 {{s.Ck|fmtFloat}}
                             </div>
                             <div class="record">
@@ -267,13 +267,16 @@
 
                 // 排序
                 that.students.redUnite = that.students.redUnite.sort(function (a, b) {
-                    return b.Cle - a.Cle;
+                    // return b.Cle - a.Cle;
+                    return b.Ck - a.Ck;
                 });
                 that.students.blueUnite = that.students.blueUnite.sort(function (a, b) {
-                    return b.Cle - a.Cle;
+                    // return b.Cle - a.Cle;
+                    return b.Ck - a.Ck;
                 });
                 that.students.yellowUnite = that.students.yellowUnite.sort(function (a, b) {
-                    return b.Cle - a.Cle;
+                    // return b.Cle - a.Cle;
+                    return b.Ck - a.Ck;
                 });
 
                 that.calcSumCK(that.students);

tv/src/views/Wait.vue

@@ -347,7 +347,7 @@
                 let that = this;
                 let param = {
                     eqSn: localStorage.eqSn,
-                    dispNum: 7
+                    dispNum: 8
                 };
                 let postdata = qs.stringify(param);
                 UserRankingQuery(postdata).then(res => {
@@ -707,11 +707,11 @@
         overflow: hidden;
         display: block;
         margin: 0 auto;
-        margin-bottom: 0.24rem;
+        margin-bottom: 0.1rem;
         padding: 0.1rem 4%;
-        background: rgba(0, 0, 0, 0.1);
+        /*background: rgba(0, 0, 0, 0.1);*/
         border-radius: 5px;
-        box-shadow: 0px 0px 6px rgba(255, 255, 255, 0.3);
+        /*box-shadow: 0px 0px 6px rgba(255, 255, 255, 0.3);*/
     }
 
     .rt li img {

tv/src/views/pk.vue

@@ -71,12 +71,12 @@
                 <div class="partInfo">
                         <span class="title rtitle">
                         <img src="../assets/img/pk/redFlag.svg"/>
-                        ck值
+                        CK
                         </span>
 
                     <span class="title btitle">
                         <img src="../assets/img/pk/blueFlag.svg"/>
-                        ck值
+                        CK
                         </span>
                 </div>
                 <div class="cubelist">

tv/src/views/threepk.vue

@@ -38,9 +38,9 @@
                     </div>
                 </div>
                 <div class="teamScore">
-                    <div class="lt">{{redSum}} <em>ck值</em></div>
-                    <div class="md">{{blueSum}} <em>ck值</em></div>
-                    <div class="rt">{{yellowSum}} <em>ck值</em></div>
+                    <div class="lt">{{redSum}} <em>CK</em></div>
+                    <div class="md">{{blueSum}} <em>CK</em></div>
+                    <div class="rt">{{yellowSum}} <em>CK</em></div>
                 </div>
             </div>
             <div class="rt">