SanHQin 1 天之前
父節點
當前提交
bd0cb2a9c9

+ 1 - 1
dist/index.html

@@ -27,7 +27,7 @@
     html,
     body{
       font-family: '黑体';
-    }</style><link href=./static/css/app.2b87253ffb836e3dd1bd39d8cca78fb9.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.b2299056e030e9dd4cb8.js></script><script type=text/javascript src=./static/js/app.3f12f5dc33edb5c47bc5.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.2c2e5dc1e758c038dcaee7a4018ba4ad.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.b2299056e030e9dd4cb8.js></script><script type=text/javascript src=./static/js/app.e613ab6d2e2f77f4fd9c.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.2c2e5dc1e758c038dcaee7a4018ba4ad.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.2c2e5dc1e758c038dcaee7a4018ba4ad.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.e613ab6d2e2f77f4fd9c.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.e613ab6d2e2f77f4fd9c.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 44 - 4
src/components/courseDetail.vue

@@ -269,7 +269,7 @@
               <div
                 class="courseItem"
                 v-if="courseDetail.state==7"
-                @click="goToStudyOrDia(classList)"
+                @click="goToStudyRate('')"
               >
                 <div class="jdAndTask">
                   <div>进入课程</div>
@@ -1581,7 +1581,7 @@ export default {
       //     }
       //   }
       // }
-      if (this.isFollow == 2 && this.tType == 2 && this.followC != i) {
+      if (this.isFollow == 2 && this.tType == 2 && this.followC != i && this.courseDetail.state != 7) {
         return;
       }
       let params = {
@@ -1669,7 +1669,27 @@ export default {
                   "&screenType=" +
                   this.screenType
               );
-            }
+            }else if (this.courseDetail.state == 7) {
+              this.goTo(
+                "/pptEasyClass?type=" +
+                  this.checkStage +
+                  "&courseId=" +
+                  this.id +
+                  "&userid=" +
+                  this.userid +
+                  "&oid=" +
+                  this.oid +
+                  "&org=" +
+                  this.org +
+                  "&cid=" +
+                  this.classId +
+                  "&tType=" +
+                  this.tType +
+                  "&screenType=" +
+                  this.screenType
+              );
+            // this.gotoCourse(this.classId);
+          }
           } else if (this.tType == 2) {
             // this.goTo(
             //   "/studyStudent?type=" +
@@ -1766,7 +1786,27 @@ export default {
                   "&screenType=" +
                   this.screenType
               );
-            }
+            }else if (this.courseDetail.state == 7) {
+              this.goTo(
+            "/pptEasyClass?type=" +
+              this.checkStage +
+              "&courseId=" +
+              this.id +
+              "&userid=" +
+              this.userid +
+              "&oid=" +
+              this.oid +
+              "&org=" +
+              this.org +
+              "&cid=" +
+              this.classId +
+              "&tType=" +
+              this.tType +
+              "&screenType=" +
+              this.screenType
+          );
+            // this.gotoCourse(this.classId);
+          }
             // this.gotoCourse(this.classId);
           } else {
             this.goTo(

+ 35 - 2
src/components/pptEasyClass/index.vue

@@ -6,6 +6,10 @@
           <div class="pec_h_l_title">
             <span>{{ courseDetail.title }}</span>
           </div>
+
+          <div v-if="tcid && inviteCode" class="inviteBox" style="margin-left: 20px;">
+              <span>随机码:{{ inviteCode }}</span>
+            </div>
         </div>
 
         <div class="pec_h_right">
@@ -45,7 +49,7 @@
       </div>
 
       <div class="pec_content">
-        <iframe :src="iframeSrc" v-if="showIframe" style="width: 100%; height: 100%; border: none"></iframe>
+        <iframe allow="camera *; microphone *;display-capture;midi;encrypted-media;clipboard-write;clipboard-read" webkitallowfullscreen="" mozallowfullscreen="" allowfullscreen="" frameborder="no" border="0" :src="iframeSrc" v-if="showIframe" style="width: 100%; height: 100%; border: none"></iframe>
       </div>
     </div>
   </div>
@@ -69,7 +73,8 @@ export default {
       showIframe: false,
       iframeSrc: "",
       courseDetail: {},
-      pageLoading: false
+      pageLoading: false,
+      inviteCode:"",
     };
   },
   methods: {
@@ -95,6 +100,26 @@ export default {
             this.courseDetail.juri ? this.courseDetail.juri.split(",") : [],
             this.tcid2 ? this.tcid2.split(",") : []
           )[0] || "";
+          if (this.tcid && res.data[1].length) {
+            let _inviteA = [];
+            for (var ik = 0; ik < res.data[1].length; ik++) {
+              _inviteA.push({
+                cid: res.data[1][ik].classid,
+                ic: res.data[1][ik].code,
+              });
+            }
+            for (var ik = 0; ik < _inviteA.length; ik++) {
+              if (
+                this.arrayToArray(
+                  _inviteA[ik].cid.split(","),
+                  this.tcid.split(",")
+                ).length
+              ) {
+                this.inviteCode = _inviteA[ik].ic;
+                break;
+              }
+            }
+          }
           this.setPptIframe()
           this.pageLoading = false;
         })
@@ -229,4 +254,12 @@ export default {
   border-radius: 0 0 12px 12px;
   background-color: #fff;
 }
+
+
+.inviteBox {
+  font-size: 14px;
+  /* margin-top: 5px; */
+  color: #00000099;
+  text-align: center;
+}
 </style>

Some files were not shown because too many files changed in this diff