Home Explore Help
Sign In
CocoRoboLabs
/
pbl-student-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-student-table

zengyicheng 2 years ago
parent
b80a48bab2 b237973d8f
commit
9b99477d1a
11 changed files with 15689 additions and 31 deletions
Unified View Show Diff Stats
  1. 5 1
      dist/index.html
  2. 1 0
      dist/static/css/app.cfae28d010539bfce27999338172e2a2.css
  3. 1 0
      dist/static/css/app.e8937e77f2dc0efc54b873076f55ccc5.css
  4. 0 0
      dist/static/css/app.e8937e77f2dc0efc54b873076f55ccc5.css.map
  5. 0 0
      dist/static/js/app.60bade967e32a943f80e.js
  6. 0 0
      dist/static/js/app.60bade967e32a943f80e.js.map
  7. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  8. 0 0
      dist/static/js/vendor.deec116227fdc82db9e5.js.map
  9. 15656 1
      package-lock.json
  10. 14 23
      src/components/courseDetail.vue
  11. 12 6
      src/components/study.vue

+ 5 - 1
dist/index.html
View File 

@@ -1 +1,5 @@
 
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>pbl-student</title><link href=./static/css/app.cfae28d010539bfce27999338172e2a2.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.deec116227fdc82db9e5.js></script><script type=text/javascript src=./static/js/app.8b0dd6f7ace42d3a7f93.js></script></body></html>
 
+<<<<<<< HEAD
 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>pbl-student</title><link href=./static/css/app.cfae28d010539bfce27999338172e2a2.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.deec116227fdc82db9e5.js></script><script type=text/javascript src=./static/js/app.8b0dd6f7ace42d3a7f93.js></script></body></html>
 
+=======
 
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>pbl-student</title><link href=./static/css/app.e8937e77f2dc0efc54b873076f55ccc5.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.deec116227fdc82db9e5.js></script><script type=text/javascript src=./static/js/app.60bade967e32a943f80e.js></script></body></html>
 
+>>>>>>> b237973d8fbccfe608395ed589bf61653d416f1d

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


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


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


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


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


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


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


File diff suppressed because it is too large
+ 15656 - 1
package-lock.json


+ 14 - 23
src/components/courseDetail.vue
View File 

@@ -14,8 +14,7 @@
 
             <div class="wheel">
 
             <div class="wheel">
 
               <img
 
               <img
 
                 :src="
 
                 :src="
 
-                  this.courseDetail.cover != null &&
 
-                  this.courseDetail.cover != ''
 
+                  this.courseDetail.cover != null && this.courseDetail.cover != ''
 
                     ? JSON.parse(this.courseDetail.cover).length > 0
 
                     ? JSON.parse(this.courseDetail.cover).length > 0
 
                       ? JSON.parse(this.courseDetail.cover)[0].url
 
                       ? JSON.parse(this.courseDetail.cover)[0].url
 
                       : mr
 
                       : mr
 
@@ -35,11 +34,7 @@
 
                 </div>
 
                 </div>
 
               </div>
 
               </div>
 
               <div class="cType">
 
               <div class="cType">
 
-                <div
 
-                  class="all_choose"
 
-                  v-for="(item, index) in courseType"
 
-                  :key="index"
 
-                >
 
