duanchangpeng před 5 roky
rodič
revize
1bab8720f9

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 0 - 0
hbuild/GoAllOutTv/GoAllOutTv/index.html


+ 2 - 2
hbuild/GoAllOutTv/GoAllOutTv/manifest.json

@@ -3,8 +3,8 @@
     "id" : "H5BB8BEB3", /*应用的标识*/
     "name" : "小飞龙", /*应用名称,程序桌面图标名称*/
     "version" : {
-        "name" : "1.2.9", /*应用版本名称*/
-        "code" : 9
+        "name" : "1.2.11", /*应用版本名称*/
+        "code" : 11
     },
     "description" : "小飞龙TV平台", /*应用描述信息*/
     "icons" : {

+ 1 - 1
tv/README.md

@@ -110,7 +110,7 @@ https://segmentfault.com/a/1190000021281307
 ========================
 12/17
 
-1. 月、周卡路里总计火焰字体√ *没更新
+1. 月、周卡路里总计火焰字体√ 
 31.TV本地字典,针对不同的EQSN给出本店的转发服务器ip地址(定一下字段名的接口)√ *没更新
 getServeIpAddress
     parame{

+ 3 - 3
tv/src/Global.js

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

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

@@ -226,11 +226,11 @@ let CalorieStatsQuery = function () {
     let Rs = [
         {
             Title: '本<s>周</s>场馆卡路里总消耗',
-            Result: [{'Values': "@integer(7654321, 1)", Unite: '千卡'}],
+            Result: [{'Values': "@integer(888888, 1)", Unite: '千卡'}],
         },
         {
             Title: '本<s>周</s>场馆卡路里总消耗',
-            Result: [{'Values': "@integer(7654321, 1)", Unite: '千卡'}],
+            Result: [{'Values': "@integer(888888, 1)", Unite: '千卡'}],
         }
     ];
     return {
@@ -321,7 +321,7 @@ 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/';
     // 学生列表
     Mock.mock(curheadapi + 'UserListInfo', 'post', testStudent(6, 1));
     // 下课排名
@@ -333,7 +333,7 @@ if (t == 1) {
     // 用户排行榜
     Mock.mock(curheadapi + 'UserRankingQuery', 'post', testStudent(1, 2));
     // 上课状态
-    Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(1, 2));
+    Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(0, 2));
     // 新同学 0 999
     Mock.mock(curheadapi + 'getNewUser', 'post', getNewUser(999));
     // 彩蛋 0 999

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

@@ -72,8 +72,8 @@
         /*flex: 1;*/
     }
     .imgContainer span em img {
-        width: 100%;
-        width: 1.1rem;
+        /*width: 100%;*/
+        width: 1.3rem;
         height: 2rem;
         overflow: hidden;
         display: block;

+ 4 - 3
tv/src/views/Index.vue

@@ -44,7 +44,6 @@
             localStorage.eqSn = '30:9C:23:0C:8B:1E';
             localStorage.version = '1.1.0';
             this.getCurVersion();
-            // test
 
         },
         methods: {
@@ -86,7 +85,8 @@
                             // alert('clientWidth:' + document.documentElement.clientHeight);
                             // alert('devicePixelRatio:' + window.devicePixelRatio);
                             console.log('getDeviceInfo success: ' + JSON.stringify(e.uuid));
-                            // that.getServeIpAddress(e.uuid);
+                            // 正式版打开
+                            that.getServeIpAddress(e.uuid);
                         },
                         fail: function (e) {
                             console.log('getDeviceInfo failed: ' + JSON.stringify(e));
@@ -164,7 +164,7 @@
                 const that = this;
                 let url = 'http://cal.beswell.com:85/v1/Sensors/GetShopConfigParam';
                 // 测试 todo
-                url = "http://192.168.0.3:19096/v1/Sensors/GetShopConfigParam";
+                // url = "http://192.168.0.3:19096/v1/Sensors/GetShopConfigParam";
                 let param = {
                     eqSn : eqsn
                 };
@@ -175,6 +175,7 @@
                         headapi = json.Rs.DataServiceIP;
                     } else {
                         headapi = 'http://192.168.0.10:8080/';
+                        console.log(json.memo);
                         that.$message.error(json.memo);
                     }
                 }, function (response) {

Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů