Browse Source

修改学生端问题

zengyicheng 2 years ago
parent
commit
394fe28b3d

+ 1 - 1
dist/index.html

@@ -1 +1 @@
-<!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.62fbe7e6acb94dc45e35b111cada2e42.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.995154f553bca4df2c50.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.e92e7b68e990138ae87cec3a809fd905.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.0d9baf952d8141436a57.js></script></body></html>

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


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


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


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


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


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


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


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


+ 41 - 8
src/components/courseDetail.vue

@@ -14,7 +14,8 @@
             <div class="wheel">
               <img
                 :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)[0].url
                       : mr
@@ -34,7 +35,11 @@
                 </div>
               </div>
               <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
                     style="
                        {
@@ -51,13 +56,20 @@
                   >
                 </div>
               </div>
-              <div class="now_study" @click="dialogVisible = true">立即学习</div>
+              <div class="now_study" @click="dialogVisible = true">
+                立即学习
+              </div>
             </div>
           </div>
         </div>
         <div class="student_body">
           <div
-            style="width: 20%; margin-right: 10px; background: #fff; padding-right: 10px"
+            style="
+              width: 20%;
+              margin-right: 10px;
+              background: #fff;
+              padding-right: 10px;
+            "
           >
             <div
               class="blue_box_one"
@@ -88,7 +100,11 @@
             </div>
             <div class="right" v-if="choose == 0">
               <div class="nav">
-                {{ courseDetail.brief != null ? courseDetail.brief : "暂无课程简介" }}
+                {{
+                  courseDetail.brief != null
+                    ? courseDetail.brief
+                    : "暂无课程简介"
+                }}
               </div>
             </div>
             <div class="right_one" v-else>
@@ -158,6 +174,7 @@ export default {
       chapInfo: [],
       courseType: [],
       courseTypeJson: {},
+      userinfo: [],
       mr: require("../assets/icon/wheel.png"),
     };
   },
@@ -178,9 +195,13 @@ export default {
       //   return;
       // }
       if (this.courseDetail.userid != suid) {
-        if (JSON.parse(this.courseDetail.course_student).indexOf(suid) == -1) {
-          this.$message.error("你没有该权限");
-          return;
+        if (this.userinfo.type == 2) {
+          if (
+            JSON.parse(this.courseDetail.course_student).indexOf(suid) == -1
+          ) {
+            this.$message.error("你没有该权限");
+            return;
+          }
         }
       }
       let params = {
@@ -259,6 +280,17 @@ export default {
           console.error(err);
         });
     },
+    getUser() {
+      let params = { uid: this.userid };
+      this.ajax
+        .get(this.$store.state.api + "getUser", params)
+        .then((res) => {
+          this.userinfo = res.data[0][0];
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
     // getSName() {
     // 	let params = {
     // 		uid: JSON.stringify(this.courseDetail.course_student),
@@ -275,6 +307,7 @@ export default {
   },
   created() {
     this.getCourseDetail();
+    this.getUser();
     document.scrollingElement.scrollTop = 0;
     // this.getSName();
   },

+ 15 - 4
src/components/study.vue

@@ -181,6 +181,7 @@
                   <div class="navText">
                     <a
                       style="text-decoration: none; color: #000"
+                      target="_Blank"
                       :href="'https://' + lines.url"
                       >{{ lines.url }}</a
                     >
@@ -359,7 +360,16 @@
                   margin: 20px 0 10px 20px;
                 "
               >
-                <div style="display: flex; flex-flow: row wrap">
+                <div
+                  style="
+                    display: flex;
+                    flex-flow: row nowrap;
+                    flex-direction: row;
+                    flex-wrap: wrap;
+                    width: auto;
+                    max-width: 60%;
+                  "
+                >
                   <!-- v-for="(itemTool, indexTool) in toolTypeList"
                   :key="indexTool" -->
                   <div
@@ -433,8 +443,8 @@
                     </div>
                   </div>
                 </div>
-                <div style="padding: 0 0 20px 30px">
-                  <div style="margin: 0 0 20px 0 ;">工具描述</div>
+                <div style="padding: 0 0 20px 30px; width: 30%">
+                  <div style="margin: 0 0 20px 0">工具描述</div>
                   <div>
                     {{ tool.toolDetail != "" ? tool.toolDetail : "暂无描述" }}
                   </div>
@@ -2467,7 +2477,8 @@ export default {
 }
 .addPoint > div > img {
   cursor: pointer;
-  margin: 0 20px;
+  margin: 0 10px;
+  width: 85px;
 }
 .addPoint {
   display: flex;

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