Merge branch 'master' of git.beswell.com:duanchangpeng/flyLong

hbuild/GoAllOutTv/GoAllOutTv/manifest.json

@@ -3,10 +3,10 @@
     "id" : "H5BB8BEB3", /*应用的标识*/
     "name" : "小飞龙", /*应用名称，程序桌面图标名称*/
     "version" : {
-        "name" : "1.3.5", /*应用版本名称*/
+        "name" : "1.3.15", /*应用版本名称*/
         "code" : 42
     },
-    "description" : "小飞龙TV平台", /*应用描述信息*/
+    "description" : "小飞龙TV平台 户外版outDoor", /*应用描述信息*/
     "icons" : {
         "72" : "icon.png"
     },

tv/src/Global.js

@@ -6,7 +6,11 @@ companyInfo = {
 };
 
 // 当前版本   演示版
-runVersion = 'test';
+// runVersion = 'test';
+// 户外版本
+// runVersion = 'outDoor';
+// normal
+runVersion = 'normal';
 
 // headapi = process.env.NODE_ENV === 'development' ? '/api/' : '../';
 // headapi = 'http://192.168.0.110:8080/';//从郑伟那里获得数据源

tv/src/Mock/index.js

@@ -376,9 +376,14 @@ if (t == 1) {
     Mock.mock('/api/testTable', 'post', testTable());
     Mock.mock('/api/getUserList', 'post', getUserList());
 
-    // let curheadapi = 'http://192.168.0.63:8080/';
-    // let curheadapi = 'http://192.168.0.10:8080/';
-    let curheadapi = 'http://cal.beswell.com:85/DataTransfer/';
+    let curheadapi = 'http://192.168.0.63:8080/';
+
+    if (runVersion == 'test') {
+        curheadapi = 'http://cal.beswell.com:85/DataTransfer/';
+    }
+    if(runVersion == 'outDoor'){
+         curheadapi = 'http://192.168.0.105:9000/';
+    }
 
     // 0: 下课 团课/私教/PK 的排名
     let LessonClass = 1;

tv/src/components/levelIcon.vue

@@ -1,5 +1,5 @@
 <template>
-    <div  :class="[{'levelIconTV':runVersion == 'test'},{'levelIconTest':runVersion != 'test'},{'levelIcon':true}]">
+    <div  :class="[{'levelIconTV':runVersion == 'test'},{'levelIconOutDoor':runVersion != 'test'},{'levelIcon':true}]">
         <ul>
             <li>
           <span class="cube">
@@ -50,7 +50,13 @@
 </template>
 
 <script>
+    import '../Global'
     export default {
+      data(){
+        return {
+          runVersion:runVersion
+        }
+      }
     }
 </script>
 
@@ -62,8 +68,10 @@
       margin: 0 auto;
       height: 5rem;
     }
-    .levelIconTest {
-
+    .levelIconOutDoor {
+      position: absolute;
+      bottom: 0.1rem;
+      padding-bottom: 5px;
     }
     .levelIconTV {
       position: absolute;

tv/src/views/2pkRank.vue

@@ -307,7 +307,6 @@ export default {
       if (runVersion == 'test') {
         return false
       }
-      console.log(dpId, groupNo);
       let that = this;
       let param = {
         dpId: dpId,

tv/src/views/Index.vue

@@ -86,7 +86,8 @@ export default {
             that.getServeIpAddress(e.uuid);
 
             // 公司测试机用公司版本升级
-            if (uuid == "a1f2d679c1624d3a" || uuid == "8e501b0bde9ce600") {
+            // if (uuid == "a1f2d679c1624d3a" || uuid == "8e501b0bde9ce600") {
+            if (uuid == "testuuid" || uuid == "8e501b0bde9ce600") {
               //首发版本 '1.1.0' 在线版不需要自动升级
               // 内测版自动升级
               let url = 'http://192.168.0.3:19096/v1/Sensors/QueryVueFramework';
@@ -181,7 +182,8 @@ export default {
         return false
       }
       // 测试使用0.3心率系统
-      if (eqsn == 'a1f2d679c1624d3a' || eqsn == '30:9C:23:0C:8B:1E') {
+      // if (eqsn == 'a1f2d679c1624d3a' || eqsn == '30:9C:23:0C:8B:1E') {
+      if (eqsn == 'testuuid' || eqsn == '30:9C:23:0C:8B:1E') {
         url = "http://192.168.0.3:19096/v1/Sensors/GetShopConfigParam";
       } else {
         url = 'http://cal.beswell.com:85/v1/Sensors/GetShopConfigParam'

tv/src/views/Main.vue

@@ -596,7 +596,7 @@ ul, li {
 
 .userList {
   width: 100%;
-  /*min-height: 33%;*/
+  /*min-height: 76%;*/
   /*height: 76%;*/
   overflow: hidden;
   overflow-y: scroll;