Merge branch 'master' of http://git.cc-lotus.info/smart-jobs/web-center

src/components/detail.vue

@@ -7,14 +7,11 @@
         </div>
       </el-col>
       <el-col :span="24" class="menu">
-        <menuInfo :backColor="backColor"></menuInfo>
+        <menuInfo :menuList="menuList" :backColor="backColor"></menuInfo>
       </el-col>
       <el-col :span="24" class="main">
         <div class="w_1200">
-          <el-col :span="5" class="mainNav">
-            <listLeft :Color="Color"></listLeft>
-          </el-col>
-          <el-col :span="18" class="mainList">
+          <el-col :span="24" class="mainList">
             <detailInfo :detailInfo="detailInfo" :Color="Color"></detailInfo>
           </el-col>
         </div>
@@ -40,11 +37,13 @@ export default {
     Color: null, //头部电话字体颜色
     backColor: null, //导航菜单背景颜色
     detailInfo: null, //详情信息
+    menuList: null, //菜单信息
+    sideMenu: null, //侧菜单
   },
   components: {
     top, //头部
     menuInfo, //导航
-    listLeft, //二级左侧导航
+    // listLeft, //二级左侧导航
     foot, //底部信息
     detailInfo, //詳情
   },
@@ -75,7 +74,7 @@ export default {
 }
 .mainList {
   float: right;
-  width: 930px;
+  // width: 930px;
 }
 .foot {
   height: 133px;

src/components/list.vue

@@ -7,15 +7,15 @@
         </div>
       </el-col>
       <el-col :span="24" class="menu">
-        <menuInfo :backColor="backColor"></menuInfo>
+        <menuInfo :menuList="menuList" :backColor="backColor"></menuInfo>
       </el-col>
       <el-col :span="24" class="main">
         <div class="w_1200">
           <el-col :span="5" class="mainNav">
-            <listLeft :Color="Color"></listLeft>
+            <listLeft :sideMenu="sideMenu" :Color="Color"></listLeft>
           </el-col>
           <el-col :span="18" class="mainList">
-            <listRight :rightList="rightList" :Color="Color"></listRight>
+            <listRight :rightList="rightList" :Color="Color" v-on="$listeners" v-bind="$attrs"></listRight>
           </el-col>
         </div>
       </el-col>
@@ -39,6 +39,8 @@ export default {
     Color: null, //头部电话字体颜色
     backColor: null, //导航菜单背景颜色
     rightList: null, //列表信息
+    menuList: null, //菜单列表
+    sideMenu: null, //侧菜单
   },
   components: {
     top, //头部

src/components/newsList.vue

@@ -42,6 +42,7 @@ export default {
     menuList: null, //菜单
     sideMenu: null, //侧菜单
     title: null, //标题
+    listSpan: { type: Number, default: 18 }, //全屏还是左右
   },
   components: {
     top, //头部
@@ -52,14 +53,7 @@ export default {
   },
   data: () => ({}),
   created() {},
-  computed: {
-    listSpan() {
-      let span = 18;
-      if (this.sideMenu === null) span = 18;
-      else span = 24;
-      return span;
-    },
-  },
+  computed: {},
   methods: {},
 };
 </script>

src/config/jobs-menu.js

@@ -0,0 +1,59 @@
+export const jobMenu = {
+  title: '招聘相关',
+  children: [
+    {
+      title: '校内宣讲会',
+      path: `/talk/list/in`,
+    },
+    {
+      title: '校外宣讲会',
+      path: `/talk/list/out`,
+    },
+    {
+      title: '校内招聘会',
+      path: `/jobfair/list/in`,
+    },
+    {
+      title: '校外招聘会',
+      path: `/jobfair/list/out`,
+    },
+    {
+      title: '招聘信息',
+      path: `/jobinfo/list`,
+    },
+    {
+      title: '正式岗位',
+      path: `/jobs/list/official`,
+    },
+    {
+      title: '实习岗位',
+      path: `/jobs/list/internship`,
+    },
+  ],
+};
+
+export const masterMenu = {
+  title: '招聘相关',
+  children: [
+    {
+      title: '宣讲会',
+      path: `/list/talk/out`,
+    },
+    {
+      title: '招聘会',
+      path: `/list/jobfair/out`,
+    },
+    {
+      title: '招聘信息',
+      path: `/list/jobinfo`,
+    },
+    {
+      title: '正式岗位',
+      path: `/list/jobs/official`,
+    },
+    {
+      title: '实习岗位',
+      path: `/list/jobs/internship`,
+    },
+  ],
+};

src/layout/index/banner.vue

@@ -22,4 +22,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="less" scoped></style>

src/layout/index/menuInfo.vue

@@ -13,6 +13,14 @@
             :router="true"
           >
             <el-menu-item index="/">首页</el-menu-item>
+            <template>
+              <el-submenu index="/jobs">
+                <template slot="title">
+                  {{ jobsMenu.title }}
+                </template>
+                <el-menu-item v-for="(sub, subIndex) in jobsMenu.children" :key="subIndex" :index="sub.path">{{ sub.title }}</el-menu-item>
+              </el-submenu>
+            </template>
             <template v-for="(item, index) in menuList">
               <el-submenu :index="`${index}`" :key="index" v-if="item.type !== 'url' && item.type !== 'content'">
                 <template slot="title">
@@ -34,6 +42,7 @@
 </template>
 
 <script>
+import { masterMenu } from '@/config/jobs-menu';
 export default {
   name: 'menuInfo',
   props: {
@@ -43,6 +52,7 @@ export default {
   components: {},
   data: () => ({
     activeIndex1: '1',
+    jobsMenu: masterMenu,
   }),
   created() {},
   computed: {},

src/layout/jobs-list/jobfair.vue

@@ -0,0 +1,59 @@
+<template>
+  <div id="jobfair">
+    <el-col :span="24">
+      <el-col :span="20" class="title">
+        <p class="textOver"><span class="dian"></span>{{ data.title }}</p>
+        <p class="textOver"><span class="dian"></span>地址:{{ data.city }}{{ data.address }}</p>
+        <p class="textOver"><span class="dian"></span>举办方:{{ data.organizer }}</p>
+      </el-col>
+      <el-col :span="4" class="date">{{ data.time }}</el-col>
+    </el-col>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'jobfair',
+  props: {
+    data: null,
+  },
+  components: {},
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="less" scoped>
+p {
+  padding: 0;
+  margin: 0;
+}
+.textOver {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.dian {
+  display: inline-block;
+  width: 4px;
+  height: 4px;
+  background-color: #4f4f4f;
+  border-radius: 90px;
+  margin: 5px 8px;
+}
+.title {
+  padding: 10px 0;
+}
+.title p {
+  font-size: 16px;
+  color: #4f4f4f;
+}
+.date {
+  font-size: 14px;
+  color: #323131;
+  text-align: right;
+  padding: 10px 0;
+}
+</style>

src/layout/jobs-list/jobinfo.vue

@@ -0,0 +1,59 @@
+<template>
+  <div id="jobinfo">
+    <el-col :span="24">
+      <el-col :span="20" class="title">
+        <p class="textOver"><span class="dian"></span>{{ data.title }}</p>
+        <p class="textOver"><span class="dian"></span>发布方:{{ data.corpname }}</p>
+        <p class="textOver"><span class="dian"></span>发布站点:{{ data.schname }}</p>
+      </el-col>
+      <el-col :span="4" class="date">{{ data.time }}</el-col>
+    </el-col>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'jobinfo',
+  props: {
+    data: null,
+  },
+  components: {},
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="less" scoped>
+p {
+  padding: 0;
+  margin: 0;
+}
+.textOver {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.dian {
+  display: inline-block;
+  width: 4px;
+  height: 4px;
+  background-color: #4f4f4f;
+  border-radius: 90px;
+  margin: 5px 8px;
+}
+.title {
+  padding: 10px 0;
+}
+.title p {
+  font-size: 16px;
+  color: #4f4f4f;
+}
+.date {
+  font-size: 14px;
+  color: #323131;
+  text-align: right;
+  padding: 10px 0;
+}
+</style>

src/layout/jobs-list/post.vue

@@ -0,0 +1,61 @@
+<template>
+  <div id="post">
+    <el-col :span="24">
+      <el-col :span="20" class="title">
+        <p class="textOver"><span class="dian"></span>{{ data.job_name }}</p>
+        <p class="textOver"><span class="dian"></span>需求人数:{{ data.job_number }}</p>
+        <p class="textOver"><span class="dian"></span>薪资:{{ data.salary.text }}</p>
+        <p class="textOver"><span class="dian"></span>福利待遇:{{ data.welfare }}</p>
+        <p class="textOver"><span class="dian"></span>职位诱惑:{{ data.job_tag }}</p>
+      </el-col>
+      <el-col :span="4" class="date">{{ data.time }}</el-col>
+    </el-col>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'post',
+  props: {
+    data: null,
+  },
+  components: {},
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="less" scoped>
+p {
+  padding: 0;
+  margin: 0;
+}
+.textOver {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.dian {
+  display: inline-block;
+  width: 4px;
+  height: 4px;
+  background-color: #4f4f4f;
+  border-radius: 90px;
+  margin: 5px 8px;
+}
+.title {
+  padding: 10px 0;
+}
+.title p {
+  font-size: 16px;
+  color: #4f4f4f;
+}
+.date {
+  font-size: 14px;
+  color: #323131;
+  text-align: right;
+  padding: 10px 0;
+}
+</style>

src/layout/jobs-list/talk.vue

@@ -0,0 +1,59 @@
+<template>
+  <div id="talk">
+    <el-col :span="24">
+      <el-col :span="20" class="title">
+        <p class="textOver"><span class="dian"></span>{{ data.title }}</p>
+        <p class="textOver"><span class="dian"></span>地址:{{ data.address }}</p>
+        <p class="textOver"><span class="dian"></span>宣讲方:{{ data.corpname }}</p>
+      </el-col>
+      <el-col :span="4" class="date">{{ data.time }}</el-col>
+    </el-col>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'talk',
+  props: {
+    data: null,
+  },
+  components: {},
+  data: () => ({}),
+  created() {},
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style lang="less" scoped>
+p {
+  padding: 0;
+  margin: 0;
+}
+.textOver {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.dian {
+  display: inline-block;
+  width: 4px;
+  height: 4px;
+  background-color: #4f4f4f;
+  border-radius: 90px;
+  margin: 5px 8px;
+}
+.title {
+  padding: 10px 0;
+}
+.title p {
+  font-size: 16px;
+  color: #4f4f4f;
+}
+.date {
+  font-size: 14px;
+  color: #323131;
+  text-align: right;
+  padding: 10px 0;
+}
+</style>

src/layout/list/listLeft.vue

@@ -2,7 +2,7 @@
   <div id="listLeft">
     <el-row>
       <el-col :span="24" class="listLeft">
-        <el-menu :default-active="$route.path" class="el-menu-vertical-demo" :router="true">
+        <el-menu :default-active="path" class="el-menu-vertical-demo" :router="true">
           <template v-for="(item, index) in sideMenu">
             <el-menu-item v-if="item.type !== 'url' && item.type !== 'content'" :index="item.path" :key="index" :style="`color:${Color}`">
               {{ item.title }}
@@ -17,6 +17,7 @@
 </template>
 
 <script>
+import _ from 'lodash';
 export default {
   name: 'listLeft',
   props: {
@@ -26,7 +27,16 @@ export default {
   components: {},
   data: () => ({}),
   created() {},
-  computed: {},
+  computed: {
+    title() {
+      return this.$route.query.title;
+    },
+    path() {
+      let path = `${this.$route.path}`;
+      if (this.title) path = `${path}?title=${this.title}`;
+      return path;
+    },
+  },
   methods: {
     turnTo(url) {
       window.open(url);

src/layout/list/listRight.vue

@@ -3,39 +3,27 @@
     <el-row>
       <el-col :span="24" class="listRight" :style="`border-color:${Color}`">
         <el-col :span="24" class="topInfo">
-          <el-col :span="12" class="top">
+          <el-col :span="10" class="top">
             <p :style="`color:${Color}`"><i class="el-icon-document"></i>{{ title }}</p>
           </el-col>
-          <el-col :span="12" class="bread">
+          <el-col :span="14" class="bread">
             <el-breadcrumb separator-class="el-icon-arrow-right">
               <el-breadcrumb-item :to="{ path: '/' }">网站首页</el-breadcrumb-item>
-              <el-breadcrumb-item>信息列表</el-breadcrumb-item>
+              <el-breadcrumb-item>{{ title }}列表</el-breadcrumb-item>
             </el-breadcrumb>
           </el-col>
         </el-col>
         <el-col :span="24" class="list">
           <el-col :span="24" class="rightList" v-for="(item, index) in rightList" :key="index">
-            <el-col :span="24">
-              <el-col :span="20" class="title">
-                <p class="textOver"><span class="dian"></span>{{ item.title }}</p>
-              </el-col>
-              <el-col :span="4" class="date">{{ item.date }}</el-col>
-            </el-col>
-            <el-col :span="20" class="content">
-              <p v-html="item.content"></p>
-            </el-col>
+            <talk v-if="jobs === 'talk'" :data="item"></talk>
+            <jobfair v-if="jobs === 'jobfair'" :data="item"></jobfair>
+            <jobinfo v-if="jobs === 'jobinfo'" :data="item"></jobinfo>
+            <post v-if="jobs === 'jobs'" :data="item"></post>
           </el-col>
         </el-col>
       </el-col>
       <el-col :span="24" class="page">
-        <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage4"
-          :page-size="8"
-          layout="total, prev, pager, next, jumper"
-          :total="1"
-        >
+        <el-pagination @current-change="search" :current-page="currentPage" :page-size="pageSize" layout="total, prev, pager, next, jumper" :total="total">
         </el-pagination>
       </el-col>
     </el-row>
@@ -43,25 +31,47 @@
 </template>
 
 <script>
+import talk from '@/layout/jobs-list/talk.vue';
+import jobfair from '@/layout/jobs-list/jobfair.vue';
+import jobinfo from '@/layout/jobs-list/jobinfo.vue';
+import post from '@/layout/jobs-list/post.vue';
+
 export default {
   name: 'listRight',
   props: {
     rightList: null,
     Color: null,
-    title: { type: String, default: '就业动态' },
+    total: { type: Number, defaultl: 0 },
+  },
+  components: {
+    talk,
+    jobfair,
+    jobinfo,
+    post,
   },
-  components: {},
   data: () => ({
-    currentPage4: 1,
+    currentPage: 1,
+    pageSize: 8,
   }),
   created() {},
-  computed: {},
-  methods: {
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
+  computed: {
+    title() {
+      let jobs = this.$route.params.jobs;
+      let returns;
+      if (jobs === 'talk') returns = '宣讲会';
+      if (jobs === 'jobfair') returns = '招聘会';
+      if (jobs === 'jobinfo') returns = '招聘信息';
+      if (jobs === 'jobs') returns = '岗位信息';
+      return returns;
     },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
+    jobs() {
+      return this.$route.params.jobs;
+    },
+  },
+  methods: {
+    search(page) {
+      let skip = (page - 1) * this.pageSize;
+      this.$emit('search', { skip: skip, limit: this.pageSize });
     },
   },
 };
@@ -108,7 +118,7 @@ p {
   overflow: hidden;
 }
 .rightList {
-  height: 110px;
+  min-height: 110px;
   border-bottom: 1px dashed #ccc;
 }
 .rightList .title {

src/layout/list/newsInfo.vue

@@ -61,12 +61,6 @@ export default {
       let skip = (page - 1) * this.pageSize;
       this.$emit('search', { skip: skip, limit: this.pageSize });
     },
-    handleSizeChange(val) {
-      console.log(`每页 ${val} 条`);
-    },
-    handleCurrentChange(val) {
-      console.log(`当前页: ${val}`);
-    },
   },
 };
 </script>

src/layout/member/banner.vue

@@ -22,4 +22,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="less" scoped></style>

src/router/index.js

@@ -13,7 +13,12 @@ export default new Router({
       component: () => import('../views/index.vue'),
     },
     {
-      path: '/list',
+      path: '/list/:jobs/:type',
+      name: 'list',
+      component: () => import('../views/list.vue'),
+    },
+    {
+      path: '/list/:jobs',
       name: 'list',
       component: () => import('../views/list.vue'),
     },

src/store/index.js

@@ -9,6 +9,7 @@ import * as jobinfo from './jobinfo';
 import * as posts from './posts';
 import * as linkCor from './link-cor';
 import * as jobfair from './jobfair';
+import * as talk from './talk';
 
 Vue.use(Vuex);
 
@@ -26,5 +27,6 @@ export default new Vuex.Store({
     posts: posts,
     linkCor: linkCor,
     jobfair: jobfair,
+    talk: talk,
   },
 });

src/store/posts.js

@@ -15,19 +15,15 @@ export const actions = {
     let result;
     if (type === 'list') {
       let { schid, corpid, is_practice, is_publish, ...searchInfo } = data;
-      result = await this.$axios.$get(
-        api.list,
-        {},
-        {
-          schid: schid,
-          corpid: corpid,
-          is_practice: is_practice,
-          skip: skip,
-          limit: limit,
-          is_publish: is_publish,
-          ...searchInfo,
-        }
-      );
+      result = await this.$axios.$get(api.list, {
+        schid: schid,
+        corpid: corpid,
+        is_practice: is_practice,
+        skip: skip,
+        limit: limit,
+        is_publish: is_publish,
+        ...searchInfo,
+      });
     }
     if (type === 'fetch') {
       let { id } = data;

src/store/talk.js

@@ -0,0 +1,32 @@
+import Vue from 'vue';
+import Vuex from 'vuex';
+import _ from 'lodash';
+Vue.use(Vuex);
+const api = {
+  list: `/api/jobs/talks`,
+  fetch: id => `/api/jobs/talks/${id}`,
+};
+export const state = () => ({});
+export const mutations = {};
+export const actions = {
+  async getTalk({ state }, { type, data }) {
+    let { skip = 0, limit } = data;
+    let result;
+    if (type !== 'fetch') {
+      let { schid, date, ...searchInfo } = data;
+      result = await this.$axios.$get(_.get(api, type), {
+        schid: schid,
+        skip: skip,
+        limit: limit,
+        date: date,
+        status: '1',
+        ...searchInfo,
+      });
+    }
+    if (type === 'fetch') {
+      let { id } = data;
+      result = await this.$axios.$get(api.fetch(id));
+    }
+    return result;
+  },
+};

src/views/aboutMe.vue

@@ -54,4 +54,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="less" scoped></style>

src/views/index.vue

@@ -128,7 +128,7 @@ export default {
           if (col.type === 'content') {
             col.path = `/detail/${col.content_id}`;
           } else if (col.type !== 'url') {
-            col.path = `/newsList/menu/${col.id}`;
+            col.path = `/newsList/menu/${col.id}?title=${col.title}`;
           }
         }
         return columns;
@@ -236,4 +236,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="less" scoped></style>

src/views/list.vue

@@ -1,43 +1,151 @@
 <template>
   <div id="list">
-    <list-detail :info="info" :backColor="backColor" :Color="Color" :rightList="rightList"></list-detail>
+    <list-detail
+      :menuList="menu"
+      :sideMenu="sideMenu"
+      :info="site"
+      :backColor="backColor"
+      :Color="Color"
+      :rightList="list"
+      :total="total"
+      @search="search"
+    ></list-detail>
   </div>
 </template>
 
 <script>
+import { mapActions, mapState } from 'vuex';
+import _ from 'lodash';
+import { masterMenu } from '@/config/jobs-menu';
 import listDetail from '@/components/list.vue';
 export default {
+  metaInfo() {
+    return {
+      title: this.siteTitle ? this.siteTitle : '就业信息网',
+    };
+  },
   name: 'list',
   props: {},
   components: {
     listDetail,
   },
   data: () => ({
-    info: {
-      src: require('@/assets/logo.png'),
-      phone: '0431-12345678',
-      banner: require('@/assets/banner.png'),
-      address: '办公地址：长春市经济技术开发区金川街151号吉林省高等学校毕业生就业指导中心2楼一站式办公大厅',
-      email: '邮编：130012',
-      gongjiao: '公交线路：乘坐120路、227路、20路、260路、80路、130路、281路、154路、190路、125路公交北方市场下车，北方市场南门南行200米。',
-      mobile: '业务咨询电话：0431-84657570 0431-84657571;',
-      date: '办公时间：周一至周五，法定假日不对外办公。',
-      footTitle: '吉ICP备09006292号-1 Copyright 2013 版权所有 吉林省高等学校毕业生就业指导中心 All Rights Reserved',
-    },
     backColor: '#0457c7',
     Color: '#0457c7',
-    rightList: [
-      {
-        title: '我省成功举办“创业有我•就在吉林',
-        date: '2019-12-03',
-        content: '我省成功举办“创业有我•就在吉林我省成功举办“创业有我•就在吉林',
-      },
-    ],
+    menu: [],
+    sideMenu: masterMenu.children,
+    site: {},
+    siteTitle: '',
+    total: 0,
+    list: [],
   }),
-  created() {},
-  computed: {},
-  methods: {},
+  async created() {
+    await this.toGetSite(); //获取主站信息
+    await this.loadMenu(); //获取菜单信息
+    await this.search();
+  },
+  computed: {
+    jobs() {
+      return this.$route.params.jobs;
+    },
+    type() {
+      return this.$route.params.type;
+    },
+  },
+  watch: {
+    jobs: 'search',
+    type: 'search',
+  },
+  methods: {
+    ...mapActions(['getSite', 'getMenu', 'getColumn', 'getJobfair', 'getTalk', 'getJobInfo', 'getPosts']),
+    async search({ skip = 0, limit = 8 } = {}) {
+      let result;
+      if (this.jobs === 'talk') {
+        result = await this.getTalk({ type: 'list', data: { skip: skip, limit: limit } });
+      } else if (this.jobs === 'jobfair') {
+        result = await this.getJobfair({ type: 'list', data: { skip: skip, limit: limit } });
+      } else if (this.jobs === 'jobs') {
+        result = await this.getPosts({ type: 'list', data: { skip: skip, limit: limit, is_practice: this.type === 'official' ? 0 : 1 } });
+      } else {
+        result = await this.getJobInfo({ type: 'list', data: { skip: skip, limit: limit } });
+      }
+      if (`${result.errcode}` === '0') {
+        //给this=>vue的实例下在中的list属性，赋予result。data的值
+        this.$set(this, `list`, result.data);
+        this.$set(this, `total`, result.total);
+      } else {
+        this.$message.error(result.errmsg ? result.errmsg : 'error');
+      }
+    },
+    //站点信息
+    async toGetSite() {
+      let site = sessionStorage.getItem('site');
+      if (!site) {
+        let result = await this.getSite({ type: 'search' });
+        if (result.errcode === 0) {
+          sessionStorage.setItem('site', JSON.stringify(result.data));
+          if (_.get(result.data, `custom`)) {
+            let item = result.custom;
+          }
+          this.$set(this, `site`, result.data);
+          this.$set(this, `siteTitle`, this.site.name);
+        }
+      } else {
+        this.$set(this, `site`, JSON.parse(site));
+        this.$set(this, `siteTitle`, this.site.name);
+        let arr = this.site;
+        if (arr.custom) {
+          let item = arr.custom;
+        }
+      }
+    },
+    //菜单
+    async loadMenu() {
+      let menu = sessionStorage.getItem('menu');
+      if (menu) {
+        this.$set(this, `menu`, JSON.parse(menu));
+        await this.finishedMenu();
+      } else this.toGetMenu();
+    },
+    async toGetMenu() {
+      let result = await this.getMenu({ type: `list` });
+      if (result.errcode === 0) {
+        sessionStorage.setItem('menu', JSON.stringify(result.data));
+        this.$set(this, `menu`, result.data);
+        this.finishedMenu();
+      }
+    },
+    async finishedMenu() {
+      let menus = JSON.parse(JSON.stringify(this.menu));
+      for (const item of menus) {
+        if (item.type === 'content') {
+          item.path = `/detail/${item.content_id}`;
+        } else if (item.type !== 'url') {
+          let res = await this.completeMenu(item);
+          item.children = res;
+        }
+      }
+      this.$set(this, `menu`, menus);
+    },
+    async completeMenu(item) {
+      let result = await this.getColumn({
+        type: `list`,
+        data: { parent_id: item.id },
+      });
+      if (result.errcode === 0) {
+        let columns = result.data;
+        for (const col of columns) {
+          if (col.type === 'content') {
+            col.path = `/detail/${col.content_id}`;
+          } else if (col.type !== 'url') {
+            col.path = `/newsList/menu/${col.id}?title=${col.title}`;
+          }
+        }
+        return columns;
+      }
+    },
+  },
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="less" scoped></style>

src/views/memberDetail.vue

@@ -34,4 +34,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="less" scoped></style>

src/views/memberList.vue

@@ -34,4 +34,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="less" scoped></style>

src/views/newsList.vue

@@ -10,6 +10,7 @@
       :title="title"
       @search="toGetNews"
       :total="total"
+      :listSpan="listSpan"
     ></list-detail>
   </div>
 </template>
@@ -65,9 +66,14 @@ export default {
     title() {
       return this.$route.query.title;
     },
+    listSpan() {
+      return this.type === 'menu' ? 18 : 24;
+    },
   },
   watch: {
     type: 'getSubMenu',
+    id: 'toGetNews',
+    title: 'getSubMenu',
   },
   methods: {
     ...mapActions(['getSite', 'getMenu', 'getColumn', 'getNews']),
@@ -133,7 +139,7 @@ export default {
           if (col.type === 'content') {
             col.path = `/detail/${col.content_id}`;
           } else if (col.type !== 'url') {
-            col.path = `/newsList/menu/${col.id}`;
+            col.path = `/newsList/menu/${col.id}?title=${col.title}`;
           }
         }
         return columns;
@@ -172,4 +178,4 @@ export default {
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="less" scoped></style>