Browse Source

Merge branch 'beta'

SanHQin 2 months ago
parent
commit
1bf1004d0b

+ 1 - 1
dist/index.html

@@ -27,7 +27,7 @@
     html,
     body{
       font-family: '黑体';
-    }</style><link href=./static/css/app.5c8287bd5f9eb9bfaf4055221e188c9a.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.72910c94d86799188299.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.40f8d521288aeb80faad8093cd7ec1fb.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.6b6ed9f9f3e1d8ffcd79.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.40f8d521288aeb80faad8093cd7ec1fb.css


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


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


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


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


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


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


+ 1 - 1
src/components/dialog/addClassDialog.vue

@@ -180,7 +180,7 @@
           this.courseDetail.userid == this.$route.query.userid &&
           this.checkboxList2.length &&
           this.$route.query.org == '16ace517-b5c7-4168-a9bb-a9e0035df840' &&
-          this.courseDetail.type == '7'
+          this.courseDetail.state == '7'
         ) {
 
           // 获取endTime为现在

+ 2 - 2
src/components/easy2/studyStudent.vue

@@ -106,7 +106,7 @@
             style="padding: 0 0 8px 0"
           >
             <div>
-              <span>随机码:{{ inviteCode }}</span>
+              <span>识别码:{{ inviteCode }}</span>
             </div>
           </div>
         </div>
@@ -31236,7 +31236,7 @@ div::-webkit-scrollbar {
     white-space: normal !important;
     display: inline !important;
 }
-.notop >>> .vjs_video_3-dimensions.vjs-fluid{
+.notop >>> .vjs-fluid{
   padding-top: 0 !important;
 }
 </style>

+ 2 - 2
src/components/easy3/studyStudent.vue

@@ -103,7 +103,7 @@
             style="padding: 0 0 8px 0"
           >
             <div>
-              <span>随机码:{{ inviteCode }}</span>
+              <span>识别码:{{ inviteCode }}</span>
             </div>
           </div>
         </div>
@@ -26491,7 +26491,7 @@ div::-webkit-scrollbar {
     white-space: normal !important;
     display: inline !important;
 }
-.notop >>> .vjs_video_3-dimensions.vjs-fluid{
+.notop >>> .vjs-fluid{
   padding-top: 0 !important;
 }
 </style>

+ 2 - 2
src/components/studyStudent.vue

@@ -75,7 +75,7 @@
             style="padding: 0 0 8px 0"
           >
             <div>
-              <span>随机码:{{ inviteCode }}</span>
+              <span>识别码:{{ inviteCode }}</span>
             </div>
           </div>
         </div>
@@ -26444,7 +26444,7 @@ div::-webkit-scrollbar {
     white-space: normal !important;
     display: inline !important;
 }
-.notop >>> .vjs_video_3-dimensions.vjs-fluid{
+.notop >>> .vjs-fluid{
   padding-top: 0 !important;
 }
 </style>

+ 2 - 2
src/components/studySutdentClass/studyStudent.vue

@@ -103,7 +103,7 @@
             style="padding: 0 0 8px 0"
           >
             <div>
-              <span>随机码:{{ inviteCode }}</span>
+              <span>识别码:{{ inviteCode }}</span>
             </div>
           </div>
         </div>
@@ -30554,7 +30554,7 @@ div::-webkit-scrollbar {
     white-space: normal !important;
     display: inline !important;
 }
-.notop >>> .vjs_video_3-dimensions.vjs-fluid{
+.notop >>> .vjs-fluid{
   padding-top: 0 !important;
 }
 </style>

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