Skip to content

W
wx-boss
Commit 126f3d30 by 姜雷
Options

Merge branch 'develop' into test

parents 50e2a390 e5343644
Showing with 7 additions and 2 deletions
miniprogram/pages/homeAndReport/homeAndReport.js
...@@ -23,6 +23,8 @@ Page({ ...@@ -23,6 +23,8 @@ Page({
var list = userRoles var list = userRoles
.map(function (item) { return tabList.find(function (menu) { return menu.code === item.menuCode; }); }) .map(function (item) { return tabList.find(function (menu) { return menu.code === item.menuCode; }); })
.filter(function (menu) { return (menu ? true : false); }); .filter(function (menu) { return (menu ? true : false); });
if (!list.find(function (item) { return item.code === '9002'; }))
list.push(tabList[tabList.length - 1]);
this.setData({ this.setData({
selected: list.length ? list[0].code : '', selected: list.length ? list[0].code : '',
list: list, list: list,
...@@ -45,4 +47,4 @@ Page({ ...@@ -45,4 +47,4 @@ Page({
}); });
}, },
}); });
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9tZUFuZFJlcG9ydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImhvbWVBbmRSZXBvcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFTQSxJQUFNLEdBQUcsR0FBRyxNQUFNLEVBQVUsQ0FBQztBQUM3QixJQUFNLE9BQU8sR0FBVztJQUN0QjtRQUNFLFFBQVEsRUFBRSxrQkFBa0I7UUFDNUIsUUFBUSxFQUFFLDhCQUE4QjtRQUN4QyxnQkFBZ0IsRUFBRSw4QkFBOEI7UUFDaEQsSUFBSSxFQUFFLE1BQU07UUFDWixJQUFJLEVBQUUsTUFBTTtLQUNiO0lBQ0Q7UUFDRSxRQUFRLEVBQUUsc0JBQXNCO1FBQ2hDLFFBQVEsRUFBRSxnQ0FBZ0M7UUFDMUMsZ0JBQWdCLEVBQUUsZ0NBQWdDO1FBQ2xELElBQUksRUFBRSxNQUFNO1FBQ1osSUFBSSxFQUFFLE1BQU07S0FDYjtDQUNGLENBQUM7QUFFRixJQUFJLENBQUM7SUFDSCxNQUFNO1FBQ0osSUFBSSxTQUFTLEdBQUcsR0FBRyxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUM7UUFDekMsSUFBSSxJQUFJLEdBQUcsU0FBUzthQUNqQixHQUFHLENBQUMsVUFBQSxJQUFJLElBQUksT0FBQSxPQUFPLENBQUMsSUFBSSxDQUFDLFVBQUEsSUFBSSxJQUFJLE9BQUEsSUFBSSxDQUFDLElBQUksS0FBSyxJQUFJLENBQUMsUUFBUSxFQUEzQixDQUEyQixDQUFDLEVBQWpELENBQWlELENBQUM7YUFDOUQsTUFBTSxDQUFDLFVBQUEsSUFBSSxJQUFJLE9BQUEsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEVBQXJCLENBQXFCLENBQUMsQ0FBQztRQUN6QyxJQUFJLENBQUMsT0FBUSxDQUFDO1lBQ1osUUFBUSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUU7WUFDekMsSUFBSSxNQUFBO1NBQ0wsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUNELE1BQU07UUFDSixFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQztZQUN0QixFQUFFLENBQUMsY0FBYyxFQUFFLENBQUM7UUFDdEIsQ0FBQztJQUNILENBQUM7SUFDRCxJQUFJLEVBQUU7UUFDSixRQUFRLEVBQUUsRUFBRTtRQUNaLElBQUksRUFBRSxFQUFFO0tBQ1Q7SUFDRCxXQUFXLFlBQUMsQ0FBQztRQUNYLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3ZCLElBQUEsYUFBMEIsRUFBeEIsY0FBSSxFQUFFLGdCQUFLLENBQWM7UUFHL0IsSUFBSSxDQUFDLE9BQVEsQ0FBQztZQUNaLFFBQVEsRUFBRSxLQUFLO1NBQ2hCLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJTXlBcHAgfSBmcm9tICcuLi8uLi9hcHAnO1xuXG50eXBlIE1lbnUgPSB7XG4gIHBhZ2VQYXRoOiBzdHJpbmc7XG4gIGljb25QYXRoOiBzdHJpbmc7XG4gIHNlbGVjdGVkSWNvblBhdGg6IHN0cmluZztcbiAgdGV4dDogc3RyaW5nO1xuICBjb2RlOiBzdHJpbmc7XG59O1xuY29uc3QgYXBwID0gZ2V0QXBwPElNeUFwcD4oKTtcbmNvbnN0IHRhYkxpc3Q6IE1lbnVbXSA9IFtcbiAge1xuICAgIHBhZ2VQYXRoOiAnL3BhZ2VzL2hvbWUvaG9tZScsXG4gICAgaWNvblBhdGg6ICcvaW1hZ2VzL3RhYl9zaHVqdV9ub3JAMngucG5nJyxcbiAgICBzZWxlY3RlZEljb25QYXRoOiAnL2ltYWdlcy90YWJfc2h1anVfcHJlQDJ4LnBuZycsXG4gICAgdGV4dDogJ+aVsOaNrummlumhtScsXG4gICAgY29kZTogJzkwMDEnLFxuICB9LFxuICB7XG4gICAgcGFnZVBhdGg6ICcvcGFnZXMvcmVwb3J0L3JlcG9ydCcsXG4gICAgaWNvblBhdGg6ICcvaW1hZ2VzL3RhYl9iYW9iaWFvX25vckAyeC5wbmcnLFxuICAgIHNlbGVjdGVkSWNvblBhdGg6ICcvaW1hZ2VzL3RhYl9iYW9iaWFvX3ByZUAyeC5wbmcnLFxuICAgIHRleHQ6ICfov5DokKXnrqHnkIYnLFxuICAgIGNvZGU6ICc5MDAyJyxcbiAgfSxcbl07XG5cblBhZ2Uoe1xuICBvbkxvYWQoKSB7XG4gICAgbGV0IHVzZXJSb2xlcyA9IGFwcC5nbG9iYWxEYXRhLnVzZXJSb2xlcztcbiAgICBsZXQgbGlzdCA9IHVzZXJSb2xlc1xuICAgICAgLm1hcChpdGVtID0+IHRhYkxpc3QuZmluZChtZW51ID0+IG1lbnUuY29kZSA9PT0gaXRlbS5tZW51Q29kZSkpXG4gICAgICAuZmlsdGVyKG1lbnUgPT4gKG1lbnUgPyB0cnVlIDogZmFsc2UpKTtcbiAgICB0aGlzLnNldERhdGEhKHtcbiAgICAgIHNlbGVjdGVkOiBsaXN0Lmxlbmd0aCA/IGxpc3RbMF0uY29kZSA6ICcnLFxuICAgICAgbGlzdCxcbiAgICB9KTtcbiAgfSxcbiAgb25TaG93KCkge1xuICAgIGlmICh3eC5oaWRlSG9tZUJ1dHRvbikge1xuICAgICAgd3guaGlkZUhvbWVCdXR0b24oKTtcbiAgICB9XG4gIH0sXG4gIGRhdGE6IHtcbiAgICBzZWxlY3RlZDogJycsXG4gICAgbGlzdDogW10sXG4gIH0sXG4gIGNsaWNrSGFuZGxlKGUpIHtcbiAgICBjb25zb2xlLmxvZygnaW4gY2xpY2snLCBlKTtcbiAgICBsZXQgeyBwYXRoLCBpbmRleCB9ID0gZS5kZXRhaWw7XG4gICAgLy8gY29uc29sZS5sb2cocGF0aCwgaW5kZXgpO1xuICAgIC8vIHd4LnN3aXRjaFRhYih7IHVybDogcGF0aCB9KTtcbiAgICB0aGlzLnNldERhdGEhKHtcbiAgICAgIHNlbGVjdGVkOiBpbmRleCxcbiAgICB9KTtcbiAgfSxcbn0pO1xuIl19 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9tZUFuZFJlcG9ydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImhvbWVBbmRSZXBvcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFTQSxJQUFNLEdBQUcsR0FBRyxNQUFNLEVBQVUsQ0FBQztBQUM3QixJQUFNLE9BQU8sR0FBVztJQUN0QjtRQUNFLFFBQVEsRUFBRSxrQkFBa0I7UUFDNUIsUUFBUSxFQUFFLDhCQUE4QjtRQUN4QyxnQkFBZ0IsRUFBRSw4QkFBOEI7UUFDaEQsSUFBSSxFQUFFLE1BQU07UUFDWixJQUFJLEVBQUUsTUFBTTtLQUNiO0lBQ0Q7UUFDRSxRQUFRLEVBQUUsc0JBQXNCO1FBQ2hDLFFBQVEsRUFBRSxnQ0FBZ0M7UUFDMUMsZ0JBQWdCLEVBQUUsZ0NBQWdDO1FBQ2xELElBQUksRUFBRSxNQUFNO1FBQ1osSUFBSSxFQUFFLE1BQU07S0FDYjtDQUNGLENBQUM7QUFFRixJQUFJLENBQUM7SUFDSCxNQUFNO1FBQ0osSUFBSSxTQUFTLEdBQUcsR0FBRyxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUM7UUFDekMsSUFBSSxJQUFJLEdBQUcsU0FBUzthQUNqQixHQUFHLENBQUMsVUFBQSxJQUFJLElBQUksT0FBQSxPQUFPLENBQUMsSUFBSSxDQUFDLFVBQUEsSUFBSSxJQUFJLE9BQUEsSUFBSSxDQUFDLElBQUksS0FBSyxJQUFJLENBQUMsUUFBUSxFQUEzQixDQUEyQixDQUFDLEVBQWpELENBQWlELENBQUM7YUFDOUQsTUFBTSxDQUFDLFVBQUEsSUFBSSxJQUFJLE9BQUEsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEVBQXJCLENBQXFCLENBQUMsQ0FBQztRQUN6QyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsVUFBQSxJQUFJLElBQUksT0FBQSxJQUFJLENBQUMsSUFBSSxLQUFLLE1BQU0sRUFBcEIsQ0FBb0IsQ0FBQyxDQUFDO1lBQzNDLElBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUV6QyxJQUFJLENBQUMsT0FBUSxDQUFDO1lBQ1osUUFBUSxFQUFFLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUU7WUFDekMsSUFBSSxNQUFBO1NBQ0wsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUNELE1BQU07UUFDSixFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQztZQUN0QixFQUFFLENBQUMsY0FBYyxFQUFFLENBQUM7UUFDdEIsQ0FBQztJQUNILENBQUM7SUFDRCxJQUFJLEVBQUU7UUFDSixRQUFRLEVBQUUsRUFBRTtRQUNaLElBQUksRUFBRSxFQUFFO0tBQ1Q7SUFDRCxXQUFXLFlBQUMsQ0FBQztRQUNYLE9BQU8sQ0FBQyxHQUFHLENBQUMsVUFBVSxFQUFFLENBQUMsQ0FBQyxDQUFDO1FBQ3ZCLElBQUEsYUFBMEIsRUFBeEIsY0FBSSxFQUFFLGdCQUFLLENBQWM7UUFHL0IsSUFBSSxDQUFDLE9BQVEsQ0FBQztZQUNaLFFBQVEsRUFBRSxLQUFLO1NBQ2hCLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJTXlBcHAgfSBmcm9tICcuLi8uLi9hcHAnO1xuXG50eXBlIE1lbnUgPSB7XG4gIHBhZ2VQYXRoOiBzdHJpbmc7XG4gIGljb25QYXRoOiBzdHJpbmc7XG4gIHNlbGVjdGVkSWNvblBhdGg6IHN0cmluZztcbiAgdGV4dDogc3RyaW5nO1xuICBjb2RlOiBzdHJpbmc7XG59O1xuY29uc3QgYXBwID0gZ2V0QXBwPElNeUFwcD4oKTtcbmNvbnN0IHRhYkxpc3Q6IE1lbnVbXSA9IFtcbiAge1xuICAgIHBhZ2VQYXRoOiAnL3BhZ2VzL2hvbWUvaG9tZScsXG4gICAgaWNvblBhdGg6ICcvaW1hZ2VzL3RhYl9zaHVqdV9ub3JAMngucG5nJyxcbiAgICBzZWxlY3RlZEljb25QYXRoOiAnL2ltYWdlcy90YWJfc2h1anVfcHJlQDJ4LnBuZycsXG4gICAgdGV4dDogJ+aVsOaNrummlumhtScsXG4gICAgY29kZTogJzkwMDEnLFxuICB9LFxuICB7XG4gICAgcGFnZVBhdGg6ICcvcGFnZXMvcmVwb3J0L3JlcG9ydCcsXG4gICAgaWNvblBhdGg6ICcvaW1hZ2VzL3RhYl9iYW9iaWFvX25vckAyeC5wbmcnLFxuICAgIHNlbGVjdGVkSWNvblBhdGg6ICcvaW1hZ2VzL3RhYl9iYW9iaWFvX3ByZUAyeC5wbmcnLFxuICAgIHRleHQ6ICfov5DokKXnrqHnkIYnLFxuICAgIGNvZGU6ICc5MDAyJyxcbiAgfSxcbl07XG5cblBhZ2Uoe1xuICBvbkxvYWQoKSB7XG4gICAgbGV0IHVzZXJSb2xlcyA9IGFwcC5nbG9iYWxEYXRhLnVzZXJSb2xlcztcbiAgICBsZXQgbGlzdCA9IHVzZXJSb2xlc1xuICAgICAgLm1hcChpdGVtID0+IHRhYkxpc3QuZmluZChtZW51ID0+IG1lbnUuY29kZSA9PT0gaXRlbS5tZW51Q29kZSkpXG4gICAgICAuZmlsdGVyKG1lbnUgPT4gKG1lbnUgPyB0cnVlIDogZmFsc2UpKTtcbiAgICBpZiAoIWxpc3QuZmluZChpdGVtID0+IGl0ZW0uY29kZSA9PT0gJzkwMDInKSlcbiAgICAgIGxpc3QucHVzaCh0YWJMaXN0W3RhYkxpc3QubGVuZ3RoIC0gMV0pO1xuXG4gICAgdGhpcy5zZXREYXRhISh7XG4gICAgICBzZWxlY3RlZDogbGlzdC5sZW5ndGggPyBsaXN0WzBdLmNvZGUgOiAnJyxcbiAgICAgIGxpc3QsXG4gICAgfSk7XG4gIH0sXG4gIG9uU2hvdygpIHtcbiAgICBpZiAod3guaGlkZUhvbWVCdXR0b24pIHtcbiAgICAgIHd4LmhpZGVIb21lQnV0dG9uKCk7XG4gICAgfVxuICB9LFxuICBkYXRhOiB7XG4gICAgc2VsZWN0ZWQ6ICcnLFxuICAgIGxpc3Q6IFtdLFxuICB9LFxuICBjbGlja0hhbmRsZShlKSB7XG4gICAgY29uc29sZS5sb2coJ2luIGNsaWNrJywgZSk7XG4gICAgbGV0IHsgcGF0aCwgaW5kZXggfSA9IGUuZGV0YWlsO1xuICAgIC8vIGNvbnNvbGUubG9nKHBhdGgsIGluZGV4KTtcbiAgICAvLyB3eC5zd2l0Y2hUYWIoeyB1cmw6IHBhdGggfSk7XG4gICAgdGhpcy5zZXREYXRhISh7XG4gICAgICBzZWxlY3RlZDogaW5kZXgsXG4gICAgfSk7XG4gIH0sXG59KTtcbiJdfQ==
\ No newline at end of file \ No newline at end of file
miniprogram/pages/homeAndReport/homeAndReport.ts
...@@ -31,6 +31,9 @@ Page({ ...@@ -31,6 +31,9 @@ Page({
let list = userRoles let list = userRoles
.map(item => tabList.find(menu => menu.code === item.menuCode)) .map(item => tabList.find(menu => menu.code === item.menuCode))
.filter(menu => (menu ? true : false)); .filter(menu => (menu ? true : false));
if (!list.find(item => item.code === '9002'))
list.push(tabList[tabList.length - 1]);
this.setData!({ this.setData!({
selected: list.length ? list[0].code : '', selected: list.length ? list[0].code : '',
list, list,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment