图标统计调整

pages/chart/index.js

@@ -1,128 +1,51 @@
+const app = getApp();
 import * as echarts from '../../ec-canvas/echarts';
 let pieData = [];
+let pieChart;
+let line1Chart;
 let line1Data = [];
+let line2Chart;
 let line2Data = [];
 function initPieChart(canvas, width, height, dpr) {
-    if (pieData.length <= 0){
-        return;
-    }
-    const chart = echarts.init(canvas, null, {
+    pieChart = echarts.init(canvas, null, {
         width: 400,
         height: 250,
         devicePixelRatio: dpr // new
     });
-    canvas.setChart(chart);
-    var option = {
-        backgroundColor: "#3C4043",
-        series: [{
-            label: {
-                normal: {
-                    fontSize: 14
-                }
-            },
-            type: 'pie',
-            center: ['50%', '50%'],
-            radius: ['0%', '70%'],
-            data: pieData
-        }]
-    };
-    chart.setOption(option);
-    chart.on('click', 'series.pie', function(param) {
-        console.log(param);
+    canvas.setChart(pieChart);
+    let option = app.$utils.getPieOption(pieData);
+    pieChart.setOption(option);
+    pieChart.on('click', 'series.pie', function(param) {
         wx.navigateTo({
             url: "./group/index?expendId=" + param.data.sId + '&rangeDate=' + param.data.sDate
         })
     });
-    return chart;
+    return pieChart
 }
-
 function initLineChart1(canvas, width, height, dpr) {
-    const chart = echarts.init(canvas, null, {
+    line1Chart = echarts.init(canvas, null, {
         width: 400,
         height: 300,
         devicePixelRatio: dpr // new
     });
-    canvas.setChart(chart);
-    var option = {
-        legend: {
-            data: ['支出', '收入', '转账','还款'],
-            top: 20,
-            left: 'center',
-            backgroundColor: 'white',
-            z: 100
-        },
-        grid: {
-            containLabel: true
-        },
-        tooltip: {
-            show: true,
-            trigger: 'axis'
-        },
-        xAxis: {
-            type: 'category',
-            boundaryGap: false,
-            show: false
-        },
-        yAxis: {
-            x: 'center',
-            type: 'value',
-            splitLine: {
-                lineStyle: {
-                    type: 'dashed'
-                }
-            }
-        },
-        series: line1Data
-    };
-    chart.setOption(option);
-    return chart;
+    canvas.setChart(line1Chart);
+    let option = app.$utils.getDayLineOption(line1Data);
+    line1Chart.setOption(option);
+    return line1Chart;
 }
 function initLineChart2(canvas, width, height, dpr) {
-    const chart = echarts.init(canvas, null, {
+    line2Chart = echarts.init(canvas, null, {
         width: 400,
         height: 300,
         devicePixelRatio: dpr // new
     });
-    canvas.setChart(chart);
-    var option = {
-        legend: {
-            data: ['支出', '收入', '转账','还款'],
-            top: 20,
-            left: 'center',
-            backgroundColor: 'white',
-            z: 100
-        },
-        grid: {
-            containLabel: true
-        },
-        tooltip: {
-            show: true,
-            trigger: 'axis'
-        },
-        xAxis: {
-            type: 'category',
-            boundaryGap: false,
-            show: false
-        },
-        yAxis: {
-            x: 'center',
-            type: 'value',
-            splitLine: {
-                lineStyle: {
-                    type: 'dashed'
-                }
-            }
-            // show: false
-        },
-        series: line2Data
-    };
-    chart.setOption(option);
-    return chart;
+    canvas.setChart(line2Chart);
+    let option = app.$utils.getMonthLineOption(line2Data);
+    line2Chart.setOption(option);
+    return line2Chart;
 }
-const app = getApp();
 Page({
     data: {
-        // 指定选择区间起始值
         start: '2000-01-01 00:00:00',
         end: '2030-09-09 12:12:12',
         showDateVisible:false,
@@ -172,6 +95,8 @@ Page({
                         });
                     })
                 }
+                let option = app.$utils.getPieOption(pieData);
+                pieChart.setOption(option);
                 this.setData({payTypeList})
             }
         })
@@ -228,6 +153,10 @@ Page({
                     smooth: true,
                     data: res.data.lineMonthRepayment
                 })
+                let line1Option = app.$utils.getDayLineOption(line1Data);
+                line1Chart.setOption(line1Option);
+                let line2Option = app.$utils.getDayLineOption(line2Data);
+                line2Chart.setOption(line2Option);
             }
         })
         app.$api.listBillByAMonth({'rangeDate':this.data.showDate}).then(res => {
@@ -273,9 +202,8 @@ Page({
             [mode]: value
             // [`${mode}Text`]: value,
         });
-        // this.updateView()
+        this.updateView()
         this.hidePicker()
-        wx.redirectTo({url:"./index?rangeDate=" + this.data.showDate})
     }
 
 });