|
|
|
@ -119,7 +119,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
|
|
|
|
|
trigger: 'item',
|
|
|
|
|
formatter :"{a} {b} : {c} ({d}%)"
|
|
|
|
|
},
|
|
|
|
|
color: ['#09bb07','#FF2D96','#00a0e9','00a0e9','#DC0808'],
|
|
|
|
|
color: ['#09bb07','#FF2D96','#00a0e9','00a0e9','#DC0808',"#FFFF33"],
|
|
|
|
|
legend: {
|
|
|
|
|
orient: 'vertical',
|
|
|
|
|
y: '450px',
|
|
|
|
@ -158,7 +158,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
|
|
|
|
|
trigger: 'axis'
|
|
|
|
|
},
|
|
|
|
|
legend: {
|
|
|
|
|
data: ['Alipay交易金额','AlipayOnline交易金额', 'Bestpay交易金额','Wechat交易金额',"JD Pay交易金额"],
|
|
|
|
|
data: ['Alipay交易金额','AlipayOnline交易金额', 'Bestpay交易金额','Wechat交易金额',"JD Pay交易金额","HF Pay交易金额"],
|
|
|
|
|
bottom: 0,
|
|
|
|
|
height: '15%',
|
|
|
|
|
width: '80%',
|
|
|
|
@ -170,7 +170,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
|
|
|
|
|
type: 'value'
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
color: ['#00a0e9','#00a0e9','#FF2D96','#09bb07','#DC0808'],
|
|
|
|
|
color: ['#00a0e9','#00a0e9','#FF2D96','#09bb07','#DC0808',"#FFFF33"]
|
|
|
|
|
},
|
|
|
|
|
xAxis: {
|
|
|
|
|
basic: {type: 'category', boundaryGap: false},
|
|
|
|
@ -231,6 +231,17 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
|
|
|
|
|
yAxisIndex: 0
|
|
|
|
|
},
|
|
|
|
|
column: {key: 'jd.total'}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
basic: {
|
|
|
|
|
name: 'HF Pay交易金额',
|
|
|
|
|
type: 'line',
|
|
|
|
|
label: {normal: {show: true}},
|
|
|
|
|
showAllSymbols: true,
|
|
|
|
|
showSymbol: true,
|
|
|
|
|
yAxisIndex: 0
|
|
|
|
|
},
|
|
|
|
|
column: {key: 'hf.total'}
|
|
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
};
|
|
|
|
@ -241,7 +252,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
|
|
|
|
|
trigger: 'axis'
|
|
|
|
|
},
|
|
|
|
|
legend: {
|
|
|
|
|
data: ['Alipay交易订单','AlipayOnline交易订单', 'Bestpay交易订单','Wechat交易订单',"JD Pay交易订单"],
|
|
|
|
|
data: ['Alipay交易订单','AlipayOnline交易订单', 'Bestpay交易订单','Wechat交易订单',"JD Pay交易订单","HF Pay交易订单"],
|
|
|
|
|
bottom: 0,
|
|
|
|
|
height: '15%',
|
|
|
|
|
width: '80%',
|
|
|
|
@ -253,7 +264,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
|
|
|
|
|
type: 'value'
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
color: ['#00a0e9','00a0e9','#FF2D96','#09bb07','#DC0808'],
|
|
|
|
|
color: ['#00a0e9','00a0e9','#FF2D96','#09bb07','#DC0808',"#FFFF33"]
|
|
|
|
|
},
|
|
|
|
|
xAxis: {
|
|
|
|
|
basic: {type: 'category', boundaryGap: false},
|
|
|
|
@ -314,6 +325,17 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
|
|
|
|
|
yAxisIndex: 0
|
|
|
|
|
},
|
|
|
|
|
column: {key: 'jd.orders'}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
basic: {
|
|
|
|
|
name: 'HF Pay交易订单',
|
|
|
|
|
type: 'line',
|
|
|
|
|
label: {normal: {show: true}},
|
|
|
|
|
showAllSymbols: true,
|
|
|
|
|
showSymbol: true,
|
|
|
|
|
yAxisIndex: 0
|
|
|
|
|
},
|
|
|
|
|
column: {key: 'hf.orders'}
|
|
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
};
|
|
|
|
@ -323,7 +345,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
|
|
|
|
|
trigger: 'axis'
|
|
|
|
|
},
|
|
|
|
|
legend: {
|
|
|
|
|
data: ['Alipay交易客单价','AlipayOnline交易客单价', 'Bestpay交易客单价','Wechat交易客单价',"JD Pay交易客单价"],
|
|
|
|
|
data: ['Alipay交易客单价','AlipayOnline交易客单价', 'Bestpay交易客单价','Wechat交易客单价',"JD Pay交易客单价","HF Pay交易客单价"],
|
|
|
|
|
bottom: 0,
|
|
|
|
|
},
|
|
|
|
|
yAxis: [
|
|
|
|
@ -332,7 +354,7 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
|
|
|
|
|
type: 'value'
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
color: ['#00a0e9','#00a0e9','#FF2D96','#09bb07','#DC0808'],
|
|
|
|
|
color: ['#00a0e9','#00a0e9','#FF2D96','#09bb07','#DC0808',"#FFFF33"]
|
|
|
|
|
},
|
|
|
|
|
xAxis: {
|
|
|
|
|
basic: {type: 'category', boundaryGap: false},
|
|
|
|
@ -393,6 +415,17 @@ define(['angular', 'static/commons/commons', 'static/commons/angular-ueditor', '
|
|
|
|
|
yAxisIndex: 0
|
|
|
|
|
},
|
|
|
|
|
column: {key: 'jd.single_amount'}
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
basic: {
|
|
|
|
|
name: 'HF Pay交易客单价',
|
|
|
|
|
type: 'line',
|
|
|
|
|
label: {normal: {show: true}},
|
|
|
|
|
showAllSymbols: true,
|
|
|
|
|
showSymbol: true,
|
|
|
|
|
yAxisIndex: 0
|
|
|
|
|
},
|
|
|
|
|
column: {key: 'hf.single_amount'}
|
|
|
|
|
}
|
|
|
|
|
]
|
|
|
|
|
};
|
|
|
|
|