baiyou - menus & route fit

src/router/index.js

@@ -829,25 +829,6 @@ export const constantRoutes = [{
         component: (resolve) => require(['@/views/career/zhiyuan/NewSimulatedVolunteer'], resolve)
       }
     ]
-  }, {
-    path: '/baiyou',
-    component: Layout,
-    hidden: true,
-    children: [{
-      path: '/baiyou/library/highSchool',
-      component: (resolve) => require(['@/views/baiyou/LibraryHighSchool/index'], resolve),
-      name: 'LibraryHighSchool',
-      meta: {
-        title: '高中信息库'
-      }
-    }, {
-      path: '/baiyou/library/enrollOrg',
-      component: (resolve) => require(['@/views/baiyou/LibraryEnrollOrg/index'], resolve),
-      name: 'LibraryEnrollOrg',
-      meta: {
-        title: '中招办'
-      }
-    }]
   }
 ]
 

src/views/career/MentalHealth/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container bg-page fx-column fx-cen-cen">
-    <index-card class="width100" title="中学生心理健康诊断测验（MHT）">
+    <index-card class="index-block" title="中学生心理健康诊断测验（MHT）">
       <div slot="more" class="fx-row">
         <el-button size="small" round type="primary" @click="goForm()">进入评测</el-button>
         <el-button size="small" round plain @click="historyVisible=true,getList()">查看记录</el-button>

src/views/career/plan/CareerEva.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <el-card shadow="never">
+  <div class="app-container fx-column ai-cen">
+    <el-card shadow="never" class="index-block">
       <el-row :gutter="40">
         <el-col :span="5">
           <el-image :src="require('@/assets/images/career/img_holland.png')"></el-image>
@@ -53,7 +53,7 @@
       </el-row>
     </el-card>
     <!-- 2. -->
-    <el-card shadow="never" class="mt20">
+    <el-card shadow="never" class="mt20 index-block">
       <el-row :gutter="40">
         <el-col :span="5">
           <el-image :src="require('@/assets/images/career/img_MBTI.png')"></el-image>

src/views/index/components/index-card-high-school.vue

