From 070a8c46724175296b01dc2392705dcee27df5c7 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Mon, 31 Oct 2022 14:06:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AF=A6=E7=BB=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=B8=8D=E8=87=AA=E5=8A=A8=E6=8A=A5=E5=90=8D=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Index.vue                | 34 ++++++++++++++++++++----------
 src/views/portal/case/Index.vue    |  2 +-
 src/views/portal/course/Detail.vue |  2 +-
 3 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/views/Index.vue b/src/views/Index.vue
index 5fa847a2..c12e619a 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -134,7 +134,7 @@
                 </interactBar>
                 <!-- <svg-icon style="font-size: 32px;margin-top: -5px;" icon-class="collectedCourse"></svg-icon> -->
               </div>
-              <a :href="toCourseDetail(course)">
+              <a @click="toCourseDetail(course)">
                 <div class="xindex-course-image">
                   <course-image :course="course"></course-image>
                   <span v-if="course.type == 20 || 10" class="course-type">录播课</span>
@@ -166,7 +166,7 @@
             <p class="ranking-title">课程排行榜</p>
             <ul class="xindex-ranking-course">
               <li  class="xindex-ranking-li" v-for="(item, cindex) in scorelist" :key="'cc'+cindex">
-                <a style="display: inherit" :href="toCourseDetail(item)">
+                <a style="display: inherit" @click="toCourseDetail(item)">
                 <span class="portal-right-text blue-one">
                   <img :src="getPic(cindex)" alt="">
                 </span>
@@ -441,7 +441,7 @@
 
 <script>
   import { mapGetters } from 'vuex';
-  import apicourseStudy from "@/api/modules/courseStudy.js"
+  import apiCourseStudy from "@/api/modules/courseStudy.js"
   import portalHeader from '@/components/PortalHeader.vue';
   import portalFooter from '@/components/PortalFooter.vue';
   import portalFloatTools from '@/components/PortalFloatTools.vue';
@@ -633,7 +633,7 @@
       },
       // 上次学习记录
       getLastStudy() {
-				apicourseStudy.lastStudy().then(res => {
+				apiCourseStudy.lastStudy().then(res => {
 					if (res.status === 200) {
 						this.lastStudy = res.result;
 						if (res.result != '' && res.result.courseId) {
@@ -750,14 +750,26 @@
       },
       toCourseDetail(item) {
         //二期调整，直接改成一个地址
-        return this.webBaseUrl + '/course/detail?id=' + item.id;
+        //return this.webBaseUrl + '/course/detail?id=' + item.id;
+        console.log(item,"item");
+        let $this=this;
+       if (item.type == 10) {
+          //return this.webBaseUrl + "/course/studyindex?id=" + item.id;
+          //console.log("直接进入学习页面");
+          this.$router.push("/course/studyindex?id=" + item.id);
+       } else if (item.type == 20) {
+         apiCourseStudy.hasSignup(item.id).then(rs=>{
+            if(rs.status==200){
+              //return $this.webBaseUrl + "/course/studyindex?id=" + item.id;
+              this.$router.push("/course/studyindex?id=" + item.id);
+            }else{
+              //return $this.webBaseUrl + "/course/detail?id=" + item.id;
+              this.$router.push("/course/detail?id=" + item.id);
+            }
+         })
+        //return $this.webBaseUrl + "/course/detail?id=" + item.id;
+       }
 
-        // if (item.type == 10) {
-        //   return this.webBaseUrl + '/course/micro?id=' + item.id;
-        // } else if (item.type == 20) {
-        //   return this.webBaseUrl + '/course/detail?id=' + item.id;
-        // }
-        // return '';
       },
       orderTypeFilter(val) {
         this.courseList.orderType = val;
diff --git a/src/views/portal/case/Index.vue b/src/views/portal/case/Index.vue
index c813d934..acef6fa8 100644
--- a/src/views/portal/case/Index.vue
+++ b/src/views/portal/case/Index.vue
@@ -112,7 +112,7 @@
               <div class="pagination-div">
                 <span class="pag-text" @click="loadMore()" v-if="moreState == 1">加载更多</span>
                 <span class="pag-text-msg" v-else-if="moreState == 2">数据加载中</span>
-                <span class="notcoures" v-else-if="moreState == 3 && !isSeach">
+                <span class="notcoures" v-else-if="moreState == 3 && !isSeach && caseList.count>0">
                    <img :src="`${webBaseUrl}/images/nocase.png`" alt="">
                   <h5>暂无案例，请优先学习其它案例吧～</h5>
                   </span>
diff --git a/src/views/portal/course/Detail.vue b/src/views/portal/course/Detail.vue
index 9f996ace..24935e9e 100644
--- a/src/views/portal/course/Detail.vue
+++ b/src/views/portal/course/Detail.vue
@@ -332,7 +332,7 @@ export default {
          this.loadLastStudy();
        } else {
          this.stuStusts = 0;
-         this.startSigningUp();
+         //this.startSigningUp();
        }
      })
    },