diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 77e4276..29474ae 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -33,11 +33,14 @@ - - + + + + {{e.name}} + @@ -79,62 +82,37 @@ serverKey: 1002 // 后端对应权限编号 }, { - id: 3, + id: 2, name: '订单管理', path: '/subpackage/device/pages/order_manage/order_manage', serverKey: 1011 // 后端对应权限编号 }, - // { - // id: 2, - // name: '经营分析', - // path: '', - // serverKey: 1003 // 后端对应权限编号 - // }, - // { - // id: 3, - // name: '场馆订单', - // path: '/pages/order_list/order_list', - // serverKey: 1004 // 后端对应权限编号 - // }, - // { - // id: 4, - // name: '会员卡订单', - // path: '/pages/order_list/order_list', - // serverKey: 1005 // 后端对应权限编号 - // }, - // { - // id: 5, - // name: '积分订单', - // // path: '/pages/order_list/order_list', - // path: '', - // serverKey: 1006 // 后端对应权限编号 - // }, { - id: 6, + id: 3, name: '员工管理', path: '/pages/employee/manage/manage', serverKey: 1007 // 后端对应权限编号 }, { - id: 7, + id: 4, name: '核销查询', path: '/pages/write_off/list/list', serverKey: 1008 // 后端对应权限编号 }, { - id: 8, + id: 5, name: '场地管理', path: '/pages/site/order_list/order_list', serverKey: 1009 // 后端对应权限编号 }, { - id: 9, + id: 6, name: '设备管理', path: '/subpackage/device/pages/index/index', serverKey: 1010 // 后端对应权限编号 }, { - id: 10, + id: 7, name: '商品零售', path: '/subpackage/retail/pages/index/index', serverKey: 1010 // 后端对应权限编号 @@ -197,14 +175,11 @@ let _permission = indexData.permission || {}; if(!app.isLogin())return this.showAuthor(); if(!tabInfo.path)return util.showNone('暂未开放!'); - if(tabInfo.id == 3)return util.routeTo(tabInfo.path,'nT'); + if(tabInfo.id == 2)return util.routeTo(tabInfo.path,'nT'); //测试 if(!_permission[tabInfo.serverKey])return util.showNone('暂无权限,请联系管理员开启!') - if(this.isOrderTab(tabInfo.id))return util.routeTo(tabInfo.path + `?order_type=${tabInfo.id}`,'nT'); util.routeTo(tabInfo.path,'nT'); }, - isOrderTab(ID){ - return ID == 3 || ID == 4 || ID == 5 - }, + getIndexInfo(){ servers.get({ url: API.calc, @@ -348,7 +323,7 @@ .ic-header{ position: relative; height: 476upx; - margin-bottom: 48upx; + margin-bottom: 24upx; padding: 38upx 24upx 0; border-radius: 14upx; background-color: $themeColor; @@ -436,7 +411,6 @@ } } .ic-notice{ - margin-bottom: 24upx; padding: 0 24upx; height: 108upx; border-radius: 10upx; @@ -481,29 +455,36 @@ } .ic-tabs{ display: flex; - justify-content: space-between; flex-wrap: wrap; + padding: 0upx 14upx 12upx; + margin-top: -12upx; .it-item{ - padding-top: 54upx; - margin-bottom: 24upx; flex-shrink: 0; - flex-grow: 0; - width: 218upx; - height: 218upx; - border-radius: 10upx; - background-color: #fff; - >image{ - display: block; - margin: 0 auto 20upx; - width: 52upx; - height: 52upx; - } + flex-grow: 1; + max-width: 33.33%; + min-width: 33.33%; + padding: 12upx; >view{ - text-align: center; - line-height: 40upx; - font-size: 28upx; - color: #1a1a1a; + padding: 40upx 10upx 0; + height: 218upx; + border-radius: 10upx; + background-color: #fff; + >image{ + display: block; + margin: 0 auto 20upx; + width: 52upx; + height: 52upx; + } + >view{ + text-align: center; + line-height: 40upx; + font-size: 28upx; + color: #1a1a1a; + @include textHide(1); + } + } + } } .ic-author-modal{ diff --git a/src/subpackage/device/pages/order_manage/order_manage.vue b/src/subpackage/device/pages/order_manage/order_manage.vue index a2ca0d7..264c49b 100644 --- a/src/subpackage/device/pages/order_manage/order_manage.vue +++ b/src/subpackage/device/pages/order_manage/order_manage.vue @@ -111,7 +111,7 @@ export default { util.routeTo(tabInfo.path,'nT'); }, isOrderTab(ID){ - return ID == 3 || ID == 4 || ID == 5 || ID == 1 + return ID == 0 || ID == 4 || ID == 5 || ID == 1 }, } }