From 3d23e0a3653388d074a65642625167d17f8a2974 Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Sun, 30 Aug 2020 16:34:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=A2=E5=8C=85=E5=B1=91=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UserSelector/SimpleMultipleUserSelector.vue   |  2 +-
 vue/src/layout/component/Main/index.vue           | 15 +++++++++------
 vue/src/layout/component/Sidebar/index.vue        |  2 +-
 vue/src/router/index.js                           |  2 +-
 vue/src/router/module/defaultRoot/child/app.js    |  4 ++--
 .../router/module/defaultRoot/child/purchase.js   |  4 ++--
 vue/src/router/module/defaultRoot/child/sell.js   |  4 ++--
 7 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/vue/src/component/biz/UserSelector/SimpleMultipleUserSelector.vue b/vue/src/component/biz/UserSelector/SimpleMultipleUserSelector.vue
index 76a1274..ffc9dd3 100644
--- a/vue/src/component/biz/UserSelector/SimpleMultipleUserSelector.vue
+++ b/vue/src/component/biz/UserSelector/SimpleMultipleUserSelector.vue
@@ -17,7 +17,7 @@ export default {
 
     props: {value: Array, disabled: Boolean},
 
-    data:()=>({data:[]}),
+    data: () => ({data: []}),
 
     methods: {
         emit(v) {
diff --git a/vue/src/layout/component/Main/index.vue b/vue/src/layout/component/Main/index.vue
index 0709e73..a2b6299 100644
--- a/vue/src/layout/component/Main/index.vue
+++ b/vue/src/layout/component/Main/index.vue
@@ -34,14 +34,17 @@ import PageFooter from "./component/PageFooter"
 export default {
     name: 'AppMain',
 
-    components: {BackToTop, Breadcrumb,PageView, PageFooter},
+    components: {BackToTop, Breadcrumb, PageView, PageFooter},
 
     computed: {
-        showBreadcrumb: () => settingGetters.showBreadcrumb,
-        showBackToTop:()=>settingGetters.showBackToTop,
-
-        cachedViews:()=>tagsViewGetters.cachedViews,
-        transitionName:()=>tagsViewGetters.transitionName,
+        showBreadcrumb() {
+            if (!settingGetters.showBreadcrumb) return false
+            return this.$route.meta.breadcrumb !== false
+        },
+        showBackToTop: () => settingGetters.showBackToTop,
+
+        cachedViews: () => tagsViewGetters.cachedViews,
+        transitionName: () => tagsViewGetters.transitionName,
 
         showIframe: () => iframeGetters.show,
         currentIframe: () => iframeGetters.current,
diff --git a/vue/src/layout/component/Sidebar/index.vue b/vue/src/layout/component/Sidebar/index.vue
index 977366f..a431a0d 100644
--- a/vue/src/layout/component/Sidebar/index.vue
+++ b/vue/src/layout/component/Sidebar/index.vue
@@ -1,7 +1,7 @@
 <script type="text/jsx">
 import actionOnSelectMenuMixin from "@/layout/mixin/actionOnSelectMenu"
 import {getters as mainGetters} from "@/layout/store/main"
-import {getters as settingGetters,mutations as settingMutations} from "@/layout/store/setting"
+import {getters as settingGetters, mutations as settingMutations} from "@/layout/store/setting"
 import Logo from './component/Logo'
 import SidebarItem from './component/SidebarItem'
 
diff --git a/vue/src/router/index.js b/vue/src/router/index.js
index 0700a28..769f991 100644
--- a/vue/src/router/index.js
+++ b/vue/src/router/index.js
@@ -5,7 +5,7 @@
 * 左侧菜单显示：name && !meta.hidden && meta.title
 * 左侧菜单排序：能在左侧菜单中显示 && meta.sort，升序排列
 * 左侧菜单不折叠只有一个children的路由：meta.alwaysShow
-* 面包屑显示：meta.title || meta.dynamicTitle
+* 面包屑显示：meta.breadcrumb !== false && (meta.title || meta.dynamicTitle)
 * tab栏显示：meta.title || meta.dynamicTitle
 * tab栏固定显示：meta.title && meta.affix
 * 页面不缓存：!name && !meta.usePathKey && !meta.useFullPathKey || meta.noCache
diff --git a/vue/src/router/module/defaultRoot/child/app.js b/vue/src/router/module/defaultRoot/child/app.js
index 360a495..7e2dbca 100644
--- a/vue/src/router/module/defaultRoot/child/app.js
+++ b/vue/src/router/module/defaultRoot/child/app.js
@@ -5,13 +5,13 @@ const router = [
         path: 'index',
         component: 'index/',
         name: 'index',
-        meta: {title: '首页', affix: true, icon: 'svg-home', noAuth: true, sort: 0}
+        meta: {title: '首页', affix: true, icon: 'svg-home', noAuth: true, breadcrumb: false, sort: 0}
     },
     {
         path: 'user',
         name: 'userCenter',
         component: 'userCenter/',
-        meta: {title: '个人中心', noCache: true, icon: 'svg-user', noAuth: true, hidden: true},
+        meta: {title: '个人中心', noCache: true, icon: 'svg-user', noAuth: true, breadcrumb: false, hidden: true},
     }
 ]
 
diff --git a/vue/src/router/module/defaultRoot/child/purchase.js b/vue/src/router/module/defaultRoot/child/purchase.js
index 2bf0161..639f7ba 100644
--- a/vue/src/router/module/defaultRoot/child/purchase.js
+++ b/vue/src/router/module/defaultRoot/child/purchase.js
@@ -12,11 +12,11 @@ const router = {
         },
         {
             path: 'order/detail/:type(see|add|edit)/:id?',
-            props: true,
             component: 'purchase/order/detail',
             meta: {
                 title: '采购订单详情页',
                 hidden: true,
+                breadcrumb: false,
                 dynamicTitle(to) {
                     const {type, id} = to.params
                     switch (type) {
@@ -41,11 +41,11 @@ const router = {
         },
         {
             path: 'inbound/detail/:type(see|add|edit)/:id?',
-            props: true,
             component: 'purchase/inbound/detail',
             meta: {
                 title: '采购入库详情页',
                 hidden: true,
+                breadcrumb: false,
                 dynamicTitle(to) {
                     const {type, id} = to.params
                     switch (type) {
diff --git a/vue/src/router/module/defaultRoot/child/sell.js b/vue/src/router/module/defaultRoot/child/sell.js
index 8aea856..e1d9419 100644
--- a/vue/src/router/module/defaultRoot/child/sell.js
+++ b/vue/src/router/module/defaultRoot/child/sell.js
@@ -12,11 +12,11 @@ const router = {
         },
         {
             path: 'order/detail/:type(see|add|edit)/:id?',
-            props: true,
             component: 'sell/order/detail',
             meta: {
                 title: '销售订单详情页',
                 hidden: true,
+                breadcrumb: false,
                 dynamicTitle(to) {
                     const {type, id} = to.params
                     switch (type) {
@@ -41,11 +41,11 @@ const router = {
         },
         {
             path: 'outbound/detail/:type(see|add|edit)/:id?',
-            props: true,
             component: 'sell/outbound/detail',
             meta: {
                 title: '销售出库详情页',
                 hidden: true,
+                breadcrumb: false,
                 dynamicTitle(to) {
                     const {type, id} = to.params
                     switch (type) {