@@ -0,0 +1,45 @@
+<template>
+  <index-card simple title="高中信息库" more-text="查看全部" @more="handleMore">
+    <el-row gutter="20">
+      <el-col v-for="item in list" :key="item.id" :span="6">
+        <el-image :src="item.pict" fit="fill" style="height: 200px; width: 100%; cursor: pointer" @click="handleMore" />
+      </el-col>
+    </el-row>
+  </index-card>
+</template>
+
+<script>
+import {getHighSchoolList} from "@/api/webApi/baiyou";
+import MxTransferMixin from "@/components/mx-transfer-mixin";
+import IndexLoginInterceptorMixin from "@/views/index/blocks/index-login-interceptor-mixin";
+import IndexCard from "@/views/index/components/index-card.vue";
+
+export default {
+  name: "index-card-high-school",
+  components: {IndexCard},
+  mixins: [MxTransferMixin, IndexLoginInterceptorMixin],
+  data() {
+    return {
+      morePath: {name: 'LibraryHighSchool'},
+      list: []
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    async getList() {
+      const {rows} = await getHighSchoolList({pageNum:1, pageSize:4})
+      this.list = rows
+    },
+    async handleMore() {
+      await this.loginCheck()
+      this.transferTo(this.morePath)
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/index/components/index-card-news.vue

@@ -1,15 +1,12 @@
 <template>
-  <index-card simple title="高考资讯" sub-title="最新、最全的高考资讯" more-text="查看全部" @more="handleMore">
+  <index-card simple title="热门资讯" more-text="查看全部" @more="handleMore">
     <div class="bg-white pd20 rd8" style="height: 270px">
       <el-tabs v-model="activeName" type="card" @tab-click="handleTabChanged">
         <el-tab-pane v-for="type in newsTypes" :key="type" :name="type" :label="type">
           <el-row>
-            <el-col v-for="news in getSafeNews(type)" :key="news.id" :span="12">
+            <el-col v-for="news in getSafeNews(type)" :key="news.id" :span="8">
               <div class="fx-row fx-sta-cen pf f-333 pr40" style="line-height: 35px">
-                <i class="el-icon-alarm-clock"></i>
-                <span class="ml3">{{ news.sendDate }}</span>
-                <span class="ml10 fx-1 text-ellipsis new-title pointer"
-                      :title="news.title" @click="goNewsWithType(type,news)">
+                <span class="text-ellipsis new-title pointer" :title="news.title" @click="goNewsWithType(type,news)">
                 {{ news.title }}</span>
               </div>
             </el-col>
@@ -43,11 +40,9 @@ export default {
   },
   methods: {
     getTypes() {
-      career.typesNoToken().then(res => {
-        this.newsTypes = res.rows.map(i => i.label)
-        this.activeName = this.newsTypes.first()
-        this.getList(this.activeName)
-      })
+      this.newsTypes = ['中考资讯','家长学校','中考学生辅导','心灵课堂']
+      this.activeName = this.newsTypes.first()
+      this.getList(this.activeName)
     },
     handleTabChanged() {
       this.getList(this.activeName)
@@ -57,7 +52,7 @@ export default {
       if (this.newsCache.hasOwnProperty(type)) return
       career.listNoToken({
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 15,
         type: type
       }).then(res => {
         this.$set(this.newsCache, type, res.rows)

src/views/index/components/index-card-test-news.vue

@@ -4,13 +4,13 @@
       <index-card simple title="我的测评">
         <el-row :gutter="12">
           <el-col :span="12" @click.native="goCareerTest">
-            <el-image :src="`${$imgBase}2023/index/login/career-test-bg.png`" class="pointer rd8"/>
+            <el-image :src="require('@/assets/images/banner/holland.png')" class="pointer rd8"/>
           </el-col>
-          <el-col :span="12" @click.native="goElectiveTest">
-            <el-image :src="`${$imgBase}2023/index/login/elective-test-bg.png`" class="pointer rd8"/>
+          <el-col :span="12" @click.native="goCareerTest">
+            <el-image :src="require('@/assets/images/banner/mbti.png')" class="pointer rd8"/>
           </el-col>
-          <el-col :span="24" class="mt12" @click.native="goElectiveQuery">
-            <el-image :src="`${$imgBase}2023/index/login/elective-query-bg.png`" class="pointer rd8"/>
+          <el-col :span="24" class="mt12" @click.native="goMentalHealth">
+            <el-image :src="require('@/assets/images/banner/mental-health.png')" class="pointer rd8"/>
           </el-col>
         </el-row>
       </index-card>
@@ -58,6 +58,10 @@ export default {
     async goCareerTest() {
       await this.loginCheck()
       this.transferTo({name: 'CareerTestIndex'})
+    },
+    async goMentalHealth() {
+      await this.loginCheck()
+      this.transferTo({name: 'MentalHealthIndex'})
     }
   }
 }

src/views/index/components/index-news-top-wrapper.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="fx-row">
-    <index-card-news class="mr20" style="width: 65%"/>
-    <index-card-top v-bind="newsOverride" class="fx-1"/>
+    <index-card-news />
+<!--    <index-card-top v-bind="newsOverride" class="fx-1"/>-->
   </div>
 </template>
 

src/views/index/components/login-top-menus.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="fx-row fx-bet-cen bg-white pl60 pr60" style="height:80px;">
-    <el-image :src="require('@/assets/logo/logo.png')" fit="contain"
-              style="width: 124px;"></el-image>
+    <el-image :src="require('@/assets/logo/logo.png')" fit="contain" style="width: 200px;" />
     <div class="fx-row fx-end-cen fx-1 menus-container">
       <el-link v-for="(item,idx) in routers" :key="idx" @click="handleMenuClick(item)" class="f16 f-fff"
                :underline="false">

src/views/index/login.vue

@@ -9,12 +9,13 @@
       <div class="fx-column fx-cen-cen">
         <index-card-career class="mt20 index-block"/>
         <index-card-test-news class="mt20 index-block" />
-        <index-card-college class="mt20 index-block" />
-        <index-card-simulate-f4 class="mt20 index-block" />
+        <index-card-college v-if="false" class="mt20 index-block" />
+        <index-card-simulate-f4 v-if="false" class="mt20 index-block" />
         <index-card-subject-query v-if="false" class="mt20 index-block"/>
         <index-card-elective-test v-if="false" class="mt20 index-block"/>
         <index-preference-simulate v-if="false" class="mt20 index-block"/>
         <index-preference v-if="false" class="mt20 index-block"/>
+        <index-card-high-school v-if="isLogin" class="mt20 index-block" />
         <index-news-top-wrapper class="mt20 index-block"/>
       </div>
       <bottom-p class="mt20"></bottom-p>
@@ -48,10 +49,12 @@ import IndexNewsTopWrapper from '@/views/index/components/index-news-top-wrapper
 import IndexCardTestNews from "@/views/index/components/index-card-test-news.vue";
 import IndexCardCollege from "@/views/index/components/index-card-college.vue";
 import IndexCardSimulateF4 from "@/views/index/components/index-card-simulate-f4.vue";
+import IndexCardHighSchool from "@/views/index/components/index-card-high-school.vue";
 
 export default {
   mixins: [loginCheckMixin],
   components: {
+    IndexCardHighSchool,
     IndexCardSimulateF4,
     IndexCardCollege,
     IndexCardTestNews,