updates

assets/roadMap.js

@@ -63,7 +63,6 @@ export const roadMapList = [
   },
   {
     project_name: '项目名称:',
-
     position: 'right-start',
     isShow: false,
     icon: 'https://webapp-pub.ezijing.com/www/pc/lifeLearning/icon3.png',
@@ -83,6 +82,11 @@ export const roadMapList = [
         tenant: 'caas',
         name: '餐饮管理方向MBA',
         href: 'https://caas.ezijing.com'
+      },
+      {
+        tenant: 'sofia',
+        name: '金融方向MBA',
+        href: 'https://sofia.ezijing.com'
       }
     ],
     checkList: [
@@ -144,36 +148,47 @@ export const roadMapList = [
     checkList: []
   }
 ]
-export const homeList = [
+export const homeMapList = [
   {
+    project_name: '项目名称:',
     position: 'left',
     icon: 'https://webapp-pub.ezijing.com/www/pc/lifeLearning/home.png',
     isShow: false,
     title: '职业证书',
     itemList: [
       {
+        tenant: 'x1',
         name: '1+X',
         href: 'https://x.ezijing.com/'
       },
       {
+        tenant: '',
         name: '私人财富风险管理顾问（PRP）',
         href: 'https://prp.ezijing.com'
       },
       {
+        tenant: '',
+
         name: '高管培训-数字创新管理',
         onClick() {
           Message('敬请期待')
         }
       },
       {
+        tenant: '',
+
         name: '互联网营销师',
         href: 'https://vst.ezijing.com'
       },
       {
+        tenant: '',
+
         name: '工业机器人系统操作员',
         href: 'https://vst.ezijing.com'
       },
       {
+        tenant: '',
+
         name: '大数据技术人员',
         href: 'https://vst.ezijing.com'
       }
@@ -186,6 +201,8 @@ export const homeList = [
     title: '实习就业',
     itemList: [
       {
+        tenant: '',
+
         name: '敬请期待',
         href: ''
       }
@@ -198,6 +215,8 @@ export const homeList = [
     title: '企业培训',
     itemList: [
       {
+        tenant: '',
+
         name: '敬请期待',
         href: ''
       }

pages/roadmap/index.vue

@@ -33,8 +33,15 @@
         </el-popover>
       </div>
       <div class="banner_homeList">
-        <div v-for="(itemRoad, indexRoad) in homeList" :key="indexRoad">
-          <el-popover trigger="hover" popper-class="popover" :placement="itemRoad.position" v-model="itemRoad.isShow">
+        <div v-for="(itemRoad, indexRoad) in homeListNew" :key="indexRoad">
+          <el-popover
+            trigger="hover"
+            popper-class="popover"
+            :placement="itemRoad.position"
+            v-model="itemRoad.isShow"
+            :title="itemRoad.project_name"
+            @show="handleShow(itemRoad)"
+          >
             <div>
               <div v-for="(it, indexItem) in itemRoad.itemList" :key="indexItem" class="project_name">
                 <AppLink :data="it">
@@ -57,12 +64,13 @@
         baseUrl="/internationalDegree"
       ></ProjectCard>
       <ProjectCard title="留学中心" :list="studyAbroadProjectList" baseUrl="/studyAbroad"></ProjectCard>
+      {{ learningInfo }}
     </div>
   </div>
 </template>
 
 <script>
-import { roadMapList, homeList } from '@/assets/roadMap'
+import { roadMapList, homeMapList } from '@/assets/roadMap'
 import ProjectCard from '@/components/ProjectCard.vue'
 import AppLink from '@/components/Link.vue'
 
@@ -130,12 +138,45 @@ export default {
       } else {
         return this.roadList
       }
+    },
+    homeListNew() {
+      if (this.learning.length > 0) {
+        console.log(this.homeList, '0000')
+        this.homeList.map(item => {
+          // 最新在读显示 弹框 显示我的项目
+          if (item.itemList.find(it => it.tenant === this.learningInfo[0].tenant)) {
+            item.isShow = true
+            item.project_name = '我的项目:'
+          } else if (
+            !this.otherInfo.find(item => item.status === '1') &&
+            this.otherInfo.find(item => item.status === '0')
+          ) {
+            this.graduateInfo[0].isShow = true
+            this.graduateInfo[0].project_name = '我的项目:'
+          }
+          const arr = []
+          this.otherInfo.forEach(itL => {
+            item.itemList.forEach(itP => {
+              if (itL.tenant === itP.tenant) {
+                arr.push(itP)
+                item.project_name = '我的项目:'
+              }
+            })
+          })
+          if (item.project_name === '我的项目:') {
+            item.itemList = arr
+          }
+        })
+        return this.homeList
+      } else {
+        return this.homeList
+      }
     }
   },
   data() {
     return {
       roadList: roadMapList,
-      homeList: homeList,
+      homeList: homeMapList,
       // 热门专业
       internationalDegreeProjectList: [
         {
@@ -171,8 +212,9 @@ export default {
   methods: {
     // 展示时触发 ，只显示一个
     handleShow(val) {
-      if (this.list) {
-        this.list.map(item => {
+      const allList = [...this.list, ...this.homeListNew]
+      if (allList) {
+        allList.map(item => {
           if (item.title !== val.title) {
             item.isShow = false
           }
@@ -212,7 +254,7 @@ export default {
     cursor: pointer;
   }
   .project_name:hover {
-    text-shadow: 2px 2px 5px rgb(143, 141, 141);
+    text-shadow: 2px 2px 5px #aa1941;
   }
   .line {
     width: 281px;