diff --git a/src/components/sunVillage/common/header.vue b/src/components/sunVillage/common/header.vue index 385094f0..c39b27ea 100644 --- a/src/components/sunVillage/common/header.vue +++ b/src/components/sunVillage/common/header.vue @@ -95,17 +95,25 @@ export default { flex-direction: row; display: flex; justify-content: space-between; + align-items: center; .flex_navigation { height: 64px; line-height: 64px; background: #ededed; font-size: 32px; border-radius: 10px; - padding: 0 28px; + flex: 1; + text-align: center; + // display: flex; + // align-items: center; + margin-right: 20px; &.current { background: #07c160; color: #fff; } + &:last-child { + margin-right: 0; + } } } } diff --git a/src/permission.js b/src/permission.js index 3f040451..d18adaa8 100644 --- a/src/permission.js +++ b/src/permission.js @@ -89,6 +89,9 @@ const whiteList = [ '/sunVillage/consulting/inquiries', //民生直通车-咨询 "/sunVillage/consulting/my_consulting", //民生直通车-我的咨询详情 '/sunVillage/consulting/kanban', //民生直通车-民生看板 + '/sunVillage/consulting/kanban/focusList', //民生直通车-民生看板 -关注民生list + '/sunVillage/consulting/kanban/focusDesc', //民生直通车-民生看板 -关注民生详情 + '/sunVillage/consulting/kanban/affairsList', //民生直通车-民生看板 - 民生办事list '/sunVillage/equity', //股权查询-股民信息 '/sunVillage/equity_desc', // 股权查询-股民信息-详情 '/sunVillage/shareBonus', //股权查询-股权分红 diff --git a/src/router/index.js b/src/router/index.js index 30754f3d..c4272275 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2639,10 +2639,37 @@ export const constantRoutes = [ path: '/sunVillage/consulting/kanban', name: 'sunVillageKanban', meta: { - title: '民生直通车', //民生直通车-我的咨询 + title: '民生直通车', //民生直通车-民生看板 + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage/throughTrain/kanban/index'], resolve) + }, + { + path: '/sunVillage/consulting/kanban/focusList', + name: 'sunVillageKanbanFocusList', + meta: { + title: '民生直通车', //民生直通车-民生看板-关注民生列表 + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage/throughTrain/kanban/focusList'], resolve) + }, + { + path: '/sunVillage/consulting/kanban/focusDesc', + name: 'sunVillageKanbanFocusDesc', + meta: { + title: '民生直通车', //民生直通车-民生看板-关注民生详情 + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage/throughTrain/kanban/focusDesc'], resolve) + }, + { + path: '/sunVillage/consulting/kanban/affairsList', + name: 'sunVillageKanbanAffairsList', + meta: { + title: '民生直通车', //民生直通车-民生看板-民生办事列表 hidden: true, }, - component: (resolve) => require(['@/views/sunVillage/throughTrain/kanban'], resolve) + component: (resolve) => require(['@/views/sunVillage/throughTrain/kanban/affairsList'], resolve) }, { path: '/sunVillage/equity', diff --git a/src/views/sunVillage/equity/info.vue b/src/views/sunVillage/equity/info.vue index 1564cced..c18bf70b 100644 --- a/src/views/sunVillage/equity/info.vue +++ b/src/views/sunVillage/equity/info.vue @@ -133,6 +133,7 @@ } .meberCode { flex: 1; + font-size: 24px; text-align: center; .text { color: #999; diff --git a/src/views/sunVillage/throughTrain/kanban/affairsList.vue b/src/views/sunVillage/throughTrain/kanban/affairsList.vue new file mode 100644 index 00000000..1fdd6aa2 --- /dev/null +++ b/src/views/sunVillage/throughTrain/kanban/affairsList.vue @@ -0,0 +1,82 @@ + + + + \ No newline at end of file diff --git a/src/views/sunVillage/throughTrain/kanban/focusDesc.vue b/src/views/sunVillage/throughTrain/kanban/focusDesc.vue new file mode 100644 index 00000000..55da271a --- /dev/null +++ b/src/views/sunVillage/throughTrain/kanban/focusDesc.vue @@ -0,0 +1,78 @@ + + + + + diff --git a/src/views/sunVillage/throughTrain/kanban/focusList.vue b/src/views/sunVillage/throughTrain/kanban/focusList.vue new file mode 100644 index 00000000..8e73bcc5 --- /dev/null +++ b/src/views/sunVillage/throughTrain/kanban/focusList.vue @@ -0,0 +1,79 @@ + + + + + \ No newline at end of file diff --git a/src/views/sunVillage/throughTrain/kanban.vue b/src/views/sunVillage/throughTrain/kanban/index.vue similarity index 78% rename from src/views/sunVillage/throughTrain/kanban.vue rename to src/views/sunVillage/throughTrain/kanban/index.vue index e7e129de..dcec0d3e 100644 --- a/src/views/sunVillage/throughTrain/kanban.vue +++ b/src/views/sunVillage/throughTrain/kanban/index.vue @@ -5,9 +5,17 @@
关注民生
-
更多 >
+
+ 更多 > +
-
+
@@ -15,13 +23,19 @@
    -
  • +
  • 阳光村务内容01
  • -
  • +
  • 阳光村务内容01
    @@ -31,19 +45,30 @@
    民生办事
    -
    更多 >
    +
    + 更多 > +
      -
    • +
    • 金融问题咨询
      2022-02-25 09:00
    • -
    • +
    • 金融问题咨询
      2022-02-25 09:00
    • -
    • +
    • 金融问题咨询
      2022-02-25 09:00
    • @@ -171,7 +196,7 @@ export default { .livelihood_desc { padding: 20px; li { - height: 55px; + height: 65px; display: flex; justify-content: space-between; align-items: center; diff --git a/src/views/sunVillage/throughTrain/my_consulting.vue b/src/views/sunVillage/throughTrain/my_consulting.vue index 29c3bc12..e476b12f 100644 --- a/src/views/sunVillage/throughTrain/my_consulting.vue +++ b/src/views/sunVillage/throughTrain/my_consulting.vue @@ -2,7 +2,7 @@
      @@ -115,9 +115,21 @@ export default { data() { return { headingsTitle: "我的咨询", + headingsUrl: "/sunVillage/consulting", }; }, - mounted() {}, + mounted() { + let routerObj = this.$route.query; + if (routerObj.type && routerObj.type == "affairs") { + //判断当前页面是从民生直通车-民生看板 访问 + this.headingsTitle = "民生看板"; + this.headingsUrl = "/sunVillage/consulting/kanban"; + } else if (routerObj.type && routerObj.type == "affairsList") { + //判断当前页面是从民生直通车-民生看板列表 访问 + this.headingsTitle = "民生看板"; + this.headingsUrl = "/sunVillage/consulting/kanban/focusList"; + } + }, methods: { skip(url) { this.$router.push(url);