Skip to content

W
wx-boss
Commit bf331da5 by 姜雷
Options

修改支付

parent 6f537cca
Showing with 380 additions and 29 deletions
miniprogram/pages/components/PlatformFeeChart/PlatformFeeChart.js
...@@ -46,6 +46,18 @@ function initChart(canvas, width, height, F2) { ...@@ -46,6 +46,18 @@ function initChart(canvas, width, height, F2) {
platforFeeChart.render(); platforFeeChart.render();
return platforFeeChart; return platforFeeChart;
} }
function findMaxIndex(list, key) {
if (!list.length)
return -1;
var max = list[0][key];
var maxIndex = 0;
for (var index = 0; index < list.length; index++) {
var element = list[index];
if (element >= max)
maxIndex = index;
}
return maxIndex;
}
Component({ Component({
properties: { properties: {
dataList: { dataList: {
...@@ -53,6 +65,12 @@ Component({ ...@@ -53,6 +65,12 @@ Component({
value: [], value: [],
observer: function (newVal) { observer: function (newVal) {
platforFeeChart && platforFeeChart.changeData(newVal); platforFeeChart && platforFeeChart.changeData(newVal);
var index = findMaxIndex(newVal, 'totalMoney');
if (index !== -1) {
var item = newVal[index];
var point = platforFeeChart.getPosition(item);
platforFeeChart.showTooltip(point);
}
}, },
}, },
month: { month: {
...@@ -68,5 +86,12 @@ Component({ ...@@ -68,5 +86,12 @@ Component({
onInit: initChart, onInit: initChart,
}, },
}, },
methods: {
clickHandle: function (e) {
console.log(e);
var obj = platforFeeChart.getRecord(e.detail);
this.triggerEvent('selectedData', obj);
},
},
}); });
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGxhdGZvcm1GZWVDaGFydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIlBsYXRmb3JtRmVlQ2hhcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUNBLElBQUksZUFBZSxHQUFHLElBQUksQ0FBQztBQUMzQixJQUFJLEtBQUssR0FBRyxFQUFFLENBQUM7QUFFZixtQkFBbUIsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsRUFBRTtJQUMxQyxJQUFNLElBQUksR0FBRyxFQUFFLENBQUM7SUFDaEIsZUFBZSxHQUFHLElBQUksRUFBRSxDQUFDLEtBQUssQ0FBQztRQUM3QixFQUFFLEVBQUUsTUFBTTtRQUNWLEtBQUssT0FBQTtRQUNMLE1BQU0sUUFBQTtLQUNQLENBQUMsQ0FBQztJQUVILGVBQWUsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFO1FBQzNCLElBQUksRUFBRTtZQUNKLEdBQUcsRUFBRSxDQUFDO1lBQ04sR0FBRyxFQUFFLEVBQUU7U0FDUjtLQUNGLENBQUMsQ0FBQztJQUNILGVBQWUsQ0FBQyxPQUFPLENBQUM7UUFDdEIsY0FBYyxFQUFFLEtBQUs7UUFDckIsVUFBVSxFQUFFO1lBQ1YsTUFBTSxFQUFFLENBQUM7WUFDVCxJQUFJLEVBQUUsU0FBUztZQUNmLE9BQU8sRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUM7U0FDakI7UUFDRCxNQUFNLFlBQUMsRUFBRTtZQUNDLElBQUEsZ0JBQUssQ0FBUTtZQUNyQixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUNuQixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLEtBQUssR0FBRyxHQUFHLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQztZQUM5QyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUNuQixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsR0FBRyxDQUFDO1FBQ3hDLENBQUM7S0FDRixDQUFDLENBQUM7SUFDSCxlQUFlO1NBQ1osSUFBSSxFQUFFO1NBQ04sUUFBUSxDQUFDLGtCQUFrQixDQUFDO1NBQzVCLEtBQUssQ0FBQyxTQUFTLENBQUM7U0FDaEIsS0FBSyxDQUFDLFFBQVEsQ0FBQztTQUNmLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNYLGVBQWU7U0FDWixJQUFJLEVBQUU7U0FDTixRQUFRLENBQUMsa0JBQWtCLENBQUM7U0FDNUIsS0FBSyxDQUFDLHdCQUF3QixDQUFDO1NBQy9CLEtBQUssQ0FBQyxRQUFRLENBQUM7U0FDZixLQUFLLENBQUM7UUFDTCxXQUFXLEVBQUUsR0FBRztLQUNqQixDQUFDLENBQUM7SUFFTCxlQUFlLENBQUMsTUFBTSxFQUFFLENBQUM7SUFDekIsTUFBTSxDQUFDLGVBQWUsQ0FBQztBQUN6QixDQUFDO0FBRUQsU0FBUyxDQUFDO0lBQ1IsVUFBVSxFQUFFO1FBQ1YsUUFBUSxFQUFFO1lBQ1IsSUFBSSxFQUFFLEtBQUs7WUFDWCxLQUFLLEVBQUUsRUFBRTtZQUNULFFBQVEsWUFBQyxNQUFNO2dCQUNiLGVBQWUsSUFBSSxlQUFlLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQ3hELENBQUM7U0FDRjtRQUNELEtBQUssRUFBRTtZQUNMLElBQUksRUFBRSxNQUFNO1lBQ1osS0FBSyxFQUFFLEVBQUU7WUFDVCxRQUFRLFlBQUMsTUFBTTtnQkFDYixLQUFLLEdBQUcsTUFBTSxDQUFDO1lBQ2pCLENBQUM7U0FDRjtLQUNGO0lBQ0QsSUFBSSxFQUFFO1FBQ0osSUFBSSxFQUFFO1lBQ0osTUFBTSxFQUFFLFNBQVM7U0FDbEI7S0FDRjtDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIi8vIHBhZ2VzL2NvbXBvbmVudHMvUGxhdGZvcm1GZWVDaGFydC9QbGF0Zm9ybUZlZUNoYXJ0LmpzXG5sZXQgcGxhdGZvckZlZUNoYXJ0ID0gbnVsbDtcbmxldCBtb250aCA9ICcnO1xuXG5mdW5jdGlvbiBpbml0Q2hhcnQoY2FudmFzLCB3aWR0aCwgaGVpZ2h0LCBGMikge1xuICBjb25zdCBkYXRhID0gW107XG4gIHBsYXRmb3JGZWVDaGFydCA9IG5ldyBGMi5DaGFydCh7XG4gICAgZWw6IGNhbnZhcyxcbiAgICB3aWR0aCxcbiAgICBoZWlnaHQsXG4gIH0pO1xuXG4gIHBsYXRmb3JGZWVDaGFydC5zb3VyY2UoZGF0YSwge1xuICAgIGRheXM6IHtcbiAgICAgIG1pbjogMSxcbiAgICAgIG1heDogMTIsXG4gICAgfSxcbiAgfSk7XG4gIHBsYXRmb3JGZWVDaGFydC50b29sdGlwKHtcbiAgICBzaG93SXRlbU1hcmtlcjogZmFsc2UsXG4gICAgYmFja2dyb3VuZDoge1xuICAgICAgcmFkaXVzOiAyLFxuICAgICAgZmlsbDogJyM2ODk1ZmUnLFxuICAgICAgcGFkZGluZzogWzYsIDEwXSxcbiAgICB9LFxuICAgIG9uU2hvdyhldikge1xuICAgICAgY29uc3QgeyBpdGVtcyB9ID0gZXY7XG4gICAgICBpdGVtc1swXS5uYW1lID0gJyc7XG4gICAgICBpdGVtc1swXS52YWx1ZSA9IG1vbnRoICsgJy0nICsgaXRlbXNbMF0udGl0bGU7XG4gICAgICBpdGVtc1sxXS5uYW1lID0gJyc7XG4gICAgICBpdGVtc1sxXS52YWx1ZSA9IGl0ZW1zWzFdLnZhbHVlICsgJ+WFgyc7XG4gICAgfSxcbiAgfSk7XG4gIHBsYXRmb3JGZWVDaGFydFxuICAgIC5saW5lKClcbiAgICAucG9zaXRpb24oJ21vbnRoKnRvdGFsTW9uZXknKVxuICAgIC5jb2xvcignIzY4OTVmZScpXG4gICAgLnNoYXBlKCdzbW9vdGgnKVxuICAgIC5zaXplKDQpO1xuICBwbGF0Zm9yRmVlQ2hhcnRcbiAgICAuYXJlYSgpXG4gICAgLnBvc2l0aW9uKCdtb250aCp0b3RhbE1vbmV5JylcbiAgICAuY29sb3IoJ2woOTApIDA6IzY4OTVmZSAxOiNmZmYnKVxuICAgIC5zaGFwZSgnc21vb3RoJylcbiAgICAuc3R5bGUoe1xuICAgICAgZmlsbE9wYWNpdHk6IDAuNixcbiAgICB9KTtcbiAgLy8gcGxhdGZvckZlZUNoYXJ0LmF4aXMoJ3JlY2hhcmdlTW9uZXknLCBmYWxzZSk7XG4gIHBsYXRmb3JGZWVDaGFydC5yZW5kZXIoKTtcbiAgcmV0dXJuIHBsYXRmb3JGZWVDaGFydDtcbn1cblxuQ29tcG9uZW50KHtcbiAgcHJvcGVydGllczoge1xuICAgIGRhdGFMaXN0OiB7XG4gICAgICB0eXBlOiBBcnJheSxcbiAgICAgIHZhbHVlOiBbXSxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICBwbGF0Zm9yRmVlQ2hhcnQgJiYgcGxhdGZvckZlZUNoYXJ0LmNoYW5nZURhdGEobmV3VmFsKTtcbiAgICAgIH0sXG4gICAgfSxcbiAgICBtb250aDoge1xuICAgICAgdHlwZTogU3RyaW5nLFxuICAgICAgdmFsdWU6ICcnLFxuICAgICAgb2JzZXJ2ZXIobmV3VmFsKSB7XG4gICAgICAgIG1vbnRoID0gbmV3VmFsO1xuICAgICAgfSxcbiAgICB9LFxuICB9LFxuICBkYXRhOiB7XG4gICAgb3B0czoge1xuICAgICAgb25Jbml0OiBpbml0Q2hhcnQsXG4gICAgfSxcbiAgfSxcbn0pO1xuIl19 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGxhdGZvcm1GZWVDaGFydC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIlBsYXRmb3JtRmVlQ2hhcnQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUNBLElBQUksZUFBZSxHQUFHLElBQUksQ0FBQztBQUMzQixJQUFJLEtBQUssR0FBRyxFQUFFLENBQUM7QUFFZixtQkFBbUIsTUFBTSxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsRUFBRTtJQUMxQyxJQUFNLElBQUksR0FBRyxFQUFFLENBQUM7SUFDaEIsZUFBZSxHQUFHLElBQUksRUFBRSxDQUFDLEtBQUssQ0FBQztRQUM3QixFQUFFLEVBQUUsTUFBTTtRQUNWLEtBQUssT0FBQTtRQUNMLE1BQU0sUUFBQTtLQUNQLENBQUMsQ0FBQztJQUVILGVBQWUsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFO1FBQzNCLElBQUksRUFBRTtZQUNKLEdBQUcsRUFBRSxDQUFDO1lBQ04sR0FBRyxFQUFFLEVBQUU7U0FDUjtLQUNGLENBQUMsQ0FBQztJQUNILGVBQWUsQ0FBQyxPQUFPLENBQUM7UUFDdEIsY0FBYyxFQUFFLEtBQUs7UUFDckIsVUFBVSxFQUFFO1lBQ1YsTUFBTSxFQUFFLENBQUM7WUFDVCxJQUFJLEVBQUUsU0FBUztZQUNmLE9BQU8sRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUM7U0FDakI7UUFDRCxNQUFNLFlBQUMsRUFBRTtZQUNDLElBQUEsZ0JBQUssQ0FBUTtZQUNyQixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUNuQixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLEtBQUssR0FBRyxHQUFHLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQztZQUM5QyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsSUFBSSxHQUFHLEVBQUUsQ0FBQztZQUNuQixLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLEdBQUcsR0FBRyxDQUFDO1FBQ3hDLENBQUM7S0FDRixDQUFDLENBQUM7SUFDSCxlQUFlO1NBQ1osSUFBSSxFQUFFO1NBQ04sUUFBUSxDQUFDLGtCQUFrQixDQUFDO1NBQzVCLEtBQUssQ0FBQyxTQUFTLENBQUM7U0FDaEIsS0FBSyxDQUFDLFFBQVEsQ0FBQztTQUNmLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUNYLGVBQWU7U0FDWixJQUFJLEVBQUU7U0FDTixRQUFRLENBQUMsa0JBQWtCLENBQUM7U0FDNUIsS0FBSyxDQUFDLHdCQUF3QixDQUFDO1NBQy9CLEtBQUssQ0FBQyxRQUFRLENBQUM7U0FDZixLQUFLLENBQUM7UUFDTCxXQUFXLEVBQUUsR0FBRztLQUNqQixDQUFDLENBQUM7SUFFTCxlQUFlLENBQUMsTUFBTSxFQUFFLENBQUM7SUFDekIsTUFBTSxDQUFDLGVBQWUsQ0FBQztBQUN6QixDQUFDO0FBRUQsc0JBQXNCLElBQUksRUFBRSxHQUFHO0lBQzdCLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQztRQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUM1QixJQUFJLEdBQUcsR0FBRyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDdkIsSUFBSSxRQUFRLEdBQUcsQ0FBQyxDQUFDO0lBQ2pCLEdBQUcsQ0FBQyxDQUFDLElBQUksS0FBSyxHQUFHLENBQUMsRUFBRSxLQUFLLEdBQUcsSUFBSSxDQUFDLE1BQU0sRUFBRSxLQUFLLEVBQUUsRUFBRSxDQUFDO1FBQ2pELElBQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztRQUM1QixFQUFFLENBQUMsQ0FBQyxPQUFPLElBQUksR0FBRyxDQUFDO1lBQUMsUUFBUSxHQUFHLEtBQUssQ0FBQztJQUN2QyxDQUFDO0lBQ0QsTUFBTSxDQUFDLFFBQVEsQ0FBQztBQUNsQixDQUFDO0FBRUQsU0FBUyxDQUFDO0lBQ1IsVUFBVSxFQUFFO1FBQ1YsUUFBUSxFQUFFO1lBQ1IsSUFBSSxFQUFFLEtBQUs7WUFDWCxLQUFLLEVBQUUsRUFBRTtZQUNULFFBQVEsWUFBQyxNQUFNO2dCQUNiLGVBQWUsSUFBSSxlQUFlLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDO2dCQUN0RCxJQUFJLEtBQUssR0FBRyxZQUFZLENBQUMsTUFBTSxFQUFFLFlBQVksQ0FBQyxDQUFDO2dCQUMvQyxFQUFFLENBQUMsQ0FBQyxLQUFLLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO29CQUNqQixJQUFJLElBQUksR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7b0JBQ3pCLElBQU0sS0FBSyxHQUFHLGVBQWUsQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLENBQUM7b0JBQ2hELGVBQWUsQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLENBQUM7Z0JBQ3JDLENBQUM7WUFDSCxDQUFDO1NBQ0Y7UUFDRCxLQUFLLEVBQUU7WUFDTCxJQUFJLEVBQUUsTUFBTTtZQUNaLEtBQUssRUFBRSxFQUFFO1lBQ1QsUUFBUSxZQUFDLE1BQU07Z0JBQ2IsS0FBSyxHQUFHLE1BQU0sQ0FBQztZQUNqQixDQUFDO1NBQ0Y7S0FDRjtJQUNELElBQUksRUFBRTtRQUNKLElBQUksRUFBRTtZQUNKLE1BQU0sRUFBRSxTQUFTO1NBQ2xCO0tBQ0Y7SUFDRCxPQUFPLEVBQUU7UUFDUCxXQUFXLFlBQUMsQ0FBQztZQUNYLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFFZixJQUFNLEdBQUcsR0FBRyxlQUFlLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUNoRCxJQUFJLENBQUMsWUFBWSxDQUFDLGNBQWMsRUFBRSxHQUFHLENBQUMsQ0FBQztRQUN6QyxDQUFDO0tBQ0Y7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyIvLyBwYWdlcy9jb21wb25lbnRzL1BsYXRmb3JtRmVlQ2hhcnQvUGxhdGZvcm1GZWVDaGFydC5qc1xubGV0IHBsYXRmb3JGZWVDaGFydCA9IG51bGw7XG5sZXQgbW9udGggPSAnJztcblxuZnVuY3Rpb24gaW5pdENoYXJ0KGNhbnZhcywgd2lkdGgsIGhlaWdodCwgRjIpIHtcbiAgY29uc3QgZGF0YSA9IFtdO1xuICBwbGF0Zm9yRmVlQ2hhcnQgPSBuZXcgRjIuQ2hhcnQoe1xuICAgIGVsOiBjYW52YXMsXG4gICAgd2lkdGgsXG4gICAgaGVpZ2h0LFxuICB9KTtcblxuICBwbGF0Zm9yRmVlQ2hhcnQuc291cmNlKGRhdGEsIHtcbiAgICBkYXlzOiB7XG4gICAgICBtaW46IDEsXG4gICAgICBtYXg6IDEyLFxuICAgIH0sXG4gIH0pO1xuICBwbGF0Zm9yRmVlQ2hhcnQudG9vbHRpcCh7XG4gICAgc2hvd0l0ZW1NYXJrZXI6IGZhbHNlLFxuICAgIGJhY2tncm91bmQ6IHtcbiAgICAgIHJhZGl1czogMixcbiAgICAgIGZpbGw6ICcjNjg5NWZlJyxcbiAgICAgIHBhZGRpbmc6IFs2LCAxMF0sXG4gICAgfSxcbiAgICBvblNob3coZXYpIHtcbiAgICAgIGNvbnN0IHsgaXRlbXMgfSA9IGV2O1xuICAgICAgaXRlbXNbMF0ubmFtZSA9ICcnO1xuICAgICAgaXRlbXNbMF0udmFsdWUgPSBtb250aCArICctJyArIGl0ZW1zWzBdLnRpdGxlO1xuICAgICAgaXRlbXNbMV0ubmFtZSA9ICcnO1xuICAgICAgaXRlbXNbMV0udmFsdWUgPSBpdGVtc1sxXS52YWx1ZSArICflhYMnO1xuICAgIH0sXG4gIH0pO1xuICBwbGF0Zm9yRmVlQ2hhcnRcbiAgICAubGluZSgpXG4gICAgLnBvc2l0aW9uKCdtb250aCp0b3RhbE1vbmV5JylcbiAgICAuY29sb3IoJyM2ODk1ZmUnKVxuICAgIC5zaGFwZSgnc21vb3RoJylcbiAgICAuc2l6ZSg0KTtcbiAgcGxhdGZvckZlZUNoYXJ0XG4gICAgLmFyZWEoKVxuICAgIC5wb3NpdGlvbignbW9udGgqdG90YWxNb25leScpXG4gICAgLmNvbG9yKCdsKDkwKSAwOiM2ODk1ZmUgMTojZmZmJylcbiAgICAuc2hhcGUoJ3Ntb290aCcpXG4gICAgLnN0eWxlKHtcbiAgICAgIGZpbGxPcGFjaXR5OiAwLjYsXG4gICAgfSk7XG4gIC8vIHBsYXRmb3JGZWVDaGFydC5heGlzKCdyZWNoYXJnZU1vbmV5JywgZmFsc2UpO1xuICBwbGF0Zm9yRmVlQ2hhcnQucmVuZGVyKCk7XG4gIHJldHVybiBwbGF0Zm9yRmVlQ2hhcnQ7XG59XG5cbmZ1bmN0aW9uIGZpbmRNYXhJbmRleChsaXN0LCBrZXkpIHtcbiAgaWYgKCFsaXN0Lmxlbmd0aCkgcmV0dXJuIC0xO1xuICBsZXQgbWF4ID0gbGlzdFswXVtrZXldO1xuICBsZXQgbWF4SW5kZXggPSAwO1xuICBmb3IgKGxldCBpbmRleCA9IDA7IGluZGV4IDwgbGlzdC5sZW5ndGg7IGluZGV4KyspIHtcbiAgICBjb25zdCBlbGVtZW50ID0gbGlzdFtpbmRleF07XG4gICAgaWYgKGVsZW1lbnQgPj0gbWF4KSBtYXhJbmRleCA9IGluZGV4O1xuICB9XG4gIHJldHVybiBtYXhJbmRleDtcbn1cblxuQ29tcG9uZW50KHtcbiAgcHJvcGVydGllczoge1xuICAgIGRhdGFMaXN0OiB7XG4gICAgICB0eXBlOiBBcnJheSxcbiAgICAgIHZhbHVlOiBbXSxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICBwbGF0Zm9yRmVlQ2hhcnQgJiYgcGxhdGZvckZlZUNoYXJ0LmNoYW5nZURhdGEobmV3VmFsKTtcbiAgICAgICAgbGV0IGluZGV4ID0gZmluZE1heEluZGV4KG5ld1ZhbCwgJ3RvdGFsTW9uZXknKTtcbiAgICAgICAgaWYgKGluZGV4ICE9PSAtMSkge1xuICAgICAgICAgIGxldCBpdGVtID0gbmV3VmFsW2luZGV4XTtcbiAgICAgICAgICBjb25zdCBwb2ludCA9IHBsYXRmb3JGZWVDaGFydC5nZXRQb3NpdGlvbihpdGVtKTtcbiAgICAgICAgICBwbGF0Zm9yRmVlQ2hhcnQuc2hvd1Rvb2x0aXAocG9pbnQpO1xuICAgICAgICB9XG4gICAgICB9LFxuICAgIH0sXG4gICAgbW9udGg6IHtcbiAgICAgIHR5cGU6IFN0cmluZyxcbiAgICAgIHZhbHVlOiAnJyxcbiAgICAgIG9ic2VydmVyKG5ld1ZhbCkge1xuICAgICAgICBtb250aCA9IG5ld1ZhbDtcbiAgICAgIH0sXG4gICAgfSxcbiAgfSxcbiAgZGF0YToge1xuICAgIG9wdHM6IHtcbiAgICAgIG9uSW5pdDogaW5pdENoYXJ0LFxuICAgIH0sXG4gIH0sXG4gIG1ldGhvZHM6IHtcbiAgICBjbGlja0hhbmRsZShlKSB7XG4gICAgICBjb25zb2xlLmxvZyhlKTtcbiAgICAgIC8vIGxldFxuICAgICAgY29uc3Qgb2JqID0gcGxhdGZvckZlZUNoYXJ0LmdldFJlY29yZChlLmRldGFpbCk7XG4gICAgICB0aGlzLnRyaWdnZXJFdmVudCgnc2VsZWN0ZWREYXRhJywgb2JqKTtcbiAgICB9LFxuICB9LFxufSk7XG4iXX0=
\ No newline at end of file \ No newline at end of file
miniprogram/pages/components/PlatformFeeChart/PlatformFeeChart.ts
...@@ -50,6 +50,17 @@ function initChart(canvas, width, height, F2) { ...@@ -50,6 +50,17 @@ function initChart(canvas, width, height, F2) {
return platforFeeChart; return platforFeeChart;
} }
function findMaxIndex(list, key) {
if (!list.length) return -1;
let max = list[0][key];
let maxIndex = 0;
for (let index = 0; index < list.length; index++) {
const element = list[index];
if (element >= max) maxIndex = index;
}
return maxIndex;
}
Component({ Component({
properties: { properties: {
dataList: { dataList: {
...@@ -57,6 +68,12 @@ Component({ ...@@ -57,6 +68,12 @@ Component({
value: [], value: [],
observer(newVal) { observer(newVal) {
platforFeeChart && platforFeeChart.changeData(newVal); platforFeeChart && platforFeeChart.changeData(newVal);
let index = findMaxIndex(newVal, 'totalMoney');
if (index !== -1) {
let item = newVal[index];
const point = platforFeeChart.getPosition(item);
platforFeeChart.showTooltip(point);
}
}, },
}, },
month: { month: {
...@@ -72,4 +89,12 @@ Component({ ...@@ -72,4 +89,12 @@ Component({
onInit: initChart, onInit: initChart,
}, },
}, },
methods: {
clickHandle(e) {
console.log(e);
// let
const obj = platforFeeChart.getRecord(e.detail);
this.triggerEvent('selectedData', obj);
},
},
}); });
miniprogram/pages/components/PlatformFeeChart/PlatformFeeChart.wxml
<!-- pages/components/PlatformFeeChart/PlatformFeeChart.wxml --> <!-- pages/components/PlatformFeeChart/PlatformFeeChart.wxml -->
<ff-canvas id="PlatformFeeChart" canvas-id="PlatformFeeChart" opts="{{ opts }}" /> <ff-canvas id="PlatformFeeChart" canvas-id="PlatformFeeChart" opts="{{ opts }}" bind:tap="clickHandle" />
\ No newline at end of file \ No newline at end of file
miniprogram/pages/components/PlatformFeeDialog/PlatformFeeDialog.js
...@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); ...@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
var fetch_1 = require("../../../api/fetch"); var fetch_1 = require("../../../api/fetch");
var app = getApp(); var app = getApp();
var timer = null; var timer = null;
var fetchedPlatform = false;
Component({ Component({
lifetimes: { lifetimes: {
attached: function () { attached: function () {
...@@ -10,7 +11,9 @@ Component({ ...@@ -10,7 +11,9 @@ Component({
this.setData({ this.setData({
userInfo: app.globalData.userInfo, userInfo: app.globalData.userInfo,
}); });
this.data.eventType === 'slef' && this.fetchPlatformFee(); this.data.eventType === 'slef' &&
!fetchedPlatform &&
this.fetchPlatformFee();
}, },
}, },
properties: { properties: {
...@@ -49,6 +52,7 @@ Component({ ...@@ -49,6 +52,7 @@ Component({
payTimeLimit: payTimeLimit, payTimeLimit: payTimeLimit,
showDialog: rechargeBalance > 0 ? true : false, showDialog: rechargeBalance > 0 ? true : false,
}); });
fetchedPlatform = true;
}) })
.catch(function (err) { .catch(function (err) {
console.log(err); console.log(err);
...@@ -60,7 +64,80 @@ Component({ ...@@ -60,7 +64,80 @@ Component({
}); });
}, },
fetchRechargeInfo: function () { fetchRechargeInfo: function () {
var _this = this;
console.log('in fetchRechargeInfo'); console.log('in fetchRechargeInfo');
wx.showLoading({
title: '',
});
wx.login({
success: function (res) {
if (res.code) {
var entity = {
billType: _this.data.billType,
isAgree: 1,
jsCode: res.code,
operateId: _this.data.userInfo.operateId,
operateName: _this.data.userInfo.operateName,
rechargeType: '2',
type: 2,
};
fetch_1.operatorFetch({
url: '/operateBalance/rechage/order/formini',
method: 'POST',
data: entity,
})
.then(function (res) {
console.log(res);
var payInfo = res.payInfo;
wx.requestPayment({
timeStamp: payInfo.timeStamp,
nonceStr: payInfo.nonceStr,
package: payInfo.package,
signType: payInfo.signType,
paySign: payInfo.paySign,
success: function (res) {
console.log(res);
wx.showToast({
title: '支付成功！',
});
_this.setData({
showDialog: false,
});
},
fail: function (res) {
console.log(res);
wx.showToast({
title: '支付失败！',
icon: 'none',
});
},
});
})
.catch(function (err) {
console.log(err);
wx.hideLoading();
wx.showToast({
title: err.msg || '请求失败',
icon: 'none',
});
});
}
else {
wx.hideLoading();
wx.showToast({
title: res.errMsg || '请求失败',
icon: 'none',
});
}
},
fail: function (res) {
wx.hideLoading();
wx.showToast({
title: res.errMsg || '请求失败',
icon: 'none',
});
},
});
}, },
goRecordsPage: function () { goRecordsPage: function () {
wx.navigateTo({ wx.navigateTo({
...@@ -95,12 +172,15 @@ Component({ ...@@ -95,12 +172,15 @@ Component({
wx.showLoading({ wx.showLoading({
title: '', title: '',
}); });
wx.login({
success: function (res) {
if (res.code) {
var entity = { var entity = {
billType: this.data.billType, billType: _this.data.billType,
isAgree: 1, isAgree: 1,
jsCode: 'string', jsCode: 'string',
operateId: this.data.userInfo.operateId, operateId: _this.data.userInfo.operateId,
operateName: this.data.userInfo.operateName, operateName: _this.data.userInfo.operateName,
rechargeType: '2', rechargeType: '2',
type: 2, type: 2,
}; };
...@@ -119,6 +199,11 @@ Component({ ...@@ -119,6 +199,11 @@ Component({
var count = _this.data.countDown; var count = _this.data.countDown;
if (count === 0) { if (count === 0) {
clearInterval(timer); clearInterval(timer);
_this.setData({
payQrUrl: '',
countDown: 600,
countDownString: '0秒',
});
} }
else { else {
var newCount = count - 1; var newCount = count - 1;
...@@ -138,7 +223,25 @@ Component({ ...@@ -138,7 +223,25 @@ Component({
}); });
console.log(err); console.log(err);
}); });
}
else {
wx.hideLoading();
wx.showToast({
title: res.errMsg || '请求失败',
icon: 'none',
});
}
},
fail: function (res) {
console.log(res);
wx.hideLoading();
wx.showToast({
title: res.errMsg || '请求失败',
icon: 'none',
});
},
});
}, },
}, },
}); });
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PlatformFeeDialog.js","sourceRoot":"","sources":["PlatformFeeDialog.ts"],"names":[],"mappings":"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","sourcesContent":["import { operatorFetch } from '../../../api/fetch';\nimport { IMyApp } from '../../../app';\n\nconst app = getApp<IMyApp>();\nlet timer = null;\n// pages/components/PlatformFeeDialog/PlatformFeeDialog.js\nComponent({\n  lifetimes: {\n    attached() {\n      console.log(app.globalData.userInfo);\n      this.setData!({\n        userInfo: app.globalData.userInfo,\n      });\n      this.data.eventType === 'slef' && this.fetchPlatformFee();\n    },\n  },\n  /**\n   * 组件的属性列表\n   */\n  properties: {\n    eventType: { type: String, value: 'slef' },\n  },\n\n  /**\n   * 组件的初始数据\n   */\n  data: {\n    userInfo: app.globalData.userInfo,\n    showDialog: false,\n    type: 1, // 1 支付 2 扫码\n    isSkip: 0,\n    rechargeBalance: 0,\n    payTimeLimit: 0,\n    billType: '0',\n    payQrUrl: '',\n    countDown: 600,\n    countDownString: '10分00秒',\n  },\n\n  /**\n   * 组件的方法列表\n   */\n  methods: {\n    fetchPlatformFee() {\n      operatorFetch({\n        url: '/operateBalance/rechage/initdata',\n        method: 'POST',\n        data: {\n          operateId: this.data.userInfo.operateId,\n          operateName: this.data.userInfo.operateName,\n          position: 3,\n          type: 2,\n        },\n      })\n        .then(res => {\n          const { isSkip, rechargeBalance, payTimeLimit } = res;\n          this.setData({\n            isSkip,\n            rechargeBalance,\n            payTimeLimit,\n            showDialog: rechargeBalance > 0 ? true : false,\n          });\n        })\n        .catch(err => {\n          console.log(err);\n        });\n    },\n    cancelShow() {\n      this.setData({\n        showDialog: false,\n      });\n    },\n    fetchRechargeInfo() {\n      console.log('in fetchRechargeInfo');\n    },\n    goRecordsPage() {\n      wx.navigateTo({\n        url: '/pages/platformFeeRecord/platformFeeRecord',\n      });\n    },\n    toggleType() {\n      let type = this.data.type;\n      this.setData({\n        type: type === 1 ? 2 : 1,\n      });\n      if (type === 1) {\n        this.fetchRechargeOrderQRcode();\n      } else {\n        timer && clearInterval(timer);\n        this.setData({\n          countDown: 600,\n          countDownString: '',\n        });\n      }\n    },\n    checkBillType(e) {\n      console.log(e);\n      const { value } = e.currentTarget.dataset;\n      this.setData({\n        billType: value,\n      });\n    },\n    fetchRechargeOrderQRcode() {\n      wx.showLoading({\n        title: '',\n      });\n      const entity = {\n        billType: this.data.billType,\n        isAgree: 1,\n        jsCode: 'string',\n        operateId: this.data.userInfo.operateId,\n        operateName: this.data.userInfo.operateName,\n        rechargeType: '2',\n        type: 2,\n      };\n      operatorFetch({\n        url: '/operateBalance/rechage/order/formini',\n        method: 'POST',\n        data: entity,\n      })\n        .then(res => {\n          wx.hideLoading();\n          const { payQrUrl } = res;\n          this.setData({\n            payQrUrl,\n          });\n          timer = setInterval(() => {\n            let count = this.data.countDown;\n            if (count === 0) {\n              clearInterval(timer);\n            } else {\n              let newCount = count - 1;\n              let countString =\n                Math.floor(newCount / 60) + '分' + (newCount % 60) + '秒';\n              this.setData({\n                countDown: newCount,\n                countDownString: countString,\n              });\n            }\n          }, 1000);\n        })\n        .catch(err => {\n          wx.hideLoading();\n          wx.showToast({\n            title: err.msg || '请求失败',\n            icon: 'none',\n          });\n          console.log(err);\n        });\n    },\n  },\n});\n"]} //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PlatformFeeDialog.js","sourceRoot":"","sources":["PlatformFeeDialog.ts"],"names":[],"mappings":"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","sourcesContent":["import { operatorFetch } from '../../../api/fetch';\nimport { IMyApp } from '../../../app';\n\nconst app = getApp<IMyApp>();\nlet timer = null;\nlet fetchedPlatform = false;\n// pages/components/PlatformFeeDialog/PlatformFeeDialog.js\nComponent({\n  lifetimes: {\n    attached() {\n      console.log(app.globalData.userInfo);\n      this.setData!({\n        userInfo: app.globalData.userInfo,\n      });\n      this.data.eventType === 'slef' &&\n        !fetchedPlatform &&\n        this.fetchPlatformFee();\n    },\n  },\n  /**\n   * 组件的属性列表\n   */\n  properties: {\n    eventType: { type: String, value: 'slef' },\n  },\n\n  /**\n   * 组件的初始数据\n   */\n  data: {\n    userInfo: app.globalData.userInfo,\n    showDialog: false,\n    type: 1, // 1 支付 2 扫码\n    isSkip: 0,\n    rechargeBalance: 0,\n    payTimeLimit: 0,\n    billType: '0',\n    payQrUrl: '',\n    countDown: 600,\n    countDownString: '10分00秒',\n  },\n\n  /**\n   * 组件的方法列表\n   */\n  methods: {\n    fetchPlatformFee() {\n      operatorFetch({\n        url: '/operateBalance/rechage/initdata',\n        method: 'POST',\n        data: {\n          operateId: this.data.userInfo.operateId,\n          operateName: this.data.userInfo.operateName,\n          position: 3,\n          type: 2,\n        },\n      })\n        .then(res => {\n          const { isSkip, rechargeBalance, payTimeLimit } = res;\n          this.setData({\n            isSkip,\n            rechargeBalance,\n            payTimeLimit,\n            showDialog: rechargeBalance > 0 ? true : false,\n          });\n          fetchedPlatform = true;\n        })\n        .catch(err => {\n          console.log(err);\n        });\n    },\n    cancelShow() {\n      this.setData({\n        showDialog: false,\n      });\n    },\n    fetchRechargeInfo() {\n      console.log('in fetchRechargeInfo');\n      wx.showLoading({\n        title: '',\n      });\n      wx.login({\n        success: res => {\n          if (res.code) {\n            const entity = {\n              billType: this.data.billType,\n              isAgree: 1,\n              jsCode: res.code,\n              operateId: this.data.userInfo.operateId,\n              operateName: this.data.userInfo.operateName,\n              rechargeType: '2',\n              type: 2,\n            };\n            operatorFetch({\n              url: '/operateBalance/rechage/order/formini',\n              method: 'POST',\n              data: entity,\n            })\n              .then(res => {\n                console.log(res);\n                const { payInfo } = res;\n                wx.requestPayment({\n                  timeStamp: payInfo.timeStamp,\n                  nonceStr: payInfo.nonceStr,\n                  package: payInfo.package,\n                  signType: payInfo.signType,\n                  paySign: payInfo.paySign,\n                  success: res => {\n                    console.log(res);\n                    wx.showToast({\n                      title: '支付成功！',\n                    });\n                    this.setData({\n                      showDialog: false,\n                    });\n                  },\n                  fail(res) {\n                    console.log(res);\n                    wx.showToast({\n                      title: '支付失败！',\n                      icon: 'none',\n                    });\n                  },\n                });\n              })\n              .catch(err => {\n                console.log(err);\n                wx.hideLoading();\n                wx.showToast({\n                  title: err.msg || '请求失败',\n                  icon: 'none',\n                });\n              });\n          } else {\n            wx.hideLoading();\n            wx.showToast({\n              title: res.errMsg || '请求失败',\n              icon: 'none',\n            });\n          }\n        },\n        fail(res) {\n          wx.hideLoading();\n          wx.showToast({\n            title: res.errMsg || '请求失败',\n            icon: 'none',\n          });\n        },\n      });\n    },\n    goRecordsPage() {\n      wx.navigateTo({\n        url: '/pages/platformFeeRecord/platformFeeRecord',\n      });\n    },\n    toggleType() {\n      let type = this.data.type;\n      this.setData({\n        type: type === 1 ? 2 : 1,\n      });\n      if (type === 1) {\n        this.fetchRechargeOrderQRcode();\n      } else {\n        timer && clearInterval(timer);\n        this.setData({\n          countDown: 600,\n          countDownString: '',\n        });\n      }\n    },\n    checkBillType(e) {\n      console.log(e);\n      const { value } = e.currentTarget.dataset;\n      this.setData({\n        billType: value,\n      });\n    },\n    fetchRechargeOrderQRcode() {\n      wx.showLoading({\n        title: '',\n      });\n      wx.login({\n        success: res => {\n          if (res.code) {\n            const entity = {\n              billType: this.data.billType,\n              isAgree: 1,\n              jsCode: 'string',\n              operateId: this.data.userInfo.operateId,\n              operateName: this.data.userInfo.operateName,\n              rechargeType: '2',\n              type: 2,\n            };\n            operatorFetch({\n              url: '/operateBalance/rechage/order/formini',\n              method: 'POST',\n              data: entity,\n            })\n              .then(res => {\n                wx.hideLoading();\n                const { payQrUrl } = res;\n                this.setData({\n                  payQrUrl,\n                });\n                timer = setInterval(() => {\n                  let count = this.data.countDown;\n                  if (count === 0) {\n                    clearInterval(timer);\n                    this.setData({\n                      payQrUrl: '',\n                      countDown: 600,\n                      countDownString: '0秒',\n                    });\n                  } else {\n                    let newCount = count - 1;\n                    let countString =\n                      Math.floor(newCount / 60) + '分' + (newCount % 60) + '秒';\n                    this.setData({\n                      countDown: newCount,\n                      countDownString: countString,\n                    });\n                  }\n                }, 1000);\n              })\n              .catch(err => {\n                wx.hideLoading();\n                wx.showToast({\n                  title: err.msg || '请求失败',\n                  icon: 'none',\n                });\n                console.log(err);\n              });\n          } else {\n            wx.hideLoading();\n            wx.showToast({\n              title: res.errMsg || '请求失败',\n              icon: 'none',\n            });\n          }\n        },\n        fail(res) {\n          console.log(res);\n          wx.hideLoading();\n          wx.showToast({\n            title: res.errMsg || '请求失败',\n            icon: 'none',\n          });\n        },\n      });\n    },\n  },\n});\n"]}
\ No newline at end of file \ No newline at end of file
miniprogram/pages/components/PlatformFeeDialog/PlatformFeeDialog.ts
...@@ -3,6 +3,7 @@ import { IMyApp } from '../../../app'; ...@@ -3,6 +3,7 @@ import { IMyApp } from '../../../app';
const app = getApp<IMyApp>(); const app = getApp<IMyApp>();
let timer = null; let timer = null;
let fetchedPlatform = false;
// pages/components/PlatformFeeDialog/PlatformFeeDialog.js // pages/components/PlatformFeeDialog/PlatformFeeDialog.js
Component({ Component({
lifetimes: { lifetimes: {
...@@ -11,7 +12,9 @@ Component({ ...@@ -11,7 +12,9 @@ Component({
this.setData!({ this.setData!({
userInfo: app.globalData.userInfo, userInfo: app.globalData.userInfo,
}); });
this.data.eventType === 'slef' && this.fetchPlatformFee(); this.data.eventType === 'slef' &&
!fetchedPlatform &&
this.fetchPlatformFee();
}, },
}, },
/** /**
...@@ -60,6 +63,7 @@ Component({ ...@@ -60,6 +63,7 @@ Component({
payTimeLimit, payTimeLimit,
showDialog: rechargeBalance > 0 ? true : false, showDialog: rechargeBalance > 0 ? true : false,
}); });
fetchedPlatform = true;
}) })
.catch(err => { .catch(err => {
console.log(err); console.log(err);
...@@ -72,6 +76,77 @@ Component({ ...@@ -72,6 +76,77 @@ Component({
}, },
fetchRechargeInfo() { fetchRechargeInfo() {
console.log('in fetchRechargeInfo'); console.log('in fetchRechargeInfo');
wx.showLoading({
title: '',
});
wx.login({
success: res => {
if (res.code) {
const entity = {
billType: this.data.billType,
isAgree: 1,
jsCode: res.code,
operateId: this.data.userInfo.operateId,
operateName: this.data.userInfo.operateName,
rechargeType: '2',
type: 2,
};
operatorFetch({
url: '/operateBalance/rechage/order/formini',
method: 'POST',
data: entity,
})
.then(res => {
console.log(res);
const { payInfo } = res;
wx.requestPayment({
timeStamp: payInfo.timeStamp,
nonceStr: payInfo.nonceStr,
package: payInfo.package,
signType: payInfo.signType,
paySign: payInfo.paySign,
success: res => {
console.log(res);
wx.showToast({
title: '支付成功！',
});
this.setData({
showDialog: false,
});
},
fail(res) {
console.log(res);
wx.showToast({
title: '支付失败！',
icon: 'none',
});
},
});
})
.catch(err => {
console.log(err);
wx.hideLoading();
wx.showToast({
title: err.msg || '请求失败',
icon: 'none',
});
});
} else {
wx.hideLoading();
wx.showToast({
title: res.errMsg || '请求失败',
icon: 'none',
});
}
},
fail(res) {
wx.hideLoading();
wx.showToast({
title: res.errMsg || '请求失败',
icon: 'none',
});
},
});
}, },
goRecordsPage() { goRecordsPage() {
wx.navigateTo({ wx.navigateTo({
...@@ -104,6 +179,9 @@ Component({ ...@@ -104,6 +179,9 @@ Component({
wx.showLoading({ wx.showLoading({
title: '', title: '',
}); });
wx.login({
success: res => {
if (res.code) {
const entity = { const entity = {
billType: this.data.billType, billType: this.data.billType,
isAgree: 1, isAgree: 1,
...@@ -128,6 +206,11 @@ Component({ ...@@ -128,6 +206,11 @@ Component({
let count = this.data.countDown; let count = this.data.countDown;
if (count === 0) { if (count === 0) {
clearInterval(timer); clearInterval(timer);
this.setData({
payQrUrl: '',
countDown: 600,
countDownString: '0秒',
});
} else { } else {
let newCount = count - 1; let newCount = count - 1;
let countString = let countString =
...@@ -147,6 +230,23 @@ Component({ ...@@ -147,6 +230,23 @@ Component({
}); });
console.log(err); console.log(err);
}); });
} else {
wx.hideLoading();
wx.showToast({
title: res.errMsg || '请求失败',
icon: 'none',
});
}
},
fail(res) {
console.log(res);
wx.hideLoading();
wx.showToast({
title: res.errMsg || '请求失败',
icon: 'none',
});
},
});
}, },
}, },
}); });
miniprogram/pages/home/home.js
...@@ -163,6 +163,21 @@ Component({ ...@@ -163,6 +163,21 @@ Component({
console.log(err); console.log(err);
}); });
}, },
requestSubMsg: function () {
console.log('in requestSubMsg');
wx.requestSubscribeMessage({
tmplIds: ['WU2yMHKM_yNPLGHRsstggsDYnZhKoHIg4heM2fZkD5I'],
success: function (res) {
console.log('in success', res);
},
fail: function (res) {
console.log('in fail', res);
},
complete: function (res) {
console.log('in complete', res);
},
});
},
}, },
}); });
//# 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"]} //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"home.js","sourceRoot":"","sources":["home.ts"],"names":[],"mappings":";;AAAA,yCAAkD;AAClD,yCAA8C;AAG9C,SAAS,CAAC;IACR,SAAS,EAAE;QACT,QAAQ;YACN,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3C,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACjD,CAAC;KACF;IAID,IAAI,EAAE;QACJ,QAAQ,EAAE,CAAC;QACX,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,EAAE;QACf,YAAY,EAAE;YACZ,KAAK,EAAE,MAAM;YACb,UAAU,EAAE,OAAO;YACnB,KAAK,EAAE,CAAC;SACT;QACD,aAAa,EAAE;YACb,KAAK,EAAE,OAAO;YACd,UAAU,EAAE,EAAE;YACd,KAAK,EAAE,CAAC;SACT;QACD,kBAAkB,EAAE;YAClB,KAAK,EAAE,MAAM;YACb,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,CAAC;YACR,KAAK,EAAE,CAAC;SACT;QACD,mBAAmB,EAAE;YACnB,KAAK,EAAE,MAAM;YACb,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,CAAC;YACR,KAAK,EAAE,CAAC;SACT;QACD,YAAY,EAAE;YACZ,KAAK,EAAE,MAAM;YACb,UAAU,EAAE,OAAO;YACnB,KAAK,EAAE,CAAC;SACT;QACD,aAAa,EAAE;YACb,KAAK,EAAE,OAAO;YACd,UAAU,EAAE,EAAE;YACd,KAAK,EAAE,CAAC;SACT;QACD,UAAU,EAAE;YACV,KAAK,EAAE,MAAM;YACb,UAAU,EAAE,OAAO;YACnB,KAAK,EAAE,CAAC;SACT;QACD,WAAW,EAAE;YACX,KAAK,EAAE,OAAO;YACd,UAAU,EAAE,EAAE;YACd,KAAK,EAAE,CAAC;SACT;QACD,QAAQ,EAAE;YACR,KAAK,EAAE,MAAM;YACb,UAAU,EAAE,OAAO;YACnB,KAAK,EAAE,CAAC;SACT;QACD,SAAS,EAAE;YACT,KAAK,EAAE,MAAM;YACb,UAAU,EAAE,GAAG;YACf,KAAK,EAAE,CAAC;YACR,KAAK,EAAE,CAAC;SACT;KACF;IACD,OAAO,EAAE;QACP,cAAc,YAAC,CAAC;YACN,IAAA,2CAAQ,CAA6B;YAC7C,EAAE,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;gBAAC,MAAM,CAAC;YAC5C,IAAI,CAAC,OAAO,CAAC;gBACX,QAAQ,EAAE,QAAQ;aACnB,CAAC,CAAC;YACH,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;YACjC,MAAM,CAAC,KAAK,CAAC;QACf,CAAC;QACD,iBAAiB,YAAC,QAAiB;YAAnC,iBA2FC;YA1FC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;gBAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;YAC7C,IAAM,KAAK,GAAG,iBAAU,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;YACrC,IAAI,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/B,IAAI,MAAM,GAAG;gBACX,QAAQ,UAAA;aACT,CAAC;YACF,EAAE,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC;gBACnB,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;YACrB,CAAC;YAAC,IAAI,CAAC,EAAE,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC1B,MAAM,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YAClC,CAAC;YAAC,IAAI,CAAC,EAAE,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC1B,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;YACjC,CAAC;YACD,EAAE,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YAE1C,IAAI,iBAAiB,GAAG,uBAAe,CAAC;gBACtC,GAAG,EAAE,2CAA2C;gBAChD,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,MAAM;aACb,CAAC,CAAC,IAAI,CAAC,UAAA,GAAG;gBACT,IAAM,IAAI,GAAG,GAAG,CAAC,oBAAoB,CAAC;gBACtC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;oBAEP,IAAA,8BAAW,EACX,kCAAa,EACb,8BAAW,EACX,8BAAW,EACX,4CAAkB,EAClB,gDAAoB,EACpB,0CAAiB,EACjB,8CAAmB,CACZ;oBACT,KAAI,CAAC,OAAO,CAAC;wBACX,oBAAoB,EAAE,aAAa;wBACnC,qBAAqB,EAAE,WAAW;wBAClC,kBAAkB,EAAE,WAAW;wBAC/B,mBAAmB,EAAE,WAAW;wBAChC,0BAA0B,EAAE,mBAAmB;wBAC/C,0BAA0B,EAAE,iBAAiB;wBAC7C,2BAA2B,EAAE,oBAAoB;wBACjD,2BAA2B,EAAE,kBAAkB;qBAChD,CAAC,CAAC;gBACL,CAAC;gBAAC,IAAI,CAAC,CAAC;oBACN,KAAI,CAAC,OAAO,CAAC;wBACX,oBAAoB,EAAE,CAAC;wBACvB,qBAAqB,EAAE,CAAC;wBACxB,kBAAkB,EAAE,CAAC;wBACrB,mBAAmB,EAAE,CAAC;wBACtB,0BAA0B,EAAE,CAAC;wBAC7B,0BAA0B,EAAE,CAAC;wBAC7B,2BAA2B,EAAE,CAAC;wBAC9B,2BAA2B,EAAE,CAAC;qBAC/B,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,CAAC,CAAC;YACH,IAAI,gBAAgB,GAAG,uBAAe,CAAC;gBACrC,GAAG,EAAE,wCAAwC;gBAC7C,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,MAAM;aACb,CAAC,CAAC,IAAI,CAAC,UAAA,GAAG;gBACD,IAAA,mCAAc,EAAE,eAAI,CAAS;gBACrC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACjB,KAAI,CAAC,OAAO,CAAC;oBACX,WAAW,EAAE,IAAI,CAAC,GAAG,CAAC,UAAA,IAAI,IAAI,OAAA,CAAC;wBAC7B,SAAS,EAAE,IAAI,CAAC,SAAS;wBACzB,KAAK,EAAE,IAAI,CAAC,WAAW;wBACvB,UAAU,EAAE,GAAG;wBACf,KAAK,EAAE,IAAI,CAAC,MAAM;wBAClB,KAAK,EAAE,IAAI,CAAC,YAAY;qBACzB,CAAC,EAN4B,CAM5B,CAAC;oBACH,oBAAoB,EAClB,cAAc,IAAI,cAAc,CAAC,YAAY;wBAC3C,CAAC,CAAC,cAAc,CAAC,YAAY;wBAC7B,CAAC,CAAC,CAAC;oBACP,qBAAqB,EACnB,cAAc,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;iBACtE,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YACH,OAAO,CAAC,GAAG,CAAC,CAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAC;iBAC/C,IAAI,CAAC;gBACJ,EAAE,CAAC,WAAW,EAAE,CAAC;YACnB,CAAC,CAAC;iBACD,KAAK,CAAC,UAAC,GAA6B;gBACnC,EAAE,CAAC,WAAW,EAAE,CAAC;gBACjB,EAAE,CAAC,SAAS,CAAC;oBACX,KAAK,EAAE,GAAG,CAAC,MAAM;oBACjB,IAAI,EAAE,MAAM;iBACb,CAAC,CAAC;gBACH,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACnB,CAAC,CAAC,CAAC;QACP,CAAC;QACD,aAAa;YACX,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;YAChC,EAAE,CAAC,uBAAuB,CAAC;gBACzB,OAAO,EAAE,CAAC,6CAA6C,CAAC;gBACxD,OAAO,YAAC,GAAG;oBACT,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;gBACjC,CAAC;gBACD,IAAI,YAAC,GAAG;oBACN,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;gBAC9B,CAAC;gBACD,QAAQ,YAAC,GAAG;oBACV,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;gBAClC,CAAC;aACF,CAAC,CAAC;QACL,CAAC;KACF;CACF,CAAC,CAAC","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    requestSubMsg() {\n      console.log('in requestSubMsg');\n      wx.requestSubscribeMessage({\n        tmplIds: ['WU2yMHKM_yNPLGHRsstggsDYnZhKoHIg4heM2fZkD5I'],\n        success(res) {\n          console.log('in success', res);\n        },\n        fail(res) {\n          console.log('in fail', res);\n        },\n        complete(res) {\n          console.log('in complete', res);\n        },\n      });\n    },\n  },\n});\n"]}
\ No newline at end of file \ No newline at end of file
miniprogram/pages/home/home.ts
...@@ -172,5 +172,20 @@ Component({ ...@@ -172,5 +172,20 @@ Component({
console.log(err); console.log(err);
}); });
}, },
requestSubMsg() {
console.log('in requestSubMsg');
wx.requestSubscribeMessage({
tmplIds: ['WU2yMHKM_yNPLGHRsstggsDYnZhKoHIg4heM2fZkD5I'],
success(res) {
console.log('in success', res);
},
fail(res) {
console.log('in fail', res);
},
complete(res) {
console.log('in complete', res);
},
});
},
}, },
}); });
miniprogram/pages/home/home.wxml
<!-- miniprogram/pages/home.wxml --> <!-- miniprogram/pages/home.wxml -->
<view class="container home"> <view class="container home">
<!-- <button bind:tap="requestSubMsg">订阅</button> -->
<view class="home-title"> <view class="home-title">
<view class="home-title-text">盈收数据</view> <view class="home-title-text">盈收数据</view>
<view class="home-title-type"> <view class="home-title-type">
...@@ -34,6 +35,5 @@ ...@@ -34,6 +35,5 @@
<price-and-count tag-data="{{refundData}}" /> <price-and-count tag-data="{{refundData}}" />
<price-and-count tag-data="{{refundCount}}" /> <price-and-count tag-data="{{refundCount}}" />
</view> </view>
<view class="home-box">您有平台服务费需要结算，请到缴纳页面及时处理</view>
<platform-dialog /> <platform-dialog />
</view> </view>
\ No newline at end of file
miniprogram/pages/platformFee/platformFee.js
"use strict"; "use strict";
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
var fetch_1 = require("../../api/fetch"); var fetch_1 = require("../../api/fetch");
function findMaxIndex(list, key) {
if (!list.length)
return -1;
var max = list[0][key];
var maxIndex = 0;
for (var index = 0; index < list.length; index++) {
var element = list[index];
if (element >= max)
maxIndex = index;
}
return maxIndex;
}
Page({ Page({
data: { data: {
areaCount: 0, areaCount: 0,
year: '', year: '',
dataList: [], dataList: [],
selected: {
areaId: undefined,
areaName: '',
month: '',
totalMoney: 0,
},
}, },
onLoad: function (options) { onLoad: function (options) {
var year = new Date().getFullYear(); var year = new Date().getFullYear();
...@@ -29,6 +47,13 @@ Page({ ...@@ -29,6 +47,13 @@ Page({
areaCount: areaCount, areaCount: areaCount,
dataList: platformFees, dataList: platformFees,
}); });
if (platformFees && platformFees.length) {
var index = findMaxIndex(platformFees, 'totalMoney');
var item = platformFees[index];
_this.setData({
selected: item,
});
}
}) })
.catch(function (err) { .catch(function (err) {
console.log(err); console.log(err);
...@@ -46,5 +71,11 @@ Page({ ...@@ -46,5 +71,11 @@ Page({
url: '/pages/platformFeeRecord/platformFeeRecord', url: '/pages/platformFeeRecord/platformFeeRecord',
}); });
}, },
selectedData: function (e) {
var data = e.detail;
this.setData({
selected: data,
});
},
}); });
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhdGZvcm1GZWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJwbGF0Zm9ybUZlZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHlDQUFrRDtBQUdsRCxJQUFJLENBQUM7SUFJSCxJQUFJLEVBQUU7UUFDSixTQUFTLEVBQUUsQ0FBQztRQUNaLElBQUksRUFBRSxFQUFFO1FBQ1IsUUFBUSxFQUFFLEVBQUU7S0FDYjtJQUtELE1BQU0sRUFBRSxVQUFTLE9BQU87UUFDdEIsSUFBSSxJQUFJLEdBQUcsSUFBSSxJQUFJLEVBQUUsQ0FBQyxXQUFXLEVBQUUsQ0FBQztRQUNwQyxPQUFPLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ2xCLElBQUksQ0FBQyxTQUFTLENBQUM7WUFDYixJQUFJLE1BQUE7U0FDTCxDQUFDLENBQUM7UUFDSCxJQUFJLENBQUMsT0FBUSxDQUFDO1lBQ1osSUFBSSxNQUFBO1NBQ0wsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUNELFNBQVMsWUFBQyxNQUFNO1FBQWhCLGlCQWVDO1FBZEMsTUFBTSxDQUFDLHVCQUFlLENBQUM7WUFDckIsR0FBRyxFQUFFLHlDQUF5QztZQUM5QyxJQUFJLEVBQUUsTUFBTTtTQUNiLENBQUM7YUFDQyxJQUFJLENBQUMsVUFBQSxHQUFHO1lBQ0MsSUFBQSx5QkFBUyxFQUFFLCtCQUFZLENBQVM7WUFDeEMsS0FBSSxDQUFDLE9BQVEsQ0FBQztnQkFDWixTQUFTLFdBQUE7Z0JBQ1QsUUFBUSxFQUFFLFlBQVk7YUFDdkIsQ0FBQyxDQUFDO1FBQ0wsQ0FBQyxDQUFDO2FBQ0QsS0FBSyxDQUFDLFVBQUEsR0FBRztZQUNSLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDbkIsQ0FBQyxDQUFDLENBQUM7SUFDUCxDQUFDO0lBQ0QsZ0JBQWdCLFlBQUMsQ0FBQztRQUNoQixPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ1AsSUFBQSxzQkFBSyxDQUFjO1FBQzNCLElBQUksQ0FBQyxTQUFTLENBQUM7WUFDYixJQUFJLEVBQUUsS0FBSztTQUNaLENBQUMsQ0FBQztJQUNMLENBQUM7SUFDRCxZQUFZO1FBQ1YsRUFBRSxDQUFDLFVBQVUsQ0FBQztZQUNaLEdBQUcsRUFBRSw0Q0FBNEM7U0FDbEQsQ0FBQyxDQUFDO0lBQ0wsQ0FBQztDQUNGLENBQUMsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IHN0YXRpc3RpY3NGZXRjaCB9IGZyb20gJy4uLy4uL2FwaS9mZXRjaCc7XG5cbi8vIG1pbmlwcm9ncmFtL3BhZ2VzL3BsYXRmb3JtRmVlL3BsYXRmb3JtRmVlLmpzXG5QYWdlKHtcbiAgLyoqXG4gICAqIOmhtemdoueahOWIneWni+aVsOaNrlxuICAgKi9cbiAgZGF0YToge1xuICAgIGFyZWFDb3VudDogMCxcbiAgICB5ZWFyOiAnJyxcbiAgICBkYXRhTGlzdDogW10sXG4gIH0sXG5cbiAgLyoqXG4gICAqIOeUn+WRveWRqOacn+WHveaVsC0t55uR5ZCs6aG16Z2i5Yqg6L29XG4gICAqL1xuICBvbkxvYWQ6IGZ1bmN0aW9uKG9wdGlvbnMpIHtcbiAgICBsZXQgeWVhciA9IG5ldyBEYXRlKCkuZ2V0RnVsbFllYXIoKTtcbiAgICBjb25zb2xlLmxvZyh5ZWFyKTtcbiAgICB0aGlzLmZldGNoTGlzdCh7XG4gICAgICB5ZWFyLFxuICAgIH0pO1xuICAgIHRoaXMuc2V0RGF0YSEoe1xuICAgICAgeWVhcixcbiAgICB9KTtcbiAgfSxcbiAgZmV0Y2hMaXN0KGVudGl0eSkge1xuICAgIHJldHVybiBzdGF0aXN0aWNzRmV0Y2goe1xuICAgICAgdXJsOiAnL2RjeHkvcGxhdGZvcm1GZWUvb3BlcmF0ZS9hcmVhcy9tb250aGx5JyxcbiAgICAgIGRhdGE6IGVudGl0eSxcbiAgICB9KVxuICAgICAgLnRoZW4ocmVzID0+IHtcbiAgICAgICAgY29uc3QgeyBhcmVhQ291bnQsIHBsYXRmb3JtRmVlcyB9ID0gcmVzO1xuICAgICAgICB0aGlzLnNldERhdGEhKHtcbiAgICAgICAgICBhcmVhQ291bnQsXG4gICAgICAgICAgZGF0YUxpc3Q6IHBsYXRmb3JtRmVlcyxcbiAgICAgICAgfSk7XG4gICAgICB9KVxuICAgICAgLmNhdGNoKGVyciA9PiB7XG4gICAgICAgIGNvbnNvbGUubG9nKGVycik7XG4gICAgICB9KTtcbiAgfSxcbiAgeWVhckNoYW5nZUhhbmRsZShlKSB7XG4gICAgY29uc29sZS5sb2coZSk7XG4gICAgY29uc3QgeyB2YWx1ZSB9ID0gZS5kZXRhaWw7XG4gICAgdGhpcy5mZXRjaExpc3Qoe1xuICAgICAgeWVhcjogdmFsdWUsXG4gICAgfSk7XG4gIH0sXG4gIGdvUmVjb3JkUGFnZSgpIHtcbiAgICB3eC5uYXZpZ2F0ZVRvKHtcbiAgICAgIHVybDogJy9wYWdlcy9wbGF0Zm9ybUZlZVJlY29yZC9wbGF0Zm9ybUZlZVJlY29yZCcsXG4gICAgfSk7XG4gIH0sXG59KTtcbiJdfQ== //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGxhdGZvcm1GZWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJwbGF0Zm9ybUZlZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLHlDQUFrRDtBQUVsRCxzQkFBc0IsSUFBSSxFQUFFLEdBQUc7SUFDN0IsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDO1FBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQzVCLElBQUksR0FBRyxHQUFHLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUN2QixJQUFJLFFBQVEsR0FBRyxDQUFDLENBQUM7SUFDakIsR0FBRyxDQUFDLENBQUMsSUFBSSxLQUFLLEdBQUcsQ0FBQyxFQUFFLEtBQUssR0FBRyxJQUFJLENBQUMsTUFBTSxFQUFFLEtBQUssRUFBRSxFQUFFLENBQUM7UUFDakQsSUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDO1FBQzVCLEVBQUUsQ0FBQyxDQUFDLE9BQU8sSUFBSSxHQUFHLENBQUM7WUFBQyxRQUFRLEdBQUcsS0FBSyxDQUFDO0lBQ3ZDLENBQUM7SUFDRCxNQUFNLENBQUMsUUFBUSxDQUFDO0FBQ2xCLENBQUM7QUFHRCxJQUFJLENBQUM7SUFJSCxJQUFJLEVBQUU7UUFDSixTQUFTLEVBQUUsQ0FBQztRQUNaLElBQUksRUFBRSxFQUFFO1FBQ1IsUUFBUSxFQUFFLEVBQUU7UUFDWixRQUFRLEVBQUU7WUFDUixNQUFNLEVBQUUsU0FBUztZQUNqQixRQUFRLEVBQUUsRUFBRTtZQUNaLEtBQUssRUFBRSxFQUFFO1lBQ1QsVUFBVSxFQUFFLENBQUM7U0FDZDtLQUNGO0lBS0QsTUFBTSxFQUFFLFVBQVMsT0FBTztRQUN0QixJQUFJLElBQUksR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDLFdBQVcsRUFBRSxDQUFDO1FBQ3BDLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDbEIsSUFBSSxDQUFDLFNBQVMsQ0FBQztZQUNiLElBQUksTUFBQTtTQUNMLENBQUMsQ0FBQztRQUNILElBQUksQ0FBQyxPQUFRLENBQUM7WUFDWixJQUFJLE1BQUE7U0FDTCxDQUFDLENBQUM7SUFDTCxDQUFDO0lBQ0QsU0FBUyxZQUFDLE1BQU07UUFBaEIsaUJBc0JDO1FBckJDLE1BQU0sQ0FBQyx1QkFBZSxDQUFDO1lBQ3JCLEdBQUcsRUFBRSx5Q0FBeUM7WUFDOUMsSUFBSSxFQUFFLE1BQU07U0FDYixDQUFDO2FBQ0MsSUFBSSxDQUFDLFVBQUEsR0FBRztZQUNDLElBQUEseUJBQVMsRUFBRSwrQkFBWSxDQUFTO1lBQ3hDLEtBQUksQ0FBQyxPQUFRLENBQUM7Z0JBQ1osU0FBUyxXQUFBO2dCQUNULFFBQVEsRUFBRSxZQUFZO2FBQ3ZCLENBQUMsQ0FBQztZQUNILEVBQUUsQ0FBQyxDQUFDLFlBQVksSUFBSSxZQUFZLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDeEMsSUFBSSxLQUFLLEdBQUcsWUFBWSxDQUFDLFlBQVksRUFBRSxZQUFZLENBQUMsQ0FBQztnQkFDckQsSUFBSSxJQUFJLEdBQUcsWUFBWSxDQUFDLEtBQUssQ0FBQyxDQUFDO2dCQUMvQixLQUFJLENBQUMsT0FBUSxDQUFDO29CQUNaLFFBQVEsRUFBRSxJQUFJO2lCQUNmLENBQUMsQ0FBQztZQUNMLENBQUM7UUFDSCxDQUFDLENBQUM7YUFDRCxLQUFLLENBQUMsVUFBQSxHQUFHO1lBQ1IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNuQixDQUFDLENBQUMsQ0FBQztJQUNQLENBQUM7SUFDRCxnQkFBZ0IsWUFBQyxDQUFDO1FBQ2hCLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDUCxJQUFBLHNCQUFLLENBQWM7UUFDM0IsSUFBSSxDQUFDLFNBQVMsQ0FBQztZQUNiLElBQUksRUFBRSxLQUFLO1NBQ1osQ0FBQyxDQUFDO0lBQ0wsQ0FBQztJQUNELFlBQVk7UUFDVixFQUFFLENBQUMsVUFBVSxDQUFDO1lBQ1osR0FBRyxFQUFFLDRDQUE0QztTQUNsRCxDQUFDLENBQUM7SUFDTCxDQUFDO0lBQ0QsWUFBWSxZQUFDLENBQUM7UUFDWixJQUFNLElBQUksR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDO1FBQ3RCLElBQUksQ0FBQyxPQUFPLENBQUM7WUFDWCxRQUFRLEVBQUUsSUFBSTtTQUNmLENBQUMsQ0FBQztJQUNMLENBQUM7Q0FDRixDQUFDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBzdGF0aXN0aWNzRmV0Y2ggfSBmcm9tICcuLi8uLi9hcGkvZmV0Y2gnO1xuXG5mdW5jdGlvbiBmaW5kTWF4SW5kZXgobGlzdCwga2V5KSB7XG4gIGlmICghbGlzdC5sZW5ndGgpIHJldHVybiAtMTtcbiAgbGV0IG1heCA9IGxpc3RbMF1ba2V5XTtcbiAgbGV0IG1heEluZGV4ID0gMDtcbiAgZm9yIChsZXQgaW5kZXggPSAwOyBpbmRleCA8IGxpc3QubGVuZ3RoOyBpbmRleCsrKSB7XG4gICAgY29uc3QgZWxlbWVudCA9IGxpc3RbaW5kZXhdO1xuICAgIGlmIChlbGVtZW50ID49IG1heCkgbWF4SW5kZXggPSBpbmRleDtcbiAgfVxuICByZXR1cm4gbWF4SW5kZXg7XG59XG5cbi8vIG1pbmlwcm9ncmFtL3BhZ2VzL3BsYXRmb3JtRmVlL3BsYXRmb3JtRmVlLmpzXG5QYWdlKHtcbiAgLyoqXG4gICAqIOmhtemdoueahOWIneWni+aVsOaNrlxuICAgKi9cbiAgZGF0YToge1xuICAgIGFyZWFDb3VudDogMCxcbiAgICB5ZWFyOiAnJyxcbiAgICBkYXRhTGlzdDogW10sXG4gICAgc2VsZWN0ZWQ6IHtcbiAgICAgIGFyZWFJZDogdW5kZWZpbmVkLFxuICAgICAgYXJlYU5hbWU6ICcnLFxuICAgICAgbW9udGg6ICcnLFxuICAgICAgdG90YWxNb25leTogMCxcbiAgICB9LFxuICB9LFxuXG4gIC8qKlxuICAgKiDnlJ/lkb3lkajmnJ/lh73mlbAtLeebkeWQrOmhtemdouWKoOi9vVxuICAgKi9cbiAgb25Mb2FkOiBmdW5jdGlvbihvcHRpb25zKSB7XG4gICAgbGV0IHllYXIgPSBuZXcgRGF0ZSgpLmdldEZ1bGxZZWFyKCk7XG4gICAgY29uc29sZS5sb2coeWVhcik7XG4gICAgdGhpcy5mZXRjaExpc3Qoe1xuICAgICAgeWVhcixcbiAgICB9KTtcbiAgICB0aGlzLnNldERhdGEhKHtcbiAgICAgIHllYXIsXG4gICAgfSk7XG4gIH0sXG4gIGZldGNoTGlzdChlbnRpdHkpIHtcbiAgICByZXR1cm4gc3RhdGlzdGljc0ZldGNoKHtcbiAgICAgIHVybDogJy9kY3h5L3BsYXRmb3JtRmVlL29wZXJhdGUvYXJlYXMvbW9udGhseScsXG4gICAgICBkYXRhOiBlbnRpdHksXG4gICAgfSlcbiAgICAgIC50aGVuKHJlcyA9PiB7XG4gICAgICAgIGNvbnN0IHsgYXJlYUNvdW50LCBwbGF0Zm9ybUZlZXMgfSA9IHJlcztcbiAgICAgICAgdGhpcy5zZXREYXRhISh7XG4gICAgICAgICAgYXJlYUNvdW50LFxuICAgICAgICAgIGRhdGFMaXN0OiBwbGF0Zm9ybUZlZXMsXG4gICAgICAgIH0pO1xuICAgICAgICBpZiAocGxhdGZvcm1GZWVzICYmIHBsYXRmb3JtRmVlcy5sZW5ndGgpIHtcbiAgICAgICAgICBsZXQgaW5kZXggPSBmaW5kTWF4SW5kZXgocGxhdGZvcm1GZWVzLCAndG90YWxNb25leScpO1xuICAgICAgICAgIGxldCBpdGVtID0gcGxhdGZvcm1GZWVzW2luZGV4XTtcbiAgICAgICAgICB0aGlzLnNldERhdGEhKHtcbiAgICAgICAgICAgIHNlbGVjdGVkOiBpdGVtLFxuICAgICAgICAgIH0pO1xuICAgICAgICB9XG4gICAgICB9KVxuICAgICAgLmNhdGNoKGVyciA9PiB7XG4gICAgICAgIGNvbnNvbGUubG9nKGVycik7XG4gICAgICB9KTtcbiAgfSxcbiAgeWVhckNoYW5nZUhhbmRsZShlKSB7XG4gICAgY29uc29sZS5sb2coZSk7XG4gICAgY29uc3QgeyB2YWx1ZSB9ID0gZS5kZXRhaWw7XG4gICAgdGhpcy5mZXRjaExpc3Qoe1xuICAgICAgeWVhcjogdmFsdWUsXG4gICAgfSk7XG4gIH0sXG4gIGdvUmVjb3JkUGFnZSgpIHtcbiAgICB3eC5uYXZpZ2F0ZVRvKHtcbiAgICAgIHVybDogJy9wYWdlcy9wbGF0Zm9ybUZlZVJlY29yZC9wbGF0Zm9ybUZlZVJlY29yZCcsXG4gICAgfSk7XG4gIH0sXG4gIHNlbGVjdGVkRGF0YShlKSB7XG4gICAgY29uc3QgZGF0YSA9IGUuZGV0YWlsO1xuICAgIHRoaXMuc2V0RGF0YSh7XG4gICAgICBzZWxlY3RlZDogZGF0YSxcbiAgICB9KTtcbiAgfSxcbn0pO1xuIl19
\ No newline at end of file \ No newline at end of file
miniprogram/pages/platformFee/platformFee.ts
import { statisticsFetch } from '../../api/fetch'; import { statisticsFetch } from '../../api/fetch';
function findMaxIndex(list, key) {
if (!list.length) return -1;
let max = list[0][key];
let maxIndex = 0;
for (let index = 0; index < list.length; index++) {
const element = list[index];
if (element >= max) maxIndex = index;
}
return maxIndex;
}
// miniprogram/pages/platformFee/platformFee.js // miniprogram/pages/platformFee/platformFee.js
Page({ Page({
/** /**
...@@ -9,6 +20,12 @@ Page({ ...@@ -9,6 +20,12 @@ Page({
areaCount: 0, areaCount: 0,
year: '', year: '',
dataList: [], dataList: [],
selected: {
areaId: undefined,
areaName: '',
month: '',
totalMoney: 0,
},
}, },
/** /**
...@@ -35,6 +52,13 @@ Page({ ...@@ -35,6 +52,13 @@ Page({
areaCount, areaCount,
dataList: platformFees, dataList: platformFees,
}); });
if (platformFees && platformFees.length) {
let index = findMaxIndex(platformFees, 'totalMoney');
let item = platformFees[index];
this.setData!({
selected: item,
});
}
}) })
.catch(err => { .catch(err => {
console.log(err); console.log(err);
...@@ -52,4 +76,10 @@ Page({ ...@@ -52,4 +76,10 @@ Page({
url: '/pages/platformFeeRecord/platformFeeRecord', url: '/pages/platformFeeRecord/platformFeeRecord',
}); });
}, },
selectedData(e) {
const data = e.detail;
this.setData({
selected: data,
});
},
}); });
miniprogram/pages/platformFee/platformFee.wxml
...@@ -12,26 +12,26 @@ ...@@ -12,26 +12,26 @@
<view class="platformFee-title-text">共计{{areaCount}}个校区</view> <view class="platformFee-title-text">共计{{areaCount}}个校区</view>
</view> </view>
<view class="platformFee-canvas"> <view class="platformFee-canvas">
<platform-fee-chart dataList="{{dataList}}" /> <platform-fee-chart dataList="{{dataList}}" bind:selectedData="selectedData" />
</view> </view>
</view> </view>
<view class="platformFee-block"> <view class="platformFee-block" wx:if="{{selected.areaId}}">
<view class="platformFee-title"> <view class="platformFee-title">
<view class="platformFee-title-color user"></view> <view class="platformFee-title-color user"></view>
<view class="platformFee-title-text">各校区服务费(9月)</view> <view class="platformFee-title-text">各校区服务费({{selected.month}}月)</view>
<view class="platformFee-title-sum">合计：1,800.00</view> <view class="platformFee-title-sum">合计：{{selected.totalMoney}}</view>
</view> </view>
<view class="platformFee-areaList"> <view class="platformFee-areaList">
<view class="platformFee-areaItem"> <view class="platformFee-areaItem" wx:for="{{selected.areaPlatformFees}}">
<view class="platformFee-areaItem-index">1</view> <view class="platformFee-areaItem-index">{{index}}</view>
<view class="platformFee-areaItem-name">多彩温江</view> <view class="platformFee-areaItem-name">{{item.areaName}}</view>
<view class="platformFee-areaItem-price">1,000.00</view> <view class="platformFee-areaItem-price">{{item.totalMoney}}</view>
</view> </view>
<view class="platformFee-areaItem"> <!-- <view class="platformFee-areaItem">
<view class="platformFee-areaItem-index">2</view> <view class="platformFee-areaItem-index">2</view>
<view class="platformFee-areaItem-name">多彩温江</view> <view class="platformFee-areaItem-name">多彩温江</view>
<view class="platformFee-areaItem-price">1,000.00</view> <view class="platformFee-areaItem-price">1,000.00</view>
</view> </view> -->
</view> </view>
</view> </view>
</view> </view>
\ No newline at end of file
miniprogram/pages/platformFeeRecord/platformFeeRecord.wxml
<!-- miniprogram/pages/platformFeeRecord/platformFeeRecord.wxml --> <!-- miniprogram/pages/platformFeeRecord/platformFeeRecord.wxml -->
<view class="platformFeeRecord"> <view class="platformFeeRecord">
<scroll-view class="platformFeeRecord-list" scroll-y bindscrolltolower="getMoreListItem"> <scroll-view wx:if="{{dataList.length}}" class="platformFeeRecord-list" scroll-y bindscrolltolower="getMoreListItem">
<view class="platformFeeRecord-item" wx:for="{{dataList}}" wx:key="{{item.id}}"> <view class="platformFeeRecord-item" wx:for="{{dataList}}" wx:key="{{item.id}}">
<view class="platformFeeRecord-itemTitle"> <view class="platformFeeRecord-itemTitle">
<view class="platformFeeRecord-itemTitle-text"> <view class="platformFeeRecord-itemTitle-text">
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
<view wx:else class="noData">暂无数据</view>
<!-- <view class="platformFeeRecord-item"> <!-- <view class="platformFeeRecord-item">
<view class="platformFeeRecord-itemTitle"> <view class="platformFeeRecord-itemTitle">
<view class="platformFeeRecord-itemTitle-text">微信缴费-专用发票</view> <view class="platformFeeRecord-itemTitle-text">微信缴费-专用发票</view>
......
miniprogram/pages/platformFeeRecord/platformFeeRecord.wxss
...@@ -33,3 +33,7 @@ page, ...@@ -33,3 +33,7 @@ page,
.platformFeeRecord-col:last-child { .platformFeeRecord-col:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
.noData{
padding: 50rpx;
text-align: center;
}
\ No newline at end of file
miniprogram/pages/report/report.wxml
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<view class="report-header-bottom"></view> <view class="report-header-bottom"></view>
</view> </view>
<view class="report-nav"> <view class="report-nav">
<nav-item wx:for="{{itemList}}" wx:key="{{index}}" nav-data="{{item}}"></nav-item> <nav-item wx:for="{{itemList}}" wx:key="index" nav-data="{{item}}"></nav-item>
</view> </view>
<platform-dialog id="platformDialog" eventType="parents" /> <platform-dialog id="platformDialog" eventType="parents" />
</view> </view>
\ No newline at end of file
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