+                <div class="all_choose" v-for="(item, index) in courseType" :key="index">
 
                   <span
 
                   <span
 
                     style="
 
                     style="
 
                        {
 
                        {
 
@@ -56,20 +51,13 @@
 
                   >
 
                   >
 
                 </div>
 
                 </div>
 
               </div>
 
               </div>
 
-              <div class="now_study" @click="dialogVisible = true">
 
-                立即学习
 
-              </div>
 
+              <div class="now_study" @click="dialogVisible = true">立即学习</div>
 
             </div>
 
             </div>
 
           </div>
 
           </div>
 
         </div>
 
         </div>
 
         <div class="student_body">
 
         <div class="student_body">
 
           <div
 
           <div
 
-            style="
 
-              width: 20%;
 
-              margin-right: 10px;
 
-              background: #fff;
 
-              padding-right: 10px;
 
-            "
 
+            style="width: 20%; margin-right: 10px; background: #fff; padding-right: 10px"
 
           >
 
           >
 
             <div
 
             <div
 
               class="blue_box_one"
 
               class="blue_box_one"
 
@@ -100,11 +88,7 @@
 
             </div>
 
             </div>
 
             <div class="right" v-if="choose == 0">
 
             <div class="right" v-if="choose == 0">
 
               <div class="nav">
 
               <div class="nav">
 
-                {{
 
-                  courseDetail.brief != null
 
-                    ? courseDetail.brief
 
-                    : "暂无课程简介"
 
-                }}
 
+                {{ courseDetail.brief != null ? courseDetail.brief : "暂无课程简介" }}
 
               </div>
 
               </div>
 
             </div>
 
             </div>
 
             <div class="right_one" v-else>
 
             <div class="right_one" v-else>
 
@@ -457,6 +441,12 @@ export default {
 
 .dialog_change >>> .el-dialog__body {
 
 .dialog_change >>> .el-dialog__body {
 
   background: #f5f5f5;
 
   background: #f5f5f5;
 
 }
 
 }
 
+.blue_box {
 
+  align-items: center;
 
+  display: flex;
 
+  flex-direction: column;
 
+  justify-content: center;
 
+}
 
 .blue_box,
 
 .blue_box,
 
 .blue_box_one {
 
 .blue_box_one {
 
   width: 30%;
 
   width: 30%;
 
@@ -478,14 +468,15 @@ export default {
 
 }
 
 }
 
 .blue_box > div:nth-child(1),
 
 .blue_box > div:nth-child(1),
 
 .blue_box_one > div:nth-child(1) {
 
 .blue_box_one > div:nth-child(1) {
 
-  line-height: 65px;
 
+  /* line-height: 65px; */
 
 }
 
 }
 
 .blue_box_one > div:nth-child(1) {
 
 .blue_box_one > div:nth-child(1) {
 
   margin: 0 5px;
 
   margin: 0 5px;
 
   width: 40%;
 
   width: 40%;
 
 }
 
 }
 
 .blue_box > div:nth-child(2) {
 
 .blue_box > div:nth-child(2) {
 
-  line-height: 0px;
 
+  /* line-height: 0px; */
 
+  margin-top: 10px;
 
 }
 
 }
 
 .blue_box_one > div:nth-child(1) {
 
 .blue_box_one > div:nth-child(1) {
 
   line-height: 65px;
 
   line-height: 65px;

+ 12 - 6
src/components/study.vue
View File 

@@ -1265,10 +1265,12 @@ export default {
 
           this.swichTask(0);
 
           this.swichTask(0);
 
 
 
           this.$nextTick(function () {
 
           this.$nextTick(function () {
 
-            var a =
 
-              document.getElementsByClassName("video-player")[0].offsetHeight;
 
-            document.getElementsByClassName("vedioList")[0].style.height =
 
-              a + "px";
 
+            setTimeout(() => {
 
+              var a =
 
+                document.getElementsByClassName("video-player")[0].offsetHeight;
 
+              document.getElementsByClassName("vedioList")[0].style.height =
 
+                a + "px";
 
+            }, 500);
 
           });
 
           });
 
           // this.addToolsType(0);
 
           // this.addToolsType(0);
 
         })
 
         })
 
@@ -1684,10 +1686,14 @@ export default {
 
     this.getStudentAsk();
 
     this.getStudentAsk();
 
     document.scrollingElement.scrollTop = 0;
 
     document.scrollingElement.scrollTop = 0;
 
 
 
-    window.onresize = function () {
 
+    // window.onresize = function () {
 
+    //   var a = document.getElementsByClassName("video-player")[0].offsetHeight;
 
+    //   document.getElementsByClassName("vedioList")[0].style.height = a + "px";
 
+    // };
 
+    window.addEventListener("resize", () => {
 
       var a = document.getElementsByClassName("video-player")[0].offsetHeight;
 
       var a = document.getElementsByClassName("video-player")[0].offsetHeight;
 
       document.getElementsByClassName("vedioList")[0].style.height = a + "px";
 
       document.getElementsByClassName("vedioList")[0].style.height = a + "px";
 
-    };
 
+    });
 
   },
 
   },
 
 };
 
 };
 
 </script>
 
 </script>

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