浏览代码

修改存在bug

秦鹏 3 年之前
父节点
当前提交
de77d84925

+ 3 - 3
src/components/payment/Confirmorder.vue

@@ -12,9 +12,9 @@
         <p class="p1">
           {{ data.name }}
         </p>
-        <!-- <p class="p2">
-          <span>xx课程</span>
-        </p> -->
+        <p class="p2">
+          <span>教研课程</span>
+        </p>
         <p class="p3">
           <span v-for="(item, i) in data.teacher" :key="i + item">
             {{ item }}{{ i == data.teacher.length - 1 ? "" : "," }}

+ 5 - 5
src/components/payment/Payment.vue

@@ -12,9 +12,9 @@
         <p class="p1">
           {{ data.name }}
         </p>
-        <!-- <p class="p2">
-          <span>xx课程</span>
-        </p> -->
+        <p class="p2">
+          <span>教研课程</span>
+        </p>
         <p class="p3">
           <span v-for="(item, i) in data.teacher" :key="i + item">
             {{ item }}{{ i == data.teacher.length - 1 ? "" : "," }}
@@ -384,8 +384,8 @@ export default {
 }
 </style>
 <style lang="scss">
-.tarcer-dev-Previrw{
-  .el-dialog__body{
+.tarcer-dev-Previrw {
+  .el-dialog__body {
     padding: 30px 32px;
   }
 }

+ 3 - 3
src/components/teacher-dev/Textbook.vue

@@ -109,8 +109,7 @@ export default {
       }
     },
   },
-  created(){
-  }
+  created() {},
 };
 </script>
 
@@ -164,7 +163,6 @@ export default {
       margin-right: 20px;
       transition: all 1s;
       cursor: pointer;
-      margin-bottom: 32px;
       .one_name {
         height: 48px;
         margin-top: 16px;
@@ -184,6 +182,8 @@ export default {
         font-weight: bold;
         color: #2c2c2c;
         font-size: 24px;
+        margin-bottom: 32px;
+
         .price_2 {
           font-size: 16px;
         }

+ 4 - 1
src/router/index.js

@@ -45,7 +45,8 @@ const routes = [{
     {
         path: '/',
         name: 'Index',
-        component: Index
+        component: Index,
+        meta: { title: '', keepAlive: true },
     },
     {
         path: '/login',
@@ -62,12 +63,14 @@ const routes = [{
     {
         path: "/Viewmore",
         name: 'Viewmore',
+        meta: { title: '', keepAlive: true },
         component: () =>
             import ('../views/teacher-dev/Viewmore.vue')
     },
     {
         path: '/teacherdevEntering',
         name: 'teacherdevEntering',
+        meta: { title: '', keepAlive: true },
         component: () =>
             import ('../views/teacher-devEntering/index.vue')
     },

+ 2 - 2
src/style/deleelement.css

@@ -1,3 +1,3 @@
 .el-dropdown {
-  /* width: 100px; */
-}
+    /* width: 100px; */
+}

+ 19 - 7
src/views/teacher-dev/Preview.vue

@@ -51,7 +51,9 @@
       <div :class="data.isPurchased || Ispreview ? 'buy' : 'NObuy'">
         <!--fileUrl需要改成安全地址 file_url_https -->
         <iframe
-          v-if="attachment[0].fileType != 'pdf'"
+          v-if="
+            attachment[0].fileType != 'pdf' && attachment[0].fileType != 'PDF'
+          "
           :src="
             'https://view.officeapps.live.com/op/view.aspx?src=' +
             `${attachment[0].fileUrlHttps}`
@@ -59,6 +61,7 @@
           width="100%"
           height="1000px"
           scrolling="no"
+          id="if"
         >
         </iframe>
         <pdf
@@ -143,7 +146,7 @@ export default {
       PymentShow: false, //支付订单弹窗
       orderNumber: null, //订单号
       IsDownload: false, //是否可以下载
-      allList:null,
+      allList: null,
     };
   },
   computed: {},
@@ -221,6 +224,7 @@ export default {
       let loadingTask = pdf.createLoadingTask(
         _this.attachment[0].fileRelativePath
       );
+
       loadingTask.promise
         .then((pdf) => {
           if (_this.data.isPurchased) {
@@ -293,7 +297,6 @@ export default {
         isSelectForUpdate: this.Ispreview ? true : false,
       })
         .then((res) => {
-          console.log("请求了函数getdetail");
           if (res.data.result) {
             let index = res.data.result.tag.indexOf("downloadable");
             if (index != -1) {
@@ -310,16 +313,20 @@ export default {
             });
             this.data.fileType = this.data.tag[this.data.tag.length - 1];
             this.attachment = JSON.parse(res.data.result.attachment);
-            this.changePrice(this.data.price);
             this.loading = false;
-            if (this.attachment[0].fileType == "pdf") {
+            if (
+              this.attachment[0].fileType == "pdf" ||
+              this.attachment[0].fileType == "PDF"
+            ) {
               // this.attachment[0].fileRelativePath =
               //   process.env.VUE_APP_BASE_API + this.attachment[0].fileRelativePath;
               this.attachment[0].fileRelativePath =
                 process.env.VUE_APP_PDF_API +
                 this.attachment[0].fileRelativePath;
+              console.log(this.attachment[0].fileRelativePath);
               this.getNumPages();
             }
+            this.changePrice(this.data.price);
           }
         })
         .catch((res) => {
@@ -331,7 +338,7 @@ export default {
   mounted() {
     this.materialId = this.$route.query.id;
     this.Ispreview = this.$route.query.type;
-    this.allList = this.$route.query.allList
+    this.allList = this.$route.query.allList;
     if (this.materialId) {
       this.getdetail();
       if (!this.Ispreview) {
@@ -344,6 +351,8 @@ export default {
           });
       }
     }
+    let node = document.getElementsByClassName("cui-ribbonTopBars")[0];
+    console.log(node);
   },
 };
 </script>
@@ -381,7 +390,7 @@ export default {
   }
   .main {
     min-height: 543px;
-    background: #e5e5e5;
+    background: #f6f6f6;
     padding-bottom: 20px;
     padding-top: 30px;
     position: relative;
@@ -501,4 +510,7 @@ export default {
     padding: 30px 32px;
   }
 }
+.cui-ribbonTopBars {
+  display: none !important;
+}
 </style>

+ 1 - 1
src/views/teacher-dev/Viewmore.vue

@@ -358,7 +358,7 @@ export default {
     }
   }
   .main {
-    background: #e5e5e5;
+    background: #F6F6F6;
     min-height: 568px;
     padding-top: 24px;
     padding-bottom: 20px;

+ 1 - 1
src/views/teacher-dev/index.vue

@@ -271,7 +271,7 @@ export default {
   }
   .main {
     min-height: 80vh;
-    background: #e5e5e5;
+    background: #F6F6F6;
     padding-bottom: 50px;
   }
 }