Skip to content

W
wx-boss
Commit c4c04e50 by 姜雷
Options

修改图表

parent dc723ba3
Showing with 64 additions and 52 deletions
miniprogram/pages/components/ConsumeChart/ConsumeChart.js
...@@ -43,7 +43,6 @@ function initChart(canvas, width, height, F2) { ...@@ -43,7 +43,6 @@ function initChart(canvas, width, height, F2) {
.style({ .style({
fillOpacity: 0.6, fillOpacity: 0.6,
}); });
consumeChart.axis('payableMoney', false);
consumeChart.render(); consumeChart.render();
return consumeChart; return consumeChart;
} }
...@@ -70,4 +69,4 @@ Component({ ...@@ -70,4 +69,4 @@ Component({
}, },
}, },
}); });
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29uc3VtZUNoYXJ0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiQ29uc3VtZUNoYXJ0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxJQUFJLFlBQVksR0FBRyxJQUFJLENBQUM7QUFDeEIsSUFBSSxLQUFLLEdBQUcsRUFBRSxDQUFDO0FBRWYsbUJBQW1CLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEVBQUU7SUFDMUMsSUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDO0lBQ2hCLFlBQVksR0FBRyxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUM7UUFDMUIsRUFBRSxFQUFFLE1BQU07UUFDVixLQUFLLE9BQUE7UUFDTCxNQUFNLFFBQUE7S0FDUCxDQUFDLENBQUM7SUFFSCxZQUFZLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRTtRQUN4QixJQUFJLEVBQUU7WUFDSixHQUFHLEVBQUUsQ0FBQztZQUNOLEdBQUcsRUFBRSxFQUFFO1NBQ1I7S0FDRixDQUFDLENBQUM7SUFDSCxZQUFZLENBQUMsT0FBTyxDQUFDO1FBQ25CLGNBQWMsRUFBRSxLQUFLO1FBQ3JCLFVBQVUsRUFBRTtZQUNWLE1BQU0sRUFBRSxDQUFDO1lBQ1QsSUFBSSxFQUFFLFNBQVM7WUFDZixPQUFPLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDO1NBQ2pCO1FBQ0QsTUFBTSxZQUFDLEVBQUU7WUFDQyxJQUFBLGdCQUFLLENBQVE7WUFDckIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLEdBQUcsR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7WUFDOUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLEdBQUcsQ0FBQztRQUN4QyxDQUFDO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsWUFBWTtTQUNULElBQUksRUFBRTtTQUNOLFFBQVEsQ0FBQyxtQkFBbUIsQ0FBQztTQUM3QixLQUFLLENBQUMsU0FBUyxDQUFDO1NBQ2hCLEtBQUssQ0FBQyxRQUFRLENBQUM7U0FDZixJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDWCxZQUFZO1NBQ1QsSUFBSSxFQUFFO1NBQ04sUUFBUSxDQUFDLG1CQUFtQixDQUFDO1NBQzdCLEtBQUssQ0FBQyx3QkFBd0IsQ0FBQztTQUMvQixLQUFLLENBQUMsUUFBUSxDQUFDO1NBQ2YsS0FBSyxDQUFDO1FBQ0wsV0FBVyxFQUFFLEdBQUc7S0FDakIsQ0FBQyxDQUFDO0lBQ0wsWUFBWSxDQUFDLElBQUksQ0FBQyxjQUFjLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFDekMsWUFBWSxDQUFDLE1BQU0sRUFBRSxDQUFDO0lBQ3RCLE1BQU0sQ0FBQyxZQUFZLENBQUM7QUFDdEIsQ0FBQztBQUVELFNBQVMsQ0FBQztJQUNSLFVBQVUsRUFBRTtRQUNWLFFBQVEsRUFBRTtZQUNSLElBQUksRUFBRSxLQUFLO1lBQ1gsS0FBSyxFQUFFLEVBQUU7WUFDVCxRQUFRLFlBQUMsTUFBTTtnQkFDYixZQUFZLElBQUksWUFBWSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUNsRCxDQUFDO1NBQ0Y7UUFDRCxLQUFLLEVBQUU7WUFDTCxJQUFJLEVBQUUsTUFBTTtZQUNaLEtBQUssRUFBRSxFQUFFO1lBQ1QsUUFBUSxZQUFDLE1BQU07Z0JBQ2IsS0FBSyxHQUFHLE1BQU0sQ0FBQztZQUNqQixDQUFDO1NBQ0Y7S0FDRjtJQUNELElBQUksRUFBRTtRQUNKLElBQUksRUFBRTtZQUNKLE1BQU0sRUFBRSxTQUFTO1NBQ2xCO0tBQ0Y7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJsZXQgY29uc3VtZUNoYXJ0ID0gbnVsbDtcbmxldCBtb250aCA9ICcnO1xuXG5mdW5jdGlvbiBpbml0Q2hhcnQoY2FudmFzLCB3aWR0aCwgaGVpZ2h0LCBGMikge1xuICBjb25zdCBkYXRhID0gW107XG4gIGNvbnN1bWVDaGFydCA9IG5ldyBGMi5DaGFydCh7XG4gICAgZWw6IGNhbnZhcyxcbiAgICB3aWR0aCxcbiAgICBoZWlnaHQsXG4gIH0pO1xuXG4gIGNvbnN1bWVDaGFydC5zb3VyY2UoZGF0YSwge1xuICAgIGRheXM6IHtcbiAgICAgIG1pbjogMSxcbiAgICAgIG1heDogMzEsXG4gICAgfSxcbiAgfSk7XG4gIGNvbnN1bWVDaGFydC50b29sdGlwKHtcbiAgICBzaG93SXRlbU1hcmtlcjogZmFsc2UsXG4gICAgYmFja2dyb3VuZDoge1xuICAgICAgcmFkaXVzOiAyLFxuICAgICAgZmlsbDogJyM2ZWRiOGYnLFxuICAgICAgcGFkZGluZzogWzYsIDEwXSxcbiAgICB9LFxuICAgIG9uU2hvdyhldikge1xuICAgICAgY29uc3QgeyBpdGVtcyB9ID0gZXY7XG4gICAgICBpdGVtc1swXS5uYW1lID0gJyc7XG4gICAgICBpdGVtc1swXS52YWx1ZSA9IG1vbnRoICsgJy0nICsgaXRlbXNbMF0udGl0bGU7XG4gICAgICBpdGVtc1sxXS5uYW1lID0gJyc7XG4gICAgICBpdGVtc1sxXS52YWx1ZSA9IGl0ZW1zWzFdLnZhbHVlICsgJ+WFgyc7XG4gICAgfSxcbiAgfSk7XG4gIGNvbnN1bWVDaGFydFxuICAgIC5saW5lKClcbiAgICAucG9zaXRpb24oJ2RheXMqcGF5YWJsZU1vbmV5JylcbiAgICAuY29sb3IoJyM2ZWRiOGYnKVxuICAgIC5zaGFwZSgnc21vb3RoJylcbiAgICAuc2l6ZSg0KTtcbiAgY29uc3VtZUNoYXJ0XG4gICAgLmFyZWEoKVxuICAgIC5wb3NpdGlvbignZGF5cypwYXlhYmxlTW9uZXknKVxuICAgIC5jb2xvcignbCg5MCkgMDojNmVkYjhmIDE6I2ZmZicpXG4gICAgLnNoYXBlKCdzbW9vdGgnKVxuICAgIC5zdHlsZSh7XG4gICAgICBmaWxsT3BhY2l0eTogMC42LFxuICAgIH0pO1xuICBjb25zdW1lQ2hhcnQuYXhpcygncGF5YWJsZU1vbmV5JywgZmFsc2UpO1xuICBjb25zdW1lQ2hhcnQucmVuZGVyKCk7XG4gIHJldHVybiBjb25zdW1lQ2hhcnQ7XG59XG5cbkNvbXBvbmVudCh7XG4gIHByb3BlcnRpZXM6IHtcbiAgICBkYXRhTGlzdDoge1xuICAgICAgdHlwZTogQXJyYXksXG4gICAgICB2YWx1ZTogW10sXG4gICAgICBvYnNlcnZlcihuZXdWYWwpIHtcbiAgICAgICAgY29uc3VtZUNoYXJ0ICYmIGNvbnN1bWVDaGFydC5jaGFuZ2VEYXRhKG5ld1ZhbCk7XG4gICAgICB9LFxuICAgIH0sXG4gICAgbW9udGg6IHtcbiAgICAgIHR5cGU6IFN0cmluZyxcbiAgICAgIHZhbHVlOiAnJyxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICBtb250aCA9IG5ld1ZhbDtcbiAgICAgIH0sXG4gICAgfSxcbiAgfSxcbiAgZGF0YToge1xuICAgIG9wdHM6IHtcbiAgICAgIG9uSW5pdDogaW5pdENoYXJ0LFxuICAgIH0sXG4gIH0sXG59KTtcbiJdfQ== //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29uc3VtZUNoYXJ0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiQ29uc3VtZUNoYXJ0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxJQUFJLFlBQVksR0FBRyxJQUFJLENBQUM7QUFDeEIsSUFBSSxLQUFLLEdBQUcsRUFBRSxDQUFDO0FBRWYsbUJBQW1CLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEVBQUU7SUFDMUMsSUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDO0lBQ2hCLFlBQVksR0FBRyxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUM7UUFDMUIsRUFBRSxFQUFFLE1BQU07UUFDVixLQUFLLE9BQUE7UUFDTCxNQUFNLFFBQUE7S0FDUCxDQUFDLENBQUM7SUFFSCxZQUFZLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRTtRQUN4QixJQUFJLEVBQUU7WUFDSixHQUFHLEVBQUUsQ0FBQztZQUNOLEdBQUcsRUFBRSxFQUFFO1NBQ1I7S0FDRixDQUFDLENBQUM7SUFDSCxZQUFZLENBQUMsT0FBTyxDQUFDO1FBQ25CLGNBQWMsRUFBRSxLQUFLO1FBQ3JCLFVBQVUsRUFBRTtZQUNWLE1BQU0sRUFBRSxDQUFDO1lBQ1QsSUFBSSxFQUFFLFNBQVM7WUFDZixPQUFPLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDO1NBQ2pCO1FBQ0QsTUFBTSxZQUFDLEVBQUU7WUFDQyxJQUFBLGdCQUFLLENBQVE7WUFDckIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLEdBQUcsR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7WUFDOUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLEdBQUcsQ0FBQztRQUN4QyxDQUFDO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsWUFBWTtTQUNULElBQUksRUFBRTtTQUNOLFFBQVEsQ0FBQyxtQkFBbUIsQ0FBQztTQUM3QixLQUFLLENBQUMsU0FBUyxDQUFDO1NBQ2hCLEtBQUssQ0FBQyxRQUFRLENBQUM7U0FDZixJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDWCxZQUFZO1NBQ1QsSUFBSSxFQUFFO1NBQ04sUUFBUSxDQUFDLG1CQUFtQixDQUFDO1NBQzdCLEtBQUssQ0FBQyx3QkFBd0IsQ0FBQztTQUMvQixLQUFLLENBQUMsUUFBUSxDQUFDO1NBQ2YsS0FBSyxDQUFDO1FBQ0wsV0FBVyxFQUFFLEdBQUc7S0FDakIsQ0FBQyxDQUFDO0lBRUwsWUFBWSxDQUFDLE1BQU0sRUFBRSxDQUFDO0lBQ3RCLE1BQU0sQ0FBQyxZQUFZLENBQUM7QUFDdEIsQ0FBQztBQUVELFNBQVMsQ0FBQztJQUNSLFVBQVUsRUFBRTtRQUNWLFFBQVEsRUFBRTtZQUNSLElBQUksRUFBRSxLQUFLO1lBQ1gsS0FBSyxFQUFFLEVBQUU7WUFDVCxRQUFRLFlBQUMsTUFBTTtnQkFDYixZQUFZLElBQUksWUFBWSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUNsRCxDQUFDO1NBQ0Y7UUFDRCxLQUFLLEVBQUU7WUFDTCxJQUFJLEVBQUUsTUFBTTtZQUNaLEtBQUssRUFBRSxFQUFFO1lBQ1QsUUFBUSxZQUFDLE1BQU07Z0JBQ2IsS0FBSyxHQUFHLE1BQU0sQ0FBQztZQUNqQixDQUFDO1NBQ0Y7S0FDRjtJQUNELElBQUksRUFBRTtRQUNKLElBQUksRUFBRTtZQUNKLE1BQU0sRUFBRSxTQUFTO1NBQ2xCO0tBQ0Y7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJsZXQgY29uc3VtZUNoYXJ0ID0gbnVsbDtcbmxldCBtb250aCA9ICcnO1xuXG5mdW5jdGlvbiBpbml0Q2hhcnQoY2FudmFzLCB3aWR0aCwgaGVpZ2h0LCBGMikge1xuICBjb25zdCBkYXRhID0gW107XG4gIGNvbnN1bWVDaGFydCA9IG5ldyBGMi5DaGFydCh7XG4gICAgZWw6IGNhbnZhcyxcbiAgICB3aWR0aCxcbiAgICBoZWlnaHQsXG4gIH0pO1xuXG4gIGNvbnN1bWVDaGFydC5zb3VyY2UoZGF0YSwge1xuICAgIGRheXM6IHtcbiAgICAgIG1pbjogMSxcbiAgICAgIG1heDogMzEsXG4gICAgfSxcbiAgfSk7XG4gIGNvbnN1bWVDaGFydC50b29sdGlwKHtcbiAgICBzaG93SXRlbU1hcmtlcjogZmFsc2UsXG4gICAgYmFja2dyb3VuZDoge1xuICAgICAgcmFkaXVzOiAyLFxuICAgICAgZmlsbDogJyM2ZWRiOGYnLFxuICAgICAgcGFkZGluZzogWzYsIDEwXSxcbiAgICB9LFxuICAgIG9uU2hvdyhldikge1xuICAgICAgY29uc3QgeyBpdGVtcyB9ID0gZXY7XG4gICAgICBpdGVtc1swXS5uYW1lID0gJyc7XG4gICAgICBpdGVtc1swXS52YWx1ZSA9IG1vbnRoICsgJy0nICsgaXRlbXNbMF0udGl0bGU7XG4gICAgICBpdGVtc1sxXS5uYW1lID0gJyc7XG4gICAgICBpdGVtc1sxXS52YWx1ZSA9IGl0ZW1zWzFdLnZhbHVlICsgJ+WFgyc7XG4gICAgfSxcbiAgfSk7XG4gIGNvbnN1bWVDaGFydFxuICAgIC5saW5lKClcbiAgICAucG9zaXRpb24oJ2RheXMqcGF5YWJsZU1vbmV5JylcbiAgICAuY29sb3IoJyM2ZWRiOGYnKVxuICAgIC5zaGFwZSgnc21vb3RoJylcbiAgICAuc2l6ZSg0KTtcbiAgY29uc3VtZUNoYXJ0XG4gICAgLmFyZWEoKVxuICAgIC5wb3NpdGlvbignZGF5cypwYXlhYmxlTW9uZXknKVxuICAgIC5jb2xvcignbCg5MCkgMDojNmVkYjhmIDE6I2ZmZicpXG4gICAgLnNoYXBlKCdzbW9vdGgnKVxuICAgIC5zdHlsZSh7XG4gICAgICBmaWxsT3BhY2l0eTogMC42LFxuICAgIH0pO1xuICAvLyBjb25zdW1lQ2hhcnQuYXhpcygncGF5YWJsZU1vbmV5JywgZmFsc2UpO1xuICBjb25zdW1lQ2hhcnQucmVuZGVyKCk7XG4gIHJldHVybiBjb25zdW1lQ2hhcnQ7XG59XG5cbkNvbXBvbmVudCh7XG4gIHByb3BlcnRpZXM6IHtcbiAgICBkYXRhTGlzdDoge1xuICAgICAgdHlwZTogQXJyYXksXG4gICAgICB2YWx1ZTogW10sXG4gICAgICBvYnNlcnZlcihuZXdWYWwpIHtcbiAgICAgICAgY29uc3VtZUNoYXJ0ICYmIGNvbnN1bWVDaGFydC5jaGFuZ2VEYXRhKG5ld1ZhbCk7XG4gICAgICB9LFxuICAgIH0sXG4gICAgbW9udGg6IHtcbiAgICAgIHR5cGU6IFN0cmluZyxcbiAgICAgIHZhbHVlOiAnJyxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICBtb250aCA9IG5ld1ZhbDtcbiAgICAgIH0sXG4gICAgfSxcbiAgfSxcbiAgZGF0YToge1xuICAgIG9wdHM6IHtcbiAgICAgIG9uSW5pdDogaW5pdENoYXJ0LFxuICAgIH0sXG4gIH0sXG59KTtcbiJdfQ==
\ No newline at end of file \ No newline at end of file
miniprogram/pages/components/ConsumeChart/ConsumeChart.ts
...@@ -44,7 +44,7 @@ function initChart(canvas, width, height, F2) { ...@@ -44,7 +44,7 @@ function initChart(canvas, width, height, F2) {
.style({ .style({
fillOpacity: 0.6, fillOpacity: 0.6,
}); });
consumeChart.axis('payableMoney', false); // consumeChart.axis('payableMoney', false);
consumeChart.render(); consumeChart.render();
return consumeChart; return consumeChart;
} }
......
miniprogram/pages/components/ConsumeCountChart/ConsumeCountChart.js
...@@ -43,7 +43,6 @@ function initChart(canvas, width, height, F2) { ...@@ -43,7 +43,6 @@ function initChart(canvas, width, height, F2) {
.style({ .style({
fillOpacity: 0.6, fillOpacity: 0.6,
}); });
consumeCountChart.axis('payMen', false);
consumeCountChart.render(); consumeCountChart.render();
return consumeCountChart; return consumeCountChart;
} }
...@@ -70,4 +69,4 @@ Component({ ...@@ -70,4 +69,4 @@ Component({
}, },
}, },
}); });
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29uc3VtZUNvdW50Q2hhcnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJDb25zdW1lQ291bnRDaGFydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQ0EsSUFBSSxpQkFBaUIsR0FBRyxJQUFJLENBQUM7QUFDN0IsSUFBSSxLQUFLLEdBQUcsRUFBRSxDQUFDO0FBRWYsbUJBQW1CLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEVBQUU7SUFDMUMsSUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDO0lBQ2hCLGlCQUFpQixHQUFHLElBQUksRUFBRSxDQUFDLEtBQUssQ0FBQztRQUMvQixFQUFFLEVBQUUsTUFBTTtRQUNWLEtBQUssT0FBQTtRQUNMLE1BQU0sUUFBQTtLQUNQLENBQUMsQ0FBQztJQUVILGlCQUFpQixDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUU7UUFDN0IsSUFBSSxFQUFFO1lBQ0osR0FBRyxFQUFFLENBQUM7WUFDTixHQUFHLEVBQUUsRUFBRTtTQUNSO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsaUJBQWlCLENBQUMsT0FBTyxDQUFDO1FBQ3hCLGNBQWMsRUFBRSxLQUFLO1FBQ3JCLFVBQVUsRUFBRTtZQUNWLE1BQU0sRUFBRSxDQUFDO1lBQ1QsSUFBSSxFQUFFLFNBQVM7WUFDZixPQUFPLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDO1NBQ2pCO1FBQ0QsTUFBTSxZQUFDLEVBQUU7WUFDQyxJQUFBLGdCQUFLLENBQVE7WUFDckIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLEdBQUcsR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7WUFDOUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLEdBQUcsQ0FBQztRQUN4QyxDQUFDO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsaUJBQWlCO1NBQ2QsSUFBSSxFQUFFO1NBQ04sUUFBUSxDQUFDLGFBQWEsQ0FBQztTQUN2QixLQUFLLENBQUMsU0FBUyxDQUFDO1NBQ2hCLEtBQUssQ0FBQyxRQUFRLENBQUM7U0FDZixJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDWCxpQkFBaUI7U0FDZCxJQUFJLEVBQUU7U0FDTixRQUFRLENBQUMsYUFBYSxDQUFDO1NBQ3ZCLEtBQUssQ0FBQyx3QkFBd0IsQ0FBQztTQUMvQixLQUFLLENBQUMsUUFBUSxDQUFDO1NBQ2YsS0FBSyxDQUFDO1FBQ0wsV0FBVyxFQUFFLEdBQUc7S0FDakIsQ0FBQyxDQUFDO0lBQ0wsaUJBQWlCLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRSxLQUFLLENBQUMsQ0FBQztJQUN4QyxpQkFBaUIsQ0FBQyxNQUFNLEVBQUUsQ0FBQztJQUMzQixNQUFNLENBQUMsaUJBQWlCLENBQUM7QUFDM0IsQ0FBQztBQUVELFNBQVMsQ0FBQztJQUNSLFVBQVUsRUFBRTtRQUNWLFFBQVEsRUFBRTtZQUNSLElBQUksRUFBRSxLQUFLO1lBQ1gsS0FBSyxFQUFFLEVBQUU7WUFDVCxRQUFRLFlBQUMsTUFBTTtnQkFDYixpQkFBaUIsSUFBSSxpQkFBaUIsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUM7WUFDNUQsQ0FBQztTQUNGO1FBQ0QsS0FBSyxFQUFFO1lBQ0wsSUFBSSxFQUFFLE1BQU07WUFDWixLQUFLLEVBQUUsRUFBRTtZQUNULFFBQVEsWUFBQyxNQUFNO2dCQUNiLEtBQUssR0FBRyxNQUFNLENBQUM7WUFDakIsQ0FBQztTQUNGO0tBQ0Y7SUFDRCxJQUFJLEVBQUU7UUFDSixJQUFJLEVBQUU7WUFDSixNQUFNLEVBQUUsU0FBUztTQUNsQjtLQUNGO0NBQ0YsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gcGFnZXMvY29tcG9uZW50cy9Db25zdW1lQ291bnRDaGFydC9Db25zdW1lQ291bnRDaGFydC5qc1xubGV0IGNvbnN1bWVDb3VudENoYXJ0ID0gbnVsbDtcbmxldCBtb250aCA9ICcnO1xuXG5mdW5jdGlvbiBpbml0Q2hhcnQoY2FudmFzLCB3aWR0aCwgaGVpZ2h0LCBGMikge1xuICBjb25zdCBkYXRhID0gW107XG4gIGNvbnN1bWVDb3VudENoYXJ0ID0gbmV3IEYyLkNoYXJ0KHtcbiAgICBlbDogY2FudmFzLFxuICAgIHdpZHRoLFxuICAgIGhlaWdodCxcbiAgfSk7XG5cbiAgY29uc3VtZUNvdW50Q2hhcnQuc291cmNlKGRhdGEsIHtcbiAgICBkYXlzOiB7XG4gICAgICBtaW46IDEsXG4gICAgICBtYXg6IDMxLFxuICAgIH0sXG4gIH0pO1xuICBjb25zdW1lQ291bnRDaGFydC50b29sdGlwKHtcbiAgICBzaG93SXRlbU1hcmtlcjogZmFsc2UsXG4gICAgYmFja2dyb3VuZDoge1xuICAgICAgcmFkaXVzOiAyLFxuICAgICAgZmlsbDogJyM2OGQwZmUnLFxuICAgICAgcGFkZGluZzogWzYsIDEwXSxcbiAgICB9LFxuICAgIG9uU2hvdyhldikge1xuICAgICAgY29uc3QgeyBpdGVtcyB9ID0gZXY7XG4gICAgICBpdGVtc1swXS5uYW1lID0gJyc7XG4gICAgICBpdGVtc1swXS52YWx1ZSA9IG1vbnRoICsgJy0nICsgaXRlbXNbMF0udGl0bGU7XG4gICAgICBpdGVtc1sxXS5uYW1lID0gJyc7XG4gICAgICBpdGVtc1sxXS52YWx1ZSA9IGl0ZW1zWzFdLnZhbHVlICsgJ+eslCc7XG4gICAgfSxcbiAgfSk7XG4gIGNvbnN1bWVDb3VudENoYXJ0XG4gICAgLmxpbmUoKVxuICAgIC5wb3NpdGlvbignZGF5cypwYXlNZW4nKVxuICAgIC5jb2xvcignIzY4ZDBmZScpXG4gICAgLnNoYXBlKCdzbW9vdGgnKVxuICAgIC5zaXplKDQpO1xuICBjb25zdW1lQ291bnRDaGFydFxuICAgIC5hcmVhKClcbiAgICAucG9zaXRpb24oJ2RheXMqcGF5TWVuJylcbiAgICAuY29sb3IoJ2woOTApIDA6IzY4ZDBmZSAxOiNmZmYnKVxuICAgIC5zaGFwZSgnc21vb3RoJylcbiAgICAuc3R5bGUoe1xuICAgICAgZmlsbE9wYWNpdHk6IDAuNixcbiAgICB9KTtcbiAgY29uc3VtZUNvdW50Q2hhcnQuYXhpcygncGF5TWVuJywgZmFsc2UpO1xuICBjb25zdW1lQ291bnRDaGFydC5yZW5kZXIoKTtcbiAgcmV0dXJuIGNvbnN1bWVDb3VudENoYXJ0O1xufVxuXG5Db21wb25lbnQoe1xuICBwcm9wZXJ0aWVzOiB7XG4gICAgZGF0YUxpc3Q6IHtcbiAgICAgIHR5cGU6IEFycmF5LFxuICAgICAgdmFsdWU6IFtdLFxuICAgICAgb2JzZXJ2ZXIobmV3VmFsKSB7XG4gICAgICAgIGNvbnN1bWVDb3VudENoYXJ0ICYmIGNvbnN1bWVDb3VudENoYXJ0LmNoYW5nZURhdGEobmV3VmFsKTtcbiAgICAgIH0sXG4gICAgfSxcbiAgICBtb250aDoge1xuICAgICAgdHlwZTogU3RyaW5nLFxuICAgICAgdmFsdWU6ICcnLFxuICAgICAgb2JzZXJ2ZXIobmV3VmFsKSB7XG4gICAgICAgIG1vbnRoID0gbmV3VmFsO1xuICAgICAgfSxcbiAgICB9LFxuICB9LFxuICBkYXRhOiB7XG4gICAgb3B0czoge1xuICAgICAgb25Jbml0OiBpbml0Q2hhcnQsXG4gICAgfSxcbiAgfSxcbn0pO1xuIl19 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29uc3VtZUNvdW50Q2hhcnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJDb25zdW1lQ291bnRDaGFydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQ0EsSUFBSSxpQkFBaUIsR0FBRyxJQUFJLENBQUM7QUFDN0IsSUFBSSxLQUFLLEdBQUcsRUFBRSxDQUFDO0FBRWYsbUJBQW1CLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEVBQUU7SUFDMUMsSUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDO0lBQ2hCLGlCQUFpQixHQUFHLElBQUksRUFBRSxDQUFDLEtBQUssQ0FBQztRQUMvQixFQUFFLEVBQUUsTUFBTTtRQUNWLEtBQUssT0FBQTtRQUNMLE1BQU0sUUFBQTtLQUNQLENBQUMsQ0FBQztJQUVILGlCQUFpQixDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUU7UUFDN0IsSUFBSSxFQUFFO1lBQ0osR0FBRyxFQUFFLENBQUM7WUFDTixHQUFHLEVBQUUsRUFBRTtTQUNSO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsaUJBQWlCLENBQUMsT0FBTyxDQUFDO1FBQ3hCLGNBQWMsRUFBRSxLQUFLO1FBQ3JCLFVBQVUsRUFBRTtZQUNWLE1BQU0sRUFBRSxDQUFDO1lBQ1QsSUFBSSxFQUFFLFNBQVM7WUFDZixPQUFPLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDO1NBQ2pCO1FBQ0QsTUFBTSxZQUFDLEVBQUU7WUFDQyxJQUFBLGdCQUFLLENBQVE7WUFDckIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLEdBQUcsR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7WUFDOUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLEdBQUcsQ0FBQztRQUN4QyxDQUFDO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsaUJBQWlCO1NBQ2QsSUFBSSxFQUFFO1NBQ04sUUFBUSxDQUFDLGFBQWEsQ0FBQztTQUN2QixLQUFLLENBQUMsU0FBUyxDQUFDO1NBQ2hCLEtBQUssQ0FBQyxRQUFRLENBQUM7U0FDZixJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDWCxpQkFBaUI7U0FDZCxJQUFJLEVBQUU7U0FDTixRQUFRLENBQUMsYUFBYSxDQUFDO1NBQ3ZCLEtBQUssQ0FBQyx3QkFBd0IsQ0FBQztTQUMvQixLQUFLLENBQUMsUUFBUSxDQUFDO1NBQ2YsS0FBSyxDQUFDO1FBQ0wsV0FBVyxFQUFFLEdBQUc7S0FDakIsQ0FBQyxDQUFDO0lBRUwsaUJBQWlCLENBQUMsTUFBTSxFQUFFLENBQUM7SUFDM0IsTUFBTSxDQUFDLGlCQUFpQixDQUFDO0FBQzNCLENBQUM7QUFFRCxTQUFTLENBQUM7SUFDUixVQUFVLEVBQUU7UUFDVixRQUFRLEVBQUU7WUFDUixJQUFJLEVBQUUsS0FBSztZQUNYLEtBQUssRUFBRSxFQUFFO1lBQ1QsUUFBUSxZQUFDLE1BQU07Z0JBQ2IsaUJBQWlCLElBQUksaUJBQWlCLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQzVELENBQUM7U0FDRjtRQUNELEtBQUssRUFBRTtZQUNMLElBQUksRUFBRSxNQUFNO1lBQ1osS0FBSyxFQUFFLEVBQUU7WUFDVCxRQUFRLFlBQUMsTUFBTTtnQkFDYixLQUFLLEdBQUcsTUFBTSxDQUFDO1lBQ2pCLENBQUM7U0FDRjtLQUNGO0lBQ0QsSUFBSSxFQUFFO1FBQ0osSUFBSSxFQUFFO1lBQ0osTUFBTSxFQUFFLFNBQVM7U0FDbEI7S0FDRjtDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8vIHBhZ2VzL2NvbXBvbmVudHMvQ29uc3VtZUNvdW50Q2hhcnQvQ29uc3VtZUNvdW50Q2hhcnQuanNcbmxldCBjb25zdW1lQ291bnRDaGFydCA9IG51bGw7XG5sZXQgbW9udGggPSAnJztcblxuZnVuY3Rpb24gaW5pdENoYXJ0KGNhbnZhcywgd2lkdGgsIGhlaWdodCwgRjIpIHtcbiAgY29uc3QgZGF0YSA9IFtdO1xuICBjb25zdW1lQ291bnRDaGFydCA9IG5ldyBGMi5DaGFydCh7XG4gICAgZWw6IGNhbnZhcyxcbiAgICB3aWR0aCxcbiAgICBoZWlnaHQsXG4gIH0pO1xuXG4gIGNvbnN1bWVDb3VudENoYXJ0LnNvdXJjZShkYXRhLCB7XG4gICAgZGF5czoge1xuICAgICAgbWluOiAxLFxuICAgICAgbWF4OiAzMSxcbiAgICB9LFxuICB9KTtcbiAgY29uc3VtZUNvdW50Q2hhcnQudG9vbHRpcCh7XG4gICAgc2hvd0l0ZW1NYXJrZXI6IGZhbHNlLFxuICAgIGJhY2tncm91bmQ6IHtcbiAgICAgIHJhZGl1czogMixcbiAgICAgIGZpbGw6ICcjNjhkMGZlJyxcbiAgICAgIHBhZGRpbmc6IFs2LCAxMF0sXG4gICAgfSxcbiAgICBvblNob3coZXYpIHtcbiAgICAgIGNvbnN0IHsgaXRlbXMgfSA9IGV2O1xuICAgICAgaXRlbXNbMF0ubmFtZSA9ICcnO1xuICAgICAgaXRlbXNbMF0udmFsdWUgPSBtb250aCArICctJyArIGl0ZW1zWzBdLnRpdGxlO1xuICAgICAgaXRlbXNbMV0ubmFtZSA9ICcnO1xuICAgICAgaXRlbXNbMV0udmFsdWUgPSBpdGVtc1sxXS52YWx1ZSArICfnrJQnO1xuICAgIH0sXG4gIH0pO1xuICBjb25zdW1lQ291bnRDaGFydFxuICAgIC5saW5lKClcbiAgICAucG9zaXRpb24oJ2RheXMqcGF5TWVuJylcbiAgICAuY29sb3IoJyM2OGQwZmUnKVxuICAgIC5zaGFwZSgnc21vb3RoJylcbiAgICAuc2l6ZSg0KTtcbiAgY29uc3VtZUNvdW50Q2hhcnRcbiAgICAuYXJlYSgpXG4gICAgLnBvc2l0aW9uKCdkYXlzKnBheU1lbicpXG4gICAgLmNvbG9yKCdsKDkwKSAwOiM2OGQwZmUgMTojZmZmJylcbiAgICAuc2hhcGUoJ3Ntb290aCcpXG4gICAgLnN0eWxlKHtcbiAgICAgIGZpbGxPcGFjaXR5OiAwLjYsXG4gICAgfSk7XG4gIC8vIGNvbnN1bWVDb3VudENoYXJ0LmF4aXMoJ3BheU1lbicsIGZhbHNlKTtcbiAgY29uc3VtZUNvdW50Q2hhcnQucmVuZGVyKCk7XG4gIHJldHVybiBjb25zdW1lQ291bnRDaGFydDtcbn1cblxuQ29tcG9uZW50KHtcbiAgcHJvcGVydGllczoge1xuICAgIGRhdGFMaXN0OiB7XG4gICAgICB0eXBlOiBBcnJheSxcbiAgICAgIHZhbHVlOiBbXSxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICBjb25zdW1lQ291bnRDaGFydCAmJiBjb25zdW1lQ291bnRDaGFydC5jaGFuZ2VEYXRhKG5ld1ZhbCk7XG4gICAgICB9LFxuICAgIH0sXG4gICAgbW9udGg6IHtcbiAgICAgIHR5cGU6IFN0cmluZyxcbiAgICAgIHZhbHVlOiAnJyxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICBtb250aCA9IG5ld1ZhbDtcbiAgICAgIH0sXG4gICAgfSxcbiAgfSxcbiAgZGF0YToge1xuICAgIG9wdHM6IHtcbiAgICAgIG9uSW5pdDogaW5pdENoYXJ0LFxuICAgIH0sXG4gIH0sXG59KTtcbiJdfQ==
\ No newline at end of file \ No newline at end of file
miniprogram/pages/components/ConsumeCountChart/ConsumeCountChart.ts
...@@ -45,7 +45,7 @@ function initChart(canvas, width, height, F2) { ...@@ -45,7 +45,7 @@ function initChart(canvas, width, height, F2) {
.style({ .style({
fillOpacity: 0.6, fillOpacity: 0.6,
}); });
consumeCountChart.axis('payMen', false); // consumeCountChart.axis('payMen', false);
consumeCountChart.render(); consumeCountChart.render();
return consumeCountChart; return consumeCountChart;
} }
......
miniprogram/pages/components/PayTypeChart/PayTypeChart.js
...@@ -40,10 +40,6 @@ function initChart(canvas, width, height, F2) { ...@@ -40,10 +40,6 @@ function initChart(canvas, width, height, F2) {
paytypeChart.legend({ paytypeChart.legend({
position: 'right', position: 'right',
marker: 'square', marker: 'square',
onClick: function (ev) {
var tooltip = paytypeChart.get('tooltip');
console.log(ev, tooltip);
},
}); });
paytypeChart paytypeChart
.interval() .interval()
...@@ -65,6 +61,27 @@ Component({ ...@@ -65,6 +61,27 @@ Component({
type: Array, type: Array,
value: [], value: [],
observer: function (newVal) { observer: function (newVal) {
paytypeChart &&
paytypeChart.legend({
position: 'right',
marker: 'square',
itemFormatter: function (val) {
var item = newVal.find(function (item) { return item.name === val; });
if (item) {
var name_1 = item.name;
if (item && item.name.length < 4) {
name_1 += '\xa0\xa0\xa0';
}
return name_1 + ' ' + util_1.formatPrice(item.count);
}
else {
return '';
}
},
onClick: function (ev) {
console.log(ev, paytypeChart);
},
});
paytypeChart && paytypeChart.changeData(newVal); paytypeChart && paytypeChart.changeData(newVal);
}, },
}, },
...@@ -82,4 +99,4 @@ Component({ ...@@ -82,4 +99,4 @@ Component({
}, },
}, },
}); });
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGF5VHlwZUNoYXJ0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiUGF5VHlwZUNoYXJ0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsNENBQWtEO0FBR2xELElBQUksWUFBWSxHQUFHLElBQUksQ0FBQztBQUN4QixJQUFJLEtBQUssR0FBRyxFQUFFLENBQUM7QUFDZixJQUFNLFFBQVEsR0FBRztJQUNmLElBQUksRUFBRSxTQUFTO0lBQ2YsSUFBSSxFQUFFLFNBQVM7SUFDZixRQUFRLEVBQUUsU0FBUztJQUNuQixNQUFNLEVBQUUsU0FBUztDQUNsQixDQUFDO0FBRUYsbUJBQW1CLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEVBQUU7SUFDMUMsSUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDO0lBQ2hCLFlBQVksR0FBRyxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUM7UUFDMUIsRUFBRSxFQUFFLE1BQU07UUFDVixLQUFLLE9BQUE7UUFDTCxNQUFNLFFBQUE7UUFDTixPQUFPLEVBQUUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxNQUFNLENBQUM7S0FDdEMsQ0FBQyxDQUFDO0lBRUgsWUFBWSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUU7UUFDeEIsSUFBSSxFQUFFO1lBQ0osR0FBRyxFQUFFLENBQUM7WUFDTixHQUFHLEVBQUUsRUFBRTtTQUNSO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsWUFBWSxDQUFDLE9BQU8sQ0FBQztRQUNuQixjQUFjLEVBQUUsS0FBSztRQUNyQixVQUFVLEVBQUU7WUFDVixNQUFNLEVBQUUsQ0FBQztZQUNULElBQUksRUFBRSxTQUFTO1lBQ2YsT0FBTyxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQztTQUNqQjtRQUNELE1BQU0sWUFBQyxFQUFFO1lBQ1AsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNSLElBQUEsZ0JBQUssQ0FBUTtZQUNyQixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7WUFDL0IsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxrQkFBVyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztRQUd2RCxDQUFDO0tBQ0YsQ0FBQyxDQUFDO0lBT0gsWUFBWSxDQUFDLE1BQU0sQ0FBQztRQUNsQixRQUFRLEVBQUUsT0FBTztRQUNqQixNQUFNLEVBQUUsUUFBUTtRQUNoQixPQUFPLEVBQUUsVUFBQSxFQUFFO1lBQ1QsSUFBTSxPQUFPLEdBQUcsWUFBWSxDQUFDLEdBQUcsQ0FBQyxTQUFTLENBQUMsQ0FBQztZQUM1QyxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUUsRUFBRSxPQUFPLENBQUMsQ0FBQztRQUUzQixDQUFDO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsWUFBWTtTQUNULFFBQVEsRUFBRTtTQUNWLFFBQVEsQ0FBQyxZQUFZLENBQUM7U0FDdEIsS0FBSyxDQUFDLE1BQU0sRUFBRSxDQUFDLFNBQVMsRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUM7SUFDL0QsWUFBWSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQUU7UUFDeEIsS0FBSyxFQUFFO1lBQ0wsTUFBTSxFQUFFLENBQUMsSUFBSSxDQUFDLEVBQUUsR0FBRyxDQUFDO1lBQ3BCLFNBQVMsRUFBRSxLQUFLO1lBQ2hCLFlBQVksRUFBRSxRQUFRO1NBQ3ZCO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsWUFBWSxDQUFDLE1BQU0sRUFBRSxDQUFDO0lBaUJ0QixNQUFNLENBQUMsWUFBWSxDQUFDO0FBQ3RCLENBQUM7QUFFRCxTQUFTLENBQUM7SUFDUixVQUFVLEVBQUU7UUFDVixRQUFRLEVBQUU7WUFDUixJQUFJLEVBQUUsS0FBSztZQUNYLEtBQUssRUFBRSxFQUFFO1lBQ1QsUUFBUSxZQUFDLE1BQU07Z0JBa0JiLFlBQVksSUFBSSxZQUFZLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQ2xELENBQUM7U0FDRjtRQUNELEtBQUssRUFBRTtZQUNMLElBQUksRUFBRSxNQUFNO1lBQ1osS0FBSyxFQUFFLEVBQUU7WUFDVCxRQUFRLFlBQUMsTUFBTTtnQkFDYixLQUFLLEdBQUcsTUFBTSxDQUFDO1lBQ2pCLENBQUM7U0FDRjtLQUNGO0lBQ0QsSUFBSSxFQUFFO1FBQ0osSUFBSSxFQUFFO1lBQ0osTUFBTSxFQUFFLFNBQVM7U0FDbEI7S0FDRjtDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IGZvcm1hdFByaWNlIH0gZnJvbSAnLi4vLi4vLi4vdXRpbHMvdXRpbCc7XG5cbi8vIHBhZ2VzL2NvbXBvbmVudHMvUGF5VHlwZUNoYXJ0L1BheVR5cGVDaGFydC5qc1xubGV0IHBheXR5cGVDaGFydCA9IG51bGw7XG5sZXQgbW9udGggPSAnJztcbmNvbnN0IGNvbG9yTWFwID0ge1xuICBhaW1pOiAnI0VCN0U1OScsXG4gIGJlYW46ICcjMTNDMkMyJyxcbiAgZGlzY291bnQ6ICcjRkFDQzE0JyxcbiAgb25saW5lOiAnIzE4OTBGRicsXG59O1xuXG5mdW5jdGlvbiBpbml0Q2hhcnQoY2FudmFzLCB3aWR0aCwgaGVpZ2h0LCBGMikge1xuICBjb25zdCBkYXRhID0gW107XG4gIHBheXR5cGVDaGFydCA9IG5ldyBGMi5DaGFydCh7XG4gICAgZWw6IGNhbnZhcyxcbiAgICB3aWR0aCxcbiAgICBoZWlnaHQsXG4gICAgcGFkZGluZzogWydhdXRvJywgJ2F1dG8nLCA1MCwgJ2F1dG8nXSxcbiAgfSk7XG5cbiAgcGF5dHlwZUNoYXJ0LnNvdXJjZShkYXRhLCB7XG4gICAgZGF5czoge1xuICAgICAgbWluOiAxLFxuICAgICAgbWF4OiAzMSxcbiAgICB9LFxuICB9KTtcbiAgcGF5dHlwZUNoYXJ0LnRvb2x0aXAoe1xuICAgIHNob3dJdGVtTWFya2VyOiBmYWxzZSxcbiAgICBiYWNrZ3JvdW5kOiB7XG4gICAgICByYWRpdXM6IDIsXG4gICAgICBmaWxsOiAnI2YxNjZmZCcsXG4gICAgICBwYWRkaW5nOiBbNiwgMTBdLFxuICAgIH0sXG4gICAgb25TaG93KGV2KSB7XG4gICAgICBjb25zb2xlLmxvZyhldik7XG4gICAgICBjb25zdCB7IGl0ZW1zIH0gPSBldjtcbiAgICAgIGl0ZW1zWzBdLm5hbWUgPSBpdGVtc1swXS50aXRsZTtcbiAgICAgIGl0ZW1zWzBdLnZhbHVlID0gZm9ybWF0UHJpY2UoTnVtYmVyKGl0ZW1zWzBdLnZhbHVlKSk7XG4gICAgICAvLyBpdGVtc1sxXS5uYW1lID0gJyc7XG4gICAgICAvLyBpdGVtc1sxXS52YWx1ZSA9IGl0ZW1zWzFdLnZhbHVlICsgJ+WFgyc7XG4gICAgfSxcbiAgfSk7XG5cbiAgLy8gcGF5dHlwZUNoYXJ0LmNvb3JkKCdwb2xhcicsIHtcbiAgLy8gICB0cmFuc3Bvc2VkOiB0cnVlLFxuICAvLyAgIGlubmVyUmFkaXVzOiAwLjUsXG4gIC8vICAgcmFkaXVzOiAwLjksXG4gIC8vIH0pO1xuICBwYXl0eXBlQ2hhcnQubGVnZW5kKHtcbiAgICBwb3NpdGlvbjogJ3JpZ2h0JyxcbiAgICBtYXJrZXI6ICdzcXVhcmUnLFxuICAgIG9uQ2xpY2s6IGV2ID0+IHtcbiAgICAgIGNvbnN0IHRvb2x0aXAgPSBwYXl0eXBlQ2hhcnQuZ2V0KCd0b29sdGlwJyk7XG4gICAgICBjb25zb2xlLmxvZyhldiwgdG9vbHRpcCk7XG4gICAgICAvLyBwYXl0eXBlQ2hhcnQuXG4gICAgfSxcbiAgfSk7XG4gIHBheXR5cGVDaGFydFxuICAgIC5pbnRlcnZhbCgpXG4gICAgLnBvc2l0aW9uKCduYW1lKmNvdW50JylcbiAgICAuY29sb3IoJ25hbWUnLCBbJyNFQjdFNTknLCAnIzEzQzJDMicsICcjRkFDQzE0JywgJyMxODkwRkYnXSk7XG4gIHBheXR5cGVDaGFydC5heGlzKCduYW1lJywge1xuICAgIGxhYmVsOiB7XG4gICAgICByb3RhdGU6IC1NYXRoLlBJIC8gNCxcbiAgICAgIHRleHRBbGlnbjogJ2VuZCcsXG4gICAgICB0ZXh0QmFzZWxpbmU6ICdtaWRkbGUnLFxuICAgIH0sXG4gIH0pO1xuICBwYXl0eXBlQ2hhcnQucmVuZGVyKCk7XG5cbiAgLy8g57uY5Yi25YaF6Zi05b2xXG4gIC8vIGNvbnN0IGZyb250UGxvdCA9IHBheXR5cGVDaGFydC5nZXQoJ2Zyb250UGxvdCcpO1xuICAvLyBjb25zdCBjb29yZCA9IHBheXR5cGVDaGFydC5nZXQoJ2Nvb3JkJyk7IC8vIOiOt+WPluWdkOagh+ezu+WvueixoVxuICAvLyBmcm9udFBsb3QuYWRkU2hhcGUoJ3NlY3RvcicsIHtcbiAgLy8gICBhdHRyczoge1xuICAvLyAgICAgeDogY29vcmQuY2lyY2xlUmFkaXVzLFxuICAvLyAgICAgeTogY29vcmQuY2VudGVyLnksXG4gIC8vICAgICByOiBjb29yZC5jaXJjbGVSYWRpdXMgKiBjb29yZC5pbm5lclJhZGl1cyAqIDEuMSwgLy8g5YWo5Y2K5b6EXG4gIC8vICAgICByMDogMCxcbiAgLy8gICAgIGZpbGw6ICcjMDAwJyxcbiAgLy8gICB9LFxuICAvLyB9KTtcbiAgLy8gcGF5dHlwZUNoYXJ0LmdldCgnY2FudmFzJykuZHJhdygpO1xuICAvLyBjb25zb2xlLmxvZygnY29vcmQnLCBjb29yZCk7XG5cbiAgcmV0dXJuIHBheXR5cGVDaGFydDtcbn1cblxuQ29tcG9uZW50KHtcbiAgcHJvcGVydGllczoge1xuICAgIGRhdGFMaXN0OiB7XG4gICAgICB0eXBlOiBBcnJheSxcbiAgICAgIHZhbHVlOiBbXSxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICAvLyBwYXl0eXBlQ2hhcnQgJiZcbiAgICAgICAgLy8gICBwYXl0eXBlQ2hhcnQubGVnZW5kKHtcbiAgICAgICAgLy8gICAgIHBvc2l0aW9uOiAncmlnaHQnLFxuICAgICAgICAvLyAgICAgbWFya2VyOiAnc3F1YXJlJyxcbiAgICAgICAgLy8gICAgIGl0ZW1Gb3JtYXR0ZXI6IHZhbCA9PiB7XG4gICAgICAgIC8vICAgICAgIGxldCBpdGVtID0gbmV3VmFsLmZpbmQoaXRlbSA9PiBpdGVtLmtleSA9PT0gdmFsKTtcbiAgICAgICAgLy8gICAgICAgaWYgKGl0ZW0pIHtcbiAgICAgICAgLy8gICAgICAgICBsZXQgbmFtZSA9IGl0ZW0ubmFtZTtcbiAgICAgICAgLy8gICAgICAgICBpZiAoaXRlbSAmJiBpdGVtLm5hbWUubGVuZ3RoIDwgNCkge1xuICAgICAgICAvLyAgICAgICAgICAgbmFtZSArPSAnXFx4YTBcXHhhMFxceGEwJztcbiAgICAgICAgLy8gICAgICAgICB9XG4gICAgICAgIC8vICAgICAgICAgcmV0dXJuIG5hbWUgKyAnICAgJyArIGZvcm1hdFByaWNlKGl0ZW0uY291bnQpO1xuICAgICAgICAvLyAgICAgICB9IGVsc2Uge1xuICAgICAgICAvLyAgICAgICAgIHJldHVybiAnJztcbiAgICAgICAgLy8gICAgICAgfVxuICAgICAgICAvLyAgICAgfSxcbiAgICAgICAgLy8gICB9KTtcbiAgICAgICAgcGF5dHlwZUNoYXJ0ICYmIHBheXR5cGVDaGFydC5jaGFuZ2VEYXRhKG5ld1ZhbCk7XG4gICAgICB9LFxuICAgIH0sXG4gICAgbW9udGg6IHtcbiAgICAgIHR5cGU6IFN0cmluZyxcbiAgICAgIHZhbHVlOiAnJyxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICBtb250aCA9IG5ld1ZhbDtcbiAgICAgIH0sXG4gICAgfSxcbiAgfSxcbiAgZGF0YToge1xuICAgIG9wdHM6IHtcbiAgICAgIG9uSW5pdDogaW5pdENoYXJ0LFxuICAgIH0sXG4gIH0sXG59KTtcbiJdfQ== //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGF5VHlwZUNoYXJ0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiUGF5VHlwZUNoYXJ0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsNENBQWtEO0FBR2xELElBQUksWUFBWSxHQUFHLElBQUksQ0FBQztBQUN4QixJQUFJLEtBQUssR0FBRyxFQUFFLENBQUM7QUFDZixJQUFNLFFBQVEsR0FBRztJQUNmLElBQUksRUFBRSxTQUFTO0lBQ2YsSUFBSSxFQUFFLFNBQVM7SUFDZixRQUFRLEVBQUUsU0FBUztJQUNuQixNQUFNLEVBQUUsU0FBUztDQUNsQixDQUFDO0FBRUYsbUJBQW1CLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEVBQUU7SUFDMUMsSUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDO0lBQ2hCLFlBQVksR0FBRyxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUM7UUFDMUIsRUFBRSxFQUFFLE1BQU07UUFDVixLQUFLLE9BQUE7UUFDTCxNQUFNLFFBQUE7UUFDTixPQUFPLEVBQUUsQ0FBQyxNQUFNLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxNQUFNLENBQUM7S0FDdEMsQ0FBQyxDQUFDO0lBRUgsWUFBWSxDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUU7UUFDeEIsSUFBSSxFQUFFO1lBQ0osR0FBRyxFQUFFLENBQUM7WUFDTixHQUFHLEVBQUUsRUFBRTtTQUNSO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsWUFBWSxDQUFDLE9BQU8sQ0FBQztRQUNuQixjQUFjLEVBQUUsS0FBSztRQUNyQixVQUFVLEVBQUU7WUFDVixNQUFNLEVBQUUsQ0FBQztZQUNULElBQUksRUFBRSxTQUFTO1lBQ2YsT0FBTyxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQztTQUNqQjtRQUNELE1BQU0sWUFBQyxFQUFFO1lBQ1AsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNSLElBQUEsZ0JBQUssQ0FBUTtZQUNyQixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7WUFDL0IsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxrQkFBVyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztRQUd2RCxDQUFDO0tBQ0YsQ0FBQyxDQUFDO0lBT0gsWUFBWSxDQUFDLE1BQU0sQ0FBQztRQUNsQixRQUFRLEVBQUUsT0FBTztRQUNqQixNQUFNLEVBQUUsUUFBUTtLQUNqQixDQUFDLENBQUM7SUFDSCxZQUFZO1NBQ1QsUUFBUSxFQUFFO1NBQ1YsUUFBUSxDQUFDLFlBQVksQ0FBQztTQUN0QixLQUFLLENBQUMsTUFBTSxFQUFFLENBQUMsU0FBUyxFQUFFLFNBQVMsRUFBRSxTQUFTLEVBQUUsU0FBUyxDQUFDLENBQUMsQ0FBQztJQUMvRCxZQUFZLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBRTtRQUN4QixLQUFLLEVBQUU7WUFDTCxNQUFNLEVBQUUsQ0FBQyxJQUFJLENBQUMsRUFBRSxHQUFHLENBQUM7WUFDcEIsU0FBUyxFQUFFLEtBQUs7WUFDaEIsWUFBWSxFQUFFLFFBQVE7U0FDdkI7S0FDRixDQUFDLENBQUM7SUFDSCxZQUFZLENBQUMsTUFBTSxFQUFFLENBQUM7SUFpQnRCLE1BQU0sQ0FBQyxZQUFZLENBQUM7QUFDdEIsQ0FBQztBQUVELFNBQVMsQ0FBQztJQUNSLFVBQVUsRUFBRTtRQUNWLFFBQVEsRUFBRTtZQUNSLElBQUksRUFBRSxLQUFLO1lBQ1gsS0FBSyxFQUFFLEVBQUU7WUFDVCxRQUFRLFlBQUMsTUFBTTtnQkFDYixZQUFZO29CQUNWLFlBQVksQ0FBQyxNQUFNLENBQUM7d0JBQ2xCLFFBQVEsRUFBRSxPQUFPO3dCQUNqQixNQUFNLEVBQUUsUUFBUTt3QkFFaEIsYUFBYSxFQUFFLFVBQUEsR0FBRzs0QkFDaEIsSUFBSSxJQUFJLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBQyxVQUFBLElBQUksSUFBSSxPQUFBLElBQUksQ0FBQyxJQUFJLEtBQUssR0FBRyxFQUFqQixDQUFpQixDQUFDLENBQUM7NEJBQ2xELEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7Z0NBQ1QsSUFBSSxNQUFJLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQztnQ0FDckIsRUFBRSxDQUFDLENBQUMsSUFBSSxJQUFJLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7b0NBQ2pDLE1BQUksSUFBSSxjQUFjLENBQUM7Z0NBQ3pCLENBQUM7Z0NBQ0QsTUFBTSxDQUFDLE1BQUksR0FBRyxLQUFLLEdBQUcsa0JBQVcsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7NEJBQ2hELENBQUM7NEJBQUMsSUFBSSxDQUFDLENBQUM7Z0NBQ04sTUFBTSxDQUFDLEVBQUUsQ0FBQzs0QkFDWixDQUFDO3dCQUNILENBQUM7d0JBQ0QsT0FBTyxFQUFFLFVBQUEsRUFBRTs0QkFDVCxPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUUsRUFBRSxZQUFZLENBQUMsQ0FBQzt3QkFHaEMsQ0FBQztxQkFDRixDQUFDLENBQUM7Z0JBQ0wsWUFBWSxJQUFJLFlBQVksQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUM7WUFDbEQsQ0FBQztTQUNGO1FBQ0QsS0FBSyxFQUFFO1lBQ0wsSUFBSSxFQUFFLE1BQU07WUFDWixLQUFLLEVBQUUsRUFBRTtZQUNULFFBQVEsWUFBQyxNQUFNO2dCQUNiLEtBQUssR0FBRyxNQUFNLENBQUM7WUFDakIsQ0FBQztTQUNGO0tBQ0Y7SUFDRCxJQUFJLEVBQUU7UUFDSixJQUFJLEVBQUU7WUFDSixNQUFNLEVBQUUsU0FBUztTQUNsQjtLQUNGO0NBQ0YsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZm9ybWF0UHJpY2UgfSBmcm9tICcuLi8uLi8uLi91dGlscy91dGlsJztcblxuLy8gcGFnZXMvY29tcG9uZW50cy9QYXlUeXBlQ2hhcnQvUGF5VHlwZUNoYXJ0LmpzXG5sZXQgcGF5dHlwZUNoYXJ0ID0gbnVsbDtcbmxldCBtb250aCA9ICcnO1xuY29uc3QgY29sb3JNYXAgPSB7XG4gIGFpbWk6ICcjRUI3RTU5JyxcbiAgYmVhbjogJyMxM0MyQzInLFxuICBkaXNjb3VudDogJyNGQUNDMTQnLFxuICBvbmxpbmU6ICcjMTg5MEZGJyxcbn07XG5cbmZ1bmN0aW9uIGluaXRDaGFydChjYW52YXMsIHdpZHRoLCBoZWlnaHQsIEYyKSB7XG4gIGNvbnN0IGRhdGEgPSBbXTtcbiAgcGF5dHlwZUNoYXJ0ID0gbmV3IEYyLkNoYXJ0KHtcbiAgICBlbDogY2FudmFzLFxuICAgIHdpZHRoLFxuICAgIGhlaWdodCxcbiAgICBwYWRkaW5nOiBbJ2F1dG8nLCAnYXV0bycsIDUwLCAnYXV0byddLFxuICB9KTtcblxuICBwYXl0eXBlQ2hhcnQuc291cmNlKGRhdGEsIHtcbiAgICBkYXlzOiB7XG4gICAgICBtaW46IDEsXG4gICAgICBtYXg6IDMxLFxuICAgIH0sXG4gIH0pO1xuICBwYXl0eXBlQ2hhcnQudG9vbHRpcCh7XG4gICAgc2hvd0l0ZW1NYXJrZXI6IGZhbHNlLFxuICAgIGJhY2tncm91bmQ6IHtcbiAgICAgIHJhZGl1czogMixcbiAgICAgIGZpbGw6ICcjZjE2NmZkJyxcbiAgICAgIHBhZGRpbmc6IFs2LCAxMF0sXG4gICAgfSxcbiAgICBvblNob3coZXYpIHtcbiAgICAgIGNvbnNvbGUubG9nKGV2KTtcbiAgICAgIGNvbnN0IHsgaXRlbXMgfSA9IGV2O1xuICAgICAgaXRlbXNbMF0ubmFtZSA9IGl0ZW1zWzBdLnRpdGxlO1xuICAgICAgaXRlbXNbMF0udmFsdWUgPSBmb3JtYXRQcmljZShOdW1iZXIoaXRlbXNbMF0udmFsdWUpKTtcbiAgICAgIC8vIGl0ZW1zWzFdLm5hbWUgPSAnJztcbiAgICAgIC8vIGl0ZW1zWzFdLnZhbHVlID0gaXRlbXNbMV0udmFsdWUgKyAn5YWDJztcbiAgICB9LFxuICB9KTtcblxuICAvLyBwYXl0eXBlQ2hhcnQuY29vcmQoJ3BvbGFyJywge1xuICAvLyAgIHRyYW5zcG9zZWQ6IHRydWUsXG4gIC8vICAgaW5uZXJSYWRpdXM6IDAuNSxcbiAgLy8gICByYWRpdXM6IDAuOSxcbiAgLy8gfSk7XG4gIHBheXR5cGVDaGFydC5sZWdlbmQoe1xuICAgIHBvc2l0aW9uOiAncmlnaHQnLFxuICAgIG1hcmtlcjogJ3NxdWFyZScsXG4gIH0pO1xuICBwYXl0eXBlQ2hhcnRcbiAgICAuaW50ZXJ2YWwoKVxuICAgIC5wb3NpdGlvbignbmFtZSpjb3VudCcpXG4gICAgLmNvbG9yKCduYW1lJywgWycjRUI3RTU5JywgJyMxM0MyQzInLCAnI0ZBQ0MxNCcsICcjMTg5MEZGJ10pO1xuICBwYXl0eXBlQ2hhcnQuYXhpcygnbmFtZScsIHtcbiAgICBsYWJlbDoge1xuICAgICAgcm90YXRlOiAtTWF0aC5QSSAvIDQsXG4gICAgICB0ZXh0QWxpZ246ICdlbmQnLFxuICAgICAgdGV4dEJhc2VsaW5lOiAnbWlkZGxlJyxcbiAgICB9LFxuICB9KTtcbiAgcGF5dHlwZUNoYXJ0LnJlbmRlcigpO1xuXG4gIC8vIOe7mOWItuWGhemYtOW9sVxuICAvLyBjb25zdCBmcm9udFBsb3QgPSBwYXl0eXBlQ2hhcnQuZ2V0KCdmcm9udFBsb3QnKTtcbiAgLy8gY29uc3QgY29vcmQgPSBwYXl0eXBlQ2hhcnQuZ2V0KCdjb29yZCcpOyAvLyDojrflj5blnZDmoIfns7vlr7nosaFcbiAgLy8gZnJvbnRQbG90LmFkZFNoYXBlKCdzZWN0b3InLCB7XG4gIC8vICAgYXR0cnM6IHtcbiAgLy8gICAgIHg6IGNvb3JkLmNpcmNsZVJhZGl1cyxcbiAgLy8gICAgIHk6IGNvb3JkLmNlbnRlci55LFxuICAvLyAgICAgcjogY29vcmQuY2lyY2xlUmFkaXVzICogY29vcmQuaW5uZXJSYWRpdXMgKiAxLjEsIC8vIOWFqOWNiuW+hFxuICAvLyAgICAgcjA6IDAsXG4gIC8vICAgICBmaWxsOiAnIzAwMCcsXG4gIC8vICAgfSxcbiAgLy8gfSk7XG4gIC8vIHBheXR5cGVDaGFydC5nZXQoJ2NhbnZhcycpLmRyYXcoKTtcbiAgLy8gY29uc29sZS5sb2coJ2Nvb3JkJywgY29vcmQpO1xuXG4gIHJldHVybiBwYXl0eXBlQ2hhcnQ7XG59XG5cbkNvbXBvbmVudCh7XG4gIHByb3BlcnRpZXM6IHtcbiAgICBkYXRhTGlzdDoge1xuICAgICAgdHlwZTogQXJyYXksXG4gICAgICB2YWx1ZTogW10sXG4gICAgICBvYnNlcnZlcihuZXdWYWwpIHtcbiAgICAgICAgcGF5dHlwZUNoYXJ0ICYmXG4gICAgICAgICAgcGF5dHlwZUNoYXJ0LmxlZ2VuZCh7XG4gICAgICAgICAgICBwb3NpdGlvbjogJ3JpZ2h0JyxcbiAgICAgICAgICAgIG1hcmtlcjogJ3NxdWFyZScsXG4gICAgICAgICAgICAvLyBjdXN0b206IHRydWUsXG4gICAgICAgICAgICBpdGVtRm9ybWF0dGVyOiB2YWwgPT4ge1xuICAgICAgICAgICAgICBsZXQgaXRlbSA9IG5ld1ZhbC5maW5kKGl0ZW0gPT4gaXRlbS5uYW1lID09PSB2YWwpO1xuICAgICAgICAgICAgICBpZiAoaXRlbSkge1xuICAgICAgICAgICAgICAgIGxldCBuYW1lID0gaXRlbS5uYW1lO1xuICAgICAgICAgICAgICAgIGlmIChpdGVtICYmIGl0ZW0ubmFtZS5sZW5ndGggPCA0KSB7XG4gICAgICAgICAgICAgICAgICBuYW1lICs9ICdcXHhhMFxceGEwXFx4YTAnO1xuICAgICAgICAgICAgICAgIH1cbiAgICAgICAgICAgICAgICByZXR1cm4gbmFtZSArICcgICAnICsgZm9ybWF0UHJpY2UoaXRlbS5jb3VudCk7XG4gICAgICAgICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgICAgICAgcmV0dXJuICcnO1xuICAgICAgICAgICAgICB9XG4gICAgICAgICAgICB9LFxuICAgICAgICAgICAgb25DbGljazogZXYgPT4ge1xuICAgICAgICAgICAgICBjb25zb2xlLmxvZyhldiwgcGF5dHlwZUNoYXJ0KTtcbiAgICAgICAgICAgICAgLy8gbGV0IHBvaW50ID0gcGF5dHlwZUNoYXJ0LmdldFhZKGNsaWNrZWRJdGVtKTtcbiAgICAgICAgICAgICAgLy8gcGF5dHlwZUNoYXJ0LnNob3dUb29sdGlwKHBvaW50KTtcbiAgICAgICAgICAgIH0sXG4gICAgICAgICAgfSk7XG4gICAgICAgIHBheXR5cGVDaGFydCAmJiBwYXl0eXBlQ2hhcnQuY2hhbmdlRGF0YShuZXdWYWwpO1xuICAgICAgfSxcbiAgICB9LFxuICAgIG1vbnRoOiB7XG4gICAgICB0eXBlOiBTdHJpbmcsXG4gICAgICB2YWx1ZTogJycsXG4gICAgICBvYnNlcnZlcihuZXdWYWwpIHtcbiAgICAgICAgbW9udGggPSBuZXdWYWw7XG4gICAgICB9LFxuICAgIH0sXG4gIH0sXG4gIGRhdGE6IHtcbiAgICBvcHRzOiB7XG4gICAgICBvbkluaXQ6IGluaXRDaGFydCxcbiAgICB9LFxuICB9LFxufSk7XG4iXX0=
\ No newline at end of file \ No newline at end of file
miniprogram/pages/components/PayTypeChart/PayTypeChart.ts
...@@ -50,11 +50,6 @@ function initChart(canvas, width, height, F2) { ...@@ -50,11 +50,6 @@ function initChart(canvas, width, height, F2) {
paytypeChart.legend({ paytypeChart.legend({
position: 'right', position: 'right',
marker: 'square', marker: 'square',
onClick: ev => {
const tooltip = paytypeChart.get('tooltip');
console.log(ev, tooltip);
// paytypeChart.
},
}); });
paytypeChart paytypeChart
.interval() .interval()
...@@ -93,23 +88,29 @@ Component({ ...@@ -93,23 +88,29 @@ Component({
type: Array, type: Array,
value: [], value: [],
observer(newVal) { observer(newVal) {
// paytypeChart && paytypeChart &&
// paytypeChart.legend({ paytypeChart.legend({
// position: 'right', position: 'right',
// marker: 'square', marker: 'square',
// itemFormatter: val => { // custom: true,
// let item = newVal.find(item => item.key === val); itemFormatter: val => {
// if (item) { let item = newVal.find(item => item.name === val);
// let name = item.name; if (item) {
// if (item && item.name.length < 4) { let name = item.name;
// name += '\xa0\xa0\xa0'; if (item && item.name.length < 4) {
// } name += '\xa0\xa0\xa0';
// return name + ' ' + formatPrice(item.count); }
// } else { return name + ' ' + formatPrice(item.count);
// return ''; } else {
// } return '';
// }, }
// }); },
onClick: ev => {
console.log(ev, paytypeChart);
// let point = paytypeChart.getXY(clickedItem);
// paytypeChart.showTooltip(point);
},
});
paytypeChart && paytypeChart.changeData(newVal); paytypeChart && paytypeChart.changeData(newVal);
}, },
}, },
......
miniprogram/pages/components/RechargeChart/RechargeChart.js
...@@ -43,7 +43,6 @@ function initChart(canvas, width, height, F2) { ...@@ -43,7 +43,6 @@ function initChart(canvas, width, height, F2) {
.style({ .style({
fillOpacity: 0.6, fillOpacity: 0.6,
}); });
rechargeChart.axis('rechargeMoney', false);
rechargeChart.render(); rechargeChart.render();
return rechargeChart; return rechargeChart;
} }
...@@ -70,4 +69,4 @@ Component({ ...@@ -70,4 +69,4 @@ Component({
}, },
}, },
}); });
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVjaGFyZ2VDaGFydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIlJlY2hhcmdlQ2hhcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLElBQUksYUFBYSxHQUFHLElBQUksQ0FBQztBQUN6QixJQUFJLEtBQUssR0FBRyxFQUFFLENBQUM7QUFFZixtQkFBbUIsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsRUFBRTtJQUMxQyxJQUFNLElBQUksR0FBRyxFQUFFLENBQUM7SUFDaEIsYUFBYSxHQUFHLElBQUksRUFBRSxDQUFDLEtBQUssQ0FBQztRQUMzQixFQUFFLEVBQUUsTUFBTTtRQUNWLEtBQUssT0FBQTtRQUNMLE1BQU0sUUFBQTtLQUNQLENBQUMsQ0FBQztJQUVILGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFO1FBQ3pCLElBQUksRUFBRTtZQUNKLEdBQUcsRUFBRSxDQUFDO1lBQ04sR0FBRyxFQUFFLEVBQUU7U0FDUjtLQUNGLENBQUMsQ0FBQztJQUNILGFBQWEsQ0FBQyxPQUFPLENBQUM7UUFDcEIsY0FBYyxFQUFFLEtBQUs7UUFDckIsVUFBVSxFQUFFO1lBQ1YsTUFBTSxFQUFFLENBQUM7WUFDVCxJQUFJLEVBQUUsU0FBUztZQUNmLE9BQU8sRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUM7U0FDakI7UUFDRCxNQUFNLFlBQUMsRUFBRTtZQUNDLElBQUEsZ0JBQUssQ0FBUTtZQUNyQixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUNuQixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLEtBQUssR0FBRyxHQUFHLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQztZQUM5QyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUNuQixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsR0FBRyxDQUFDO1FBQ3hDLENBQUM7S0FDRixDQUFDLENBQUM7SUFDSCxhQUFhO1NBQ1YsSUFBSSxFQUFFO1NBQ04sUUFBUSxDQUFDLG9CQUFvQixDQUFDO1NBQzlCLEtBQUssQ0FBQyxTQUFTLENBQUM7U0FDaEIsS0FBSyxDQUFDLFFBQVEsQ0FBQztTQUNmLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNYLGFBQWE7U0FDVixJQUFJLEVBQUU7U0FDTixRQUFRLENBQUMsb0JBQW9CLENBQUM7U0FDOUIsS0FBSyxDQUFDLHdCQUF3QixDQUFDO1NBQy9CLEtBQUssQ0FBQyxRQUFRLENBQUM7U0FDZixLQUFLLENBQUM7UUFDTCxXQUFXLEVBQUUsR0FBRztLQUNqQixDQUFDLENBQUM7SUFDTCxhQUFhLENBQUMsSUFBSSxDQUFDLGVBQWUsRUFBRSxLQUFLLENBQUMsQ0FBQztJQUMzQyxhQUFhLENBQUMsTUFBTSxFQUFFLENBQUM7SUFDdkIsTUFBTSxDQUFDLGFBQWEsQ0FBQztBQUN2QixDQUFDO0FBRUQsU0FBUyxDQUFDO0lBQ1IsVUFBVSxFQUFFO1FBQ1YsUUFBUSxFQUFFO1lBQ1IsSUFBSSxFQUFFLEtBQUs7WUFDWCxLQUFLLEVBQUUsRUFBRTtZQUNULFFBQVEsWUFBQyxNQUFNO2dCQUNiLGFBQWEsSUFBSSxhQUFhLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQ3BELENBQUM7U0FDRjtRQUNELEtBQUssRUFBRTtZQUNMLElBQUksRUFBRSxNQUFNO1lBQ1osS0FBSyxFQUFFLEVBQUU7WUFDVCxRQUFRLFlBQUMsTUFBTTtnQkFDYixLQUFLLEdBQUcsTUFBTSxDQUFDO1lBQ2pCLENBQUM7U0FDRjtLQUNGO0lBQ0QsSUFBSSxFQUFFO1FBQ0osSUFBSSxFQUFFO1lBQ0osTUFBTSxFQUFFLFNBQVM7U0FDbEI7S0FDRjtDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImxldCByZWNoYXJnZUNoYXJ0ID0gbnVsbDtcbmxldCBtb250aCA9ICcnO1xuXG5mdW5jdGlvbiBpbml0Q2hhcnQoY2FudmFzLCB3aWR0aCwgaGVpZ2h0LCBGMikge1xuICBjb25zdCBkYXRhID0gW107XG4gIHJlY2hhcmdlQ2hhcnQgPSBuZXcgRjIuQ2hhcnQoe1xuICAgIGVsOiBjYW52YXMsXG4gICAgd2lkdGgsXG4gICAgaGVpZ2h0LFxuICB9KTtcblxuICByZWNoYXJnZUNoYXJ0LnNvdXJjZShkYXRhLCB7XG4gICAgZGF5czoge1xuICAgICAgbWluOiAxLFxuICAgICAgbWF4OiAzMSxcbiAgICB9LFxuICB9KTtcbiAgcmVjaGFyZ2VDaGFydC50b29sdGlwKHtcbiAgICBzaG93SXRlbU1hcmtlcjogZmFsc2UsXG4gICAgYmFja2dyb3VuZDoge1xuICAgICAgcmFkaXVzOiAyLFxuICAgICAgZmlsbDogJyM2ODk1ZmUnLFxuICAgICAgcGFkZGluZzogWzYsIDEwXSxcbiAgICB9LFxuICAgIG9uU2hvdyhldikge1xuICAgICAgY29uc3QgeyBpdGVtcyB9ID0gZXY7XG4gICAgICBpdGVtc1swXS5uYW1lID0gJyc7XG4gICAgICBpdGVtc1swXS52YWx1ZSA9IG1vbnRoICsgJy0nICsgaXRlbXNbMF0udGl0bGU7XG4gICAgICBpdGVtc1sxXS5uYW1lID0gJyc7XG4gICAgICBpdGVtc1sxXS52YWx1ZSA9IGl0ZW1zWzFdLnZhbHVlICsgJ+WFgyc7XG4gICAgfSxcbiAgfSk7XG4gIHJlY2hhcmdlQ2hhcnRcbiAgICAubGluZSgpXG4gICAgLnBvc2l0aW9uKCdkYXlzKnJlY2hhcmdlTW9uZXknKVxuICAgIC5jb2xvcignIzY4OTVmZScpXG4gICAgLnNoYXBlKCdzbW9vdGgnKVxuICAgIC5zaXplKDQpO1xuICByZWNoYXJnZUNoYXJ0XG4gICAgLmFyZWEoKVxuICAgIC5wb3NpdGlvbignZGF5cypyZWNoYXJnZU1vbmV5JylcbiAgICAuY29sb3IoJ2woOTApIDA6IzY4OTVmZSAxOiNmZmYnKVxuICAgIC5zaGFwZSgnc21vb3RoJylcbiAgICAuc3R5bGUoe1xuICAgICAgZmlsbE9wYWNpdHk6IDAuNixcbiAgICB9KTtcbiAgcmVjaGFyZ2VDaGFydC5heGlzKCdyZWNoYXJnZU1vbmV5JywgZmFsc2UpO1xuICByZWNoYXJnZUNoYXJ0LnJlbmRlcigpO1xuICByZXR1cm4gcmVjaGFyZ2VDaGFydDtcbn1cblxuQ29tcG9uZW50KHtcbiAgcHJvcGVydGllczoge1xuICAgIGRhdGFMaXN0OiB7XG4gICAgICB0eXBlOiBBcnJheSxcbiAgICAgIHZhbHVlOiBbXSxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICByZWNoYXJnZUNoYXJ0ICYmIHJlY2hhcmdlQ2hhcnQuY2hhbmdlRGF0YShuZXdWYWwpO1xuICAgICAgfSxcbiAgICB9LFxuICAgIG1vbnRoOiB7XG4gICAgICB0eXBlOiBTdHJpbmcsXG4gICAgICB2YWx1ZTogJycsXG4gICAgICBvYnNlcnZlcihuZXdWYWwpIHtcbiAgICAgICAgbW9udGggPSBuZXdWYWw7XG4gICAgICB9LFxuICAgIH0sXG4gIH0sXG4gIGRhdGE6IHtcbiAgICBvcHRzOiB7XG4gICAgICBvbkluaXQ6IGluaXRDaGFydCxcbiAgICB9LFxuICB9LFxufSk7XG4iXX0= //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVjaGFyZ2VDaGFydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIlJlY2hhcmdlQ2hhcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLElBQUksYUFBYSxHQUFHLElBQUksQ0FBQztBQUN6QixJQUFJLEtBQUssR0FBRyxFQUFFLENBQUM7QUFFZixtQkFBbUIsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsRUFBRTtJQUMxQyxJQUFNLElBQUksR0FBRyxFQUFFLENBQUM7SUFDaEIsYUFBYSxHQUFHLElBQUksRUFBRSxDQUFDLEtBQUssQ0FBQztRQUMzQixFQUFFLEVBQUUsTUFBTTtRQUNWLEtBQUssT0FBQTtRQUNMLE1BQU0sUUFBQTtLQUNQLENBQUMsQ0FBQztJQUVILGFBQWEsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFO1FBQ3pCLElBQUksRUFBRTtZQUNKLEdBQUcsRUFBRSxDQUFDO1lBQ04sR0FBRyxFQUFFLEVBQUU7U0FDUjtLQUNGLENBQUMsQ0FBQztJQUNILGFBQWEsQ0FBQyxPQUFPLENBQUM7UUFDcEIsY0FBYyxFQUFFLEtBQUs7UUFDckIsVUFBVSxFQUFFO1lBQ1YsTUFBTSxFQUFFLENBQUM7WUFDVCxJQUFJLEVBQUUsU0FBUztZQUNmLE9BQU8sRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUM7U0FDakI7UUFDRCxNQUFNLFlBQUMsRUFBRTtZQUNDLElBQUEsZ0JBQUssQ0FBUTtZQUNyQixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUNuQixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLEtBQUssR0FBRyxHQUFHLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQztZQUM5QyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUNuQixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsR0FBRyxDQUFDO1FBQ3hDLENBQUM7S0FDRixDQUFDLENBQUM7SUFDSCxhQUFhO1NBQ1YsSUFBSSxFQUFFO1NBQ04sUUFBUSxDQUFDLG9CQUFvQixDQUFDO1NBQzlCLEtBQUssQ0FBQyxTQUFTLENBQUM7U0FDaEIsS0FBSyxDQUFDLFFBQVEsQ0FBQztTQUNmLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNYLGFBQWE7U0FDVixJQUFJLEVBQUU7U0FDTixRQUFRLENBQUMsb0JBQW9CLENBQUM7U0FDOUIsS0FBSyxDQUFDLHdCQUF3QixDQUFDO1NBQy9CLEtBQUssQ0FBQyxRQUFRLENBQUM7U0FDZixLQUFLLENBQUM7UUFDTCxXQUFXLEVBQUUsR0FBRztLQUNqQixDQUFDLENBQUM7SUFFTCxhQUFhLENBQUMsTUFBTSxFQUFFLENBQUM7SUFDdkIsTUFBTSxDQUFDLGFBQWEsQ0FBQztBQUN2QixDQUFDO0FBRUQsU0FBUyxDQUFDO0lBQ1IsVUFBVSxFQUFFO1FBQ1YsUUFBUSxFQUFFO1lBQ1IsSUFBSSxFQUFFLEtBQUs7WUFDWCxLQUFLLEVBQUUsRUFBRTtZQUNULFFBQVEsWUFBQyxNQUFNO2dCQUNiLGFBQWEsSUFBSSxhQUFhLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQ3BELENBQUM7U0FDRjtRQUNELEtBQUssRUFBRTtZQUNMLElBQUksRUFBRSxNQUFNO1lBQ1osS0FBSyxFQUFFLEVBQUU7WUFDVCxRQUFRLFlBQUMsTUFBTTtnQkFDYixLQUFLLEdBQUcsTUFBTSxDQUFDO1lBQ2pCLENBQUM7U0FDRjtLQUNGO0lBQ0QsSUFBSSxFQUFFO1FBQ0osSUFBSSxFQUFFO1lBQ0osTUFBTSxFQUFFLFNBQVM7U0FDbEI7S0FDRjtDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImxldCByZWNoYXJnZUNoYXJ0ID0gbnVsbDtcbmxldCBtb250aCA9ICcnO1xuXG5mdW5jdGlvbiBpbml0Q2hhcnQoY2FudmFzLCB3aWR0aCwgaGVpZ2h0LCBGMikge1xuICBjb25zdCBkYXRhID0gW107XG4gIHJlY2hhcmdlQ2hhcnQgPSBuZXcgRjIuQ2hhcnQoe1xuICAgIGVsOiBjYW52YXMsXG4gICAgd2lkdGgsXG4gICAgaGVpZ2h0LFxuICB9KTtcblxuICByZWNoYXJnZUNoYXJ0LnNvdXJjZShkYXRhLCB7XG4gICAgZGF5czoge1xuICAgICAgbWluOiAxLFxuICAgICAgbWF4OiAzMSxcbiAgICB9LFxuICB9KTtcbiAgcmVjaGFyZ2VDaGFydC50b29sdGlwKHtcbiAgICBzaG93SXRlbU1hcmtlcjogZmFsc2UsXG4gICAgYmFja2dyb3VuZDoge1xuICAgICAgcmFkaXVzOiAyLFxuICAgICAgZmlsbDogJyM2ODk1ZmUnLFxuICAgICAgcGFkZGluZzogWzYsIDEwXSxcbiAgICB9LFxuICAgIG9uU2hvdyhldikge1xuICAgICAgY29uc3QgeyBpdGVtcyB9ID0gZXY7XG4gICAgICBpdGVtc1swXS5uYW1lID0gJyc7XG4gICAgICBpdGVtc1swXS52YWx1ZSA9IG1vbnRoICsgJy0nICsgaXRlbXNbMF0udGl0bGU7XG4gICAgICBpdGVtc1sxXS5uYW1lID0gJyc7XG4gICAgICBpdGVtc1sxXS52YWx1ZSA9IGl0ZW1zWzFdLnZhbHVlICsgJ+WFgyc7XG4gICAgfSxcbiAgfSk7XG4gIHJlY2hhcmdlQ2hhcnRcbiAgICAubGluZSgpXG4gICAgLnBvc2l0aW9uKCdkYXlzKnJlY2hhcmdlTW9uZXknKVxuICAgIC5jb2xvcignIzY4OTVmZScpXG4gICAgLnNoYXBlKCdzbW9vdGgnKVxuICAgIC5zaXplKDQpO1xuICByZWNoYXJnZUNoYXJ0XG4gICAgLmFyZWEoKVxuICAgIC5wb3NpdGlvbignZGF5cypyZWNoYXJnZU1vbmV5JylcbiAgICAuY29sb3IoJ2woOTApIDA6IzY4OTVmZSAxOiNmZmYnKVxuICAgIC5zaGFwZSgnc21vb3RoJylcbiAgICAuc3R5bGUoe1xuICAgICAgZmlsbE9wYWNpdHk6IDAuNixcbiAgICB9KTtcbiAgLy8gcmVjaGFyZ2VDaGFydC5heGlzKCdyZWNoYXJnZU1vbmV5JywgZmFsc2UpO1xuICByZWNoYXJnZUNoYXJ0LnJlbmRlcigpO1xuICByZXR1cm4gcmVjaGFyZ2VDaGFydDtcbn1cblxuQ29tcG9uZW50KHtcbiAgcHJvcGVydGllczoge1xuICAgIGRhdGFMaXN0OiB7XG4gICAgICB0eXBlOiBBcnJheSxcbiAgICAgIHZhbHVlOiBbXSxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICByZWNoYXJnZUNoYXJ0ICYmIHJlY2hhcmdlQ2hhcnQuY2hhbmdlRGF0YShuZXdWYWwpO1xuICAgICAgfSxcbiAgICB9LFxuICAgIG1vbnRoOiB7XG4gICAgICB0eXBlOiBTdHJpbmcsXG4gICAgICB2YWx1ZTogJycsXG4gICAgICBvYnNlcnZlcihuZXdWYWwpIHtcbiAgICAgICAgbW9udGggPSBuZXdWYWw7XG4gICAgICB9LFxuICAgIH0sXG4gIH0sXG4gIGRhdGE6IHtcbiAgICBvcHRzOiB7XG4gICAgICBvbkluaXQ6IGluaXRDaGFydCxcbiAgICB9LFxuICB9LFxufSk7XG4iXX0=
\ No newline at end of file \ No newline at end of file
miniprogram/pages/components/RechargeChart/RechargeChart.ts
...@@ -44,7 +44,7 @@ function initChart(canvas, width, height, F2) { ...@@ -44,7 +44,7 @@ function initChart(canvas, width, height, F2) {
.style({ .style({
fillOpacity: 0.6, fillOpacity: 0.6,
}); });
rechargeChart.axis('rechargeMoney', false); // rechargeChart.axis('rechargeMoney', false);
rechargeChart.render(); rechargeChart.render();
return rechargeChart; return rechargeChart;
} }
......
miniprogram/pages/components/RefundChart/RefundChart.js
...@@ -51,7 +51,6 @@ function initChart(canvas, width, height, F2) { ...@@ -51,7 +51,6 @@ function initChart(canvas, width, height, F2) {
.style({ .style({
fillOpacity: 0.6, fillOpacity: 0.6,
}); });
refundChart.axis('refundMoney', false);
refundChart.render(); refundChart.render();
return refundChart; return refundChart;
} }
...@@ -79,4 +78,4 @@ Component({ ...@@ -79,4 +78,4 @@ Component({
}, },
}, },
}); });
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVmdW5kQ2hhcnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJSZWZ1bmRDaGFydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFDQSxJQUFJLFdBQVcsR0FBRyxJQUFJLENBQUM7QUFDdkIsSUFBSSxLQUFLLEdBQUcsRUFBRSxDQUFDO0FBRWYsbUJBQW1CLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEVBQUU7SUFDMUMsSUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDO0lBQ2hCLFdBQVcsR0FBRyxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUM7UUFDekIsRUFBRSxFQUFFLE1BQU07UUFDVixLQUFLLE9BQUE7UUFDTCxNQUFNLFFBQUE7S0FDUCxDQUFDLENBQUM7SUFFSCxXQUFXLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRTtRQUN2QixJQUFJLEVBQUU7WUFDSixHQUFHLEVBQUUsQ0FBQztZQUNOLEdBQUcsRUFBRSxFQUFFO1NBQ1I7S0FDRixDQUFDLENBQUM7SUFDSCxXQUFXLENBQUMsT0FBTyxDQUFDO1FBQ2xCLGNBQWMsRUFBRSxLQUFLO1FBQ3JCLFVBQVUsRUFBRTtZQUNWLE1BQU0sRUFBRSxDQUFDO1lBQ1QsSUFBSSxFQUFFLFNBQVM7WUFDZixPQUFPLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDO1NBQ2pCO1FBQ0QsTUFBTSxZQUFDLEVBQUU7WUFDQyxJQUFBLGdCQUFLLENBQVE7WUFDckIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLEdBQUcsR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7WUFDOUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLEdBQUcsQ0FBQztRQUN4QyxDQUFDO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsV0FBVztTQUNSLElBQUksRUFBRTtTQUNOLFFBQVEsQ0FBQyxrQkFBa0IsQ0FBQztTQUM1QixLQUFLLENBQUMsU0FBUyxDQUFDO1NBQ2hCLEtBQUssQ0FBQyxRQUFRLENBQUM7U0FDZixJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDWCxXQUFXO1NBQ1IsSUFBSSxFQUFFO1NBQ04sUUFBUSxDQUFDLGtCQUFrQixDQUFDO1NBQzVCLEtBQUssQ0FBQyx3QkFBd0IsQ0FBQztTQUMvQixLQUFLLENBQUMsUUFBUSxDQUFDO1NBQ2YsS0FBSyxDQUFDO1FBQ0wsV0FBVyxFQUFFLEdBQUc7S0FDakIsQ0FBQyxDQUFDO0lBQ0wsV0FBVyxDQUFDLElBQUksQ0FBQyxhQUFhLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFDdkMsV0FBVyxDQUFDLE1BQU0sRUFBRSxDQUFDO0lBQ3JCLE1BQU0sQ0FBQyxXQUFXLENBQUM7QUFDckIsQ0FBQztBQUVELFNBQVMsQ0FBQztJQUNSLFVBQVUsRUFBRTtRQUNWLFFBQVEsRUFBRTtZQUNSLElBQUksRUFBRSxLQUFLO1lBQ1gsS0FBSyxFQUFFLEVBQUU7WUFDVCxRQUFRLFlBQUMsTUFBTTtnQkFDYixJQUFJLElBQUksR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLFVBQUEsSUFBSSxJQUFJLE9BQUEsY0FDekIsSUFBSSxJQUNQLFdBQVcsRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsSUFDdkMsRUFINEIsQ0FHNUIsQ0FBQyxDQUFDO2dCQUNKLFdBQVcsSUFBSSxXQUFXLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQzlDLENBQUM7U0FDRjtRQUNELEtBQUssRUFBRTtZQUNMLElBQUksRUFBRSxNQUFNO1lBQ1osS0FBSyxFQUFFLEVBQUU7WUFDVCxRQUFRLFlBQUMsTUFBTTtnQkFDYixLQUFLLEdBQUcsTUFBTSxDQUFDO1lBQ2pCLENBQUM7U0FDRjtLQUNGO0lBQ0QsSUFBSSxFQUFFO1FBQ0osSUFBSSxFQUFFO1lBQ0osTUFBTSxFQUFFLFNBQVM7U0FDbEI7S0FDRjtDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8vIHBhZ2VzL2NvbXBvbmVudHMvUmVmdW5kQ2hhcnQvUmVmdW5kQ2hhcnQuanNcbmxldCByZWZ1bmRDaGFydCA9IG51bGw7XG5sZXQgbW9udGggPSAnJztcblxuZnVuY3Rpb24gaW5pdENoYXJ0KGNhbnZhcywgd2lkdGgsIGhlaWdodCwgRjIpIHtcbiAgY29uc3QgZGF0YSA9IFtdO1xuICByZWZ1bmRDaGFydCA9IG5ldyBGMi5DaGFydCh7XG4gICAgZWw6IGNhbnZhcyxcbiAgICB3aWR0aCxcbiAgICBoZWlnaHQsXG4gIH0pO1xuXG4gIHJlZnVuZENoYXJ0LnNvdXJjZShkYXRhLCB7XG4gICAgZGF5czoge1xuICAgICAgbWluOiAxLFxuICAgICAgbWF4OiAzMSxcbiAgICB9LFxuICB9KTtcbiAgcmVmdW5kQ2hhcnQudG9vbHRpcCh7XG4gICAgc2hvd0l0ZW1NYXJrZXI6IGZhbHNlLFxuICAgIGJhY2tncm91bmQ6IHtcbiAgICAgIHJhZGl1czogMixcbiAgICAgIGZpbGw6ICcjZjE2NmZkJyxcbiAgICAgIHBhZGRpbmc6IFs2LCAxMF0sXG4gICAgfSxcbiAgICBvblNob3coZXYpIHtcbiAgICAgIGNvbnN0IHsgaXRlbXMgfSA9IGV2O1xuICAgICAgaXRlbXNbMF0ubmFtZSA9ICcnO1xuICAgICAgaXRlbXNbMF0udmFsdWUgPSBtb250aCArICctJyArIGl0ZW1zWzBdLnRpdGxlO1xuICAgICAgaXRlbXNbMV0ubmFtZSA9ICcnO1xuICAgICAgaXRlbXNbMV0udmFsdWUgPSBpdGVtc1sxXS52YWx1ZSArICflhYMnO1xuICAgIH0sXG4gIH0pO1xuICByZWZ1bmRDaGFydFxuICAgIC5saW5lKClcbiAgICAucG9zaXRpb24oJ2RheXMqcmVmdW5kTW9uZXknKVxuICAgIC5jb2xvcignI2YxNjZmZCcpXG4gICAgLnNoYXBlKCdzbW9vdGgnKVxuICAgIC5zaXplKDQpO1xuICByZWZ1bmRDaGFydFxuICAgIC5hcmVhKClcbiAgICAucG9zaXRpb24oJ2RheXMqcmVmdW5kTW9uZXknKVxuICAgIC5jb2xvcignbCg5MCkgMDojZjE2NmZkIDE6I2ZmZicpXG4gICAgLnNoYXBlKCdzbW9vdGgnKVxuICAgIC5zdHlsZSh7XG4gICAgICBmaWxsT3BhY2l0eTogMC42LFxuICAgIH0pO1xuICByZWZ1bmRDaGFydC5heGlzKCdyZWZ1bmRNb25leScsIGZhbHNlKTtcbiAgcmVmdW5kQ2hhcnQucmVuZGVyKCk7XG4gIHJldHVybiByZWZ1bmRDaGFydDtcbn1cblxuQ29tcG9uZW50KHtcbiAgcHJvcGVydGllczoge1xuICAgIGRhdGFMaXN0OiB7XG4gICAgICB0eXBlOiBBcnJheSxcbiAgICAgIHZhbHVlOiBbXSxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICBsZXQgbGlzdCA9IG5ld1ZhbC5tYXAoaXRlbSA9PiAoe1xuICAgICAgICAgIC4uLml0ZW0sXG4gICAgICAgICAgcmVmdW5kTW9uZXk6IE1hdGguYWJzKGl0ZW0ucmVmdW5kTW9uZXkpLFxuICAgICAgICB9KSk7XG4gICAgICAgIHJlZnVuZENoYXJ0ICYmIHJlZnVuZENoYXJ0LmNoYW5nZURhdGEobGlzdCk7XG4gICAgICB9LFxuICAgIH0sXG4gICAgbW9udGg6IHtcbiAgICAgIHR5cGU6IFN0cmluZyxcbiAgICAgIHZhbHVlOiAnJyxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICBtb250aCA9IG5ld1ZhbDtcbiAgICAgIH0sXG4gICAgfSxcbiAgfSxcbiAgZGF0YToge1xuICAgIG9wdHM6IHtcbiAgICAgIG9uSW5pdDogaW5pdENoYXJ0LFxuICAgIH0sXG4gIH0sXG59KTtcbiJdfQ== //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVmdW5kQ2hhcnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJSZWZ1bmRDaGFydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFDQSxJQUFJLFdBQVcsR0FBRyxJQUFJLENBQUM7QUFDdkIsSUFBSSxLQUFLLEdBQUcsRUFBRSxDQUFDO0FBRWYsbUJBQW1CLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEVBQUU7SUFDMUMsSUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDO0lBQ2hCLFdBQVcsR0FBRyxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUM7UUFDekIsRUFBRSxFQUFFLE1BQU07UUFDVixLQUFLLE9BQUE7UUFDTCxNQUFNLFFBQUE7S0FDUCxDQUFDLENBQUM7SUFFSCxXQUFXLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRTtRQUN2QixJQUFJLEVBQUU7WUFDSixHQUFHLEVBQUUsQ0FBQztZQUNOLEdBQUcsRUFBRSxFQUFFO1NBQ1I7S0FDRixDQUFDLENBQUM7SUFDSCxXQUFXLENBQUMsT0FBTyxDQUFDO1FBQ2xCLGNBQWMsRUFBRSxLQUFLO1FBQ3JCLFVBQVUsRUFBRTtZQUNWLE1BQU0sRUFBRSxDQUFDO1lBQ1QsSUFBSSxFQUFFLFNBQVM7WUFDZixPQUFPLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDO1NBQ2pCO1FBQ0QsTUFBTSxZQUFDLEVBQUU7WUFDQyxJQUFBLGdCQUFLLENBQVE7WUFDckIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLEdBQUcsR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7WUFDOUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLEdBQUcsQ0FBQztRQUN4QyxDQUFDO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsV0FBVztTQUNSLElBQUksRUFBRTtTQUNOLFFBQVEsQ0FBQyxrQkFBa0IsQ0FBQztTQUM1QixLQUFLLENBQUMsU0FBUyxDQUFDO1NBQ2hCLEtBQUssQ0FBQyxRQUFRLENBQUM7U0FDZixJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDWCxXQUFXO1NBQ1IsSUFBSSxFQUFFO1NBQ04sUUFBUSxDQUFDLGtCQUFrQixDQUFDO1NBQzVCLEtBQUssQ0FBQyx3QkFBd0IsQ0FBQztTQUMvQixLQUFLLENBQUMsUUFBUSxDQUFDO1NBQ2YsS0FBSyxDQUFDO1FBQ0wsV0FBVyxFQUFFLEdBQUc7S0FDakIsQ0FBQyxDQUFDO0lBRUwsV0FBVyxDQUFDLE1BQU0sRUFBRSxDQUFDO0lBQ3JCLE1BQU0sQ0FBQyxXQUFXLENBQUM7QUFDckIsQ0FBQztBQUVELFNBQVMsQ0FBQztJQUNSLFVBQVUsRUFBRTtRQUNWLFFBQVEsRUFBRTtZQUNSLElBQUksRUFBRSxLQUFLO1lBQ1gsS0FBSyxFQUFFLEVBQUU7WUFDVCxRQUFRLFlBQUMsTUFBTTtnQkFDYixJQUFJLElBQUksR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLFVBQUEsSUFBSSxJQUFJLE9BQUEsY0FDekIsSUFBSSxJQUNQLFdBQVcsRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsSUFDdkMsRUFINEIsQ0FHNUIsQ0FBQyxDQUFDO2dCQUNKLFdBQVcsSUFBSSxXQUFXLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQzlDLENBQUM7U0FDRjtRQUNELEtBQUssRUFBRTtZQUNMLElBQUksRUFBRSxNQUFNO1lBQ1osS0FBSyxFQUFFLEVBQUU7WUFDVCxRQUFRLFlBQUMsTUFBTTtnQkFDYixLQUFLLEdBQUcsTUFBTSxDQUFDO1lBQ2pCLENBQUM7U0FDRjtLQUNGO0lBQ0QsSUFBSSxFQUFFO1FBQ0osSUFBSSxFQUFFO1lBQ0osTUFBTSxFQUFFLFNBQVM7U0FDbEI7S0FDRjtDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8vIHBhZ2VzL2NvbXBvbmVudHMvUmVmdW5kQ2hhcnQvUmVmdW5kQ2hhcnQuanNcbmxldCByZWZ1bmRDaGFydCA9IG51bGw7XG5sZXQgbW9udGggPSAnJztcblxuZnVuY3Rpb24gaW5pdENoYXJ0KGNhbnZhcywgd2lkdGgsIGhlaWdodCwgRjIpIHtcbiAgY29uc3QgZGF0YSA9IFtdO1xuICByZWZ1bmRDaGFydCA9IG5ldyBGMi5DaGFydCh7XG4gICAgZWw6IGNhbnZhcyxcbiAgICB3aWR0aCxcbiAgICBoZWlnaHQsXG4gIH0pO1xuXG4gIHJlZnVuZENoYXJ0LnNvdXJjZShkYXRhLCB7XG4gICAgZGF5czoge1xuICAgICAgbWluOiAxLFxuICAgICAgbWF4OiAzMSxcbiAgICB9LFxuICB9KTtcbiAgcmVmdW5kQ2hhcnQudG9vbHRpcCh7XG4gICAgc2hvd0l0ZW1NYXJrZXI6IGZhbHNlLFxuICAgIGJhY2tncm91bmQ6IHtcbiAgICAgIHJhZGl1czogMixcbiAgICAgIGZpbGw6ICcjZjE2NmZkJyxcbiAgICAgIHBhZGRpbmc6IFs2LCAxMF0sXG4gICAgfSxcbiAgICBvblNob3coZXYpIHtcbiAgICAgIGNvbnN0IHsgaXRlbXMgfSA9IGV2O1xuICAgICAgaXRlbXNbMF0ubmFtZSA9ICcnO1xuICAgICAgaXRlbXNbMF0udmFsdWUgPSBtb250aCArICctJyArIGl0ZW1zWzBdLnRpdGxlO1xuICAgICAgaXRlbXNbMV0ubmFtZSA9ICcnO1xuICAgICAgaXRlbXNbMV0udmFsdWUgPSBpdGVtc1sxXS52YWx1ZSArICflhYMnO1xuICAgIH0sXG4gIH0pO1xuICByZWZ1bmRDaGFydFxuICAgIC5saW5lKClcbiAgICAucG9zaXRpb24oJ2RheXMqcmVmdW5kTW9uZXknKVxuICAgIC5jb2xvcignI2YxNjZmZCcpXG4gICAgLnNoYXBlKCdzbW9vdGgnKVxuICAgIC5zaXplKDQpO1xuICByZWZ1bmRDaGFydFxuICAgIC5hcmVhKClcbiAgICAucG9zaXRpb24oJ2RheXMqcmVmdW5kTW9uZXknKVxuICAgIC5jb2xvcignbCg5MCkgMDojZjE2NmZkIDE6I2ZmZicpXG4gICAgLnNoYXBlKCdzbW9vdGgnKVxuICAgIC5zdHlsZSh7XG4gICAgICBmaWxsT3BhY2l0eTogMC42LFxuICAgIH0pO1xuICAvLyByZWZ1bmRDaGFydC5heGlzKCdyZWZ1bmRNb25leScsIGZhbHNlKTtcbiAgcmVmdW5kQ2hhcnQucmVuZGVyKCk7XG4gIHJldHVybiByZWZ1bmRDaGFydDtcbn1cblxuQ29tcG9uZW50KHtcbiAgcHJvcGVydGllczoge1xuICAgIGRhdGFMaXN0OiB7XG4gICAgICB0eXBlOiBBcnJheSxcbiAgICAgIHZhbHVlOiBbXSxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICBsZXQgbGlzdCA9IG5ld1ZhbC5tYXAoaXRlbSA9PiAoe1xuICAgICAgICAgIC4uLml0ZW0sXG4gICAgICAgICAgcmVmdW5kTW9uZXk6IE1hdGguYWJzKGl0ZW0ucmVmdW5kTW9uZXkpLFxuICAgICAgICB9KSk7XG4gICAgICAgIHJlZnVuZENoYXJ0ICYmIHJlZnVuZENoYXJ0LmNoYW5nZURhdGEobGlzdCk7XG4gICAgICB9LFxuICAgIH0sXG4gICAgbW9udGg6IHtcbiAgICAgIHR5cGU6IFN0cmluZyxcbiAgICAgIHZhbHVlOiAnJyxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICBtb250aCA9IG5ld1ZhbDtcbiAgICAgIH0sXG4gICAgfSxcbiAgfSxcbiAgZGF0YToge1xuICAgIG9wdHM6IHtcbiAgICAgIG9uSW5pdDogaW5pdENoYXJ0LFxuICAgIH0sXG4gIH0sXG59KTtcbiJdfQ==
\ No newline at end of file \ No newline at end of file
miniprogram/pages/components/RefundChart/RefundChart.ts
...@@ -45,7 +45,7 @@ function initChart(canvas, width, height, F2) { ...@@ -45,7 +45,7 @@ function initChart(canvas, width, height, F2) {
.style({ .style({
fillOpacity: 0.6, fillOpacity: 0.6,
}); });
refundChart.axis('refundMoney', false); // refundChart.axis('refundMoney', false);
refundChart.render(); refundChart.render();
return refundChart; return refundChart;
} }
......
miniprogram/pages/components/UserActivityChart/UserActivityChart.js
...@@ -43,7 +43,6 @@ function initChart(canvas, width, height, F2) { ...@@ -43,7 +43,6 @@ function initChart(canvas, width, height, F2) {
.style({ .style({
fillOpacity: 0.6, fillOpacity: 0.6,
}); });
userActivityChart.axis('count', false);
userActivityChart.render(); userActivityChart.render();
return userActivityChart; return userActivityChart;
} }
...@@ -70,4 +69,4 @@ Component({ ...@@ -70,4 +69,4 @@ Component({
}, },
}, },
}); });
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlckFjdGl2aXR5Q2hhcnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJVc2VyQWN0aXZpdHlDaGFydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQ0EsSUFBSSxpQkFBaUIsR0FBRyxJQUFJLENBQUM7QUFDN0IsSUFBSSxLQUFLLEdBQUcsRUFBRSxDQUFDO0FBRWYsbUJBQW1CLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEVBQUU7SUFDMUMsSUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDO0lBQ2hCLGlCQUFpQixHQUFHLElBQUksRUFBRSxDQUFDLEtBQUssQ0FBQztRQUMvQixFQUFFLEVBQUUsTUFBTTtRQUNWLEtBQUssT0FBQTtRQUNMLE1BQU0sUUFBQTtLQUNQLENBQUMsQ0FBQztJQUVILGlCQUFpQixDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUU7UUFDN0IsSUFBSSxFQUFFO1lBQ0osR0FBRyxFQUFFLENBQUM7WUFDTixHQUFHLEVBQUUsRUFBRTtTQUNSO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsaUJBQWlCLENBQUMsT0FBTyxDQUFDO1FBQ3hCLGNBQWMsRUFBRSxLQUFLO1FBQ3JCLFVBQVUsRUFBRTtZQUNWLE1BQU0sRUFBRSxDQUFDO1lBQ1QsSUFBSSxFQUFFLFNBQVM7WUFDZixPQUFPLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDO1NBQ2pCO1FBQ0QsTUFBTSxZQUFDLEVBQUU7WUFDQyxJQUFBLGdCQUFLLENBQVE7WUFDckIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLEdBQUcsR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7WUFDOUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLEdBQUcsQ0FBQztRQUN4QyxDQUFDO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsaUJBQWlCO1NBQ2QsSUFBSSxFQUFFO1NBQ04sUUFBUSxDQUFDLFlBQVksQ0FBQztTQUN0QixLQUFLLENBQUMsU0FBUyxDQUFDO1NBQ2hCLEtBQUssQ0FBQyxRQUFRLENBQUM7U0FDZixJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDWCxpQkFBaUI7U0FDZCxJQUFJLEVBQUU7U0FDTixRQUFRLENBQUMsWUFBWSxDQUFDO1NBQ3RCLEtBQUssQ0FBQyx3QkFBd0IsQ0FBQztTQUMvQixLQUFLLENBQUMsUUFBUSxDQUFDO1NBQ2YsS0FBSyxDQUFDO1FBQ0wsV0FBVyxFQUFFLEdBQUc7S0FDakIsQ0FBQyxDQUFDO0lBQ0wsaUJBQWlCLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxLQUFLLENBQUMsQ0FBQztJQUN2QyxpQkFBaUIsQ0FBQyxNQUFNLEVBQUUsQ0FBQztJQUMzQixNQUFNLENBQUMsaUJBQWlCLENBQUM7QUFDM0IsQ0FBQztBQUVELFNBQVMsQ0FBQztJQUNSLFVBQVUsRUFBRTtRQUNWLFFBQVEsRUFBRTtZQUNSLElBQUksRUFBRSxLQUFLO1lBQ1gsS0FBSyxFQUFFLEVBQUU7WUFDVCxRQUFRLFlBQUMsTUFBTTtnQkFDYixpQkFBaUIsSUFBSSxpQkFBaUIsQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUM7WUFDNUQsQ0FBQztTQUNGO1FBQ0QsS0FBSyxFQUFFO1lBQ0wsSUFBSSxFQUFFLE1BQU07WUFDWixLQUFLLEVBQUUsRUFBRTtZQUNULFFBQVEsWUFBQyxNQUFNO2dCQUNiLEtBQUssR0FBRyxNQUFNLENBQUM7WUFDakIsQ0FBQztTQUNGO0tBQ0Y7SUFDRCxJQUFJLEVBQUU7UUFDSixJQUFJLEVBQUU7WUFDSixNQUFNLEVBQUUsU0FBUztTQUNsQjtLQUNGO0NBQ0YsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLy8gcGFnZXMvY29tcG9uZW50cy9Vc2VyQWN0aXZpdHlDaGFydC9Vc2VyQWN0aXZpdHlDaGFydC5qc1xubGV0IHVzZXJBY3Rpdml0eUNoYXJ0ID0gbnVsbDtcbmxldCBtb250aCA9ICcnO1xuXG5mdW5jdGlvbiBpbml0Q2hhcnQoY2FudmFzLCB3aWR0aCwgaGVpZ2h0LCBGMikge1xuICBjb25zdCBkYXRhID0gW107XG4gIHVzZXJBY3Rpdml0eUNoYXJ0ID0gbmV3IEYyLkNoYXJ0KHtcbiAgICBlbDogY2FudmFzLFxuICAgIHdpZHRoLFxuICAgIGhlaWdodCxcbiAgfSk7XG5cbiAgdXNlckFjdGl2aXR5Q2hhcnQuc291cmNlKGRhdGEsIHtcbiAgICBkYXlzOiB7XG4gICAgICBtaW46IDEsXG4gICAgICBtYXg6IDMxLFxuICAgIH0sXG4gIH0pO1xuICB1c2VyQWN0aXZpdHlDaGFydC50b29sdGlwKHtcbiAgICBzaG93SXRlbU1hcmtlcjogZmFsc2UsXG4gICAgYmFja2dyb3VuZDoge1xuICAgICAgcmFkaXVzOiAyLFxuICAgICAgZmlsbDogJyM2ODk1ZmUnLFxuICAgICAgcGFkZGluZzogWzYsIDEwXSxcbiAgICB9LFxuICAgIG9uU2hvdyhldikge1xuICAgICAgY29uc3QgeyBpdGVtcyB9ID0gZXY7XG4gICAgICBpdGVtc1swXS5uYW1lID0gJyc7XG4gICAgICBpdGVtc1swXS52YWx1ZSA9IG1vbnRoICsgJy0nICsgaXRlbXNbMF0udGl0bGU7XG4gICAgICBpdGVtc1sxXS5uYW1lID0gJyc7XG4gICAgICBpdGVtc1sxXS52YWx1ZSA9IGl0ZW1zWzFdLnZhbHVlICsgJ+S6uic7XG4gICAgfSxcbiAgfSk7XG4gIHVzZXJBY3Rpdml0eUNoYXJ0XG4gICAgLmxpbmUoKVxuICAgIC5wb3NpdGlvbignZGF5cypjb3VudCcpXG4gICAgLmNvbG9yKCcjNjg5NWZlJylcbiAgICAuc2hhcGUoJ3Ntb290aCcpXG4gICAgLnNpemUoNCk7XG4gIHVzZXJBY3Rpdml0eUNoYXJ0XG4gICAgLmFyZWEoKVxuICAgIC5wb3NpdGlvbignZGF5cypjb3VudCcpXG4gICAgLmNvbG9yKCdsKDkwKSAwOiM2ODk1ZmUgMTojZmZmJylcbiAgICAuc2hhcGUoJ3Ntb290aCcpXG4gICAgLnN0eWxlKHtcbiAgICAgIGZpbGxPcGFjaXR5OiAwLjYsXG4gICAgfSk7XG4gIHVzZXJBY3Rpdml0eUNoYXJ0LmF4aXMoJ2NvdW50JywgZmFsc2UpO1xuICB1c2VyQWN0aXZpdHlDaGFydC5yZW5kZXIoKTtcbiAgcmV0dXJuIHVzZXJBY3Rpdml0eUNoYXJ0O1xufVxuXG5Db21wb25lbnQoe1xuICBwcm9wZXJ0aWVzOiB7XG4gICAgZGF0YUxpc3Q6IHtcbiAgICAgIHR5cGU6IEFycmF5LFxuICAgICAgdmFsdWU6IFtdLFxuICAgICAgb2JzZXJ2ZXIobmV3VmFsKSB7XG4gICAgICAgIHVzZXJBY3Rpdml0eUNoYXJ0ICYmIHVzZXJBY3Rpdml0eUNoYXJ0LmNoYW5nZURhdGEobmV3VmFsKTtcbiAgICAgIH0sXG4gICAgfSxcbiAgICBtb250aDoge1xuICAgICAgdHlwZTogU3RyaW5nLFxuICAgICAgdmFsdWU6ICcnLFxuICAgICAgb2JzZXJ2ZXIobmV3VmFsKSB7XG4gICAgICAgIG1vbnRoID0gbmV3VmFsO1xuICAgICAgfSxcbiAgICB9LFxuICB9LFxuICBkYXRhOiB7XG4gICAgb3B0czoge1xuICAgICAgb25Jbml0OiBpbml0Q2hhcnQsXG4gICAgfSxcbiAgfSxcbn0pO1xuIl19 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlckFjdGl2aXR5Q2hhcnQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJVc2VyQWN0aXZpdHlDaGFydC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQ0EsSUFBSSxpQkFBaUIsR0FBRyxJQUFJLENBQUM7QUFDN0IsSUFBSSxLQUFLLEdBQUcsRUFBRSxDQUFDO0FBRWYsbUJBQW1CLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEVBQUU7SUFDMUMsSUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDO0lBQ2hCLGlCQUFpQixHQUFHLElBQUksRUFBRSxDQUFDLEtBQUssQ0FBQztRQUMvQixFQUFFLEVBQUUsTUFBTTtRQUNWLEtBQUssT0FBQTtRQUNMLE1BQU0sUUFBQTtLQUNQLENBQUMsQ0FBQztJQUVILGlCQUFpQixDQUFDLE1BQU0sQ0FBQyxJQUFJLEVBQUU7UUFDN0IsSUFBSSxFQUFFO1lBQ0osR0FBRyxFQUFFLENBQUM7WUFDTixHQUFHLEVBQUUsRUFBRTtTQUNSO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsaUJBQWlCLENBQUMsT0FBTyxDQUFDO1FBQ3hCLGNBQWMsRUFBRSxLQUFLO1FBQ3JCLFVBQVUsRUFBRTtZQUNWLE1BQU0sRUFBRSxDQUFDO1lBQ1QsSUFBSSxFQUFFLFNBQVM7WUFDZixPQUFPLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDO1NBQ2pCO1FBQ0QsTUFBTSxZQUFDLEVBQUU7WUFDQyxJQUFBLGdCQUFLLENBQVE7WUFDckIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLEdBQUcsR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7WUFDOUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLEdBQUcsQ0FBQztRQUN4QyxDQUFDO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsaUJBQWlCO1NBQ2QsSUFBSSxFQUFFO1NBQ04sUUFBUSxDQUFDLFlBQVksQ0FBQztTQUN0QixLQUFLLENBQUMsU0FBUyxDQUFDO1NBQ2hCLEtBQUssQ0FBQyxRQUFRLENBQUM7U0FDZixJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDWCxpQkFBaUI7U0FDZCxJQUFJLEVBQUU7U0FDTixRQUFRLENBQUMsWUFBWSxDQUFDO1NBQ3RCLEtBQUssQ0FBQyx3QkFBd0IsQ0FBQztTQUMvQixLQUFLLENBQUMsUUFBUSxDQUFDO1NBQ2YsS0FBSyxDQUFDO1FBQ0wsV0FBVyxFQUFFLEdBQUc7S0FDakIsQ0FBQyxDQUFDO0lBRUwsaUJBQWlCLENBQUMsTUFBTSxFQUFFLENBQUM7SUFDM0IsTUFBTSxDQUFDLGlCQUFpQixDQUFDO0FBQzNCLENBQUM7QUFFRCxTQUFTLENBQUM7SUFDUixVQUFVLEVBQUU7UUFDVixRQUFRLEVBQUU7WUFDUixJQUFJLEVBQUUsS0FBSztZQUNYLEtBQUssRUFBRSxFQUFFO1lBQ1QsUUFBUSxZQUFDLE1BQU07Z0JBQ2IsaUJBQWlCLElBQUksaUJBQWlCLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQzVELENBQUM7U0FDRjtRQUNELEtBQUssRUFBRTtZQUNMLElBQUksRUFBRSxNQUFNO1lBQ1osS0FBSyxFQUFFLEVBQUU7WUFDVCxRQUFRLFlBQUMsTUFBTTtnQkFDYixLQUFLLEdBQUcsTUFBTSxDQUFDO1lBQ2pCLENBQUM7U0FDRjtLQUNGO0lBQ0QsSUFBSSxFQUFFO1FBQ0osSUFBSSxFQUFFO1lBQ0osTUFBTSxFQUFFLFNBQVM7U0FDbEI7S0FDRjtDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8vIHBhZ2VzL2NvbXBvbmVudHMvVXNlckFjdGl2aXR5Q2hhcnQvVXNlckFjdGl2aXR5Q2hhcnQuanNcbmxldCB1c2VyQWN0aXZpdHlDaGFydCA9IG51bGw7XG5sZXQgbW9udGggPSAnJztcblxuZnVuY3Rpb24gaW5pdENoYXJ0KGNhbnZhcywgd2lkdGgsIGhlaWdodCwgRjIpIHtcbiAgY29uc3QgZGF0YSA9IFtdO1xuICB1c2VyQWN0aXZpdHlDaGFydCA9IG5ldyBGMi5DaGFydCh7XG4gICAgZWw6IGNhbnZhcyxcbiAgICB3aWR0aCxcbiAgICBoZWlnaHQsXG4gIH0pO1xuXG4gIHVzZXJBY3Rpdml0eUNoYXJ0LnNvdXJjZShkYXRhLCB7XG4gICAgZGF5czoge1xuICAgICAgbWluOiAxLFxuICAgICAgbWF4OiAzMSxcbiAgICB9LFxuICB9KTtcbiAgdXNlckFjdGl2aXR5Q2hhcnQudG9vbHRpcCh7XG4gICAgc2hvd0l0ZW1NYXJrZXI6IGZhbHNlLFxuICAgIGJhY2tncm91bmQ6IHtcbiAgICAgIHJhZGl1czogMixcbiAgICAgIGZpbGw6ICcjNjg5NWZlJyxcbiAgICAgIHBhZGRpbmc6IFs2LCAxMF0sXG4gICAgfSxcbiAgICBvblNob3coZXYpIHtcbiAgICAgIGNvbnN0IHsgaXRlbXMgfSA9IGV2O1xuICAgICAgaXRlbXNbMF0ubmFtZSA9ICcnO1xuICAgICAgaXRlbXNbMF0udmFsdWUgPSBtb250aCArICctJyArIGl0ZW1zWzBdLnRpdGxlO1xuICAgICAgaXRlbXNbMV0ubmFtZSA9ICcnO1xuICAgICAgaXRlbXNbMV0udmFsdWUgPSBpdGVtc1sxXS52YWx1ZSArICfkuronO1xuICAgIH0sXG4gIH0pO1xuICB1c2VyQWN0aXZpdHlDaGFydFxuICAgIC5saW5lKClcbiAgICAucG9zaXRpb24oJ2RheXMqY291bnQnKVxuICAgIC5jb2xvcignIzY4OTVmZScpXG4gICAgLnNoYXBlKCdzbW9vdGgnKVxuICAgIC5zaXplKDQpO1xuICB1c2VyQWN0aXZpdHlDaGFydFxuICAgIC5hcmVhKClcbiAgICAucG9zaXRpb24oJ2RheXMqY291bnQnKVxuICAgIC5jb2xvcignbCg5MCkgMDojNjg5NWZlIDE6I2ZmZicpXG4gICAgLnNoYXBlKCdzbW9vdGgnKVxuICAgIC5zdHlsZSh7XG4gICAgICBmaWxsT3BhY2l0eTogMC42LFxuICAgIH0pO1xuICAvLyB1c2VyQWN0aXZpdHlDaGFydC5heGlzKCdjb3VudCcsIGZhbHNlKTtcbiAgdXNlckFjdGl2aXR5Q2hhcnQucmVuZGVyKCk7XG4gIHJldHVybiB1c2VyQWN0aXZpdHlDaGFydDtcbn1cblxuQ29tcG9uZW50KHtcbiAgcHJvcGVydGllczoge1xuICAgIGRhdGFMaXN0OiB7XG4gICAgICB0eXBlOiBBcnJheSxcbiAgICAgIHZhbHVlOiBbXSxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICB1c2VyQWN0aXZpdHlDaGFydCAmJiB1c2VyQWN0aXZpdHlDaGFydC5jaGFuZ2VEYXRhKG5ld1ZhbCk7XG4gICAgICB9LFxuICAgIH0sXG4gICAgbW9udGg6IHtcbiAgICAgIHR5cGU6IFN0cmluZyxcbiAgICAgIHZhbHVlOiAnJyxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICBtb250aCA9IG5ld1ZhbDtcbiAgICAgIH0sXG4gICAgfSxcbiAgfSxcbiAgZGF0YToge1xuICAgIG9wdHM6IHtcbiAgICAgIG9uSW5pdDogaW5pdENoYXJ0LFxuICAgIH0sXG4gIH0sXG59KTtcbiJdfQ==
\ No newline at end of file \ No newline at end of file
miniprogram/pages/components/UserActivityChart/UserActivityChart.ts
...@@ -45,7 +45,7 @@ function initChart(canvas, width, height, F2) { ...@@ -45,7 +45,7 @@ function initChart(canvas, width, height, F2) {
.style({ .style({
fillOpacity: 0.6, fillOpacity: 0.6,
}); });
userActivityChart.axis('count', false); // userActivityChart.axis('count', false);
userActivityChart.render(); userActivityChart.render();
return userActivityChart; return userActivityChart;
} }
......
miniprogram/pages/components/UserGrouthChart/UserGrouthChart.js
...@@ -43,7 +43,6 @@ function initChart(canvas, width, height, F2) { ...@@ -43,7 +43,6 @@ function initChart(canvas, width, height, F2) {
.style({ .style({
fillOpacity: 0.6, fillOpacity: 0.6,
}); });
userGrouthChart.axis('count', false);
userGrouthChart.render(); userGrouthChart.render();
return userGrouthChart; return userGrouthChart;
} }
...@@ -70,4 +69,4 @@ Component({ ...@@ -70,4 +69,4 @@ Component({
}, },
}, },
}); });
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlckdyb3V0aENoYXJ0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiVXNlckdyb3V0aENoYXJ0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFDQSxJQUFJLGVBQWUsR0FBRyxJQUFJLENBQUM7QUFDM0IsSUFBSSxLQUFLLEdBQUcsRUFBRSxDQUFDO0FBRWYsbUJBQW1CLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEVBQUU7SUFDMUMsSUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDO0lBQ2hCLGVBQWUsR0FBRyxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUM7UUFDN0IsRUFBRSxFQUFFLE1BQU07UUFDVixLQUFLLE9BQUE7UUFDTCxNQUFNLFFBQUE7S0FDUCxDQUFDLENBQUM7SUFFSCxlQUFlLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRTtRQUMzQixJQUFJLEVBQUU7WUFDSixHQUFHLEVBQUUsQ0FBQztZQUNOLEdBQUcsRUFBRSxFQUFFO1NBQ1I7S0FDRixDQUFDLENBQUM7SUFDSCxlQUFlLENBQUMsT0FBTyxDQUFDO1FBQ3RCLGNBQWMsRUFBRSxLQUFLO1FBQ3JCLFVBQVUsRUFBRTtZQUNWLE1BQU0sRUFBRSxDQUFDO1lBQ1QsSUFBSSxFQUFFLFNBQVM7WUFDZixPQUFPLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDO1NBQ2pCO1FBQ0QsTUFBTSxZQUFDLEVBQUU7WUFDQyxJQUFBLGdCQUFLLENBQVE7WUFDckIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLEdBQUcsR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7WUFDOUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLEdBQUcsQ0FBQztRQUN4QyxDQUFDO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsZUFBZTtTQUNaLElBQUksRUFBRTtTQUNOLFFBQVEsQ0FBQyxZQUFZLENBQUM7U0FDdEIsS0FBSyxDQUFDLFNBQVMsQ0FBQztTQUNoQixLQUFLLENBQUMsUUFBUSxDQUFDO1NBQ2YsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ1gsZUFBZTtTQUNaLElBQUksRUFBRTtTQUNOLFFBQVEsQ0FBQyxZQUFZLENBQUM7U0FDdEIsS0FBSyxDQUFDLHdCQUF3QixDQUFDO1NBQy9CLEtBQUssQ0FBQyxRQUFRLENBQUM7U0FDZixLQUFLLENBQUM7UUFDTCxXQUFXLEVBQUUsR0FBRztLQUNqQixDQUFDLENBQUM7SUFDTCxlQUFlLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxLQUFLLENBQUMsQ0FBQztJQUNyQyxlQUFlLENBQUMsTUFBTSxFQUFFLENBQUM7SUFDekIsTUFBTSxDQUFDLGVBQWUsQ0FBQztBQUN6QixDQUFDO0FBRUQsU0FBUyxDQUFDO0lBQ1IsVUFBVSxFQUFFO1FBQ1YsUUFBUSxFQUFFO1lBQ1IsSUFBSSxFQUFFLEtBQUs7WUFDWCxLQUFLLEVBQUUsRUFBRTtZQUNULFFBQVEsWUFBQyxNQUFNO2dCQUNiLGVBQWUsSUFBSSxlQUFlLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQ3hELENBQUM7U0FDRjtRQUNELEtBQUssRUFBRTtZQUNMLElBQUksRUFBRSxNQUFNO1lBQ1osS0FBSyxFQUFFLEVBQUU7WUFDVCxRQUFRLFlBQUMsTUFBTTtnQkFDYixLQUFLLEdBQUcsTUFBTSxDQUFDO1lBQ2pCLENBQUM7U0FDRjtLQUNGO0lBQ0QsSUFBSSxFQUFFO1FBQ0osSUFBSSxFQUFFO1lBQ0osTUFBTSxFQUFFLFNBQVM7U0FDbEI7S0FDRjtDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8vIHBhZ2VzL2NvbXBvbmVudHMvVXNlckdyb3V0aENoYXJ0L1VzZXJHcm91dGhDaGFydC5qc1xubGV0IHVzZXJHcm91dGhDaGFydCA9IG51bGw7XG5sZXQgbW9udGggPSAnJztcblxuZnVuY3Rpb24gaW5pdENoYXJ0KGNhbnZhcywgd2lkdGgsIGhlaWdodCwgRjIpIHtcbiAgY29uc3QgZGF0YSA9IFtdO1xuICB1c2VyR3JvdXRoQ2hhcnQgPSBuZXcgRjIuQ2hhcnQoe1xuICAgIGVsOiBjYW52YXMsXG4gICAgd2lkdGgsXG4gICAgaGVpZ2h0LFxuICB9KTtcblxuICB1c2VyR3JvdXRoQ2hhcnQuc291cmNlKGRhdGEsIHtcbiAgICBkYXlzOiB7XG4gICAgICBtaW46IDEsXG4gICAgICBtYXg6IDMxLFxuICAgIH0sXG4gIH0pO1xuICB1c2VyR3JvdXRoQ2hhcnQudG9vbHRpcCh7XG4gICAgc2hvd0l0ZW1NYXJrZXI6IGZhbHNlLFxuICAgIGJhY2tncm91bmQ6IHtcbiAgICAgIHJhZGl1czogMixcbiAgICAgIGZpbGw6ICcjNjg5NWZlJyxcbiAgICAgIHBhZGRpbmc6IFs2LCAxMF0sXG4gICAgfSxcbiAgICBvblNob3coZXYpIHtcbiAgICAgIGNvbnN0IHsgaXRlbXMgfSA9IGV2O1xuICAgICAgaXRlbXNbMF0ubmFtZSA9ICcnO1xuICAgICAgaXRlbXNbMF0udmFsdWUgPSBtb250aCArICctJyArIGl0ZW1zWzBdLnRpdGxlO1xuICAgICAgaXRlbXNbMV0ubmFtZSA9ICcnO1xuICAgICAgaXRlbXNbMV0udmFsdWUgPSBpdGVtc1sxXS52YWx1ZSArICfkuronO1xuICAgIH0sXG4gIH0pO1xuICB1c2VyR3JvdXRoQ2hhcnRcbiAgICAubGluZSgpXG4gICAgLnBvc2l0aW9uKCdkYXlzKmNvdW50JylcbiAgICAuY29sb3IoJyM2ODk1ZmUnKVxuICAgIC5zaGFwZSgnc21vb3RoJylcbiAgICAuc2l6ZSg0KTtcbiAgdXNlckdyb3V0aENoYXJ0XG4gICAgLmFyZWEoKVxuICAgIC5wb3NpdGlvbignZGF5cypjb3VudCcpXG4gICAgLmNvbG9yKCdsKDkwKSAwOiM2ODk1ZmUgMTojZmZmJylcbiAgICAuc2hhcGUoJ3Ntb290aCcpXG4gICAgLnN0eWxlKHtcbiAgICAgIGZpbGxPcGFjaXR5OiAwLjYsXG4gICAgfSk7XG4gIHVzZXJHcm91dGhDaGFydC5heGlzKCdjb3VudCcsIGZhbHNlKTtcbiAgdXNlckdyb3V0aENoYXJ0LnJlbmRlcigpO1xuICByZXR1cm4gdXNlckdyb3V0aENoYXJ0O1xufVxuXG5Db21wb25lbnQoe1xuICBwcm9wZXJ0aWVzOiB7XG4gICAgZGF0YUxpc3Q6IHtcbiAgICAgIHR5cGU6IEFycmF5LFxuICAgICAgdmFsdWU6IFtdLFxuICAgICAgb2JzZXJ2ZXIobmV3VmFsKSB7XG4gICAgICAgIHVzZXJHcm91dGhDaGFydCAmJiB1c2VyR3JvdXRoQ2hhcnQuY2hhbmdlRGF0YShuZXdWYWwpO1xuICAgICAgfSxcbiAgICB9LFxuICAgIG1vbnRoOiB7XG4gICAgICB0eXBlOiBTdHJpbmcsXG4gICAgICB2YWx1ZTogJycsXG4gICAgICBvYnNlcnZlcihuZXdWYWwpIHtcbiAgICAgICAgbW9udGggPSBuZXdWYWw7XG4gICAgICB9LFxuICAgIH0sXG4gIH0sXG4gIGRhdGE6IHtcbiAgICBvcHRzOiB7XG4gICAgICBvbkluaXQ6IGluaXRDaGFydCxcbiAgICB9LFxuICB9LFxufSk7XG5cbiJdfQ== //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiVXNlckdyb3V0aENoYXJ0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiVXNlckdyb3V0aENoYXJ0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFDQSxJQUFJLGVBQWUsR0FBRyxJQUFJLENBQUM7QUFDM0IsSUFBSSxLQUFLLEdBQUcsRUFBRSxDQUFDO0FBRWYsbUJBQW1CLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEVBQUU7SUFDMUMsSUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDO0lBQ2hCLGVBQWUsR0FBRyxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUM7UUFDN0IsRUFBRSxFQUFFLE1BQU07UUFDVixLQUFLLE9BQUE7UUFDTCxNQUFNLFFBQUE7S0FDUCxDQUFDLENBQUM7SUFFSCxlQUFlLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRTtRQUMzQixJQUFJLEVBQUU7WUFDSixHQUFHLEVBQUUsQ0FBQztZQUNOLEdBQUcsRUFBRSxFQUFFO1NBQ1I7S0FDRixDQUFDLENBQUM7SUFDSCxlQUFlLENBQUMsT0FBTyxDQUFDO1FBQ3RCLGNBQWMsRUFBRSxLQUFLO1FBQ3JCLFVBQVUsRUFBRTtZQUNWLE1BQU0sRUFBRSxDQUFDO1lBQ1QsSUFBSSxFQUFFLFNBQVM7WUFDZixPQUFPLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDO1NBQ2pCO1FBQ0QsTUFBTSxZQUFDLEVBQUU7WUFDQyxJQUFBLGdCQUFLLENBQVE7WUFDckIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLEdBQUcsR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7WUFDOUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLEdBQUcsQ0FBQztRQUN4QyxDQUFDO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsZUFBZTtTQUNaLElBQUksRUFBRTtTQUNOLFFBQVEsQ0FBQyxZQUFZLENBQUM7U0FDdEIsS0FBSyxDQUFDLFNBQVMsQ0FBQztTQUNoQixLQUFLLENBQUMsUUFBUSxDQUFDO1NBQ2YsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ1gsZUFBZTtTQUNaLElBQUksRUFBRTtTQUNOLFFBQVEsQ0FBQyxZQUFZLENBQUM7U0FDdEIsS0FBSyxDQUFDLHdCQUF3QixDQUFDO1NBQy9CLEtBQUssQ0FBQyxRQUFRLENBQUM7U0FDZixLQUFLLENBQUM7UUFDTCxXQUFXLEVBQUUsR0FBRztLQUNqQixDQUFDLENBQUM7SUFFTCxlQUFlLENBQUMsTUFBTSxFQUFFLENBQUM7SUFDekIsTUFBTSxDQUFDLGVBQWUsQ0FBQztBQUN6QixDQUFDO0FBRUQsU0FBUyxDQUFDO0lBQ1IsVUFBVSxFQUFFO1FBQ1YsUUFBUSxFQUFFO1lBQ1IsSUFBSSxFQUFFLEtBQUs7WUFDWCxLQUFLLEVBQUUsRUFBRTtZQUNULFFBQVEsWUFBQyxNQUFNO2dCQUNiLGVBQWUsSUFBSSxlQUFlLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQ3hELENBQUM7U0FDRjtRQUNELEtBQUssRUFBRTtZQUNMLElBQUksRUFBRSxNQUFNO1lBQ1osS0FBSyxFQUFFLEVBQUU7WUFDVCxRQUFRLFlBQUMsTUFBTTtnQkFDYixLQUFLLEdBQUcsTUFBTSxDQUFDO1lBQ2pCLENBQUM7U0FDRjtLQUNGO0lBQ0QsSUFBSSxFQUFFO1FBQ0osSUFBSSxFQUFFO1lBQ0osTUFBTSxFQUFFLFNBQVM7U0FDbEI7S0FDRjtDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8vIHBhZ2VzL2NvbXBvbmVudHMvVXNlckdyb3V0aENoYXJ0L1VzZXJHcm91dGhDaGFydC5qc1xubGV0IHVzZXJHcm91dGhDaGFydCA9IG51bGw7XG5sZXQgbW9udGggPSAnJztcblxuZnVuY3Rpb24gaW5pdENoYXJ0KGNhbnZhcywgd2lkdGgsIGhlaWdodCwgRjIpIHtcbiAgY29uc3QgZGF0YSA9IFtdO1xuICB1c2VyR3JvdXRoQ2hhcnQgPSBuZXcgRjIuQ2hhcnQoe1xuICAgIGVsOiBjYW52YXMsXG4gICAgd2lkdGgsXG4gICAgaGVpZ2h0LFxuICB9KTtcblxuICB1c2VyR3JvdXRoQ2hhcnQuc291cmNlKGRhdGEsIHtcbiAgICBkYXlzOiB7XG4gICAgICBtaW46IDEsXG4gICAgICBtYXg6IDMxLFxuICAgIH0sXG4gIH0pO1xuICB1c2VyR3JvdXRoQ2hhcnQudG9vbHRpcCh7XG4gICAgc2hvd0l0ZW1NYXJrZXI6IGZhbHNlLFxuICAgIGJhY2tncm91bmQ6IHtcbiAgICAgIHJhZGl1czogMixcbiAgICAgIGZpbGw6ICcjNjg5NWZlJyxcbiAgICAgIHBhZGRpbmc6IFs2LCAxMF0sXG4gICAgfSxcbiAgICBvblNob3coZXYpIHtcbiAgICAgIGNvbnN0IHsgaXRlbXMgfSA9IGV2O1xuICAgICAgaXRlbXNbMF0ubmFtZSA9ICcnO1xuICAgICAgaXRlbXNbMF0udmFsdWUgPSBtb250aCArICctJyArIGl0ZW1zWzBdLnRpdGxlO1xuICAgICAgaXRlbXNbMV0ubmFtZSA9ICcnO1xuICAgICAgaXRlbXNbMV0udmFsdWUgPSBpdGVtc1sxXS52YWx1ZSArICfkuronO1xuICAgIH0sXG4gIH0pO1xuICB1c2VyR3JvdXRoQ2hhcnRcbiAgICAubGluZSgpXG4gICAgLnBvc2l0aW9uKCdkYXlzKmNvdW50JylcbiAgICAuY29sb3IoJyM2ODk1ZmUnKVxuICAgIC5zaGFwZSgnc21vb3RoJylcbiAgICAuc2l6ZSg0KTtcbiAgdXNlckdyb3V0aENoYXJ0XG4gICAgLmFyZWEoKVxuICAgIC5wb3NpdGlvbignZGF5cypjb3VudCcpXG4gICAgLmNvbG9yKCdsKDkwKSAwOiM2ODk1ZmUgMTojZmZmJylcbiAgICAuc2hhcGUoJ3Ntb290aCcpXG4gICAgLnN0eWxlKHtcbiAgICAgIGZpbGxPcGFjaXR5OiAwLjYsXG4gICAgfSk7XG4gIC8vIHVzZXJHcm91dGhDaGFydC5heGlzKCdjb3VudCcsIGZhbHNlKTtcbiAgdXNlckdyb3V0aENoYXJ0LnJlbmRlcigpO1xuICByZXR1cm4gdXNlckdyb3V0aENoYXJ0O1xufVxuXG5Db21wb25lbnQoe1xuICBwcm9wZXJ0aWVzOiB7XG4gICAgZGF0YUxpc3Q6IHtcbiAgICAgIHR5cGU6IEFycmF5LFxuICAgICAgdmFsdWU6IFtdLFxuICAgICAgb2JzZXJ2ZXIobmV3VmFsKSB7XG4gICAgICAgIHVzZXJHcm91dGhDaGFydCAmJiB1c2VyR3JvdXRoQ2hhcnQuY2hhbmdlRGF0YShuZXdWYWwpO1xuICAgICAgfSxcbiAgICB9LFxuICAgIG1vbnRoOiB7XG4gICAgICB0eXBlOiBTdHJpbmcsXG4gICAgICB2YWx1ZTogJycsXG4gICAgICBvYnNlcnZlcihuZXdWYWwpIHtcbiAgICAgICAgbW9udGggPSBuZXdWYWw7XG4gICAgICB9LFxuICAgIH0sXG4gIH0sXG4gIGRhdGE6IHtcbiAgICBvcHRzOiB7XG4gICAgICBvbkluaXQ6IGluaXRDaGFydCxcbiAgICB9LFxuICB9LFxufSk7XG5cbiJdfQ==
\ No newline at end of file \ No newline at end of file
miniprogram/pages/components/UserGrouthChart/UserGrouthChart.ts
...@@ -45,7 +45,7 @@ function initChart(canvas, width, height, F2) { ...@@ -45,7 +45,7 @@ function initChart(canvas, width, height, F2) {
.style({ .style({
fillOpacity: 0.6, fillOpacity: 0.6,
}); });
userGrouthChart.axis('count', false); // userGrouthChart.axis('count', false);
userGrouthChart.render(); userGrouthChart.render();
return userGrouthChart; return userGrouthChart;
} }
......
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