Changpeng Duan hace 5 años
padre
commit
dc408250c9
Se han modificado 4 ficheros con 181 adiciones y 141 borrados
  1. 122 85
      tv/.idea/workspace.xml
  2. 3 3
      tv/src/views/Index.vue
  3. 39 37
      tv/src/views/Main.vue
  4. 17 16
      tv/src/views/Wait.vue

+ 122 - 85
tv/.idea/workspace.xml

@@ -23,19 +23,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="c813a37b-038b-4bb1-a925-c03a432a7638" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/../pc/src/views/bindRecord.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/api/Navs.js" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/api/Navs.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../pc/src/api/getApiRes.js" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/api/getApiRes.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/router/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/router/index.js" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/views/Lesson.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/Lesson.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/views/Main.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/Main.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../pc/src/views/courseEdit.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/courseEdit.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../pc/src/views/courses.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/courses.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/views/finishDetail.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/finishDetail.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../pc/src/views/heartEquip.vue" beforeDir="false" afterPath="$PROJECT_DIR$/../pc/src/views/heartEquip.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/views/Index.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/Index.vue" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/views/Main.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/Main.vue" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/views/Wait.vue" beforeDir="false" afterPath="$PROJECT_DIR$/src/views/Wait.vue" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/vue.config.js" beforeDir="false" afterPath="$PROJECT_DIR$/vue.config.js" afterDir="false" />
     </list>
     <ignored path="$PROJECT_DIR$/.tmp/" />
     <ignored path="$PROJECT_DIR$/temp/" />
@@ -49,12 +43,43 @@
   <component name="FileEditorManager">
     <leaf>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/views/Rank.vue">
+        <entry file="file://$PROJECT_DIR$/vue.config.js">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="190">
-              <caret line="69" column="30" selection-start-line="69" selection-start-column="30" selection-end-line="69" selection-end-column="30" />
+            <state relative-caret-position="378">
+              <caret line="18" column="18" selection-start-line="18" selection-start-column="18" selection-end-line="18" selection-end-column="18" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/api/getApiRes.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="359">
+              <caret line="46" column="39" selection-start-line="46" selection-start-column="25" selection-end-line="46" selection-end-column="39" />
               <folding>
-                <element signature="e#2820#2864#0" expanded="true" />
+                <element signature="e#0#26#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/src/views/Index.vue">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="531">
+              <caret line="63" column="53" selection-start-line="63" selection-start-column="39" selection-end-line="63" selection-end-column="53" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/main.js">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="294">
+              <caret line="14" column="18" selection-start-line="14" selection-start-column="14" selection-end-line="14" selection-end-column="18" />
+              <folding>
+                <element signature="e#0#21#0" expanded="true" />
+                <element signature="e#136#171#0" expanded="true" />
               </folding>
             </state>
           </provider>
@@ -63,8 +88,8 @@
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/views/Main.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="296">
-              <caret line="325" column="41" lean-forward="true" selection-start-line="325" selection-start-column="41" selection-end-line="325" selection-end-column="41" />
+            <state relative-caret-position="485">
+              <caret line="299" column="36" selection-start-line="299" selection-start-column="29" selection-end-line="299" selection-end-column="36" />
               <folding>
                 <element signature="e#5168#5212#0" expanded="true" />
               </folding>
@@ -73,19 +98,22 @@
         </entry>
       </file>
       <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/vue.config.js">
+        <entry file="file://$PROJECT_DIR$/src/views/Rank.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="483">
-              <caret line="23" column="61" lean-forward="true" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
+            <state relative-caret-position="569">
+              <caret line="142" column="28" lean-forward="true" selection-start-line="142" selection-start-column="28" selection-end-line="142" selection-end-column="28" />
+              <folding>
+                <element signature="e#2820#2864#0" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="true">
+      <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/src/views/Wait.vue">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="446">
-              <caret line="330" column="20" selection-start-line="330" selection-start-column="20" selection-end-line="330" selection-end-column="20" />
+            <state relative-caret-position="1052">
+              <caret line="347" column="14" lean-forward="true" selection-start-line="314" selection-start-column="9" selection-end-line="347" selection-end-column="14" />
             </state>
           </provider>
         </entry>
@@ -104,41 +132,42 @@
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>.two</find>
-      <find>students</find>
-      <find>fly</find>
-      <find>heart</find>
-      <find>.urt</find>
-      <find>Sensors</find>
-      <find>QueryVueFramework</find>
-      <find>.urt img</find>
       <find>bottomLi</find>
       <find>.bottomLi img</find>
       <find>bottomLi .step</find>
       <find>.bottomLi span</find>
       <find>two</find>
       <find>getUserListInfo</find>
