diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index c9abd4b..582561b 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -2,10 +2,15 @@ // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数 "version": "0.0", "configurations": [{ - "type": "uniCloud", - "default": { - "launchtype": "local" - } - } + "app-plus" : + { + "launchtype" : "local" + }, + "default" : + { + "launchtype" : "local" + }, + "type" : "uniCloud" + } ] } diff --git a/pages/home/home.vue b/pages/home/home.vue index 90d515e..5f655b6 100644 --- a/pages/home/home.vue +++ b/pages/home/home.vue @@ -13,15 +13,11 @@ - - - - {{e.name}} - + - - - {{el.name}} + + + {{e.name}} @@ -36,19 +32,10 @@ return { userName: '', menuList: [ - {id: '1', name: '人工组盘', sonTree: [ - {menu_id: '1', icon: 'RF01', name: '人工组盘', path: '/pages/manage/man-group-disk'} - ]}, - {id: '2', name: '原材料库', sonTree: [ - {menu_id: '1', icon: 'RF02', name: '入库', path: '/pages/manage/in-storage'}, - {menu_id: '2', icon: 'RF03', name: '出库', path: '/pages/manage/out-storage'} - ]}, - {id: '3', name: '任务流转', sonTree: [ - {menu_id: '1', icon: 'RF04', name: '任务流转', path: '/pages/manage/task-flow'} - ]} - ], - show: false, - secM: [] + {id: '1', name: '人工排产', icon: 'RF01', path: '/pages/manage/man-group-disk'}, + {id: '2', name: '涂线板', icon: 'RF02', path: '/pages/manage/man-group-disk'}, + {id: '3', name: '物料库存', icon: 'RF03', path: '/pages/manage/man-group-disk'} + ] }; }, created () { @@ -58,11 +45,6 @@ } }, methods: { - async _authority () { - let res = await authority() - this.menuList = [...res.sonTree] - - }, toPage (e) { let url = e.path uni.redirectTo({ diff --git a/pages/login/login.vue b/pages/login/login.vue index 984935b..202f41c 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -1,24 +1,29 @@ @@ -70,9 +75,9 @@ }) }, async toLogin() { - // uni.redirectTo({ - // url: '/pages/home/home' - // }) + uni.redirectTo({ + url: '/pages/home/home' + }) this.disabled = true if (this.user === '') { uni.showToast({ @@ -130,12 +135,39 @@