实验台

src/pages/station/list/index.vue

@@ -110,9 +110,11 @@ export default {
       }
     },
     toProduct (item) {
-      // 未过期
+      const links = item.nonAssociatedLinks
-      if (item.isInEffect) {
+      // 已过期 / 没有cid并且没有链接，则跳转到产品详情
-        const links = item.nonAssociatedLinks
+      if (!item.isInEffect || (!item.cid && !links)) {
+        this.$router.push(`product?id=${item.mallId}`)
+      } else {
         // 有链接
         if (links && links.length) {
           if (links.length === 1) {
@@ -122,11 +124,8 @@ export default {
             this.links = item.nonAssociatedLinks
           }
         } else {
-          this.$router.push(`/station/preview?courseId=${item.cid}&curriculumName=${item.goodsName}&mallId=${item.mallId || ''}&keyword=${this.keyword}&active=${this.active}`)
+          this.$router.push(`/station/preview?courseId=${item.cid || ''}&curriculumName=${item.goodsName}&mallId=${item.mallId || ''}&keyword=${this.keyword}&active=${this.active}`)
         }
-      } else {
-        // 续费
-        this.$router.push(`product?id=${item.mallId}`)
       }
     },
     // tab切换

src/pages/station/preview/index.vue

@@ -413,7 +413,7 @@ export default {
   },
   destroyed () {
     // 记录播放时长
-    Util.local.get(Setting.tokenKey) && this.$post(this.api.playRecordSave, {
+    Util.local.get(Setting.tokenKey) && this.courseId && this.$post(this.api.playRecordSave, {
       courseId: this.courseId,
       courseType: 0,
       playTime: Math.ceil((Date.now() - this.startTime) / 1000 / 60)
@@ -429,23 +429,25 @@ export default {
       this.addRecord()
     },
     async getData () {
-      const { data } = await this.$post(`${this.api.curriculumDetail}?cid=${this.courseId}&mallId=${this.mallId}`);
+      if (this.courseId) {
-      this.routes = [
+        const { data } = await this.$post(`${this.api.curriculumDetail}?cid=${this.courseId}&mallId=${this.mallId}`);
-        {
+        this.routes = [
-          name: '实验台',
+          {
-          path: `list?keyword=${this.$route.query.keyword || ''}&active=${this.$route.query.active || 0}`
+            name: '实验台',
-        },
+            path: `list?keyword=${this.$route.query.keyword || ''}&active=${this.$route.query.active || 0}`
-        {
+          },
-          name: data.curriculumName
+          {
-        }
+            name: data.curriculumName
-      ]
+          }
-
+        ]
-      this.courseName = data.curriculumName;
+
-      this.briefIntroduction = data.briefIntroduction;
+        this.courseName = data.curriculumName;
-      this.teachingObjectives = data.teachingObjectives;
+        this.briefIntroduction = data.briefIntroduction;
-      this.assessmentList = data.assessmentConfig;
+        this.teachingObjectives = data.teachingObjectives;
-      this.systemIds = data.systemIds
+        this.assessmentList = data.assessmentConfig;
-      this.queryProject()
+        this.systemIds = data.systemIds
+        this.queryProject()
+      }
       this.getStatus()
     },
     // 记录最近使用
@@ -465,20 +467,24 @@ export default {
     },
     // 获取章节小节
     async getChapter () {
-      let res = await this.$get(`${this.api.curriculumChapter}/${this.courseId}`);
+      if (this.courseId) {
-      this.chapterList = res.chapterList;
+        let res = await this.$get(`${this.api.curriculumChapter}/${this.courseId}`);
-      if (this.chapterList.length && this.chapterList[0].subsectionList && this.chapterList[0].subsectionList.length && !this.commentId) {
+        this.chapterList = res.chapterList;
-        this.preview(this.chapterList[0].subsectionList[0], this.chapterList[0].name, 1);
+        if (this.chapterList.length && this.chapterList[0].subsectionList && this.chapterList[0].subsectionList.length && !this.commentId) {
+          this.preview(this.chapterList[0].subsectionList[0], this.chapterList[0].name, 1);
+        }
       }
     },
     // 获取学习进度
     async getProgress () {
-      let res = await this.$post(`${this.api.courseLearningProgress}?courseId=${this.courseId}&systemId=${this.systemIds}&mallId=${this.mallId}`);
+      if (this.courseId) {
-      this.progressList = res.list
+        let res = await this.$post(`${this.api.courseLearningProgress}?courseId=${this.courseId}&systemId=${this.systemIds}&mallId=${this.mallId}`);
-      if (res.list.length) this.archProject = res.list[0].projectId
+        this.progressList = res.list
-      this.maximumScores.length || this.getMaximumScore()
+        if (res.list.length) this.archProject = res.list[0].projectId
-      this.plan = res.plan
+        this.maximumScores.length || this.getMaximumScore()
-      this.schedule = +(res.schedule.replace('%', ''))
+        this.plan = res.plan
+        this.schedule = +(res.schedule.replace('%', ''))
+      }
     },
     // 获取最高分列表
     async getMaximumScore () {

src/pages/station/product/index.vue

@@ -48,7 +48,8 @@
               <div class="text">{{ form.goodsRes.typeName }}</div>
             </div>
           </div>
-          <button class="btn" @click="toRenew">续期</button>
+          <button v-if="!overdue" class="btn" @click="toRenew">续期</button>
+          <button v-else-if="withLink" class="btn entry" @click="toStation">进入实验</button>
         </div>
       </div>
       <div class="course" id="part0">
@@ -145,7 +146,8 @@ export default {
       chapterList: [],
       hots: [],
       linkVisible: false,
-      height: ''
+      height: '',
+      overdue: 0, //是否过期
     };
   },
   computed: {
@@ -193,6 +195,7 @@ export default {
     next()
   },
   mounted () {
+    this.getStatus()
     this.getData()
     this.getHot()
   },
@@ -233,6 +236,14 @@ export default {
         this.chapterList = res.chapterList
       }
     },
+    // 查询是否过期
+    async getStatus () {
+      const { isRenew } = await this.$get(this.api.whetherToRenewTheFee, {
+        mallId: this.id
+      })
+      // 1正常显示资源，0显示续费
+      this.overdue = isRenew
+    },
     // tab切换
     tabChange ({ id }) {
       this.curTab = id