-      <find>getHello</find>
-      <find>eqsn</find>
       <find>param</find>
       <find>ClassStat</find>
-      <find>getClassStat</find>
       <find>UserListInfo</find>
       <find>pageStyle</find>
       <find>fmt</find>
       <find>then</find>
       <find>fmtFloat</find>
+      <find>ClassDetailQuery</find>
+      <find>rank</find>
       <find>eqSn</find>
+      <find>autoUpdate</find>
+      <find>h</find>
+      <find>eqsn</find>
+      <find>getHello</find>
+      <find>GetgetUserList</find>
+      <find>sta</find>
+      <find>getRecordBreak</find>
+      <find>getClassStat</find>
+      <find>JSON.stringify(e).uuid</find>
       <find>ClassUserRank</find>
       <find>ClassStatQuery</find>
-      <find>ClassDetailQuery</find>
-      <find>rank</find>
       <find>curgetClassStat</find>
+      <find>999</find>
+      <find>OpenEgg</find>
     </findStrings>
     <replaceStrings>
       <replace>0.2rem</replace>
       <replace>parseInt(res.length)</replace>
       <replace>font-family: vista;</replace>
+      <replace>JSON.stringify(e.uuid)</replace>
       <replace>eqSn</replace>
     </replaceStrings>
   </component>
@@ -163,17 +192,17 @@
         <option value="$PROJECT_DIR$/src/App.vue" />
         <option value="$PROJECT_DIR$/src/components/Headside.vue" />
         <option value="$PROJECT_DIR$/src/views/gropePk.vue" />
-        <option value="$PROJECT_DIR$/src/views/Index.vue" />
         <option value="$PROJECT_DIR$/src/api/test.js" />
         <option value="$PROJECT_DIR$/src/Global.js" />
         <option value="$PROJECT_DIR$/src/api/getApiRes.js" />
         <option value="$PROJECT_DIR$/src/router/index.js" />
         <option value="$PROJECT_DIR$/src/views/pk.vue" />
         <option value="$PROJECT_DIR$/src/assets/css/bg.css" />
-        <option value="$PROJECT_DIR$/src/views/Rank.vue" />
-        <option value="$PROJECT_DIR$/src/views/Main.vue" />
         <option value="$PROJECT_DIR$/vue.config.js" />
+        <option value="$PROJECT_DIR$/src/views/Rank.vue" />
         <option value="$PROJECT_DIR$/src/views/Wait.vue" />
+        <option value="$PROJECT_DIR$/src/views/Index.vue" />
+        <option value="$PROJECT_DIR$/src/views/Main.vue" />
       </list>
     </option>
   </component>
@@ -183,7 +212,7 @@
     <other-services-enabled>true</other-services-enabled>
     <auto-save>true</auto-save>
   </component>
-  <component name="ProjectFrameBounds" extendedState="7">
+  <component name="ProjectFrameBounds" extendedState="1">
     <option name="x" value="-2568" />
     <option name="y" value="-8" />
     <option name="width" value="1296" />
@@ -334,7 +363,7 @@
       <workItem from="1605406240238" duration="51039000" />
       <workItem from="1605668164423" duration="15041000" />
       <workItem from="1605747566783" duration="13000" />
-      <workItem from="1605775278675" duration="17943000" />
+      <workItem from="1605775278675" duration="27378000" />
     </task>
     <task id="LOCAL-00001" summary="test web">
       <created>1605431368250</created>
@@ -420,23 +449,30 @@
       <option name="project" value="LOCAL" />
       <updated>1605938984285</updated>
     </task>
-    <option name="localTasksCounter" value="13" />
+    <task id="LOCAL-00013" summary="获取设备的uuid">
+      <created>1605960709780</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1605960709780</updated>
+    </task>
+    <option name="localTasksCounter" value="14" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="248035000" />
+    <option name="totallyTimeSpent" value="257470000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="-2568" y="-8" width="2576" height="1395" extended-state="7" />
+    <frame x="-2568" y="-8" width="1296" height="1395" extended-state="1" />
     <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.14513557" />
+      <window_info content_ui="combo" id="Project" order="0" weight="0.29641694" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.24973656" />
       <window_info id="Favorites" order="2" side_tool="true" weight="0.32982087" />
       <window_info id="npm" order="3" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" weight="0.32687446" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" visible="true" weight="0.31086773" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.31086773" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.21468298" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -507,7 +543,8 @@
     <MESSAGE value="1.原来的排名页面改为等待页面&#10;2.等待页面按照开课类型跳转不同的课程页面&#10;3.团课结束后跳转专属的排名页面&#10;4.排名页面的渲染和1分钟后跳入等待页面" />
     <MESSAGE value="more and more" />
     <MESSAGE value="test" />
