Skip to content

W
wx-boss
Commit 4db55921 by 姜雷
Options

Merge branch 'develop' into test

parents 3bdf7452 ebbf177e
Showing with 55 additions and 44 deletions
miniprogram/pages/components/PayTypeChart/PayTypeChart.js
......@@ -39,7 +39,8 @@ function initChart(canvas, width, height, F2) {
});
paytypeChart.coord('polar', {
transposed: true,
innerRadius: 0.7,
innerRadius: 0.5,
radius: 0.9,
});
paytypeChart.legend({
position: 'right',
......@@ -49,9 +50,7 @@ function initChart(canvas, width, height, F2) {
paytypeChart
.interval()
.position('a*count')
.color('key', function (val) {
return colorMap[val];
})
.color('key', ['#EB7E59', '#13C2C2', '#FACC14', '#1890FF'])
.adjust('stack');
paytypeChart.axis(false);
paytypeChart.render();
......@@ -67,16 +66,10 @@ Component({
paytypeChart.legend({
position: 'right',
marker: 'square',
custom: true,
items: newVal.map(function (item) { return ({
name: item.name,
value: ' ' + util_1.formatPrice(item.count),
marker: {
symbol: 'square',
fill: colorMap[item.key],
radius: 4,
},
}); }),
itemFormatter: function (val) {
var item = newVal.find(function (item) { return item.key === val; });
return item ? item.name + ' ' + util_1.formatPrice(item.count) : '';
},
});
paytypeChart && paytypeChart.changeData(newVal);
},
......@@ -95,4 +88,4 @@ Component({
},
},
});
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGF5VHlwZUNoYXJ0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiUGF5VHlwZUNoYXJ0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsNENBQWtEO0FBR2xELElBQUksWUFBWSxHQUFHLElBQUksQ0FBQztBQUN4QixJQUFJLEtBQUssR0FBRyxFQUFFLENBQUM7QUFDZixJQUFNLFFBQVEsR0FBRztJQUNmLElBQUksRUFBRSxTQUFTO0lBQ2YsSUFBSSxFQUFFLFNBQVM7SUFDZixRQUFRLEVBQUUsU0FBUztJQUNuQixNQUFNLEVBQUUsU0FBUztDQUNsQixDQUFDO0FBRUYsbUJBQW1CLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEVBQUU7SUFDMUMsSUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDO0lBQ2hCLFlBQVksR0FBRyxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUM7UUFDMUIsRUFBRSxFQUFFLE1BQU07UUFDVixLQUFLLE9BQUE7UUFDTCxNQUFNLFFBQUE7S0FDUCxDQUFDLENBQUM7SUFFSCxZQUFZLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRTtRQUN4QixJQUFJLEVBQUU7WUFDSixHQUFHLEVBQUUsQ0FBQztZQUNOLEdBQUcsRUFBRSxFQUFFO1NBQ1I7S0FDRixDQUFDLENBQUM7SUFDSCxZQUFZLENBQUMsT0FBTyxDQUFDO1FBQ25CLGNBQWMsRUFBRSxLQUFLO1FBQ3JCLFVBQVUsRUFBRTtZQUNWLE1BQU0sRUFBRSxDQUFDO1lBQ1QsSUFBSSxFQUFFLFNBQVM7WUFDZixPQUFPLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDO1NBQ2pCO1FBQ0QsTUFBTSxZQUFDLEVBQUU7WUFDQyxJQUFBLGdCQUFLLENBQVE7WUFDckIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLEdBQUcsR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7WUFDOUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLEdBQUcsQ0FBQztRQUN4QyxDQUFDO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsWUFBWSxDQUFDLEtBQUssQ0FBQyxPQUFPLEVBQUU7UUFDMUIsVUFBVSxFQUFFLElBQUk7UUFDaEIsV0FBVyxFQUFFLEdBQUc7S0FDakIsQ0FBQyxDQUFDO0lBQ0gsWUFBWSxDQUFDLE1BQU0sQ0FBQztRQUNsQixRQUFRLEVBQUUsT0FBTztRQUNqQixNQUFNLEVBQUUsUUFBUTtLQUNqQixDQUFDLENBQUM7SUFDSCxZQUFZLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQzVCLFlBQVk7U0FDVCxRQUFRLEVBQUU7U0FDVixRQUFRLENBQUMsU0FBUyxDQUFDO1NBQ25CLEtBQUssQ0FBQyxLQUFLLEVBQUUsVUFBQSxHQUFHO1FBQ2YsTUFBTSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUN2QixDQUFDLENBQUM7U0FDRCxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7SUFDbkIsWUFBWSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUN6QixZQUFZLENBQUMsTUFBTSxFQUFFLENBQUM7SUFDdEIsTUFBTSxDQUFDLFlBQVksQ0FBQztBQUN0QixDQUFDO0FBRUQsU0FBUyxDQUFDO0lBQ1IsVUFBVSxFQUFFO1FBQ1YsUUFBUSxFQUFFO1lBQ1IsSUFBSSxFQUFFLEtBQUs7WUFDWCxLQUFLLEVBQUUsRUFBRTtZQUNULFFBQVEsWUFBQyxNQUFNO2dCQUNiLFlBQVk7b0JBQ1YsWUFBWSxDQUFDLE1BQU0sQ0FBQzt3QkFDbEIsUUFBUSxFQUFFLE9BQU87d0JBQ2pCLE1BQU0sRUFBRSxRQUFRO3dCQUNoQixNQUFNLEVBQUUsSUFBSTt3QkFDWixLQUFLLEVBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxVQUFBLElBQUksSUFBSSxPQUFBLENBQUM7NEJBQ3pCLElBQUksRUFBRSxJQUFJLENBQUMsSUFBSTs0QkFDZixLQUFLLEVBQUUsR0FBRyxHQUFHLGtCQUFXLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQzs0QkFDcEMsTUFBTSxFQUFFO2dDQUNOLE1BQU0sRUFBRSxRQUFRO2dDQUNoQixJQUFJLEVBQUUsUUFBUSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUM7Z0NBQ3hCLE1BQU0sRUFBRSxDQUFDOzZCQUNWO3lCQUNGLENBQUMsRUFSd0IsQ0FReEIsQ0FBQztxQkFDSixDQUFDLENBQUM7Z0JBQ0wsWUFBWSxJQUFJLFlBQVksQ0FBQyxVQUFVLENBQUMsTUFBTSxDQUFDLENBQUM7WUFDbEQsQ0FBQztTQUNGO1FBQ0QsS0FBSyxFQUFFO1lBQ0wsSUFBSSxFQUFFLE1BQU07WUFDWixLQUFLLEVBQUUsRUFBRTtZQUNULFFBQVEsWUFBQyxNQUFNO2dCQUNiLEtBQUssR0FBRyxNQUFNLENBQUM7WUFDakIsQ0FBQztTQUNGO0tBQ0Y7SUFDRCxJQUFJLEVBQUU7UUFDSixJQUFJLEVBQUU7WUFDSixNQUFNLEVBQUUsU0FBUztTQUNsQjtLQUNGO0NBQ0YsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZm9ybWF0UHJpY2UgfSBmcm9tICcuLi8uLi8uLi91dGlscy91dGlsJztcblxuLy8gcGFnZXMvY29tcG9uZW50cy9QYXlUeXBlQ2hhcnQvUGF5VHlwZUNoYXJ0LmpzXG5sZXQgcGF5dHlwZUNoYXJ0ID0gbnVsbDtcbmxldCBtb250aCA9ICcnO1xuY29uc3QgY29sb3JNYXAgPSB7XG4gIGFpbWk6ICcjRUI3RTU5JyxcbiAgYmVhbjogJyMxM0MyQzInLFxuICBkaXNjb3VudDogJyNGQUNDMTQnLFxuICBvbmxpbmU6ICcjMTg5MEZGJyxcbn07XG5cbmZ1bmN0aW9uIGluaXRDaGFydChjYW52YXMsIHdpZHRoLCBoZWlnaHQsIEYyKSB7XG4gIGNvbnN0IGRhdGEgPSBbXTtcbiAgcGF5dHlwZUNoYXJ0ID0gbmV3IEYyLkNoYXJ0KHtcbiAgICBlbDogY2FudmFzLFxuICAgIHdpZHRoLFxuICAgIGhlaWdodCxcbiAgfSk7XG5cbiAgcGF5dHlwZUNoYXJ0LnNvdXJjZShkYXRhLCB7XG4gICAgZGF5czoge1xuICAgICAgbWluOiAxLFxuICAgICAgbWF4OiAzMSxcbiAgICB9LFxuICB9KTtcbiAgcGF5dHlwZUNoYXJ0LnRvb2x0aXAoe1xuICAgIHNob3dJdGVtTWFya2VyOiBmYWxzZSxcbiAgICBiYWNrZ3JvdW5kOiB7XG4gICAgICByYWRpdXM6IDIsXG4gICAgICBmaWxsOiAnI2YxNjZmZCcsXG4gICAgICBwYWRkaW5nOiBbNiwgMTBdLFxuICAgIH0sXG4gICAgb25TaG93KGV2KSB7XG4gICAgICBjb25zdCB7IGl0ZW1zIH0gPSBldjtcbiAgICAgIGl0ZW1zWzBdLm5hbWUgPSAnJztcbiAgICAgIGl0ZW1zWzBdLnZhbHVlID0gbW9udGggKyAnLScgKyBpdGVtc1swXS50aXRsZTtcbiAgICAgIGl0ZW1zWzFdLm5hbWUgPSAnJztcbiAgICAgIGl0ZW1zWzFdLnZhbHVlID0gaXRlbXNbMV0udmFsdWUgKyAn5YWDJztcbiAgICB9LFxuICB9KTtcbiAgcGF5dHlwZUNoYXJ0LmNvb3JkKCdwb2xhcicsIHtcbiAgICB0cmFuc3Bvc2VkOiB0cnVlLFxuICAgIGlubmVyUmFkaXVzOiAwLjcsXG4gIH0pO1xuICBwYXl0eXBlQ2hhcnQubGVnZW5kKHtcbiAgICBwb3NpdGlvbjogJ3JpZ2h0JyxcbiAgICBtYXJrZXI6ICdzcXVhcmUnLFxuICB9KTtcbiAgcGF5dHlwZUNoYXJ0LnRvb2x0aXAoZmFsc2UpO1xuICBwYXl0eXBlQ2hhcnRcbiAgICAuaW50ZXJ2YWwoKVxuICAgIC5wb3NpdGlvbignYSpjb3VudCcpXG4gICAgLmNvbG9yKCdrZXknLCB2YWwgPT4ge1xuICAgICAgcmV0dXJuIGNvbG9yTWFwW3ZhbF07XG4gICAgfSlcbiAgICAuYWRqdXN0KCdzdGFjaycpO1xuICBwYXl0eXBlQ2hhcnQuYXhpcyhmYWxzZSk7XG4gIHBheXR5cGVDaGFydC5yZW5kZXIoKTtcbiAgcmV0dXJuIHBheXR5cGVDaGFydDtcbn1cblxuQ29tcG9uZW50KHtcbiAgcHJvcGVydGllczoge1xuICAgIGRhdGFMaXN0OiB7XG4gICAgICB0eXBlOiBBcnJheSxcbiAgICAgIHZhbHVlOiBbXSxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICBwYXl0eXBlQ2hhcnQgJiZcbiAgICAgICAgICBwYXl0eXBlQ2hhcnQubGVnZW5kKHtcbiAgICAgICAgICAgIHBvc2l0aW9uOiAncmlnaHQnLFxuICAgICAgICAgICAgbWFya2VyOiAnc3F1YXJlJyxcbiAgICAgICAgICAgIGN1c3RvbTogdHJ1ZSxcbiAgICAgICAgICAgIGl0ZW1zOiBuZXdWYWwubWFwKGl0ZW0gPT4gKHtcbiAgICAgICAgICAgICAgbmFtZTogaXRlbS5uYW1lLFxuICAgICAgICAgICAgICB2YWx1ZTogJyAnICsgZm9ybWF0UHJpY2UoaXRlbS5jb3VudCksXG4gICAgICAgICAgICAgIG1hcmtlcjoge1xuICAgICAgICAgICAgICAgIHN5bWJvbDogJ3NxdWFyZScsXG4gICAgICAgICAgICAgICAgZmlsbDogY29sb3JNYXBbaXRlbS5rZXldLFxuICAgICAgICAgICAgICAgIHJhZGl1czogNCxcbiAgICAgICAgICAgICAgfSxcbiAgICAgICAgICAgIH0pKSxcbiAgICAgICAgICB9KTtcbiAgICAgICAgcGF5dHlwZUNoYXJ0ICYmIHBheXR5cGVDaGFydC5jaGFuZ2VEYXRhKG5ld1ZhbCk7XG4gICAgICB9LFxuICAgIH0sXG4gICAgbW9udGg6IHtcbiAgICAgIHR5cGU6IFN0cmluZyxcbiAgICAgIHZhbHVlOiAnJyxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICBtb250aCA9IG5ld1ZhbDtcbiAgICAgIH0sXG4gICAgfSxcbiAgfSxcbiAgZGF0YToge1xuICAgIG9wdHM6IHtcbiAgICAgIG9uSW5pdDogaW5pdENoYXJ0LFxuICAgIH0sXG4gIH0sXG59KTtcbiJdfQ==
\ No newline at end of file
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGF5VHlwZUNoYXJ0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiUGF5VHlwZUNoYXJ0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsNENBQWtEO0FBR2xELElBQUksWUFBWSxHQUFHLElBQUksQ0FBQztBQUN4QixJQUFJLEtBQUssR0FBRyxFQUFFLENBQUM7QUFDZixJQUFNLFFBQVEsR0FBRztJQUNmLElBQUksRUFBRSxTQUFTO0lBQ2YsSUFBSSxFQUFFLFNBQVM7SUFDZixRQUFRLEVBQUUsU0FBUztJQUNuQixNQUFNLEVBQUUsU0FBUztDQUNsQixDQUFDO0FBRUYsbUJBQW1CLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLEVBQUU7SUFDMUMsSUFBTSxJQUFJLEdBQUcsRUFBRSxDQUFDO0lBQ2hCLFlBQVksR0FBRyxJQUFJLEVBQUUsQ0FBQyxLQUFLLENBQUM7UUFDMUIsRUFBRSxFQUFFLE1BQU07UUFDVixLQUFLLE9BQUE7UUFDTCxNQUFNLFFBQUE7S0FDUCxDQUFDLENBQUM7SUFFSCxZQUFZLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRTtRQUN4QixJQUFJLEVBQUU7WUFDSixHQUFHLEVBQUUsQ0FBQztZQUNOLEdBQUcsRUFBRSxFQUFFO1NBQ1I7S0FDRixDQUFDLENBQUM7SUFDSCxZQUFZLENBQUMsT0FBTyxDQUFDO1FBQ25CLGNBQWMsRUFBRSxLQUFLO1FBQ3JCLFVBQVUsRUFBRTtZQUNWLE1BQU0sRUFBRSxDQUFDO1lBQ1QsSUFBSSxFQUFFLFNBQVM7WUFDZixPQUFPLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDO1NBQ2pCO1FBQ0QsTUFBTSxZQUFDLEVBQUU7WUFDQyxJQUFBLGdCQUFLLENBQVE7WUFDckIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLEdBQUcsR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7WUFDOUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLElBQUksR0FBRyxFQUFFLENBQUM7WUFDbkIsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLEdBQUcsQ0FBQztRQUN4QyxDQUFDO0tBQ0YsQ0FBQyxDQUFDO0lBQ0gsWUFBWSxDQUFDLEtBQUssQ0FBQyxPQUFPLEVBQUU7UUFDMUIsVUFBVSxFQUFFLElBQUk7UUFDaEIsV0FBVyxFQUFFLEdBQUc7UUFDaEIsTUFBTSxFQUFFLEdBQUc7S0FDWixDQUFDLENBQUM7SUFDSCxZQUFZLENBQUMsTUFBTSxDQUFDO1FBQ2xCLFFBQVEsRUFBRSxPQUFPO1FBQ2pCLE1BQU0sRUFBRSxRQUFRO0tBQ2pCLENBQUMsQ0FBQztJQUNILFlBQVksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDNUIsWUFBWTtTQUNULFFBQVEsRUFBRTtTQUNWLFFBQVEsQ0FBQyxTQUFTLENBQUM7U0FDbkIsS0FBSyxDQUFDLEtBQUssRUFBRSxDQUFDLFNBQVMsRUFBRSxTQUFTLEVBQUUsU0FBUyxFQUFFLFNBQVMsQ0FBQyxDQUFDO1NBQzFELE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUNuQixZQUFZLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3pCLFlBQVksQ0FBQyxNQUFNLEVBQUUsQ0FBQztJQUN0QixNQUFNLENBQUMsWUFBWSxDQUFDO0FBQ3RCLENBQUM7QUFFRCxTQUFTLENBQUM7SUFDUixVQUFVLEVBQUU7UUFDVixRQUFRLEVBQUU7WUFDUixJQUFJLEVBQUUsS0FBSztZQUNYLEtBQUssRUFBRSxFQUFFO1lBQ1QsUUFBUSxZQUFDLE1BQU07Z0JBQ2IsWUFBWTtvQkFDVixZQUFZLENBQUMsTUFBTSxDQUFDO3dCQUNsQixRQUFRLEVBQUUsT0FBTzt3QkFDakIsTUFBTSxFQUFFLFFBQVE7d0JBQ2hCLGFBQWEsRUFBRSxVQUFBLEdBQUc7NEJBQ2hCLElBQUksSUFBSSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsVUFBQSxJQUFJLElBQUksT0FBQSxJQUFJLENBQUMsR0FBRyxLQUFLLEdBQUcsRUFBaEIsQ0FBZ0IsQ0FBQyxDQUFDOzRCQUNqRCxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxHQUFHLE1BQU0sR0FBRyxrQkFBVyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO3dCQUNsRSxDQUFDO3FCQVdGLENBQUMsQ0FBQztnQkFDTCxZQUFZLElBQUksWUFBWSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUNsRCxDQUFDO1NBQ0Y7UUFDRCxLQUFLLEVBQUU7WUFDTCxJQUFJLEVBQUUsTUFBTTtZQUNaLEtBQUssRUFBRSxFQUFFO1lBQ1QsUUFBUSxZQUFDLE1BQU07Z0JBQ2IsS0FBSyxHQUFHLE1BQU0sQ0FBQztZQUNqQixDQUFDO1NBQ0Y7S0FDRjtJQUNELElBQUksRUFBRTtRQUNKLElBQUksRUFBRTtZQUNKLE1BQU0sRUFBRSxTQUFTO1NBQ2xCO0tBQ0Y7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBmb3JtYXRQcmljZSB9IGZyb20gJy4uLy4uLy4uL3V0aWxzL3V0aWwnO1xuXG4vLyBwYWdlcy9jb21wb25lbnRzL1BheVR5cGVDaGFydC9QYXlUeXBlQ2hhcnQuanNcbmxldCBwYXl0eXBlQ2hhcnQgPSBudWxsO1xubGV0IG1vbnRoID0gJyc7XG5jb25zdCBjb2xvck1hcCA9IHtcbiAgYWltaTogJyNFQjdFNTknLFxuICBiZWFuOiAnIzEzQzJDMicsXG4gIGRpc2NvdW50OiAnI0ZBQ0MxNCcsXG4gIG9ubGluZTogJyMxODkwRkYnLFxufTtcblxuZnVuY3Rpb24gaW5pdENoYXJ0KGNhbnZhcywgd2lkdGgsIGhlaWdodCwgRjIpIHtcbiAgY29uc3QgZGF0YSA9IFtdO1xuICBwYXl0eXBlQ2hhcnQgPSBuZXcgRjIuQ2hhcnQoe1xuICAgIGVsOiBjYW52YXMsXG4gICAgd2lkdGgsXG4gICAgaGVpZ2h0LFxuICB9KTtcblxuICBwYXl0eXBlQ2hhcnQuc291cmNlKGRhdGEsIHtcbiAgICBkYXlzOiB7XG4gICAgICBtaW46IDEsXG4gICAgICBtYXg6IDMxLFxuICAgIH0sXG4gIH0pO1xuICBwYXl0eXBlQ2hhcnQudG9vbHRpcCh7XG4gICAgc2hvd0l0ZW1NYXJrZXI6IGZhbHNlLFxuICAgIGJhY2tncm91bmQ6IHtcbiAgICAgIHJhZGl1czogMixcbiAgICAgIGZpbGw6ICcjZjE2NmZkJyxcbiAgICAgIHBhZGRpbmc6IFs2LCAxMF0sXG4gICAgfSxcbiAgICBvblNob3coZXYpIHtcbiAgICAgIGNvbnN0IHsgaXRlbXMgfSA9IGV2O1xuICAgICAgaXRlbXNbMF0ubmFtZSA9ICcnO1xuICAgICAgaXRlbXNbMF0udmFsdWUgPSBtb250aCArICctJyArIGl0ZW1zWzBdLnRpdGxlO1xuICAgICAgaXRlbXNbMV0ubmFtZSA9ICcnO1xuICAgICAgaXRlbXNbMV0udmFsdWUgPSBpdGVtc1sxXS52YWx1ZSArICflhYMnO1xuICAgIH0sXG4gIH0pO1xuICBwYXl0eXBlQ2hhcnQuY29vcmQoJ3BvbGFyJywge1xuICAgIHRyYW5zcG9zZWQ6IHRydWUsXG4gICAgaW5uZXJSYWRpdXM6IDAuNSxcbiAgICByYWRpdXM6IDAuOSxcbiAgfSk7XG4gIHBheXR5cGVDaGFydC5sZWdlbmQoe1xuICAgIHBvc2l0aW9uOiAncmlnaHQnLFxuICAgIG1hcmtlcjogJ3NxdWFyZScsXG4gIH0pO1xuICBwYXl0eXBlQ2hhcnQudG9vbHRpcChmYWxzZSk7XG4gIHBheXR5cGVDaGFydFxuICAgIC5pbnRlcnZhbCgpXG4gICAgLnBvc2l0aW9uKCdhKmNvdW50JylcbiAgICAuY29sb3IoJ2tleScsIFsnI0VCN0U1OScsICcjMTNDMkMyJywgJyNGQUNDMTQnLCAnIzE4OTBGRiddKVxuICAgIC5hZGp1c3QoJ3N0YWNrJyk7XG4gIHBheXR5cGVDaGFydC5heGlzKGZhbHNlKTtcbiAgcGF5dHlwZUNoYXJ0LnJlbmRlcigpO1xuICByZXR1cm4gcGF5dHlwZUNoYXJ0O1xufVxuXG5Db21wb25lbnQoe1xuICBwcm9wZXJ0aWVzOiB7XG4gICAgZGF0YUxpc3Q6IHtcbiAgICAgIHR5cGU6IEFycmF5LFxuICAgICAgdmFsdWU6IFtdLFxuICAgICAgb2JzZXJ2ZXIobmV3VmFsKSB7XG4gICAgICAgIHBheXR5cGVDaGFydCAmJlxuICAgICAgICAgIHBheXR5cGVDaGFydC5sZWdlbmQoe1xuICAgICAgICAgICAgcG9zaXRpb246ICdyaWdodCcsXG4gICAgICAgICAgICBtYXJrZXI6ICdzcXVhcmUnLFxuICAgICAgICAgICAgaXRlbUZvcm1hdHRlcjogdmFsID0+IHtcbiAgICAgICAgICAgICAgbGV0IGl0ZW0gPSBuZXdWYWwuZmluZChpdGVtID0+IGl0ZW0ua2V5ID09PSB2YWwpO1xuICAgICAgICAgICAgICByZXR1cm4gaXRlbSA/IGl0ZW0ubmFtZSArICcgICAgJyArIGZvcm1hdFByaWNlKGl0ZW0uY291bnQpIDogJyc7XG4gICAgICAgICAgICB9LFxuICAgICAgICAgICAgLy8gY3VzdG9tOiB0cnVlLFxuICAgICAgICAgICAgLy8gaXRlbXM6IG5ld1ZhbC5tYXAoaXRlbSA9PiAoe1xuICAgICAgICAgICAgLy8gICBuYW1lOiBpdGVtLm5hbWUsXG4gICAgICAgICAgICAvLyAgIHZhbHVlOiAnICcgKyBmb3JtYXRQcmljZShpdGVtLmNvdW50KSxcbiAgICAgICAgICAgIC8vICAgbWFya2VyOiB7XG4gICAgICAgICAgICAvLyAgICAgc3ltYm9sOiAnc3F1YXJlJyxcbiAgICAgICAgICAgIC8vICAgICBmaWxsOiBjb2xvck1hcFtpdGVtLmtleV0sXG4gICAgICAgICAgICAvLyAgICAgcmFkaXVzOiA0LFxuICAgICAgICAgICAgLy8gICB9LFxuICAgICAgICAgICAgLy8gfSkpLFxuICAgICAgICAgIH0pO1xuICAgICAgICBwYXl0eXBlQ2hhcnQgJiYgcGF5dHlwZUNoYXJ0LmNoYW5nZURhdGEobmV3VmFsKTtcbiAgICAgIH0sXG4gICAgfSxcbiAgICBtb250aDoge1xuICAgICAgdHlwZTogU3RyaW5nLFxuICAgICAgdmFsdWU6ICcnLFxuICAgICAgb2JzZXJ2ZXIobmV3VmFsKSB7XG4gICAgICAgIG1vbnRoID0gbmV3VmFsO1xuICAgICAgfSxcbiAgICB9LFxuICB9LFxuICBkYXRhOiB7XG4gICAgb3B0czoge1xuICAgICAgb25Jbml0OiBpbml0Q2hhcnQsXG4gICAgfSxcbiAgfSxcbn0pO1xuIl19
\ No newline at end of file
miniprogram/pages/components/PayTypeChart/PayTypeChart.ts
......@@ -41,7 +41,8 @@ function initChart(canvas, width, height, F2) {
});
paytypeChart.coord('polar', {
transposed: true,
innerRadius: 0.7,
innerRadius: 0.5,
radius: 0.9,
});
paytypeChart.legend({
position: 'right',
......@@ -51,9 +52,7 @@ function initChart(canvas, width, height, F2) {
paytypeChart
.interval()
.position('a*count')
.color('key', val => {
return colorMap[val];
})
.color('key', ['#EB7E59', '#13C2C2', '#FACC14', '#1890FF'])
.adjust('stack');
paytypeChart.axis(false);
paytypeChart.render();
......@@ -70,16 +69,20 @@ Component({
paytypeChart.legend({
position: 'right',
marker: 'square',
custom: true,
items: newVal.map(item => ({
name: item.name,
value: ' ' + formatPrice(item.count),
marker: {
symbol: 'square',
fill: colorMap[item.key],
radius: 4,
},
})),
itemFormatter: val => {
let item = newVal.find(item => item.key === val);
return item ? item.name + ' ' + formatPrice(item.count) : '';
},
// custom: true,
// items: newVal.map(item => ({
// name: item.name,
// value: ' ' + formatPrice(item.count),
// marker: {
// symbol: 'square',
// fill: colorMap[item.key],
// radius: 4,
// },
// })),
});
paytypeChart && paytypeChart.changeData(newVal);
},
......
miniprogram/pages/home/home.js
......@@ -96,7 +96,7 @@ Component({
else if (timeType === 2) {
entity.year = date.slice(0, 4);
}
wx.showLoading({ title: '' });
wx.showLoading({ title: '', mask: true });
var rechargeDataFetch = fetch_1.statisticsFetch({
url: '/dcxy/reportInfo/queryRechargeOrderListV2',
method: 'POST',
......@@ -165,4 +165,4 @@ Component({
},
},
});
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"home.js","sourceRoot":"","sources":["home.ts"],"names":[],"mappings":"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","sourcesContent":["import { statisticsFetch } from '../../api/fetch';\nimport { formatTime } from '../../utils/util';\n\n// miniprogram/pages/home/home.js\nComponent({\n  lifetimes: {\n    attached() {\n      console.log('in show ', this.data.fetched);\n      !this.data.fetched && this.fetchRechargeData();\n    },\n  },\n  /**\n   * 页面的初始数据\n   */\n  data: {\n    timeType: 0,\n    fetched: false,\n    serviceList: [],\n    rechargeData: {\n      title: '充值总额',\n      numberType: 'price',\n      count: 0,\n    },\n    rechargeCount: {\n      title: '充值总笔数',\n      numberType: '',\n      count: 0,\n    },\n    onlineRechargeData: {\n      title: '线上充值',\n      numberType: '1',\n      count: 0,\n      price: 0,\n    },\n    offlineRechargeData: {\n      title: '线下充值',\n      numberType: '1',\n      count: 0,\n      price: 0,\n    },\n    comsumerData: {\n      title: '消费总额',\n      numberType: 'price',\n      count: 0,\n    },\n    comsumerCount: {\n      title: '消费总笔数',\n      numberType: '',\n      count: 0,\n    },\n    refundData: {\n      title: '退款总额',\n      numberType: 'price',\n      count: 0,\n    },\n    refundCount: {\n      title: '退款总笔数',\n      numberType: '',\n      count: 0,\n    },\n    testData: {\n      title: '充值总额',\n      numberType: 'price',\n      count: 0,\n    },\n    testData2: {\n      title: '线上充值',\n      numberType: '1',\n      count: 0,\n      price: 0,\n    },\n  },\n  methods: {\n    changeTimeType(e) {\n      const { timetype } = e.currentTarget.dataset;\n      if (timetype === this.data.timeType) return;\n      this.setData({\n        timeType: timetype,\n      });\n      this.fetchRechargeData(timetype);\n      return false;\n    },\n    fetchRechargeData(timeType?: number) {\n      if (!timeType) timeType = this.data.timeType;\n      const today = formatTime(new Date());\n      let date = today.split(' ')[0];\n      let entity = {\n        timeType,\n      };\n      if (timeType === 0) {\n        entity.date = date;\n      } else if (timeType === 1) {\n        entity.month = date.slice(0, 7);\n      } else if (timeType === 2) {\n        entity.year = date.slice(0, 4);\n      }\n      wx.showLoading({ title: '' });\n\n      let rechargeDataFetch = statisticsFetch({\n        url: '/dcxy/reportInfo/queryRechargeOrderListV2',\n        method: 'POST',\n        data: entity,\n      }).then(res => {\n        const data = res.rechargeOrderCountVo;\n        if (data) {\n          const {\n            rechargeMen,\n            rechargeMoney,\n            refundCount,\n            refundMoney,\n            offlineRechargeMen,\n            offlineRechargeMoney,\n            onlineRechargeMen,\n            onlineRechargeMoney,\n          } = data;\n          this.setData({\n            'rechargeData.count': rechargeMoney,\n            'rechargeCount.count': rechargeMen,\n            'refundData.count': refundMoney,\n            'refundCount.count': refundCount,\n            'onlineRechargeData.price': onlineRechargeMoney,\n            'onlineRechargeData.count': onlineRechargeMen,\n            'offlineRechargeData.price': offlineRechargeMoney,\n            'offlineRechargeData.count': offlineRechargeMen,\n          });\n        } else {\n          this.setData({\n            'rechargeData.count': 0,\n            'rechargeCount.count': 0,\n            'refundData.count': 0,\n            'refundCount.count': 0,\n            'onlineRechargeData.price': 0,\n            'onlineRechargeData.count': 0,\n            'offlineRechargeData.price': 0,\n            'offlineRechargeData.count': 0,\n          });\n        }\n      });\n      let consumeDataFetch = statisticsFetch({\n        url: '/dcxy/reportInfo/queryConsumeOrderList',\n        method: 'POST',\n        data: entity,\n      }).then(res => {\n        const { consumeCountVo, data } = res;\n        console.log(res);\n        this.setData({\n          serviceList: data.map(item => ({\n            serviceId: item.serviceId,\n            title: item.serviceName,\n            numberType: '1',\n            count: item.payMen,\n            price: item.payableMoney,\n          })),\n          'comsumerData.count':\n            consumeCountVo && consumeCountVo.payableMoney\n              ? consumeCountVo.payableMoney\n              : 0,\n          'comsumerCount.count':\n            consumeCountVo && consumeCountVo.payMen ? consumeCountVo.payMen : 0,\n        });\n      });\n      Promise.all([consumeDataFetch, rechargeDataFetch])\n        .then(() => {\n          wx.hideLoading();\n        })\n        .catch((err: wx.GeneralCallbackResult) => {\n          wx.hideLoading();\n          wx.showToast({\n            title: err.errMsg,\n            icon: 'none',\n          });\n          console.log(err);\n        });\n    },\n  },\n});\n"]}
\ No newline at end of file
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"home.js","sourceRoot":"","sources":["home.ts"],"names":[],"mappings":"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","sourcesContent":["import { statisticsFetch } from '../../api/fetch';\nimport { formatTime } from '../../utils/util';\n\n// miniprogram/pages/home/home.js\nComponent({\n  lifetimes: {\n    attached() {\n      console.log('in show ', this.data.fetched);\n      !this.data.fetched && this.fetchRechargeData();\n    },\n  },\n  /**\n   * 页面的初始数据\n   */\n  data: {\n    timeType: 0,\n    fetched: false,\n    serviceList: [],\n    rechargeData: {\n      title: '充值总额',\n      numberType: 'price',\n      count: 0,\n    },\n    rechargeCount: {\n      title: '充值总笔数',\n      numberType: '',\n      count: 0,\n    },\n    onlineRechargeData: {\n      title: '线上充值',\n      numberType: '1',\n      count: 0,\n      price: 0,\n    },\n    offlineRechargeData: {\n      title: '线下充值',\n      numberType: '1',\n      count: 0,\n      price: 0,\n    },\n    comsumerData: {\n      title: '消费总额',\n      numberType: 'price',\n      count: 0,\n    },\n    comsumerCount: {\n      title: '消费总笔数',\n      numberType: '',\n      count: 0,\n    },\n    refundData: {\n      title: '退款总额',\n      numberType: 'price',\n      count: 0,\n    },\n    refundCount: {\n      title: '退款总笔数',\n      numberType: '',\n      count: 0,\n    },\n    testData: {\n      title: '充值总额',\n      numberType: 'price',\n      count: 0,\n    },\n    testData2: {\n      title: '线上充值',\n      numberType: '1',\n      count: 0,\n      price: 0,\n    },\n  },\n  methods: {\n    changeTimeType(e) {\n      const { timetype } = e.currentTarget.dataset;\n      if (timetype === this.data.timeType) return;\n      this.setData({\n        timeType: timetype,\n      });\n      this.fetchRechargeData(timetype);\n      return false;\n    },\n    fetchRechargeData(timeType?: number) {\n      if (!timeType) timeType = this.data.timeType;\n      const today = formatTime(new Date());\n      let date = today.split(' ')[0];\n      let entity = {\n        timeType,\n      };\n      if (timeType === 0) {\n        entity.date = date;\n      } else if (timeType === 1) {\n        entity.month = date.slice(0, 7);\n      } else if (timeType === 2) {\n        entity.year = date.slice(0, 4);\n      }\n      wx.showLoading({ title: '', mask: true });\n\n      let rechargeDataFetch = statisticsFetch({\n        url: '/dcxy/reportInfo/queryRechargeOrderListV2',\n        method: 'POST',\n        data: entity,\n      }).then(res => {\n        const data = res.rechargeOrderCountVo;\n        if (data) {\n          const {\n            rechargeMen,\n            rechargeMoney,\n            refundCount,\n            refundMoney,\n            offlineRechargeMen,\n            offlineRechargeMoney,\n            onlineRechargeMen,\n            onlineRechargeMoney,\n          } = data;\n          this.setData({\n            'rechargeData.count': rechargeMoney,\n            'rechargeCount.count': rechargeMen,\n            'refundData.count': refundMoney,\n            'refundCount.count': refundCount,\n            'onlineRechargeData.price': onlineRechargeMoney,\n            'onlineRechargeData.count': onlineRechargeMen,\n            'offlineRechargeData.price': offlineRechargeMoney,\n            'offlineRechargeData.count': offlineRechargeMen,\n          });\n        } else {\n          this.setData({\n            'rechargeData.count': 0,\n            'rechargeCount.count': 0,\n            'refundData.count': 0,\n            'refundCount.count': 0,\n            'onlineRechargeData.price': 0,\n            'onlineRechargeData.count': 0,\n            'offlineRechargeData.price': 0,\n            'offlineRechargeData.count': 0,\n          });\n        }\n      });\n      let consumeDataFetch = statisticsFetch({\n        url: '/dcxy/reportInfo/queryConsumeOrderList',\n        method: 'POST',\n        data: entity,\n      }).then(res => {\n        const { consumeCountVo, data } = res;\n        console.log(res);\n        this.setData({\n          serviceList: data.map(item => ({\n            serviceId: item.serviceId,\n            title: item.serviceName,\n            numberType: '1',\n            count: item.payMen,\n            price: item.payableMoney,\n          })),\n          'comsumerData.count':\n            consumeCountVo && consumeCountVo.payableMoney\n              ? consumeCountVo.payableMoney\n              : 0,\n          'comsumerCount.count':\n            consumeCountVo && consumeCountVo.payMen ? consumeCountVo.payMen : 0,\n        });\n      });\n      Promise.all([consumeDataFetch, rechargeDataFetch])\n        .then(() => {\n          wx.hideLoading();\n        })\n        .catch((err: wx.GeneralCallbackResult) => {\n          wx.hideLoading();\n          wx.showToast({\n            title: err.errMsg,\n            icon: 'none',\n          });\n          console.log(err);\n        });\n    },\n  },\n});\n"]}
\ No newline at end of file
miniprogram/pages/home/home.ts
......@@ -94,7 +94,7 @@ Component({
} else if (timeType === 2) {
entity.year = date.slice(0, 4);
}
wx.showLoading({ title: '' });
wx.showLoading({ title: '', mask: true });
let rechargeDataFetch = statisticsFetch({
url: '/dcxy/reportInfo/queryRechargeOrderListV2',
......
miniprogram/pages/homeAndReport/homeAndReport.js
......@@ -13,7 +13,7 @@ Page({
pagePath: '/pages/report/report',
iconPath: '/images/tab_baobiao_nor@2x.png',
selectedIconPath: '/images/tab_baobiao_pre@2x.png',
text: '报表分析',
text: '运营管理',
},
],
},
......@@ -25,4 +25,4 @@ Page({
});
},
});
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9tZUFuZFJlcG9ydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImhvbWVBbmRSZXBvcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLElBQUksQ0FBQztJQUNILElBQUksRUFBRTtRQUNKLFFBQVEsRUFBRSxDQUFDO1FBQ1gsSUFBSSxFQUFFO1lBQ0o7Z0JBQ0UsUUFBUSxFQUFFLGtCQUFrQjtnQkFDNUIsUUFBUSxFQUFFLDhCQUE4QjtnQkFDeEMsZ0JBQWdCLEVBQUUsOEJBQThCO2dCQUNoRCxJQUFJLEVBQUUsTUFBTTthQUNiO1lBQ0Q7Z0JBQ0UsUUFBUSxFQUFFLHNCQUFzQjtnQkFDaEMsUUFBUSxFQUFFLGdDQUFnQztnQkFDMUMsZ0JBQWdCLEVBQUUsZ0NBQWdDO2dCQUNsRCxJQUFJLEVBQUUsTUFBTTthQUNiO1NBQ0Y7S0FDRjtJQUNELFdBQVcsWUFBQyxDQUFDO1FBQ1gsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDdkIsSUFBQSxhQUEwQixFQUF4QixjQUFJLEVBQUUsZ0JBQUssQ0FBYztRQUcvQixJQUFJLENBQUMsT0FBTyxDQUFDO1lBQ1gsUUFBUSxFQUFFLEtBQUs7U0FDaEIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIlBhZ2Uoe1xuICBkYXRhOiB7XG4gICAgc2VsZWN0ZWQ6IDAsXG4gICAgbGlzdDogW1xuICAgICAge1xuICAgICAgICBwYWdlUGF0aDogJy9wYWdlcy9ob21lL2hvbWUnLFxuICAgICAgICBpY29uUGF0aDogJy9pbWFnZXMvdGFiX3NodWp1X25vckAyeC5wbmcnLFxuICAgICAgICBzZWxlY3RlZEljb25QYXRoOiAnL2ltYWdlcy90YWJfc2h1anVfcHJlQDJ4LnBuZycsXG4gICAgICAgIHRleHQ6ICfmlbDmja7pppbpobUnLFxuICAgICAgfSxcbiAgICAgIHtcbiAgICAgICAgcGFnZVBhdGg6ICcvcGFnZXMvcmVwb3J0L3JlcG9ydCcsXG4gICAgICAgIGljb25QYXRoOiAnL2ltYWdlcy90YWJfYmFvYmlhb19ub3JAMngucG5nJyxcbiAgICAgICAgc2VsZWN0ZWRJY29uUGF0aDogJy9pbWFnZXMvdGFiX2Jhb2JpYW9fcHJlQDJ4LnBuZycsXG4gICAgICAgIHRleHQ6ICfmiqXooajliIbmnpAnLFxuICAgICAgfSxcbiAgICBdLFxuICB9LFxuICBjbGlja0hhbmRsZShlKSB7XG4gICAgY29uc29sZS5sb2coJ2luIGNsaWNrJywgZSk7XG4gICAgbGV0IHsgcGF0aCwgaW5kZXggfSA9IGUuZGV0YWlsO1xuICAgIC8vIGNvbnNvbGUubG9nKHBhdGgsIGluZGV4KTtcbiAgICAvLyB3eC5zd2l0Y2hUYWIoeyB1cmw6IHBhdGggfSk7XG4gICAgdGhpcy5zZXREYXRhKHtcbiAgICAgIHNlbGVjdGVkOiBpbmRleCxcbiAgICB9KTtcbiAgfSxcbn0pO1xuIl19
\ No newline at end of file
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaG9tZUFuZFJlcG9ydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbImhvbWVBbmRSZXBvcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLElBQUksQ0FBQztJQUNILElBQUksRUFBRTtRQUNKLFFBQVEsRUFBRSxDQUFDO1FBQ1gsSUFBSSxFQUFFO1lBQ0o7Z0JBQ0UsUUFBUSxFQUFFLGtCQUFrQjtnQkFDNUIsUUFBUSxFQUFFLDhCQUE4QjtnQkFDeEMsZ0JBQWdCLEVBQUUsOEJBQThCO2dCQUNoRCxJQUFJLEVBQUUsTUFBTTthQUNiO1lBQ0Q7Z0JBQ0UsUUFBUSxFQUFFLHNCQUFzQjtnQkFDaEMsUUFBUSxFQUFFLGdDQUFnQztnQkFDMUMsZ0JBQWdCLEVBQUUsZ0NBQWdDO2dCQUNsRCxJQUFJLEVBQUUsTUFBTTthQUNiO1NBQ0Y7S0FDRjtJQUNELFdBQVcsWUFBQyxDQUFDO1FBQ1gsT0FBTyxDQUFDLEdBQUcsQ0FBQyxVQUFVLEVBQUUsQ0FBQyxDQUFDLENBQUM7UUFDdkIsSUFBQSxhQUEwQixFQUF4QixjQUFJLEVBQUUsZ0JBQUssQ0FBYztRQUcvQixJQUFJLENBQUMsT0FBTyxDQUFDO1lBQ1gsUUFBUSxFQUFFLEtBQUs7U0FDaEIsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIlBhZ2Uoe1xuICBkYXRhOiB7XG4gICAgc2VsZWN0ZWQ6IDAsXG4gICAgbGlzdDogW1xuICAgICAge1xuICAgICAgICBwYWdlUGF0aDogJy9wYWdlcy9ob21lL2hvbWUnLFxuICAgICAgICBpY29uUGF0aDogJy9pbWFnZXMvdGFiX3NodWp1X25vckAyeC5wbmcnLFxuICAgICAgICBzZWxlY3RlZEljb25QYXRoOiAnL2ltYWdlcy90YWJfc2h1anVfcHJlQDJ4LnBuZycsXG4gICAgICAgIHRleHQ6ICfmlbDmja7pppbpobUnLFxuICAgICAgfSxcbiAgICAgIHtcbiAgICAgICAgcGFnZVBhdGg6ICcvcGFnZXMvcmVwb3J0L3JlcG9ydCcsXG4gICAgICAgIGljb25QYXRoOiAnL2ltYWdlcy90YWJfYmFvYmlhb19ub3JAMngucG5nJyxcbiAgICAgICAgc2VsZWN0ZWRJY29uUGF0aDogJy9pbWFnZXMvdGFiX2Jhb2JpYW9fcHJlQDJ4LnBuZycsXG4gICAgICAgIHRleHQ6ICfov5DokKXnrqHnkIYnLFxuICAgICAgfSxcbiAgICBdLFxuICB9LFxuICBjbGlja0hhbmRsZShlKSB7XG4gICAgY29uc29sZS5sb2coJ2luIGNsaWNrJywgZSk7XG4gICAgbGV0IHsgcGF0aCwgaW5kZXggfSA9IGUuZGV0YWlsO1xuICAgIC8vIGNvbnNvbGUubG9nKHBhdGgsIGluZGV4KTtcbiAgICAvLyB3eC5zd2l0Y2hUYWIoeyB1cmw6IHBhdGggfSk7XG4gICAgdGhpcy5zZXREYXRhKHtcbiAgICAgIHNlbGVjdGVkOiBpbmRleCxcbiAgICB9KTtcbiAgfSxcbn0pO1xuIl19
\ No newline at end of file
miniprogram/pages/homeAndReport/homeAndReport.ts
......@@ -12,7 +12,7 @@ Page({
pagePath: '/pages/report/report',
iconPath: '/images/tab_baobiao_nor@2x.png',
selectedIconPath: '/images/tab_baobiao_pre@2x.png',
text: '报表分析',
text: '运营管理',
},
],
},
......
miniprogram/pages/index/index.wxml
......@@ -5,7 +5,7 @@
<input class="login-input" placeholder="请输入账号" bindinput="nameInputHandle" />
<view class="login-input-password">
<input class="login-input" placeholder="请输入密码" password="{{!showPassword}}" bindinput="passwardInoutHandle" />
<image wx:if="{{showPassword}}" catchtap="togglePassword" class="password-eyes" src="../../images/btn_turn on.png"></image>
<image wx:if="{{showPassword}}" catchtap="togglePassword" class="password-eyes" src="../../images/btn_turn_on.png"></image>
<image wx:else catchtap="togglePassword" class="password-eyes" src="../../images/btn_turnoff.png"></image>
</view>
......
miniprogram/pages/userGrowth/userGrowth.js
......@@ -22,6 +22,7 @@ Page({
areaName: '',
areaList: [],
growthList: [],
registerCount: 0,
customerCount: 0,
activeCount: 0,
isAdmin: 0,
......@@ -102,9 +103,11 @@ Page({
dayList[daysIndex - 1] = __assign({}, dayList[daysIndex - 1], { count: element.count });
}
}
var registerCount = dayVos.reduce(function (total, current) { return (total += current.count); }, 0);
console.log('dayList:', dayList);
_this.setData({
growthList: dayList,
registerCount: registerCount,
customerCount: customerCount ? customerCount : 0,
activeCount: activeCount ? activeCount : 0,
});
......@@ -138,4 +141,4 @@ Page({
});
},
});
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"userGrowth.js","sourceRoot":"","sources":["userGrowth.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,yCAA6D;AAC7D,yCAA8C;AAE9C,IAAM,GAAG,GAAG,MAAM,EAAU,CAAC;AAG7B,IAAI,CAAC;IACH,MAAM;QACJ,IAAI,CAAC,QAAQ,EAAE,CAAC;QAChB,IAAI,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC;IAID,IAAI,EAAE;QACJ,KAAK,EAAE,EAAE;QACT,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,EAAE;QACZ,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,EAAE;QACd,aAAa,EAAE,CAAC;QAChB,WAAW,EAAE,CAAC;QACd,OAAO,EAAE,CAAC;KACX;IACD,QAAQ;QAAR,iBAyBC;QAxBC,IAAI,IAAI,GAAG,iBAAU,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;QACtC,IAAI,CAAC,OAAQ,CAAC;YACZ,QAAQ,EAAE,GAAG,CAAC,UAAU,CAAC,QAAQ;SAClC,CAAC,CAAC;QACH,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,IAAI,aAAa,GAAG,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAC/C,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,QAAQ,KAAK,MAAM,EAAxB,CAAwB,CACjC,CAAC;QACF,EAAE,CAAC,CACD,aAAa;YACb,aAAa,CAAC,gBAAgB;YAC9B,aAAa,CAAC,gBAAgB,CAAC,MACjC,CAAC,CAAC,CAAC;YACD,EAAE,CAAC,CACD,aAAa,CAAC,gBAAgB,CAAC,IAAI,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,UAAU,KAAK,MAAM,EAA1B,CAA0B,CACxE,CAAC;gBACC,OAAO,GAAG,CAAC,CAAC;QAChB,CAAC;QAED,IAAI,CAAC,OAAQ,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,SAAA,EAAE,EAAE;YAClD,KAAI,CAAC,SAAS,EAAE,CAAC;QACnB,CAAC,CAAC,CAAC;IACL,CAAC;IACD,aAAa;QAAb,iBAkBC;QAjBC,iBAAS,CAAC;YACR,GAAG,EAAE,yBAAyB;SAC/B,CAAC;aACC,IAAI,CAAC,UAAA,GAAG;YACP,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;gBACb,KAAI,CAAC,OAAQ,CAAC;oBACZ,QAAQ,EAAE,GAAG,CAAC,IAAI;iBACnB,CAAC,CAAC;YACL,CAAC;YAAC,IAAI,CAAC,CAAC;gBACN,KAAI,CAAC,OAAQ,CAAC;oBACZ,QAAQ,EAAE,EAAE;iBACb,CAAC,CAAC;YACL,CAAC;QACH,CAAC,CAAC;aACD,KAAK,CAAC,UAAA,GAAG;YACR,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;IACP,CAAC;IACD,SAAS,YAAC,MAAkD;QAC1D,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YACrB,EAAE,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;YAC9B,CAAC;YAAC,IAAI;gBAAC,MAAM,gBAAQ,MAAM,IAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,GAAE,CAAC;QAC1D,CAAC;QACD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC;IACD,aAAa,YAAC,MAAM;QAApB,iBA4CC;QA3CC,IAAI,WAAW,GACb,MAAM,IAAI,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;QAChE,IAAA,2BAAsC,EAArC,YAAI,EAAE,aAAK,CAA2B;QAC7C,IAAI,OAAO,cACT,IAAI,MAAA;YACJ,KAAK,OAAA,EACL,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,IACvB,MAAM,CACV,CAAC;QACF,uBAAe,CAAC;YACd,GAAG,EAAE,kCAAkC;YACvC,IAAI,EAAE,OAAO;SACd,CAAC;aACC,IAAI,CAAC,UAAA,GAAG;YACP,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACX,IAAA,aAAiD,EAA/C,gCAAa,EAAE,kBAAM,EAAE,4BAAW,CAAc;YACxD,IAAI,OAAO,GAAG,IAAI,KAAK,CAAC,EAAE,CAAC;iBACxB,IAAI,CAAC;gBACJ,KAAK,EAAE,CAAC;aACT,CAAC;iBACD,GAAG,CAAC,UAAC,CAAC,EAAE,GAAG,IAAK,OAAA,cAAM,CAAC,IAAE,IAAI,EAAE,GAAG,GAAG,CAAC,IAAG,EAAzB,CAAyB,CAAC,CAAC;YAE9C,EAAE,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;gBAC5B,IAAI,KAAK,GAAG,MAAM,CAAC;gBACnB,GAAG,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;oBAClD,IAAM,OAAO,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;oBAC7B,IAAI,SAAS,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC/C,OAAO,CAAC,SAAS,GAAG,CAAC,CAAC,gBACjB,OAAO,CAAC,SAAS,GAAG,CAAC,CAAC,IACzB,KAAK,EAAE,OAAO,CAAC,KAAK,GACrB,CAAC;gBACJ,CAAC;YACH,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YACjC,KAAI,CAAC,OAAQ,CAAC;gBACZ,UAAU,EAAE,OAAO;gBACnB,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;gBAChD,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;aAC3C,CAAC,CAAC;QACL,CAAC,CAAC;aACD,KAAK,CAAC,UAAA,GAAG;YACR,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;IACP,CAAC;IACD,gBAAgB,YAAC,GAAG;QAApB,iBAgBC;QAfC,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,GAAG,CAAC,CAAC;QAC7B,IAAA,WAAE,EAAE,eAAI,CAAS;QACzB,IAAI,CAAC,OAAQ,CACX;YACE,MAAM,EAAE,EAAE;YACV,QAAQ,EAAE,IAAI;SACf,EACD;YACE,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACP,KAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;YACjC,CAAC;YAAC,IAAI,CAAC,CAAC;gBACN,KAAI,CAAC,SAAS,EAAE,CAAC;YACnB,CAAC;QACH,CAAC,CACF,CAAC;IACJ,CAAC;IACD,iBAAiB,YAAC,GAAG;QACnB,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;QAC9B,IAAA,wBAAK,CAAgB;QAC7B,IAAI,CAAC,SAAS,CAAC,EAAE,WAAW,EAAE,KAAK,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC,OAAQ,CAAC;YACZ,KAAK,EAAE,KAAK;SACb,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC","sourcesContent":["import { baseFetch, statisticsFetch } from '../../api/fetch';\nimport { formatTime } from '../../utils/util';\nimport { IMyApp } from '../../app';\nconst app = getApp<IMyApp>();\n\n// miniprogram/pages/userGrowth/userGrowth.js\nPage({\n  onLoad() {\n    this.initData();\n    this.fetchAreaList();\n  },\n  /**\n   * 页面的初始数据\n   */\n  data: {\n    month: '',\n    areaId: '',\n    areaName: '',\n    areaList: [],\n    growthList: [],\n    customerCount: 0,\n    activeCount: 0,\n    isAdmin: 0,\n  },\n  initData() {\n    let time = formatTime(new Date());\n    console.log(time);\n    console.log(app.globalData.userRoles);\n    this.setData!({\n      userInfo: app.globalData.userInfo,\n    });\n    let isAdmin = 0;\n    let registerRoute = app.globalData.userRoles.find(\n      item => item.menuCode === '0083',\n    );\n    if (\n      registerRoute &&\n      registerRoute.listMenuButtonVo &&\n      registerRoute.listMenuButtonVo.length\n    ) {\n      if (\n        registerRoute.listMenuButtonVo.find(item => item.buttonCode === '0001')\n      )\n        isAdmin = 1;\n    }\n\n    this.setData!({ month: time.slice(0, 7), isAdmin }, () => {\n      this.fetchList();\n    });\n  },\n  fetchAreaList() {\n    baseFetch({\n      url: '/dcxy/baseArea/queryAll',\n    })\n      .then(res => {\n        if (res.data) {\n          this.setData!({\n            areaList: res.data,\n          });\n        } else {\n          this.setData!({\n            areaList: [],\n          });\n        }\n      })\n      .catch(err => {\n        console.log(err);\n      });\n  },\n  fetchList(entity?: { areaId?: number; monthString?: string }) {\n    if (this.data.areaId) {\n      if (entity && entity.areaId) {\n      } else entity = { ...entity, areaId: this.data.areaId };\n    }\n    this.fetchUserData(entity);\n  },\n  fetchUserData(entity) {\n    let monthString =\n      entity && entity.monthString ? entity.monthString : this.data.month;\n    const [year, month] = monthString.split('-');\n    let reqBody = {\n      year,\n      month,\n      isAdmin: this.data.isAdmin,\n      ...entity,\n    };\n    statisticsFetch({\n      url: '/dcxy/reportInfo/queryReportList',\n      data: reqBody,\n    })\n      .then(res => {\n        console.log(res);\n        const { customerCount, dayVos, activeCount } = res.data;\n        let dayList = new Array(31)\n          .fill({\n            count: 0,\n          })\n          .map((v, idx) => ({ ...v, days: idx + 1 }));\n\n        if (dayVos && dayVos.length) {\n          let oList = dayVos;\n          for (let index = 0; index < oList.length; index++) {\n            const element = oList[index];\n            let daysIndex = Number(element.days.slice(-2));\n            dayList[daysIndex - 1] = {\n              ...dayList[daysIndex - 1],\n              count: element.count,\n            };\n          }\n        }\n        console.log('dayList:', dayList);\n        this.setData!({\n          growthList: dayList,\n          customerCount: customerCount ? customerCount : 0,\n          activeCount: activeCount ? activeCount : 0,\n        });\n      })\n      .catch(err => {\n        console.log(err);\n      });\n  },\n  areaChangeHandle(val) {\n    console.log('areaChangeHandle', val);\n    const { id, name } = val;\n    this.setData!(\n      {\n        areaId: id,\n        areaName: name,\n      },\n      () => {\n        if (id) {\n          this.fetchList({ areaId: id });\n        } else {\n          this.fetchList();\n        }\n      },\n    );\n  },\n  monthChangeHandle(val) {\n    console.log('monthChangeHandle', val);\n    const { value } = val.detail;\n    this.fetchList({ monthString: value });\n    this.setData!({\n      month: value,\n    });\n  },\n});\n"]}
\ No newline at end of file
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"userGrowth.js","sourceRoot":"","sources":["userGrowth.ts"],"names":[],"mappings":"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","sourcesContent":["import { baseFetch, statisticsFetch } from '../../api/fetch';\nimport { formatTime } from '../../utils/util';\nimport { IMyApp } from '../../app';\nconst app = getApp<IMyApp>();\n\n// miniprogram/pages/userGrowth/userGrowth.js\nPage({\n  onLoad() {\n    this.initData();\n    this.fetchAreaList();\n  },\n  /**\n   * 页面的初始数据\n   */\n  data: {\n    month: '',\n    areaId: '',\n    areaName: '',\n    areaList: [],\n    growthList: [],\n    registerCount: 0,\n    customerCount: 0,\n    activeCount: 0,\n    isAdmin: 0,\n  },\n  initData() {\n    let time = formatTime(new Date());\n    console.log(time);\n    console.log(app.globalData.userRoles);\n    this.setData!({\n      userInfo: app.globalData.userInfo,\n    });\n    let isAdmin = 0;\n    let registerRoute = app.globalData.userRoles.find(\n      item => item.menuCode === '0083',\n    );\n    if (\n      registerRoute &&\n      registerRoute.listMenuButtonVo &&\n      registerRoute.listMenuButtonVo.length\n    ) {\n      if (\n        registerRoute.listMenuButtonVo.find(item => item.buttonCode === '0001')\n      )\n        isAdmin = 1;\n    }\n\n    this.setData!({ month: time.slice(0, 7), isAdmin }, () => {\n      this.fetchList();\n    });\n  },\n  fetchAreaList() {\n    baseFetch({\n      url: '/dcxy/baseArea/queryAll',\n    })\n      .then(res => {\n        if (res.data) {\n          this.setData!({\n            areaList: res.data,\n          });\n        } else {\n          this.setData!({\n            areaList: [],\n          });\n        }\n      })\n      .catch(err => {\n        console.log(err);\n      });\n  },\n  fetchList(entity?: { areaId?: number; monthString?: string }) {\n    if (this.data.areaId) {\n      if (entity && entity.areaId) {\n      } else entity = { ...entity, areaId: this.data.areaId };\n    }\n    this.fetchUserData(entity);\n  },\n  fetchUserData(entity) {\n    let monthString =\n      entity && entity.monthString ? entity.monthString : this.data.month;\n    const [year, month] = monthString.split('-');\n    let reqBody = {\n      year,\n      month,\n      isAdmin: this.data.isAdmin,\n      ...entity,\n    };\n    statisticsFetch({\n      url: '/dcxy/reportInfo/queryReportList',\n      data: reqBody,\n    })\n      .then(res => {\n        console.log(res);\n        const { customerCount, dayVos, activeCount } = res.data;\n        let dayList = new Array(31)\n          .fill({\n            count: 0,\n          })\n          .map((v, idx) => ({ ...v, days: idx + 1 }));\n\n        if (dayVos && dayVos.length) {\n          let oList = dayVos;\n          for (let index = 0; index < oList.length; index++) {\n            const element = oList[index];\n            let daysIndex = Number(element.days.slice(-2));\n            dayList[daysIndex - 1] = {\n              ...dayList[daysIndex - 1],\n              count: element.count,\n            };\n          }\n        }\n        let registerCount = dayVos.reduce(\n          (total, current) => (total += current.count),\n          0,\n        );\n        console.log('dayList:', dayList);\n        this.setData!({\n          growthList: dayList,\n          registerCount: registerCount,\n          customerCount: customerCount ? customerCount : 0,\n          activeCount: activeCount ? activeCount : 0,\n        });\n      })\n      .catch(err => {\n        console.log(err);\n      });\n  },\n  areaChangeHandle(val) {\n    console.log('areaChangeHandle', val);\n    const { id, name } = val;\n    this.setData!(\n      {\n        areaId: id,\n        areaName: name,\n      },\n      () => {\n        if (id) {\n          this.fetchList({ areaId: id });\n        } else {\n          this.fetchList();\n        }\n      },\n    );\n  },\n  monthChangeHandle(val) {\n    console.log('monthChangeHandle', val);\n    const { value } = val.detail;\n    this.fetchList({ monthString: value });\n    this.setData!({\n      month: value,\n    });\n  },\n});\n"]}
\ No newline at end of file
miniprogram/pages/userGrowth/userGrowth.ts
......@@ -18,6 +18,7 @@ Page({
areaName: '',
areaList: [],
growthList: [],
registerCount: 0,
customerCount: 0,
activeCount: 0,
isAdmin: 0,
......@@ -108,9 +109,14 @@ Page({
};
}
}
let registerCount = dayVos.reduce(
(total, current) => (total += current.count),
0,
);
console.log('dayList:', dayList);
this.setData!({
growthList: dayList,
registerCount: registerCount,
customerCount: customerCount ? customerCount : 0,
activeCount: activeCount ? activeCount : 0,
});
......
miniprogram/pages/userGrowth/userGrowth.wxml
......@@ -3,7 +3,7 @@
<view class="userGrowth-topBox">
<view class="userGrowth-titleItem">
<view class="userGrowth-titleName">注册人数</view>
<view class="userGrowth-titleValue">123412</view>
<view class="userGrowth-titleValue">{{registerCount}}</view>
</view>
<view class="userGrowth-titleItem">
<view class="userGrowth-titleName">活跃人数</view>
......
miniprogram/utils/util.js
......@@ -25,6 +25,9 @@ var joinComma = function (num) {
var result = [], counter = 0;
for (var index = num.length - 1; index >= 0; index--) {
counter++;
if (index == 0 && isNaN(Number(num[index])) && result[0] === ',') {
result.shift();
}
var element = num[index];
result.unshift(element);
if (!(counter % 3) && index != 0) {
......@@ -40,4 +43,4 @@ exports.delay = (function () {
timer = setTimeout(callback, ms);
};
})();
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInV0aWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxvQkFBMkIsSUFBVTtJQUNuQyxJQUFNLElBQUksR0FBRyxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7SUFDaEMsSUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLFFBQVEsRUFBRSxHQUFHLENBQUMsQ0FBQztJQUNsQyxJQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDM0IsSUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBQzdCLElBQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztJQUNqQyxJQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUM7SUFFakMsTUFBTSxDQUFDLENBQ0wsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDO1FBQzlDLEdBQUc7UUFDSCxDQUFDLElBQUksRUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FDbkQsQ0FBQztBQUNKLENBQUM7QUFiRCxnQ0FhQztBQUVELElBQU0sWUFBWSxHQUFHLFVBQUMsQ0FBUztJQUM3QixJQUFNLEdBQUcsR0FBRyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDekIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO0FBQ2xDLENBQUMsQ0FBQztBQUVXLFFBQUEsV0FBVyxHQUFHLFVBQUMsQ0FBUztJQUNuQyxJQUFNLEdBQUcsR0FBRyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3pCLElBQUksTUFBTSxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDNUIsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxHQUFHLEdBQUcsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2hELENBQUMsQ0FBQztBQUVGLElBQU0sU0FBUyxHQUFHLFVBQUMsR0FBVztJQUM1QixJQUFJLE1BQU0sR0FBRyxFQUFFLEVBQ2IsT0FBTyxHQUFHLENBQUMsQ0FBQztJQUNkLEdBQUcsQ0FBQyxDQUFDLElBQUksS0FBSyxHQUFHLEdBQUcsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLEtBQUssSUFBSSxDQUFDLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FBQztRQUNyRCxPQUFPLEVBQUUsQ0FBQztRQUNWLElBQU0sT0FBTyxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUMzQixNQUFNLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQ3hCLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPLEdBQUcsQ0FBQyxDQUFDLElBQUksS0FBSyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDakMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUN0QixDQUFDO0lBQ0gsQ0FBQztJQUNELE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0FBQ3pCLENBQUMsQ0FBQztBQUNXLFFBQUEsS0FBSyxHQUFHLENBQUM7SUFDcEIsSUFBSSxLQUFLLEdBQUcsQ0FBQyxDQUFDO0lBQ2QsTUFBTSxDQUFDLFVBQVMsUUFBb0IsRUFBRSxFQUFVO1FBQzlDLFlBQVksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUNwQixLQUFLLEdBQUcsVUFBVSxDQUFDLFFBQVEsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUNuQyxDQUFDLENBQUM7QUFDSixDQUFDLENBQUMsRUFBRSxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGZ1bmN0aW9uIGZvcm1hdFRpbWUoZGF0ZTogRGF0ZSk6IHN0cmluZyB7XG4gIGNvbnN0IHllYXIgPSBkYXRlLmdldEZ1bGxZZWFyKCk7XG4gIGNvbnN0IG1vbnRoID0gZGF0ZS5nZXRNb250aCgpICsgMTtcbiAgY29uc3QgZGF5ID0gZGF0ZS5nZXREYXRlKCk7XG4gIGNvbnN0IGhvdXIgPSBkYXRlLmdldEhvdXJzKCk7XG4gIGNvbnN0IG1pbnV0ZSA9IGRhdGUuZ2V0TWludXRlcygpO1xuICBjb25zdCBzZWNvbmQgPSBkYXRlLmdldFNlY29uZHMoKTtcblxuICByZXR1cm4gKFxuICAgIFt5ZWFyLCBtb250aCwgZGF5XS5tYXAoZm9ybWF0TnVtYmVyKS5qb2luKCctJykgK1xuICAgICcgJyArXG4gICAgW2hvdXIsIG1pbnV0ZSwgc2Vjb25kXS5tYXAoZm9ybWF0TnVtYmVyKS5qb2luKCc6JylcbiAgKTtcbn1cblxuY29uc3QgZm9ybWF0TnVtYmVyID0gKG46IG51bWJlcikgPT4ge1xuICBjb25zdCBzdHIgPSBuLnRvU3RyaW5nKCk7XG4gIHJldHVybiBzdHJbMV0gPyBzdHIgOiAnMCcgKyBzdHI7XG59O1xuXG5leHBvcnQgY29uc3QgZm9ybWF0UHJpY2UgPSAobjogbnVtYmVyKSA9PiB7XG4gIGNvbnN0IHN0ciA9IG4udG9GaXhlZCgyKTtcbiAgbGV0IHN0ckFyciA9IHN0ci5zcGxpdCgnLicpO1xuICByZXR1cm4gam9pbkNvbW1hKHN0ckFyclswXSkgKyAnLicgKyBzdHJBcnJbMV07XG59O1xuXG5jb25zdCBqb2luQ29tbWEgPSAobnVtOiBzdHJpbmcpID0+IHtcbiAgdmFyIHJlc3VsdCA9IFtdLFxuICAgIGNvdW50ZXIgPSAwO1xuICBmb3IgKGxldCBpbmRleCA9IG51bS5sZW5ndGggLSAxOyBpbmRleCA+PSAwOyBpbmRleC0tKSB7XG4gICAgY291bnRlcisrO1xuICAgIGNvbnN0IGVsZW1lbnQgPSBudW1baW5kZXhdO1xuICAgIHJlc3VsdC51bnNoaWZ0KGVsZW1lbnQpO1xuICAgIGlmICghKGNvdW50ZXIgJSAzKSAmJiBpbmRleCAhPSAwKSB7XG4gICAgICByZXN1bHQudW5zaGlmdCgnLCcpO1xuICAgIH1cbiAgfVxuICByZXR1cm4gcmVzdWx0LmpvaW4oJycpO1xufTtcbmV4cG9ydCBjb25zdCBkZWxheSA9IChmdW5jdGlvbigpIHtcbiAgbGV0IHRpbWVyID0gMDtcbiAgcmV0dXJuIGZ1bmN0aW9uKGNhbGxiYWNrOiAoKSA9PiB2b2lkLCBtczogbnVtYmVyKSB7XG4gICAgY2xlYXJUaW1lb3V0KHRpbWVyKTtcbiAgICB0aW1lciA9IHNldFRpbWVvdXQoY2FsbGJhY2ssIG1zKTtcbiAgfTtcbn0pKCk7XG4iXX0=
\ No newline at end of file
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInV0aWwudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxvQkFBMkIsSUFBVTtJQUNuQyxJQUFNLElBQUksR0FBRyxJQUFJLENBQUMsV0FBVyxFQUFFLENBQUM7SUFDaEMsSUFBTSxLQUFLLEdBQUcsSUFBSSxDQUFDLFFBQVEsRUFBRSxHQUFHLENBQUMsQ0FBQztJQUNsQyxJQUFNLEdBQUcsR0FBRyxJQUFJLENBQUMsT0FBTyxFQUFFLENBQUM7SUFDM0IsSUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLFFBQVEsRUFBRSxDQUFDO0lBQzdCLElBQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxVQUFVLEVBQUUsQ0FBQztJQUNqQyxJQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsVUFBVSxFQUFFLENBQUM7SUFFakMsTUFBTSxDQUFDLENBQ0wsQ0FBQyxJQUFJLEVBQUUsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxZQUFZLENBQUMsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDO1FBQzlDLEdBQUc7UUFDSCxDQUFDLElBQUksRUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FDbkQsQ0FBQztBQUNKLENBQUM7QUFiRCxnQ0FhQztBQUVELElBQU0sWUFBWSxHQUFHLFVBQUMsQ0FBUztJQUM3QixJQUFNLEdBQUcsR0FBRyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUM7SUFDekIsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxHQUFHLEdBQUcsR0FBRyxDQUFDO0FBQ2xDLENBQUMsQ0FBQztBQUVXLFFBQUEsV0FBVyxHQUFHLFVBQUMsQ0FBUztJQUNuQyxJQUFNLEdBQUcsR0FBRyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ3pCLElBQUksTUFBTSxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDNUIsTUFBTSxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxHQUFHLEdBQUcsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDO0FBQ2hELENBQUMsQ0FBQztBQUVGLElBQU0sU0FBUyxHQUFHLFVBQUMsR0FBVztJQUM1QixJQUFJLE1BQU0sR0FBRyxFQUFFLEVBQ2IsT0FBTyxHQUFHLENBQUMsQ0FBQztJQUNkLEdBQUcsQ0FBQyxDQUFDLElBQUksS0FBSyxHQUFHLEdBQUcsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFLEtBQUssSUFBSSxDQUFDLEVBQUUsS0FBSyxFQUFFLEVBQUUsQ0FBQztRQUNyRCxPQUFPLEVBQUUsQ0FBQztRQUNWLEVBQUUsQ0FBQyxDQUFDLEtBQUssSUFBSSxDQUFDLElBQUksS0FBSyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxJQUFJLE1BQU0sQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLENBQUMsQ0FBQyxDQUFDO1lBQ2pFLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNqQixDQUFDO1FBQ0QsSUFBTSxPQUFPLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzNCLE1BQU0sQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7UUFDeEIsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLE9BQU8sR0FBRyxDQUFDLENBQUMsSUFBSSxLQUFLLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUNqQyxNQUFNLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBQ3RCLENBQUM7SUFDSCxDQUFDO0lBQ0QsTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7QUFDekIsQ0FBQyxDQUFDO0FBQ1csUUFBQSxLQUFLLEdBQUcsQ0FBQztJQUNwQixJQUFJLEtBQUssR0FBRyxDQUFDLENBQUM7SUFDZCxNQUFNLENBQUMsVUFBUyxRQUFvQixFQUFFLEVBQVU7UUFDOUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQ3BCLEtBQUssR0FBRyxVQUFVLENBQUMsUUFBUSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ25DLENBQUMsQ0FBQztBQUNKLENBQUMsQ0FBQyxFQUFFLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgZnVuY3Rpb24gZm9ybWF0VGltZShkYXRlOiBEYXRlKTogc3RyaW5nIHtcbiAgY29uc3QgeWVhciA9IGRhdGUuZ2V0RnVsbFllYXIoKTtcbiAgY29uc3QgbW9udGggPSBkYXRlLmdldE1vbnRoKCkgKyAxO1xuICBjb25zdCBkYXkgPSBkYXRlLmdldERhdGUoKTtcbiAgY29uc3QgaG91ciA9IGRhdGUuZ2V0SG91cnMoKTtcbiAgY29uc3QgbWludXRlID0gZGF0ZS5nZXRNaW51dGVzKCk7XG4gIGNvbnN0IHNlY29uZCA9IGRhdGUuZ2V0U2Vjb25kcygpO1xuXG4gIHJldHVybiAoXG4gICAgW3llYXIsIG1vbnRoLCBkYXldLm1hcChmb3JtYXROdW1iZXIpLmpvaW4oJy0nKSArXG4gICAgJyAnICtcbiAgICBbaG91ciwgbWludXRlLCBzZWNvbmRdLm1hcChmb3JtYXROdW1iZXIpLmpvaW4oJzonKVxuICApO1xufVxuXG5jb25zdCBmb3JtYXROdW1iZXIgPSAobjogbnVtYmVyKSA9PiB7XG4gIGNvbnN0IHN0ciA9IG4udG9TdHJpbmcoKTtcbiAgcmV0dXJuIHN0clsxXSA/IHN0ciA6ICcwJyArIHN0cjtcbn07XG5cbmV4cG9ydCBjb25zdCBmb3JtYXRQcmljZSA9IChuOiBudW1iZXIpID0+IHtcbiAgY29uc3Qgc3RyID0gbi50b0ZpeGVkKDIpO1xuICBsZXQgc3RyQXJyID0gc3RyLnNwbGl0KCcuJyk7XG4gIHJldHVybiBqb2luQ29tbWEoc3RyQXJyWzBdKSArICcuJyArIHN0ckFyclsxXTtcbn07XG5cbmNvbnN0IGpvaW5Db21tYSA9IChudW06IHN0cmluZykgPT4ge1xuICB2YXIgcmVzdWx0ID0gW10sXG4gICAgY291bnRlciA9IDA7XG4gIGZvciAobGV0IGluZGV4ID0gbnVtLmxlbmd0aCAtIDE7IGluZGV4ID49IDA7IGluZGV4LS0pIHtcbiAgICBjb3VudGVyKys7XG4gICAgaWYgKGluZGV4ID09IDAgJiYgaXNOYU4oTnVtYmVyKG51bVtpbmRleF0pKSAmJiByZXN1bHRbMF0gPT09ICcsJykge1xuICAgICAgcmVzdWx0LnNoaWZ0KCk7XG4gICAgfVxuICAgIGNvbnN0IGVsZW1lbnQgPSBudW1baW5kZXhdO1xuICAgIHJlc3VsdC51bnNoaWZ0KGVsZW1lbnQpO1xuICAgIGlmICghKGNvdW50ZXIgJSAzKSAmJiBpbmRleCAhPSAwKSB7XG4gICAgICByZXN1bHQudW5zaGlmdCgnLCcpO1xuICAgIH1cbiAgfVxuICByZXR1cm4gcmVzdWx0LmpvaW4oJycpO1xufTtcbmV4cG9ydCBjb25zdCBkZWxheSA9IChmdW5jdGlvbigpIHtcbiAgbGV0IHRpbWVyID0gMDtcbiAgcmV0dXJuIGZ1bmN0aW9uKGNhbGxiYWNrOiAoKSA9PiB2b2lkLCBtczogbnVtYmVyKSB7XG4gICAgY2xlYXJUaW1lb3V0KHRpbWVyKTtcbiAgICB0aW1lciA9IHNldFRpbWVvdXQoY2FsbGJhY2ssIG1zKTtcbiAgfTtcbn0pKCk7XG4iXX0=
\ No newline at end of file
miniprogram/utils/util.ts
......@@ -29,6 +29,9 @@ const joinComma = (num: string) => {
counter = 0;
for (let index = num.length - 1; index >= 0; index--) {
counter++;
if (index == 0 && isNaN(Number(num[index])) && result[0] === ',') {
result.shift();
}
const element = num[index];
result.unshift(element);
if (!(counter % 3) && index != 0) {
......
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