Merge branch 'zcwy_0716_learning' into dev0515

src/components/PortalHeader.vue

@@ -260,6 +260,9 @@ export default {
       ]
       Promise.all(promises).then(() => {
         this.nums = this.fistTotals + this.pathTotals + this.growTotal;
+        sessionStorage.setItem('fistTotals',this.fistTotals)
+        sessionStorage.setItem('pathTotals',this.pathTotals)
+        sessionStorage.setItem('growTotal',this.growTotal)
         this.loadBoeData();
       });
     },

src/components/UserCenter/menu.vue

@@ -480,12 +480,12 @@ export default {
       overlayShow: false,
       instructor:0,
       fistTotal:0,
-      fistTotals:0,
+      fistTotals:1,
       proTotal: 0,
       proTotals: 1,
       pathTotal:0,
-      pathTotals:0,
+      pathTotals:1,
-      growTotal: 0,
+      growTotal: 1,
       openedsList:[],
       courseNum: 0,
     };
@@ -566,16 +566,12 @@ export default {
         if(path == '/uc/study/task' && (route.query.type === undefined|| route.query.type === null)){
           if(this.fistTotals != 0){
             this.$router.push('/uc/study/task?type=1')
-            this.activeMenu = '/uc/study/task?type=1'
           }else if (this.growTotal != 0){
             this.$router.push('/uc/study/growth')
-            this.activeMenu = '/uc/study/growth'
           }else if (this.pathTotals != 0){
             this.$router.push('/uc/study/task?type=2')
-            this.activeMenu = '/uc/study/task?type=2'
           }else{
             this.$router.push('/uc/study/task?type=9')
-            this.activeMenu = '/uc/study/task?type=9'
           }
         }
       });

src/views/Index.vue

@@ -89,7 +89,7 @@
         <p class="personal-info">
           {{ cutOrgNamePath(userInfo.departFullName) }}
         </p>
-        <a href="uc/study/task">
+        <span @click="goStudy">
           <div class="personal-box" style="margin-bottom: 10px">
             <span>学习任务</span>
             <span v-if="studyTaskCount == 0" style="display: flex">
@@ -106,7 +106,7 @@
             </span>
             <!-- <img class="personal-box-img" :src="`${webBaseUrl}/images/homeWu/agency.png`" alt="" srcset=""> -->
           </div>
-        </a>
+        </span>
         <div class="last-study-info">
           <div
             class="one-line-ellipsis"
@@ -1078,6 +1078,10 @@ export default {
   },
   data() {
     return {
+      fistTotals: 0,
+      pathTotals: 0,
+      growTotal: 0,
+      courseNums: 0,
       Positive:[],
       showUClass: false,
       showLoginMedal: false, //是否显示登录勋章
@@ -1176,7 +1180,7 @@ export default {
     this.getLevel();
     this.getQaAnswers();
     this.getLastStudy();
-
+    this.setNumData()
     //检查兴趣爱好是否已填报,
     //先检查本地session和 local 15天, 这两个值是在组件中设置的
     let sessionHobby = sessionStorage.getItem(
@@ -1229,6 +1233,29 @@ export default {
     },
   },
   methods: {
+    setNumData(){
+      this.fistTotals = sessionStorage.getItem('fistTotals')
+      this.pathTotals = sessionStorage.getItem('pathTotals')
+      this.growTotal = sessionStorage.getItem('growTotal')
+      this.courseNums = sessionStorage.getItem('courseNums')
+    },
+    goStudy(){
+      const nums = this.fistTotals + this.pathTotals + this.growTotal;
+      if(nums == 0 && this.courseNums>0){
+        window.location.href = `${this.webBaseUrl}/uc/study/courses`;
+      }else{
+        if(this.nums == 0){
+          window.location.href = `${this.webBaseUrl}/uc/study/task?type=9`;
+        }
+        if(this.fistTotals != 0){
+          window.location.href = `${this.webBaseUrl}/uc/study/task?type=1`;
+        }else if (this.growTotal != 0){
+          window.location.href = `${this.webBaseUrl}/uc/study/growth`;
+        }else{
+          window.location.href = `${this.webBaseUrl}/uc/study/task?type=2`;
+        }
+      }
+    },
     getPositive() {
       // 这个是案例的好评
       // apiCase.queryComments(10).then(res => {