-    <option name="LAST_COMMIT_MESSAGE" value="test" />
+    <MESSAGE value="获取设备的uuid" />
+    <option name="LAST_COMMIT_MESSAGE" value="获取设备的uuid" />
   </component>
   <component name="WindowStateProjectService">
     <state x="-1830" y="274" width="1099" height="859" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1604022799787">
@@ -663,17 +700,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/main.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="294">
-          <caret line="14" column="18" selection-start-line="14" selection-start-column="14" selection-end-line="14" selection-end-column="18" />
-          <folding>
-            <element signature="e#0#21#0" expanded="true" />
-            <element signature="e#136#171#0" expanded="true" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/test.html">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="546">
@@ -681,20 +707,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/Index.vue">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="605">
-          <caret line="65" column="90" selection-start-line="65" selection-start-column="90" selection-end-line="65" selection-end-column="90" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/src/Global.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="887">
-          <caret line="390" selection-start-line="390" selection-end-line="390" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/assets/css/main.css">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="-630" />
@@ -727,27 +739,45 @@
     <entry file="file://$PROJECT_DIR$/src/static/img/rank/recordIcon.svg">
       <provider selected="true" editor-type-id="images" />
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/api/getApiRes.js">
+    <entry file="file://$PROJECT_DIR$/src/api/test.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="336">
+          <caret line="357" selection-start-line="357" selection-end-line="359" selection-end-column="5" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/Global.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="2219">
+          <caret line="390" selection-start-line="390" selection-end-line="390" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/main.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="573">
-          <caret line="96" column="29" selection-start-line="96" selection-start-column="16" selection-end-line="96" selection-end-column="29" />
+        <state relative-caret-position="294">
+          <caret line="14" column="18" selection-start-line="14" selection-start-column="14" selection-end-line="14" selection-end-column="18" />
           <folding>
-            <element signature="e#0#26#0" expanded="true" />
+            <element signature="e#0#21#0" expanded="true" />
+            <element signature="e#136#171#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/api/test.js">
+    <entry file="file://$PROJECT_DIR$/src/api/getApiRes.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="336">
-          <caret line="357" selection-start-line="357" selection-end-line="359" selection-end-column="5" />
+        <state relative-caret-position="359">
+          <caret line="46" column="39" selection-start-line="46" selection-start-column="25" selection-end-line="46" selection-end-column="39" />
+          <folding>
+            <element signature="e#0#26#0" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/views/Rank.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="190">
-          <caret line="69" column="30" selection-start-line="69" selection-start-column="30" selection-end-line="69" selection-end-column="30" />
+        <state relative-caret-position="569">
+          <caret line="142" column="28" lean-forward="true" selection-start-line="142" selection-start-column="28" selection-end-line="142" selection-end-column="28" />
           <folding>
             <element signature="e#2820#2864#0" expanded="true" />
           </folding>
@@ -756,25 +786,32 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/vue.config.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="483">
-          <caret line="23" column="61" lean-forward="true" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
+        <state relative-caret-position="378">
+          <caret line="18" column="18" selection-start-line="18" selection-start-column="18" selection-end-line="18" selection-end-column="18" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/src/views/Wait.vue">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1052">
+          <caret line="347" column="14" lean-forward="true" selection-start-line="314" selection-start-column="9" selection-end-line="347" selection-end-column="14" />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/src/views/Main.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="296">
-          <caret line="325" column="41" lean-forward="true" selection-start-line="325" selection-start-column="41" selection-end-line="325" selection-end-column="41" />
+        <state relative-caret-position="485">
+          <caret line="299" column="36" selection-start-line="299" selection-start-column="29" selection-end-line="299" selection-end-column="36" />
           <folding>
             <element signature="e#5168#5212#0" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/views/Wait.vue">
+    <entry file="file://$PROJECT_DIR$/src/views/Index.vue">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="446">
-          <caret line="330" column="20" selection-start-line="330" selection-start-column="20" selection-end-line="330" selection-end-column="20" />
+        <state relative-caret-position="531">
+          <caret line="63" column="53" selection-start-line="63" selection-start-column="39" selection-end-line="63" selection-end-column="53" />
         </state>
       </provider>
     </entry>

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

