duanchangpeng 5 лет назад
Родитель
Сommit
919d676615

+ 2 - 0
app/src/page/appoint.vue

@@ -306,9 +306,11 @@ export default {
           that.list = json.Rs;
           that.list = json.Rs;
           if (that.list) {
           if (that.list) {
             // 计算剩余
             // 计算剩余
+            that.num = 0;
             that.list.map(function (item) {
             that.list.map(function (item) {
               item.remain = parseInt(item.OrderToplimit) - parseInt(item.OrderCount);
               item.remain = parseInt(item.OrderToplimit) - parseInt(item.OrderCount);
               that.num = that.num + item.remain
               that.num = that.num + item.remain
+              console.log( that.num);
             })
             })
           }
           }
         } else {
         } else {

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

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

BIN
hbuild/back/H5BB8BEB3.wgt


+ 2 - 2
tv/src/Global.js

@@ -413,10 +413,10 @@ sportLevel = function (val) {
         case per <= 89 && per > 79:
         case per <= 89 && per > 79:
             colorClass = 'brown';
             colorClass = 'brown';
             break;
             break;
-        case per <= 79 && per > 70:
+        case per <= 79 && per > 69:
             colorClass = 'yellow';
             colorClass = 'yellow';
             break;
             break;
-        case per <= 70 && per > 54:
+        case per <= 69 && per > 54:
             colorClass = 'green';
             colorClass = 'green';
             break;
             break;
         case per <= 54 && per > 39:
         case per <= 54 && per > 39:

+ 6 - 5
tv/src/Mock/index.js

@@ -157,8 +157,8 @@ let testStudent = function (num, team, mustbeTeamOne) {
             UserId: 104,
             UserId: 104,
             UserMd5: "55661a861f8fae20dd505b2b4575dc0e",
             UserMd5: "55661a861f8fae20dd505b2b4575dc0e",
             Weight: 50,
             Weight: 50,
-            ActivePercent: "@integer(1, 200)",
-            // ActivePercent: 0,
+            // ActivePercent: "@integer(1, 200)",
+            ActivePercent: 70,
             bmrMSjRmrcb: 66.00000000000001,
             bmrMSjRmrcb: 66.00000000000001,
             FormatCk: "@integer(1, 999)",
             FormatCk: "@integer(1, 999)",
             isAlive: true,
             isAlive: true,
@@ -379,17 +379,18 @@ if (t == 0) {
     let curheadapi = 'http://192.168.0.63:8080/';
     let curheadapi = 'http://192.168.0.63:8080/';
 
 
     // 0: 下课 团课/私教/PK 的排名
     // 0: 下课 团课/私教/PK 的排名
-    let LessonClass = 0;
+    let LessonClass = 3;
+    let LessonDp = LessonClass;
     // 1:团课/私教
     // 1:团课/私教
     // 2:竞技课2PK
     // 2:竞技课2PK
     // 3:竞技课threepk
     // 3:竞技课threepk
-    let LessonDp = 0;
+
 
 
 
 
     if (LessonClass == 1) {
     if (LessonClass == 1) {
         // 上团课
         // 上团课
         Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(1, 1));
         Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(1, 1));
-        Mock.mock(curheadapi + 'UserListInfo', 'post', testStudent(22, 1));
+        Mock.mock(curheadapi + 'UserListInfo', 'post', testStudent(1, 1));
     } else if (LessonClass == 2) {
     } else if (LessonClass == 2) {
         // 上2队PK课
         // 上2队PK课
         Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(1, 2));
         Mock.mock(curheadapi + 'ClassStatQuery', 'post', getClassStat(1, 2));

+ 2 - 2
tv/src/views/Main.vue

@@ -414,10 +414,10 @@
                         case per <= 89 && per > 79:
                         case per <= 89 && per > 79:
                             colorClass = 'brown';
                             colorClass = 'brown';
                             break;
                             break;
-                        case per <= 79 && per > 70:
+                        case per <= 79 && per > 69:
                             colorClass = 'yellow';
                             colorClass = 'yellow';
                             break;
                             break;
-                        case per <= 70 && per > 54:
+                        case per <= 69 && per > 54:
                             colorClass = 'green';
                             colorClass = 'green';
                             break;
                             break;
                         case per <= 54 && per > 39:
                         case per <= 54 && per > 39:

+ 0 - 2
tv/src/views/pk.vue

@@ -1720,6 +1720,4 @@
         width: 0.4rem !important;
         width: 0.4rem !important;
         height: 0.4rem !important;
         height: 0.4rem !important;
     }
     }
-
-
 </style>
 </style>