diff --git a/src/components/header.vue b/src/components/header.vue index 1c16046..aecc245 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -43,6 +43,9 @@
+
+
+
@@ -94,6 +97,9 @@ export default { }, switchColor (type) { this.$emit('switchColor', type) + }, + backHome () { + this.$router.push('/home') } } } @@ -205,6 +211,12 @@ export default { padding 0 &:nth-child(2) padding 0 10px +.home_tip_wrap + _wh(18px, 45px) + _fj(center) + margin-left 15px + .icon_home + _font(18px, 45px, #fff,,center) .colors_3_wrap position relative _wh(18px, 18px) diff --git a/src/pages/modules/semifinished/semi-finished-check-search.vue b/src/pages/modules/semifinished/semi-finished-check-search.vue index fe91d6a..5f0769a 100644 --- a/src/pages/modules/semifinished/semi-finished-check-search.vue +++ b/src/pages/modules/semifinished/semi-finished-check-search.vue @@ -152,8 +152,8 @@ export default { diff --git a/src/pages/modules/semifinished/semi-finished-outstore.vue b/src/pages/modules/semifinished/semi-finished-outstore.vue index 5f81ffb..5204c6b 100644 --- a/src/pages/modules/semifinished/semi-finished-outstore.vue +++ b/src/pages/modules/semifinished/semi-finished-outstore.vue @@ -66,12 +66,9 @@
载具号
-
+
-
- -
出库点
@@ -127,10 +124,4 @@ export default { .search-item_2 width 100% margin-left 0 -.filter_button - width 96px - height 30px -.filter_input_wraper_1 - width calc(100% - 156px) - padding-right 10px diff --git a/src/router/index.js b/src/router/index.js index c4fac1f..4af042d 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -18,7 +18,6 @@ const semiFinishedOutstore = r => require.ensure([], () => r(require('@page/modu const semiFinishedOutstoreSearch = r => require.ensure([], () => r(require('@page/modules/semifinished/semi-finished-outstore-search')), 'semifinished') const semiFinishedCheck = r => require.ensure([], () => r(require('@page/modules/semifinished/semi-finished-check')), 'semifinished') const semiFinishedCheckSearch = r => require.ensure([], () => r(require('@page/modules/semifinished/semi-finished-check-search')), 'semifinished') -const semiFinishedCompose = r => require.ensure([], () => r(require('@page/modules/semifinished/semi-finished-compose')), 'semifinished') const semiFinishedComposeSearch = r => require.ensure([], () => r(require('@page/modules/semifinished/semi-finished-compose-search')), 'semifinished') const Homeset = r => require.ensure([], () => r(require('@page/homeset/index')), 'Homeset') @@ -88,11 +87,11 @@ export default new Router({ component: semiFinishedInstoreSearch, meta: {guidePath: '2'} }, { - path: '/semifinishedoutstore', // 半成品入库 + path: '/semifinishedoutstore', // 半成品出库 component: semiFinishedOutstore, meta: {guidePath: '3'} }, { - path: '/semifinishedoutstoresearch', // 半成品出库 + path: '/semifinishedoutstoresearch', component: semiFinishedOutstoreSearch, meta: {guidePath: '4'} }, { @@ -103,10 +102,6 @@ export default new Router({ path: '/semifinishedchecksearch', component: semiFinishedCheckSearch, meta: {guidePath: '6'} - }, { - path: '/semifinishedcompose', // 半成品拼盘 - component: semiFinishedCompose, - meta: {guidePath: '7'} }, { path: '/semifinishedcomposesearch', component: semiFinishedComposeSearch, diff --git a/src/style/layout.styl b/src/style/layout.styl index 3f3df7b..3f37699 100644 --- a/src/style/layout.styl +++ b/src/style/layout.styl @@ -218,6 +218,7 @@ header background-color #fff .grid_wraper _wh(100%, calc(100% - 45px)) + border-radius 5px overflow-y auto .filter-table width 100% diff --git a/src/style/reset.css b/src/style/reset.css index 936f3bc..9e0312a 100644 --- a/src/style/reset.css +++ b/src/style/reset.css @@ -60,20 +60,25 @@ li { height: 15px; } +::-webkit-scrollbar-track { + background-color: rgba(255, 255, 255, 0.2); + -webkit-border-radius: 6px; +} + ::-webkit-scrollbar-track-piece { - background-color: rgba(0, 0, 0, 0.2); + background-color: rgba(255, 255, 255, 0.2); -webkit-border-radius: 6px; } ::-webkit-scrollbar-thumb:vertical { height: 15px; - background-color: rgba(125, 125, 125, 0.7); + background-color: rgba(255, 255, 255, .4); -webkit-border-radius: 6px; } ::-webkit-scrollbar-thumb:horizontal { width: 15px; - background-color: rgba(125, 125, 125, 0.7); + background-color: rgba(255, 255, 255, .4); -webkit-border-radius: 6px; }