updates

assets/css/base.css

@@ -45,7 +45,7 @@ textarea {
 .main-banner {
   display: block;
   height: 1.2rem;
-  object-fit: cover;
+  /* object-fit: cover; */
 }
 .main-content .title {
   padding: 0.3rem 0 0.1rem;

assets/roadMap.js

@@ -37,6 +37,11 @@ export const roadMapList = [
         tenant: 'ciis',
         name: '应用心理学MAP',
         href: 'https://ciis.ezijing.com'
+      },
+      {
+        tenant: 'sofia',
+        name: '金融方向MBA',
+        href: 'https://sofia.ezijing.com'
       }
     ],
     checkList: [
@@ -143,60 +148,75 @@ export const roadMapList = [
     ]
   }
 ]
-export const homeList = [
+export const homeMapList = [
   {
-    position: 'top',
+    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() {
-          Notify({ type: 'primary', message: '即将推出' })
+          Message('敬请期待')
         }
       },
       {
+        tenant: '',
+
         name: '互联网营销师',
         href: 'https://vst.ezijing.com'
       },
       {
+        tenant: '',
+
         name: '工业机器人系统操作员',
         href: 'https://vst.ezijing.com'
       },
       {
+        tenant: '',
+
         name: '大数据技术人员',
         href: 'https://vst.ezijing.com'
       }
     ]
   },
   {
-    position: 'top-end',
+    position: 'top-start',
     icon: 'https://webapp-pub.ezijing.com/www/pc/lifeLearning/home.png',
     isShow: false,
     title: '实习就业',
     itemList: [
       {
+        tenant: '',
+
         name: '敬请期待',
         href: ''
       }
     ]
   },
   {
-    position: 'top',
+    position: 'top-start',
     icon: 'https://webapp-pub.ezijing.com/www/pc/lifeLearning/home.png',
     isShow: false,
     title: '企业培训',
     itemList: [
       {
+        tenant: '',
+
         name: '敬请期待',
         href: ''
       }

components/Menu.vue

@@ -247,6 +247,7 @@ export default {
     },
     logout() {
       this.$store.dispatch('logout')
+      window.location.reload()
     }
   },
   mounted() {

pages/roadmap/index.vue

@@ -32,8 +32,15 @@
         </el-popover>
       </div>
       <div class="homeList" v-if="homeList && homeList.length">
-        <div class="homeList_con" v-for="(itemRoad, index) in homeList" :key="index">
-          <el-popover trigger="click" popper-class="popover" :placement="itemRoad.position" v-model="itemRoad.isShow">
+        <div class="homeList_con" v-for="(itemRoad, index) in homeListNew" :key="index">
+          <el-popover
+            trigger="click"
+            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">
@@ -56,7 +63,7 @@
         :list="internationalDegreeProjectList"
         baseUrl="/internationalDegree"
       ></ProjectCard>
-      <ProjectCard title="留学中学" :list="studyAbroadProjectList" baseUrl="/studyAbroad"></ProjectCard>
+      <ProjectCard title="留学中心" :list="studyAbroadProjectList" baseUrl="/studyAbroad"></ProjectCard>
     </div>
   </div>
 </template>
@@ -130,6 +137,39 @@ 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() {
@@ -169,11 +209,14 @@ export default {
   },
   methods: {
     handleShow(val) {
-      this.list.map(item => {
-        if (item.title !== val.title) {
-          item.isShow = false
-        }
-      })
+      const allList = [...this.list, ...this.homeListNew]
+      if (allList) {
+        allList.map(item => {
+          if (item.title !== val.title) {
+            item.isShow = false
+          }
+        })
+      }
     }
   }
 }