@@ -45,9 +45,9 @@
             // 获取当前版本号
             getCurVersion() {
                 let that = this;
-                localStorage.eqSn = '30:9C:23:0C:8B:1E';
+                localStorage.eqSn = '30:9C:23:0C:8B:1E';//假的
                 function plusReady() {
-                    // if(typeof plus == 'undefined') return false;
+                    if(typeof plus == 'undefined') return false;
                     // 获取本地应用资源版本号
                     plus.runtime.getProperty(plus.runtime.appid, function (inf) {
                         localStorage.version = inf.version;
@@ -62,7 +62,7 @@
                     plus.device.getInfo({
                         success: function (e) {
                             let uuid = JSON.stringify(e.uuid).toString().substr(1);
-                            uuid = uuid.substring(0,uuid.length-1)
+                            uuid = uuid.substring(0,uuid.length-1);
                             localStorage.eqSn = uuid;
                             console.log('===== uuid =====:'+uuid);
                             // const h = this.$createElement;

+ 39 - 37
tv/src/views/Main.vue

@@ -218,7 +218,7 @@
             if (this.trueDate) {
                 this.timer = setInterval(() => {
                     this.GetgetUserList();
-                    // this.curgetClassStat();
+                    this.curgetClassStat();
                 }, 1000);
 
                 this.timer2 = setInterval(() => {
@@ -301,7 +301,7 @@
                     } else {
                         // 并没有人破记录
                         if (json.Code == 999) return false;
-                        if (json.Code != 999) that.$message.error(json.Memo);
+                        if (json.Code != 999) that.$message.error(json.Memo+'[egg]');
                     }
                 })
             },
@@ -357,47 +357,49 @@
                         // 已下课
                         console.log(json.Code);
                         if (json.Code == '999') {
-                            that.$router.push({path: '/rank'});
+                            // 没人不做处理
+                        //     that.$router.push({path: '/rank'});
                         } else {
-                            // 已出错
+                        //     // 已出错
                             that.$message.error(json.Memo);
                         }
                     }
                 })
             },
-            // curgetClassStat() {
-            //     let that = this;
-            //     let param = {
-            //         token: localStorage.token,
-            //         eqSn: localStorage.eqSn
-            //     };
-            //     let postdata = qs.stringify(param);
-            //     getClassStat(postdata).then(res => {
-            //         let json = res;
-            //         if (json.Code == 0) {
-            //             // 没开课
-            //             if (!json.ClassOn) return false
-            //             // 上课了
-            //             // 1:团课
-            //             // 2:竞技课PK
-            //             // 3:私教课
-            //             switch (parseInt(json.Rs.ClassType)) {
-            //                 case 1:
-            //                     that.$router.push({path: '/'});
-            //                     break;
-            //                 case 2:
-            //                     that.$router.push({path: '/pk'});
-            //                     break;
-            //                 case 3:
-            //                     that.$router.push({path: '/'});
-            //                     break;
-            //             }
-            //
-            //         } else {
-            //             // that.$message.error(json.Memo);
-            //         }
-            //     })
-            // },
+            curgetClassStat() {
+                let that = this;
+                let param = {
+                    token: localStorage.token,
+                    eqSn: localStorage.eqSn
+                };
+                let postdata = qs.stringify(param);
+                getClassStat(postdata).then(res => {
+                    let json = res;
+                    if (json.Code == 0) {
+                        // 没开课
+                        if (json.ClassOn == false) return false;
+                        if  (json.ClassOn){
+                            // 上课了
+                            // 1:团课
+                            // 2:竞技课PK
+                            // 3:私教课
+                            switch (parseInt(json.dp)) {
+                                case 1:
+                                    that.$router.push({path: '/'});
+                                    break;
+                                case 2:
+                                    that.$router.push({path: '/pk'});
+                                    break;
+                                case 3:
+                                    that.$router.push({path: '/'});
+                                    break;
+                            }
+                        }
+                    } else {
+                        // that.$message.error(json.Memo);
+                    }
+                })
+            },
             // 给每一个数据加类名,一次遍历全部赋值
             giveClassName(res) {
                 let that = this;

+ 17 - 16
tv/src/views/Wait.vue

@@ -323,23 +323,24 @@
                     let json = res;
                     if (json.Code == 0) {
                         // 没开课
-                        if (!json.ClassOn) return false
-                        // 上课了
-                        // 1:团课
-                        // 2:竞技课PK
-                        // 3:私教课
-                        switch (parseInt(json.Rs.ClassType)) {
-                            case 1:
-                                that.$router.push({path: '/'});
-                                break;
-                            case 2:
-                                that.$router.push({path: '/pk'});
-                                break;
-                            case 3:
-                                that.$router.push({path: '/'});
-                                break;
+                        if (json.ClassOn == false) return false;
+                        if  (json.ClassOn){
+                            // 上课了
+                            // 1:团课
+                            // 2:竞技课PK
+                            // 3:私教课
+                            switch (parseInt(json.dp)) {
+                                case 1:
+                                    that.$router.push({path: '/'});
+                                    break;
+                                case 2:
+                                    that.$router.push({path: '/pk'});
+                                    break;
+                                case 3:
+                                    that.$router.push({path: '/'});
+                                    break;
+                            }
                         }
-
                     } else {
                         // that.$message.error(json.Memo);
                     }