updates

assets/roadMap.js

@@ -15,7 +15,10 @@ export const roadMapList = [
       {
         tenant: '',
         name: '紫荆数字经济产业学院',
-        href: 'https://www.baidu.com/'
+        onClick() {
+          Message('即将推出')
+        }
+        // href: ''
       }
     ],
     checkList: [
@@ -39,7 +42,10 @@ export const roadMapList = [
       {
         tenant: '',
         name: '紫荆数字经济产业学院',
-        href: ''
+        // href: ''
+        onClick() {
+          Message('即将推出')
+        }
       },
       {
         tenant: '',
@@ -129,7 +135,6 @@ export const roadMapList = [
   },
   {
     project_name: '项目名称:',
-
     position: 'bottom-start',
     isShow: false,
     icon: 'https://webapp-pub.ezijing.com/www/pc/lifeLearning/icon5.png',
@@ -141,12 +146,7 @@ export const roadMapList = [
         href: 'https://cbu-plus.ezijing.com'
       }
     ],
-    checkList: [
-      {
-        name: '暂无',
-        href: ''
-      }
-    ]
+    checkList: []
   }
 ]
 export const homeList = [

pages/roadmap/index.vue

@@ -17,13 +17,15 @@
               {{ it.name }}
             </AppLink>
           </div>
-          <div class="line"></div>
-          <div class="el-popover__title">未来可选目标:</div>
-          <div v-for="(itTwo, index) in item.checkList" :key="itTwo.name" class="project_name">
-            <AppLink :data="itTwo">
-              {{ itTwo.name }}
-            </AppLink>
-          </div>
+          <template v-if="item.checkList.length">
+            <div class="line"></div>
+            <div class="el-popover__title">未来可选目标:</div>
+            <div v-for="(itTwo, index) in item.checkList" :key="itTwo.name" class="project_name">
+              <AppLink :data="itTwo">
+                {{ itTwo.name }}
+              </AppLink>
+            </div>
+          </template>
 
           <div slot="reference" class="banner_roadList_con">
             <img :src="item.icon" alt="" />
@@ -55,7 +57,7 @@
         :list="internationalDegreeProjectList"
         baseUrl="/internationalDegree"
       ></ProjectCard>
-      <ProjectCard title="留学中学" :list="studyAbroadProjectList" baseUrl="/studyAbroad"></ProjectCard>
+      <ProjectCard title="留学中心" :list="studyAbroadProjectList" baseUrl="/studyAbroad"></ProjectCard>
     </div>
   </div>
 </template>
@@ -68,16 +70,62 @@ import AppLink from '@/components/Link.vue'
 export default {
   components: { ProjectCard, AppLink },
   computed: {
+    // 在读
     learningInfo() {
-      return this.learning.filter(item => item.status === '1')
+      if (this.learning.length) {
+        return this.learning.filter(item => item.status === '1')
+      } else {
+        return []
+      }
+    },
+    // 毕业 休学
+    otherInfo() {
+      return this.learning.filter(item => item.status !== '3' || item.status !== '4')
     },
+
+    // list() {
+    //   if (this.learningInfo.length > 0) {
+    //     this.roadList.forEach(item => {
+    //       item.projectList.forEach(it => {
+    //         this.learningInfo.forEach(itL => {
+    //           if (it.tenant === itL.tenant) {
+    //             if (item.projectList.find(it => it.tenant === itL.tenant)) {
+    //               console.log(item.projectList, '123')
+    //               item.isShow = true
+    //             }
+    //             item.projectList = item.projectList.filter(it => it.tenant === itL.tenant)
+    //             console.log(item.projectList, 'projectList')
+    //             item.project_name = '我的项目:'
+    //           }
+    //         })
+    //       })
+    //     })
+
+    //   return this.roadList
+    // } else {
+    //   return this.roadList
+    // }
+    // }
     list() {
+      // status 状态（0：毕业，1：在读，2：休学，3：未开通，4：退学）
       if (this.learningInfo.length > 0) {
         this.roadList.forEach(item => {
+          // 最新在读显示 弹框 显示我的项目
           if (item.projectList.find(it => it.tenant === this.learningInfo[0].tenant)) {
             item.isShow = true
             item.project_name = '我的项目:'
-            item.projectList = item.projectList.filter(it => it.tenant === this.learningInfo[0].tenant)
+          }
+          const arr = []
+          this.otherInfo.forEach(itL => {
+            item.projectList.forEach(itP => {
+              if (itL.tenant === itP.tenant) {
+                arr.push(itP)
+                item.project_name = '我的项目:'
+              }
+            })
+          })
+          if (item.project_name === '我的项目:') {
+            item.projectList = arr
           }
         })
         return this.roadList
@@ -125,20 +173,37 @@ export default {
   },
   methods: {
     handleShow(val) {
-      this.list.map(item => {
-        if (item.title !== val.title) {
-          item.isShow = false
-        }
-      })
+      if (this.list) {
+        this.list.map(item => {
+          if (item.title !== val.title) {
+            item.isShow = false
+          }
+        })
+      }
     }
   },
   mounted() {
-    this.learning = JSON.parse(window.localStorage.getItem('learningList'))
+    this.learning = JSON.parse(window.localStorage.getItem('learningList')) || ''
+    // 过滤出在读的
+    // const isShowList = this.learning.filter(item=> item.status === '1')
+    // this.roadList.
   }
 }
 </script>
 
 <style lang="scss">
+.el-popper[x-placement^='left'].popover .popper__arrow {
+  right: -7px;
+}
+.el-popper[x-placement^='top'].popover .popper__arrow {
+  bottom: -7px;
+}
+.el-popper[x-placement^='right'].popover .popper__arrow {
+  left: -7px;
+}
+.el-popper[x-placement^='bottom'].popover .popper__arrow {
+  top: -7px;
+}
 .el-popover.popover {
   background: rgba(255, 255, 255, 0.39);
   border-radius: 20px;
@@ -176,6 +241,9 @@ export default {
     justify-content: center;
     align-items: center;
     flex-direction: column;
+    .banner_roadList_con:hover {
+      text-shadow: 2px 2px 5px rgb(143, 141, 141);
+    }
 
     .banner_roadList_con {
       display: flex;
@@ -183,6 +251,7 @@ export default {
       align-items: center;
       flex-direction: column;
       cursor: pointer;
+
       .item_title {
         font-size: 20px;
         font-weight: bold;
@@ -224,12 +293,15 @@ export default {
     display: flex;
     justify-content: space-around;
     align-items: center;
+    .banner_homeList_con:hover {
+      text-shadow: 2px 2px 5px rgb(143, 141, 141);
+    }
     .banner_homeList_con {
       display: flex;
       justify-content: center;
       align-items: center;
       flex-direction: column;
-
+      cursor: pointer;
       .item_title {
         font-size: 20px;
         font-weight: bold;