diff --git a/common/style/reset.css b/common/style/reset.css index 73b3b54..2e60be2 100644 --- a/common/style/reset.css +++ b/common/style/reset.css @@ -40,4 +40,104 @@ input[type="button"], input[type="submit"], input[type="search"], input[type="re overflow: hidden; text-overflow: ellipsis; white-space: nowrap; +} +.flexcol { + flex-direction: column; +} +.flexstart { + align-items: flex-start !important; +} +.jcflexstart { + justify-content: flex-start !important; +} + +.zd-row { + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; +} +.zd-col-24 { + width: 100%; +} +.zd-col-23 { + width: 95.83333% +} +.zd-col-22 { + width: 91.66667% +} +.zd-col-21 { + width: 87.5% +} +.zd-col-20 { + width: 83.33333% +} +.zd-col-19 { + width: 79.16667% +} +.zd-col-18 { + width: 75% +} +.zd-col-17 { + width: 70.83333% +} +.zd-col-16 { + width: 66.66667% +} +.zd-col-15 { + width: 62.5% +} +.zd-col-14 { + width: 58.33333% +} +.zd-col-13 { + width: 54.16667% +} +.zd-col-12 { + width: 50%; +} +.zd-col-11 { + width: 45.83333% +} +.zd-col-10 { + width: 41.66667% +} +.zd-col-9 { + width: 37.5% +} +.zd-col-8 { + width: 33.33333% +} +.zd-col-7 { + width: 29.16667% +} +.zd-col-6 { + width: 25% +} +.zd-col-5 { + width: 20.83333% +} +.zd-col-4 { + width: 16.66667% +} +.zd-col-3 { + width: 12.5% +} +.zd-col-2 { + width: 8.33333% +} +.zd-col-1 { + width: 4.16667% +} +.mgb10 { + margin-bottom: 10rpx; +} +.pdl20 { + padding-left: 20rpx; +} +.pdr20 { + padding-right: 20rpx; +} +.pdr10 { + padding-right: 10rpx; } \ No newline at end of file diff --git a/pages/home/home.vue b/pages/home/home.vue index ef94813..6aaac1c 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -12,16 +12,19 @@ 退出 - - - - - {{e.name}} + + + + {{e.name}} - - - - {{el.name}} + + + + {{e.name}} + + + {{el.name}} + @@ -35,7 +38,58 @@ data() { return { userName: '', + index: 1, + activeArr: [], menuList: [ + {id: 1, name: '仓储管理', icon: 'RF01', sonTreen: [{ + id: 'sec1', name: '半成品库管理',sonTreen: [ + {id: 'thi1', name: '半成品入库', path: '/pages/modules/SemifinishedInStore'}, + {id: 'thi2', name: '半成品出库', path: '/pages/modules/SemifinishedOutStore'}, + {id: 'thi3', name: '空箱出库', path: '/pages/modules/EmptyOutStore'} + ] + }]}, + {id: 2, name: '振动清洗管理', icon: 'RF02', sonTreen: [{ + id: 'sec1', name: '缓存线管理',sonTreen: [ + {id: 'thi1', name: '缓存线叫料', path: '/pages/modules/SemifinishedInStore'}, + {id: 'thi1', name: '缓存线盘点', path: '/pages/modules/SemifinishedInStore'} + ] + }, { + id: 'sec1', name: '清洗管理',sonTreen: [ + {id: 'thi1', name: '清洗上料', path: '/pages/modules/SemifinishedInStore'}, + {id: 'thi2', name: '清洗下料', path: '/pages/modules/SemifinishedInStore'} + ] + }]}, + {id: 3, name: '激光下料清洗管理', icon: 'RF03', sonTreen: [{ + id: 'sec1', name: '清洗管理',sonTreen: [ + {id: 'thi1', name: '清洗上料', path: '/pages/modules/SemifinishedInStore'}, + {id: 'thi2', name: '清洗下料', path: '/pages/modules/SemifinishedInStore'} + ] + }]}, + {id: 4, name: '发黑清洗管理', icon: 'RF04', sonTreen: [{ + id: 'sec1', name: '清洗管理',sonTreen: [ + {id: 'thi1', name: '清洗上料', path: '/pages/modules/SemifinishedInStore'}, + {id: 'thi2', name: '清洗下料', path: '/pages/modules/SemifinishedInStore'} + ] + }, { + id: 'sec2', name: '退货管理',sonTreen: [ + {id: 'thi1', name: '退货缓存区', path: '/pages/modules/SemifinishedInStore'}, + {id: 'thi2', name: '退货中物料', path: '/pages/modules/SemifinishedInStore'} + ] + }]}, + {id: 5, name: '环保清洗管理', icon: 'RF01', sonTreen: [{ + id: 'sec1', name: '缓存区管理',sonTreen: [ + {id: 'thi1', name: '缓存线叫料', path: '/pages/modules/SemifinishedInStore'}, + {id: 'thi2', name: '缓存线盘点', path: '/pages/modules/SemifinishedInStore'} + ] + }, { + id: 'sec2', name: '清洗管理',sonTreen: [ + {id: 'thi1', name: '清洗叫料', path: '/pages/modules/SemifinishedInStore'}, + {id: 'thi2', name: '清洗上料', path: '/pages/modules/SemifinishedInStore'}, + {id: 'thi3', name: '清洗物料列表', path: '/pages/modules/SemifinishedInStore'} + ] + }]} + ], + menuList1: [ {id: '1', name: '仓储管理', sonTree: [ {menu_id: '1', icon: 'RF01', name: '半成品入库', path: '/pages/modules/SemifinishedInStore'}, {menu_id: '2', icon: 'RF02', name: '半成品出库', path: '/pages/modules/SemifinishedOutStore'}, @@ -52,6 +106,7 @@ if (this.$store.getters.userInfo) { this.userName = JSON.parse(this.$store.getters.userInfo).username } + this.activeArr = this.menuList[0].sonTreen }, methods: { async _authority () { @@ -59,6 +114,9 @@ this.menuList = [...res.sonTree] }, + toMenu (e) { + this.activeArr = [...e.sonTreen] + }, toPage (e) { let url = e.path uni.redirectTo({ @@ -66,10 +124,11 @@ }) }, Quit () { - this.$store.dispatch('delUserInfo') - uni.redirectTo({ - url: '/pages/login/login' - }) + console.log(this.activeArr) + // this.$store.dispatch('delUserInfo') + // uni.redirectTo({ + // url: '/pages/login/login' + // }) } } } @@ -84,7 +143,7 @@ padding 0 24rpx height 100% padding-top calc(var(--status-bar-height) + 86rpx) - background linear-gradient(to bottom, #f8e6db 0%, #f6f6f6 30%, #f6f6f6 100%) + background linear-gradient(to bottom, #fae2ca 0%, #fff5ea 20%, #fdfdfd 100%) .header position fixed left 0 @@ -92,7 +151,7 @@ padding-top var(--status-bar-height) z-index 100 _wh(100%, calc(var(--status-bar-height) + 86rpx)) - background-color #f8e6db + // background-color #f8e6db _font(36rpx,86rpx,#333,,center) .userInfo-wrap _fj() @@ -125,35 +184,49 @@ _wh(100%, calc(100% - 238rpx)) background-color #fff border-radius: 12rpx; - padding: 14rpx; - margin-bottom: 24rpx; + margin-bottom: 24rpx +.fir_menus_wrap + height 100% + background-color #dedede +.sec_menus_wrap + height 100% + background-color #fff + padding 0 40rpx overflow-y auto -.menus_wrap +.fir-menu_item + _wh(100%, 90rpx) + padding 0 20rpx +.fir-menu_name + height 90rpx + _font(28rpx, 30rpx, #666,,) + _bis('../../static/image/menu/RF01.png', 50rpx,,left,) + padding-left 70rpx +.sec_menu_item width 100% - margin-bottom 24rpx -.fir_menu_wrap - _wh(100%, 98rpx) -.fir_menu_title - _font(36rpx, 98rpx, #333, bold,) -.sec_menu_wrap - _fj(flex-start,flex-start,,wrap) - align-content: flex-start -.sec_menu-item - _fj() - flex-direction column - _wh(30%, auto) - margin-bottom 40rpx - _font(26rpx, 60rpx,#e74f1a,,center) - &:nth-child(3n+2) - margin-left 5% - margin-right 5% -::v-deep .menu-img - _wh(100%, auto) - img - position relative - opacity 1 - _wh(55%, auto) - margin 0 auto 0.2rpx -.menu-name - _font(28rpx, 38rpx, #444,,center) + padding 20rpx 0 0 0 +.sec_menu_name + width max-content + height 70rpx + _font(26rpx, 70rpx, #333,700,) + background linear-gradient(to right, #fbfef1 0%, #fff2a9 100%) + transform: skew(-10deg) + border-top-right-radius: 10px; + border-bottom-right-radius: 10px; + padding 0 40rpx 0 10rpx + margin-bottom 20rpx +.sec_menu_item + &:nth-child(1) .sec_menu_name + background linear-gradient(to right, #fbfef1 0%, #f5dc51 100%) + &:nth-child(2) .sec_menu_name + background linear-gradient(to right, #fefcff 0%, #80c5e5 100%) + &:nth-child(3) .sec_menu_name + background linear-gradient(to right, #fefbf6 0%, #e6c096 100%) +.thi_menu_name + height 60rpx + _font(28rpx, 60rpx, #333,,) +.fir_menu_active + background-color #fff + .fir-menu_name + color #000 + font-weight: 700 diff --git a/pages/home/home_back.vue b/pages/home/home_back.vue new file mode 100644 index 0000000..ef94813 --- /dev/null +++ b/pages/home/home_back.vue @@ -0,0 +1,159 @@ + + + + + diff --git a/static/image/info_bg.png b/static/image/info_bg.png index 8f7e000..a44db69 100644 Binary files a/static/image/info_bg.png and b/static/image/info_bg.png differ diff --git a/static/image/login_bg.png b/static/image/login_bg.png index 680a940..0451815 100644 Binary files a/static/image/login_bg.png and b/static/image/login_bg.png differ