Merge branch 'zcwy_0716_learning' into dev0515

src/components/PortalHeader.vue

@@ -122,7 +122,7 @@
                     <div style="font-weight: 400;font-size: 16px; margin-top: 8px;">{{userInfo.name}}</div>
                   </div>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item @click.native="setCurIdentity(1)"><a :href="`${webBaseUrl}${isTiao ? '/uc/study/task' : '/uc/study/courses'}`">个人中心</a></el-dropdown-item>
+                    <el-dropdown-item @click.native="setCurIdentity(1)"><span @click="goCenter">个人中心</span></el-dropdown-item>
                     <el-dropdown-item><router-link :to="'/home/'+userInfo.aid">个人主页</router-link></el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
@@ -269,10 +269,19 @@ export default {
     tomy(){
       console.log('lll')
     },
+    goCenter(){
+      console.log(this.isTiao,'isTiao')
+      if(this.isTiao){
+        if(this.nums == 0){
+          window.location.href = `${this.webBaseUrl}/uc/study/task?type=9`;
+        }
+        window.location.href = `${this.webBaseUrl}/uc/study/task`;
+      }else{
+        window.location.href = `${this.webBaseUrl}/uc/study/courses`;
+      }
+    },
     loadBoeData() {
-      if(this.nums>0){
+      if(this.nums == 0 && this.courseNum>0){
-        this.isTiao = true;
-      }else if (this.nums == 0 && this.courseNum>0){
         this.isTiao = false;
       }else{
         this.isTiao = true;

src/components/UserCenter/menu.vue

@@ -307,7 +307,7 @@
             <span slot="title" class="study textl">自选学习</span>
           </el-menu-item>
         </el-submenu>
-        <el-menu-item v-else index="/uc/study/courses" v-show="curIdentity == 1">
+        <el-menu-item v-if="!courseNum" index="/uc/study/courses" v-show="curIdentity == 1">
           <!-- <svg-icon :icon-class="activeMenu == '/exam/mytask'?'mybiji-active':'mybiji'"></svg-icon> -->
           <svg-icon icon-class="mystudy"></svg-icon>
           <span slot="title">我的选修</span>
@@ -517,6 +517,7 @@ export default {
       if(sessionStorage.getItem('courseNums') === null || sessionStorage.getItem('courseNums') === ''){
         apiCourseStudy.myStudysFromES(reqData).then(res=>{
           this.courseNum = res.result.count;
+          sessionStorage.setItem('courseNums',this.courseNum)
         })
       }else{
         this.courseNum = sessionStorage.getItem('courseNums')

src/views/homepage/Index.vue

@@ -54,7 +54,7 @@
   </template>
 
   <script>
-    import top from '../../layout/components/TopNav/Index.vue'
+    import top from '@/components/PortalHeader.vue'
     import UcHeader from '@/components/HomePage/homePage.vue'
     import MedalImg from '@/components/Portal/medalImg.vue';
     import apiStat from '@/api/phase2/stat.js';

src/views/study/Courses.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div style="margin-top: 50px;" v-if="page.count==0">
-      <el-empty description="您还没有学习数据"></el-empty>
+      <el-empty description="您当前暂无学习数据~"></el-empty>
     </div>
     <div v-else>
       <div style="display: flex;justify-content:space-between; padding: 12px 32px 10px 18px;">

src/views/study/TaskList.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <div style="margin-top: 50px;" v-if="isType == 9||couresList.length == 0">
-      <el-empty description="您还没有学习数据"></el-empty>
+      <el-empty description="您当前暂无学习数据~"></el-empty>
     </div>
     <div v-else>
        <!-- <div style="display:flex; padding-left:20px; width:100%">