cmy 2 gadi atpakaļ
vecāks
revīzija
43545c4d5e

+ 448 - 429
src/pages/statistic/transaction/components/toDay.vue

@@ -1,451 +1,470 @@
 <template>
-<!-- 今日订单金额 -->
-    <Card :bordered="false" dis-hover class="ivu-mt">
-        <Row>
-            <Col v-if="statisticsData" class="br" v-bind="grid">
-                <div>
-                    <div class="title mb15">今日订单金额</div>
-                    <div class="price">¥<i>{{ statisticsData.left.series[0].money }}</i></div>
-                </div>
-                <echarts-new v-if="optionData" key="1" ref="visitChart" height="100%" width="100%" :option-data="optionData" :styles="style" />
-            </Col>
-            <Col v-if="statisticsData" v-bind="grid" style="padding-left:20px">
-                <div class="pl25">
-                    <div class="toDay">
-                        <span class="toDay-title spBlock mb10">今日订单数</span>
-                        <span class="toDay-number spBlock mb10 ml5">{{ statisticsData.right.today.series[0].now_money }}</span>
-                        <br/><span class="toDay-time spBlock mr10">昨日:{{statisticsData.right.today.series[0].last_money}}</span>
-                        <span class="toDay-time spBlock">日环比:
-                            <i class="content-is" :class="Number(statisticsData.right.today.series[0].rate)>=0?'up':'down'">{{ Math.floor(statisticsData.right.today.series[0].rate) }}%</i>
-                            <Icon :color="Number(statisticsData.right.today.series[0].rate)>=0?'#F5222D':'#39C15B'" :type="Number(statisticsData.right.today.series[0].rate)>=0?'md-arrow-dropup':'md-arrow-dropdown'" />
-                        </span>
-                        <echarts-new v-if="optionTodatOrder" key="2" ref="visitChart" height="100%" width="100%" :option-data="optionTodatOrder" :styles="styleToday" />
-                        <span class="toDay-title spBlock mb10">本月订单数</span>
-                        <span class="toDay-number spBlock mb10 ml5">{{ statisticsData.right.month[0].now_money }}</span>
-                        <br/><span class="toDay-time spBlock mr10">上月:{{statisticsData.right.month[0].last_money}}</span>
-                        <span class="toDay-time spBlock">月环比:
-                            <i class="content-is" :class="Number(statisticsData.right.month[0].rate)>=0?'up':'down'">{{ Math.floor(statisticsData.right.month[0].rate) }}%</i>
-                           <Icon :color="Number(statisticsData.right.month[0].rate)>=0?'#F5222D':'#39C15B'" :type="Number(statisticsData.right.month[0].rate)>=0?'md-arrow-dropup':'md-arrow-dropdown'" />
-                        </span>
-                    </div>
-                    <div class="toDay" style="border: none;">
-                        <span class="toDay-title spBlock mb10">今日支付人数</span>
-                        <span class="toDay-number spBlock mb10 ml5">{{ statisticsData.right.today.series[1].now_money }}</span>
-                        <br/><span class="toDay-time spBlock mr10">昨日:{{statisticsData.right.today.series[1].last_money}}</span>
-                        <span class="toDay-time spBlock">日环比:
-                            <i class="content-is" :class="Number(statisticsData.right.today.series[1].rate)>=0?'up':'down'">{{ Math.floor(statisticsData.right.today.series[1].rate) }}%</i>
-                            <Icon :color="Number(statisticsData.right.today.series[1].rate)>=0?'#F5222D':'#39C15B'" :type="Number(statisticsData.right.today.series[1].rate)>=0?'md-arrow-dropup':'md-arrow-dropdown'" />
-                        </span>
-                        <echarts-new v-if="optionOrderUser" key="3" ref="visitChart" height="100%" width="100%" :option-data="optionOrderUser" :styles="styleToday" />
-                        <span class="toDay-title spBlock mb10">本月支付人数</span>
-                        <span class="toDay-number spBlock mb10 ml5">{{ statisticsData.right.month[1].now_money }}</span>
-                        <br/><span class="toDay-time spBlock mr10">上月:{{statisticsData.right.month[1].last_money}}</span>
-                        <span class="toDay-time spBlock">月环比:
-                            <i class="content-is" :class="Number(statisticsData.right.month[1].rate)>=0?'up':'down'">{{ Math.floor(statisticsData.right.month[1].rate) }}%</i>
-                           <Icon :color="Number(statisticsData.right.month[1].rate)>=0?'#F5222D':'#39C15B'" :type="Number(statisticsData.right.month[1].rate)>=0?'md-arrow-dropup':'md-arrow-dropdown'" />
-                        </span>
-                    </div>
-                </div>
-            </Col>
-        </Row>
-    </Card>
+	<!-- 今日订单金额 -->
+	<Card :bordered="false" dis-hover class="ivu-mt">
+		<Row>
+			<Col v-if="statisticsData" class="br" v-bind="grid">
+			<div>
+				<div class="title mb15">今日订单金额</div>
+				<div class="price">¥<i>{{ statisticsData.left.series[0].money }}</i></div>
+			</div>
+			<echarts-new v-if="optionData" key="1" ref="visitChart" height="100%" width="100%" :option-data="optionData"
+				:styles="style" />
+			</Col>
+			<Col v-if="statisticsData" v-bind="grid" style="padding-left:20px">
+			<div class="pl25">
+				<div class="toDay">
+					<span class="toDay-title spBlock mb10">今日订单数</span>
+					<span
+						class="toDay-number spBlock mb10 ml5">{{ statisticsData.right.today.series[0].now_money }}</span>
+					<br /><span
+						class="toDay-time spBlock mr10">昨日:{{statisticsData.right.today.series[0].last_money}}</span>
+					<span class="toDay-time spBlock">日环比:
+						<i class="content-is"
+							:class="Number(statisticsData.right.today.series[0].rate)>=0?'up':'down'">{{ Math.floor(statisticsData.right.today.series[0].rate) }}%</i>
+						<Icon :color="Number(statisticsData.right.today.series[0].rate)>=0?'#F5222D':'#39C15B'"
+							:type="Number(statisticsData.right.today.series[0].rate)>=0?'md-arrow-dropup':'md-arrow-dropdown'" />
+					</span>
+					<echarts-new v-if="optionTodatOrder" key="2" ref="visitChart" height="100%" width="100%"
+						:option-data="optionTodatOrder" :styles="styleToday" />
+					<span class="toDay-title spBlock mb10">本月订单数</span>
+					<span class="toDay-number spBlock mb10 ml5">{{ statisticsData.right.month[0].now_money }}</span>
+					<br /><span class="toDay-time spBlock mr10">上月:{{statisticsData.right.month[0].last_money}}</span>
+					<span class="toDay-time spBlock">月环比:
+						<i class="content-is"
+							:class="Number(statisticsData.right.month[0].rate)>=0?'up':'down'">{{ Math.floor(statisticsData.right.month[0].rate) }}%</i>
+						<Icon :color="Number(statisticsData.right.month[0].rate)>=0?'#F5222D':'#39C15B'"
+							:type="Number(statisticsData.right.month[0].rate)>=0?'md-arrow-dropup':'md-arrow-dropdown'" />
+					</span>
+				</div>
+				<div class="toDay" style="border: none;">
+					<span class="toDay-title spBlock mb10">今日支付人数</span>
+					<span
+						class="toDay-number spBlock mb10 ml5">{{ statisticsData.right.today.series[1].now_money }}</span>
+					<br /><span
+						class="toDay-time spBlock mr10">昨日:{{statisticsData.right.today.series[1].last_money}}</span>
+					<span class="toDay-time spBlock">日环比:
+						<i class="content-is"
+							:class="Number(statisticsData.right.today.series[1].rate)>=0?'up':'down'">{{ Math.floor(statisticsData.right.today.series[1].rate) }}%</i>
+						<Icon :color="Number(statisticsData.right.today.series[1].rate)>=0?'#F5222D':'#39C15B'"
+							:type="Number(statisticsData.right.today.series[1].rate)>=0?'md-arrow-dropup':'md-arrow-dropdown'" />
+					</span>
+					<echarts-new v-if="optionOrderUser" key="3" ref="visitChart" height="100%" width="100%"
+						:option-data="optionOrderUser" :styles="styleToday" />
+					<span class="toDay-title spBlock mb10">本月支付人数</span>
+					<span class="toDay-number spBlock mb10 ml5">{{ statisticsData.right.month[1].now_money }}</span>
+					<br /><span class="toDay-time spBlock mr10">上月:{{statisticsData.right.month[1].last_money}}</span>
+					<span class="toDay-time spBlock">月环比:
+						<i class="content-is"
+							:class="Number(statisticsData.right.month[1].rate)>=0?'up':'down'">{{ Math.floor(statisticsData.right.month[1].rate) }}%</i>
+						<Icon :color="Number(statisticsData.right.month[1].rate)>=0?'#F5222D':'#39C15B'"
+							:type="Number(statisticsData.right.month[1].rate)>=0?'md-arrow-dropup':'md-arrow-dropdown'" />
+					</span>
+				</div>
+			</div>
+			</Col>
+		</Row>
+	</Card>
 </template>
 
 <script>
-    import { statisticTopTradeApi } from '@/api/statistic'
-    import echartsNew from '@/components/echartsNew/index'
-    import echarts from 'echarts'
-    export default {
-        name: 'ToDay',
-        components: {
-            echartsNew
-        },
-        data() {
-            return {
-                style: {
-                    height: '200px'
-                },
-                styleToday: {
-                    height: '130px'
-                },
-                legendData: ['今天', '昨天'],
-                seriesData: [],
-                timer: [],
-                grid: {
-                    xl: 12,
-                    lg: 12,
-                    md: 12,
-                    sm: 24,
-                    xs: 24
-                },
-                statisticsData: null,
-                optionTodatOrder: {}, // 今日订单数
-                orderData: {},
-                orderUserData: {},
-                optionData: {},  // 今日交易数据
-                listLoading: false,
-                optionDataOrder: {},
-                optionOrderUser: {} // 今日支付人数
-            }
-        },
-        beforeDestroy() {
-            if (this.visitChart) {
-                this.visitChart.dispose()
-                this.visitChart = null
-            }
-        },
-        mounted() {
-            this.getList()
-            // this.getOrder()
-            // this.getOrderUser()
-        },
-        methods: {
-            getList() {
-                this.listLoading = true
-                statisticTopTradeApi({time: 'today'}).then(res => {
-                    // 今日交易数据
-                    this.statisticsData = res.data;
-                    const leftOrder = res.data.left;
-                    const leftToday = [];
-                    const leftLegendData = leftOrder.x;
-                    Object.keys(leftOrder.series[0].value).forEach((key) => {
-                        leftToday.push(Number(leftOrder.series[0].value[key]))
-                    })
-                    const leftYesterday = [];
-                    Object.keys(leftOrder.series[1].value).forEach((key) => {
-                        leftYesterday.push(Number(leftOrder.series[1].value[key]))
-                    })
-                    const seriesData = [
-                        {
-                            name: '今天',
-                            type: 'line',
-                            areaStyle: {
-                                normal: {
-                                    color: new echarts.graphic.LinearGradient(
-                                        0, 0, 0, 1,
-                                        [{
-                                            offset: 0,
-                                            color: '#5B8FF9'
-                                        },
-                                            {
-                                                offset: 0.5,
-                                                color: '#fff'
-                                            },
-                                            {
-                                                offset: 1,
-                                                color: '#fff'
-                                            }
-                                        ]
-                                    )
-                                }
-                            },
-                            itemStyle: {
-                                normal: {
-                                    color: '#5B8FF9',
-                                    lineStyle: {
-                                        color: '#5B8FF9'
-                                    }
-                                }
-                            },
-                            data: leftToday,
-                            symbol: "none",
-                            smooth: true
-                        },
-                        {
-                            name: '昨天',
-                            type: 'line',
-                            areaStyle: {
-                                normal: {
-                                    color: new echarts.graphic.LinearGradient(
-                                        0, 0, 0, 1,
-                                        [{
-                                            offset: 0,
-                                            color: '#BFBFBF'
-                                        },
-                                            {
-                                                offset: 0.5,
-                                                color: '#fff'
-                                            },
-                                            {
-                                                offset: 1,
-                                                color: '#fff'
-                                            }
-                                        ]
-                                    )
-                                }
-                            },
-                            itemStyle: {
-                                normal: {
-                                    color: '#D9D9D9',
-                                    lineStyle: {
-                                        color: '#D9D9D9'
-                                    }
-                                }
-                            },
-                            data: leftYesterday,
-                            symbol: "none",
-                            smooth: true
-                        }
-                    ]
-                    this.optionData = {
-                        tooltip: {
-                            trigger: 'axis',
-                        },
-                        legend: {
-                            x: '1px',
-                            y: '10px',
-                            data: ['今天', '昨天']
-                        },
-                        grid: {
-                            left: '0%',
-                            right: '4%',
-                            bottom: '3%',
-                            containLabel: true
-                        },
-                        xAxis: [{
-                            boundaryGap: false,
-                            data: leftLegendData,
-                            axisLine: {
-                                show: false
-                            },
-                            show: false
-                        }],
-                        yAxis: {
-                            show: false
-                        },
-                        series: seriesData
-                    }
+	import {
+		statisticTopTradeApi
+	} from '@/api/statistic'
+	import echartsNew from '@/components/echartsNew/index'
+	import echarts from 'echarts'
+	export default {
+		name: 'ToDay',
+		components: {
+			echartsNew
+		},
+		data() {
+			return {
+				style: {
+					height: '200px'
+				},
+				styleToday: {
+					height: '130px'
+				},
+				legendData: ['今天', '昨天'],
+				seriesData: [],
+				timer: [],
+				grid: {
+					xl: 12,
+					lg: 12,
+					md: 12,
+					sm: 24,
+					xs: 24
+				},
+				statisticsData: null,
+				optionTodatOrder: {}, // 今日订单数
+				orderData: {},
+				orderUserData: {},
+				optionData: {}, // 今日交易数据
+				listLoading: false,
+				optionDataOrder: {},
+				optionOrderUser: {} // 今日支付人数
+			}
+		},
+		beforeDestroy() {
+			if (this.visitChart) {
+				this.visitChart.dispose()
+				this.visitChart = null
+			}
+		},
+		mounted() {
+			this.getList()
+			// this.getOrder()
+			// this.getOrderUser()
+		},
+		methods: {
+			getList() {
+				this.listLoading = true
+				statisticTopTradeApi({
+					time: 'today'
+				}).then(res => {
+					// 今日交易数据
+					this.statisticsData = res.data;
+					console.log(this.statisticsData);
+					const leftOrder = res.data.left;
+					const leftToday = [];
+					const leftLegendData = leftOrder.x;
+					Object.keys(leftOrder.series[0].value).forEach((key) => {
+						leftToday.push(Number(leftOrder.series[0].value[key]))
+					})
+					const leftYesterday = [];
+					Object.keys(leftOrder.series[1].value).forEach((key) => {
+						leftYesterday.push(Number(leftOrder.series[1].value[key]))
+					})
+					const seriesData = [{
+							name: '今天',
+							type: 'line',
+							areaStyle: {
+								normal: {
+									color: new echarts.graphic.LinearGradient(
+										0, 0, 0, 1,
+										[{
+												offset: 0,
+												color: '#5B8FF9'
+											},
+											{
+												offset: 0.5,
+												color: '#fff'
+											},
+											{
+												offset: 1,
+												color: '#fff'
+											}
+										]
+									)
+								}
+							},
+							itemStyle: {
+								normal: {
+									color: '#5B8FF9',
+									lineStyle: {
+										color: '#5B8FF9'
+									}
+								}
+							},
+							data: leftToday,
+							symbol: "none",
+							smooth: true
+						},
+						{
+							name: '昨天',
+							type: 'line',
+							areaStyle: {
+								normal: {
+									color: new echarts.graphic.LinearGradient(
+										0, 0, 0, 1,
+										[{
+												offset: 0,
+												color: '#BFBFBF'
+											},
+											{
+												offset: 0.5,
+												color: '#fff'
+											},
+											{
+												offset: 1,
+												color: '#fff'
+											}
+										]
+									)
+								}
+							},
+							itemStyle: {
+								normal: {
+									color: '#D9D9D9',
+									lineStyle: {
+										color: '#D9D9D9'
+									}
+								}
+							},
+							data: leftYesterday,
+							symbol: "none",
+							smooth: true
+						}
+					]
+					this.optionData = {
+						tooltip: {
+							trigger: 'axis',
+						},
+						legend: {
+							x: '1px',
+							y: '10px',
+							data: ['今天', '昨天']
+						},
+						grid: {
+							left: '0%',
+							right: '4%',
+							bottom: '3%',
+							containLabel: true
+						},
+						xAxis: [{
+							boundaryGap: false,
+							data: leftLegendData,
+							axisLine: {
+								show: false
+							},
+							show: false
+						}],
+						yAxis: {
+							show: false
+						},
+						series: seriesData
+					}
 
-                    // 今日订单数
-                    const rightOrder = res.data.right;
-                    const rightLegendData = rightOrder.today.x;
-                    const rightTodayOrder = [];
-                    Object.keys(rightOrder.today.series[0].value).forEach((key) => {
-                        rightTodayOrder.push(Number(rightOrder.today.series[0].value[key]))
-                    })
-                    const rightSeriesDataOrder = [{
-                        name: '今天',
-                        type: 'line',
-                        areaStyle: {
-                            normal: {
-                                color: new echarts.graphic.LinearGradient(
-                                    0, 0, 0, 1,
-                                    [{
-                                        offset: 0,
-                                        color: '#5B8FF9'
-                                    },
-                                        {
-                                            offset: 0.5,
-                                            color: '#fff'
-                                        },
-                                        {
-                                            offset: 1,
-                                            color: '#fff'
-                                        }
-                                    ]
-                                )
-                            }
-                        },
-                        itemStyle: {
-                            normal: {
-                                color: '#5B8FF9',
-                                lineStyle: {
-                                    color: '#5B8FF9'
-                                }
-                            }
-                        },
-                        data: rightTodayOrder,
-                        symbol: "none",
-                        smooth: true
-                    }]
-                    this.optionTodatOrder = {
-                        tooltip: {
-                            trigger: 'axis',
-                            axisPointer: {
-                                type: 'cross',
-                                label: {
-                                    backgroundColor: '#6a7985'
-                                }
-                            }
-                        },
-                        legend: {
-                            x: '1px',
-                            y: '10px',
-                            data: ['今天']
-                        },
-                        grid: {
-                            left: '0%',
-                            right: '4%',
-                            bottom: '3%',
-                            containLabel: true
-                        },
-                        axisLine: {
-                            show: false
-                        },
-                        xAxis: [{
-                            type: 'category',
-                            boundaryGap: false,
-                            data: rightLegendData,
-                            axisLine: {
-                                show: false
-                            },
-                            show: false
-                        }],
-                        yAxis: {
-                            show: false
-                        },
-                        series: rightSeriesDataOrder
-                    }
+					// 今日订单数
+					const rightOrder = res.data.right;
+					const rightLegendData = rightOrder.today.x;
+					const rightTodayOrder = [];
+					Object.keys(rightOrder.today.series[0].value).forEach((key) => {
+						rightTodayOrder.push(Number(rightOrder.today.series[0].value[key]))
+					})
+					const rightSeriesDataOrder = [{
+						name: '今天',
+						type: 'line',
+						areaStyle: {
+							normal: {
+								color: new echarts.graphic.LinearGradient(
+									0, 0, 0, 1,
+									[{
+											offset: 0,
+											color: '#5B8FF9'
+										},
+										{
+											offset: 0.5,
+											color: '#fff'
+										},
+										{
+											offset: 1,
+											color: '#fff'
+										}
+									]
+								)
+							}
+						},
+						itemStyle: {
+							normal: {
+								color: '#5B8FF9',
+								lineStyle: {
+									color: '#5B8FF9'
+								}
+							}
+						},
+						data: rightTodayOrder,
+						symbol: "none",
+						smooth: true
+					}]
+					this.optionTodatOrder = {
+						tooltip: {
+							trigger: 'axis',
+							axisPointer: {
+								type: 'cross',
+								label: {
+									backgroundColor: '#6a7985'
+								}
+							}
+						},
+						legend: {
+							x: '1px',
+							y: '10px',
+							data: ['今天']
+						},
+						grid: {
+							left: '0%',
+							right: '4%',
+							bottom: '3%',
+							containLabel: true
+						},
+						axisLine: {
+							show: false
+						},
+						xAxis: [{
+							type: 'category',
+							boundaryGap: false,
+							data: rightLegendData,
+							axisLine: {
+								show: false
+							},
+							show: false
+						}],
+						yAxis: {
+							show: false
+						},
+						series: rightSeriesDataOrder
+					}
 
-                    // 今日支付人数
-                    const rightTodayPay = [];
-                    Object.keys(rightOrder.today.series[1].value).forEach((key) => {
-                        rightTodayPay.push(Number(rightOrder.today.series[1].value[key]))
-                    })
-                    const seriesDataPay = [{
-                        name: '今天',
-                        type: 'line',
-                        areaStyle: {
-                            normal: {
-                                color: new echarts.graphic.LinearGradient(
-                                    0, 0, 0, 1,
-                                    [{
-                                        offset: 0,
-                                        color: '#5B8FF9'
-                                    },
-                                        {
-                                            offset: 0.5,
-                                            color: '#fff'
-                                        },
-                                        {
-                                            offset: 1,
-                                            color: '#fff'
-                                        }
-                                    ]
-                                )
-                            }
-                        },
-                        itemStyle: {
-                            normal: {
-                                color: '#5B8FF9',
-                                lineStyle: {
-                                    color: '#5B8FF9'
-                                }
-                            }
-                        },
-                        data: rightTodayPay,
-                        symbol: "none",
-                        smooth: true
-                    }]
-                    this.optionOrderUser = {
-                        tooltip: {
-                            trigger: 'axis',
-                            axisPointer: {
-                                type: 'cross',
-                                label: {
-                                    backgroundColor: '#6a7985'
-                                }
-                            }
-                        },
-                        legend: {
-                            x: '1px',
-                            y: '10px',
-                            data: ['今天']
-                        },
-                        grid: {
-                            left: '0%',
-                            right: '4%',
-                            bottom: '3%',
-                            containLabel: true
-                        },
-                        axisLine: {
-                            show: false
-                        },
-                        xAxis: [{
-                            type: 'category',
-                            boundaryGap: false,
-                            data: leftLegendData,
-                            axisLine: {
-                                show: false
-                            },
-                            show: false
-                        }],
-                        yAxis: {
-                            show: false
-                        },
-                        series: seriesDataPay
-                    }
-                }).catch(res => {
-                    this.listLoading = false
-                    this.$Message.error(res.msg)
-                })
-            },
-            getOrder() {
+					// 今日支付人数
+					const rightTodayPay = [];
+					Object.keys(rightOrder.today.series[1].value).forEach((key) => {
+						rightTodayPay.push(Number(rightOrder.today.series[1].value[key]))
+					})
+					const seriesDataPay = [{
+						name: '今天',
+						type: 'line',
+						areaStyle: {
+							normal: {
+								color: new echarts.graphic.LinearGradient(
+									0, 0, 0, 1,
+									[{
+											offset: 0,
+											color: '#5B8FF9'
+										},
+										{
+											offset: 0.5,
+											color: '#fff'
+										},
+										{
+											offset: 1,
+											color: '#fff'
+										}
+									]
+								)
+							}
+						},
+						itemStyle: {
+							normal: {
+								color: '#5B8FF9',
+								lineStyle: {
+									color: '#5B8FF9'
+								}
+							}
+						},
+						data: rightTodayPay,
+						symbol: "none",
+						smooth: true
+					}]
+					this.optionOrderUser = {
+						tooltip: {
+							trigger: 'axis',
+							axisPointer: {
+								type: 'cross',
+								label: {
+									backgroundColor: '#6a7985'
+								}
+							}
+						},
+						legend: {
+							x: '1px',
+							y: '10px',
+							data: ['今天']
+						},
+						grid: {
+							left: '0%',
+							right: '4%',
+							bottom: '3%',
+							containLabel: true
+						},
+						axisLine: {
+							show: false
+						},
+						xAxis: [{
+							type: 'category',
+							boundaryGap: false,
+							data: leftLegendData,
+							axisLine: {
+								show: false
+							},
+							show: false
+						}],
+						yAxis: {
+							show: false
+						},
+						series: seriesDataPay
+					}
+				}).catch(res => {
+					this.listLoading = false
+					this.$Message.error(res.msg)
+				})
+			},
+			getOrder() {
 
-            },
-            getOrderUser() {
+			},
+			getOrderUser() {
 
-            }
-        }
-    }
+			}
+		}
+	}
 </script>
 
 <style lang="less" scoped>
-    .up,
-    .el-icon-caret-top,
-    .content-is {
-        color: #F5222D;
-        font-size: 12px;
-        opacity: 1 !important;
+	.up,
+	.el-icon-caret-top,
+	.content-is {
+		color: #F5222D;
+		font-size: 12px;
+		opacity: 1 !important;
 
-        &.down {
-            color: #39C15B;
-        }
-    }
+		&.down {
+			color: #39C15B;
+		}
+	}
 
-    .down,
-    .el-icon-caret-bottom .content-is {
-        font-size: 12px;
-    }
+	.down,
+	.el-icon-caret-bottom .content-is {
+		font-size: 12px;
+	}
 
-    .el-icon-caret-bottom {
-        color: #39C15B;
-    }
+	.el-icon-caret-bottom {
+		color: #39C15B;
+	}
 
-    .br {
-        border-right: 1px solid rgba(0, 0, 0, 0.1);
-    }
+	.br {
+		border-right: 1px solid rgba(0, 0, 0, 0.1);
+	}
 
-    .toDay {
-        width: 49%;
-        display: inline-block;
+	.toDay {
+		width: 49%;
+		display: inline-block;
 
-        &-title {
-            font-size: 14px;
-        }
+		&-title {
+			font-size: 14px;
+		}
 
-        &-number {
-            font-size: 20px;
-        }
+		&-number {
+			font-size: 20px;
+		}
 
-        &-time {
-            font-size: 12px;
-            color: #8C8C8C;
-            margin-bottom: 5px;
-        }
-    }
+		&-time {
+			font-size: 12px;
+			color: #8C8C8C;
+			margin-bottom: 5px;
+		}
+	}
 
-    .title {
-        font-size: 16px;
-        color: #000000;
-        font-weight: 500;
-    }
+	.title {
+		font-size: 16px;
+		color: #000000;
+		font-weight: 500;
+	}
 
-    .price {
-        i {
-            font-style: normal;
-            font-size: 21px;
-            color: #000;
-        }
-    }
+	.price {
+		i {
+			font-style: normal;
+			font-size: 21px;
+			color: #000;
+		}
+	}
 </style>

+ 513 - 473
src/pages/statistic/transaction/components/transaction.vue

@@ -1,494 +1,534 @@
 <template>
-<!-- 交易概况 -->
-    <Card :bordered="false" dis-hover class="ivu-mt">
-        <div class="acea-row row-between-wrapper mb20">
-            <div class="header-title">交易概况</div>
-            <div class="acea-row">
-                <div class="acea-row row-middle">
-                    <span class="font-sm">时间筛选:</span>
-                    <DatePicker 
-                    :editable="false" 
-                    :clearable="false" 
-                    @on-change="onchangeTime" 
-                    :value="timeVal" 
-                    format="yyyy/MM/dd"
-                    type="datetimerange" 
-                    placement="bottom-start" 
-                    placeholder="自定义时间"
-                    class="mr20 input-add" 
-                    :options="options"></DatePicker>
-                    <Button type="primary" class="mr20" @click="onSeach">查询</Button>
-                    <Button type="primary" @click="excel">导出</Button>
-                </div>
-            </div>
-        </div>
-        <div class="acea-row mb20">
-            <div class="infoBox acea-row mb30" v-for="(item, index) in list" :key="index">
-                <div class="iconCrl mr15" :class="{'one':index%4==0,'two':index%4==1,'three':index%4==2,'four':index%4==3}"><i class="iconfont" :class="item.icon"></i></div>
-                <div class="info">
-                    <div class="sp1" >
+	<!-- 交易概况 -->
+	<Card :bordered="false" dis-hover class="ivu-mt">
+		<div class="acea-row row-between-wrapper mb20">
+			<div class="header-title">交易概况</div>
+			<div class="acea-row">
+				<div class="acea-row row-middle">
+					<span class="font-sm">时间筛选:</span>
+					<DatePicker :editable="false" :clearable="false" @on-change="onchangeTime" :value="timeVal"
+						format="yyyy/MM/dd" type="datetimerange" placement="bottom-start" placeholder="自定义时间"
+						class="mr20 input-add" :options="options"></DatePicker>
+					<Button type="primary" class="mr20" @click="onSeach">查询</Button>
+					<Button type="primary" @click="excel">导出</Button>
+				</div>
+			</div>
+		</div>
+		<div class="acea-row mb20">
+			<div class="infoBox acea-row mb30" v-for="(item, index) in list" :key="index">
+				<div class="iconCrl mr15"
+					:class="{'one':index%4==0,'two':index%4==1,'three':index%4==2,'four':index%4==3}"><i
+						class="iconfont" :class="item.icon"></i></div>
+				<div class="info">
+					<div class="sp1">
 						<span v-text="item.name" class="mr5"></span>
-						<Poptip word-wrap  trigger="hover" placement="right-start">
+						<Poptip word-wrap trigger="hover" placement="right-start">
 							<Icon type="ios-information-circle-outline" />
 							<div slot="content">{{item.desc}}</div>
 						</Poptip>
 					</div>
-                    <span class="sp2" v-if="index === list.length-1" v-text="item.money?( parseInt( item.money * 100 ) / 100 ).toFixed(2):0"></span>
-                    <span class="sp2" v-else v-text="item.money?( parseInt( item.money * 100 ) / 100 ).toFixed(2):0"></span>
-                    <span class="content-time spBlock">环比增长:<i class="content-is" :class="Number(item.rate)>=0?'up':'down'">{{ item.rate }}%</i><Icon :color="Number(item.rate)>=0?'#F5222D':'#39C15B'" :type="Number(item.rate)>=0?'md-arrow-dropup':'md-arrow-dropdown'" /></span>
-                </div>
-            </div>
-        </div>
-        <echarts-new :option-data="optionData" :styles="style" height="100%" width="100%" v-if="optionData"></echarts-new>
-        <Spin size="large" fix v-if="spinShow"></Spin>
-    </Card>
+					<span class="sp2" v-if="index === list.length-1"
+						v-text="item.money?( parseInt( item.money * 100 ) / 100 ).toFixed(2):0"></span>
+					<span class="sp2" v-else
+						v-text="item.money?( parseInt( item.money * 100 ) / 100 ).toFixed(2):0"></span>
+					<span class="content-time spBlock">环比增长:<i class="content-is"
+							:class="Number(item.rate)>=0?'up':'down'">{{ item.rate }}%</i>
+						<Icon :color="Number(item.rate)>=0?'#F5222D':'#39C15B'"
+							:type="Number(item.rate)>=0?'md-arrow-dropup':'md-arrow-dropdown'" />
+					</span>
+				</div>
+			</div>
+		</div>
+		<echarts-new :option-data="optionData" :styles="style" height="100%" width="100%" v-if="optionData">
+		</echarts-new>
+		<Spin size="large" fix v-if="spinShow"></Spin>
+	</Card>
 </template>
 
 <script>
-    import { statisticBottomTradeApi, statisticTrendApi } from '@/api/statistic'
-    import echartsNew from '@/components/echartsNew/index'
-    import { formatDate } from '@/utils/validate';
-    export default {
-        name: "transaction",
-        components: {
-            echartsNew
-        },
-        data() {
-            return {
-                grid: {
-                    xl: 8,
-                    lg: 8,
-                    md: 8,
-                    sm: 24,
-                    xs: 24
-                },
-                // options: this.$timeOptions,
+	import {
+		statisticBottomTradeApi,
+		statisticTrendApi
+	} from '@/api/statistic'
+	import echartsNew from '@/components/echartsNew/index'
+	import {
+		formatDate
+	} from '@/utils/validate';
+	export default {
+		name: "transaction",
+		components: {
+			echartsNew
+		},
+		data() {
+			return {
+				grid: {
+					xl: 8,
+					lg: 8,
+					md: 8,
+					sm: 24,
+					xs: 24
+				},
+				// options: this.$timeOptions,
 				options: {
-				  shortcuts: [
-				    {
-				      text: "今天",
-				      value() {
-				        const end = new Date();
-				        const start = new Date();
-				        start.setTime(
-				          new Date(
-				            new Date().getFullYear(),
-				            new Date().getMonth(),
-				            new Date().getDate()
-				          )
-				        );
-				        return [start, end];
-				      },
-				    },
-				    {
-				      text: "昨天",
-				      value() {
-				        const end = new Date();
-				        const start = new Date();
-				        start.setTime(
-				          start.setTime(
-				            new Date(
-				              new Date().getFullYear(),
-				              new Date().getMonth(),
-				              new Date().getDate() - 1
-				            )
-				          )
-				        );
-				        end.setTime(
-				          end.setTime(
-				            new Date(
-				              new Date().getFullYear(),
-				              new Date().getMonth(),
-				              new Date().getDate() - 1
-				            )
-				          )
-				        );
-				        return [start, end];
-				      },
-				    },
-				    {
-				      text: "最近7天",
-				      value() {
-				        const end = new Date();
-				        const start = new Date();
-				        start.setTime(
-				          start.setTime(
-				            new Date(
-				              new Date().getFullYear(),
-				              new Date().getMonth(),
-				              new Date().getDate() - 6
-				            )
-				          )
-				        );
-				        return [start, end];
-				      },
-				    },
-				    {
-				      text: "最近30天",
-				      value() {
-				        const end = new Date();
-				        const start = new Date();
-				        start.setTime(
-				          start.setTime(
-				            new Date(
-				              new Date().getFullYear(),
-				              new Date().getMonth(),
-				              new Date().getDate() - 29
-				            )
-				          )
-				        );
-				        return [start, end];
-				      },
-				    },
-				    {
-				      text: "本月",
-				      value() {
-				        const end = new Date();
-				        const start = new Date();
-				        start.setTime(
-				          start.setTime(
-				            new Date(new Date().getFullYear(), new Date().getMonth(), 1)
-				          )
-				        );
-				        return [start, end];
-				      },
-				    },
-				    {
-				      text: "本年",
-				      value() {
-				        const end = new Date();
-				        const start = new Date();
-				        start.setTime(
-				          start.setTime(new Date(new Date().getFullYear(), 0, 1))
-				        );
-				        return [start, end];
-				      },
-				    },
-				  ],
+					shortcuts: [{
+							text: "今天",
+							value() {
+								const end = new Date();
+								const start = new Date();
+								start.setTime(
+									new Date(
+										new Date().getFullYear(),
+										new Date().getMonth(),
+										new Date().getDate()
+									)
+								);
+								return [start, end];
+							},
+						},
+						{
+							text: "昨天",
+				  	value() {
+								const end = new Date();
+								const start = new Date();
+								start.setTime(
+									start.setTime(
+										new Date(
+											new Date().getFullYear(),
+											new Date().getMonth(),
+											new Date().getDate() - 1
+										)
+									)
+								);
+								end.setTime(
+									end.setTime(
+										new Date(
+											new Date().getFullYear(),
+											new Date().getMonth(),
+											new Date().getDate() - 1
+				  				)
+									)
+								);
+								return [start, end];
+							},
+						},
+						{
+							text: "最近7天",
+							value() {
+								const end = new Date();
+								const start = new Date();
+								start.setTime(
+									start.setTime(
+										new Date(
+				   				new Date().getFullYear(),
+											new Date().getMonth(),
+											new Date().getDate() - 6
+										)
+									)
+								);
+								return [start, end];
+							},
+						},
+						{
+							text: "最近30天",
+							value() {
+								const end = new Date();
+								const start = new Date();
+								start.setTime(
+									start.setTime(
+										new Date(
+											new Date().getFullYear(),
+											new Date().getMonth(),
+											new Date().getDate() - 29
+										)
+									)
+								);
+								return [start, end];
+							},
+						},
+						{
+							text: "本月",
+							value() {
+								const end = new Date();
+								const start = new Date();
+								start.setTime(
+				  			start.setTime(
+										new Date(new Date().getFullYear(), new Date().getMonth(), 1)
+									)
+								);
+								return [start, end];
+							},
+						},
+						{
+							text: "本年",
+							value() {
+								const end = new Date();
+								const start = new Date();
+								start.setTime(
+									start.setTime(new Date(new Date().getFullYear(), 0, 1))
+								);
+								return [start, end];
+							},
+						},
+					],
+				},
+				name: '近30天',
+				timeVal: [],
+				dataTime: '',
+				list: {},
+				optionData: {},
+				style: {
+					height: '400px'
 				},
-                name: '近30天',
-                timeVal: [],
-                dataTime: '',
-                list: {},
-                optionData: {},
-                style: { height: '400px' },
-                getExcel:'',
-                spinShow: false
-            }
-        },
-        created() {
-            const end = new Date()
-            const start = new Date()
-            start.setTime(start.setTime(new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate() - 29)));
-            this.timeVal = [start, end]
-            this.dataTime = formatDate(start, 'yyyy/MM/dd')+ '-'+ formatDate(end, 'yyyy/MM/dd');
-        },
-        mounted() {
-            this.getStatistics();
-        },
-        methods: {
-            onSeach(){
-                this.getStatistics();
-            },
-            // 具体日期
-            onchangeTime (e) {
-                this.timeVal = e
-                this.dataTime = this.timeVal.join('-');
-                this.name = this.dataTime;
-            },
-            // 统计
-            getStatistics() {
-                this.spinShow = true;
-                statisticBottomTradeApi({data: this.dataTime}).then(async res => {
-                    const cardLists = res.data;
-                    const incons = ['iconyingyee', 'iconjiaoyijine', 'iconshangpinzhifujine', 'icongoumaihuiyuanjine', 'iconchongzhijianshu', 'iconxianxiashouyinjine','iconzhichujine','iconyuezhifujine','iconzhifuyongjinjine','iconshangpintuikuanjine']
-                    for(var i=0;i< cardLists.series.length;i++){
-                        this.$set(cardLists.series[i], 'icon', incons[i])
-                    }
-                    this.list = cardLists.series;
-                    this.getExcel = cardLists.export;
-                    this.get(cardLists);
-                    this.spinShow = false;
-                }).catch(res => {
-                    this.$Message.error(res.msg);
-                    this.spinShow = false;
-                })
-            },
-            get(extract){
-                let dataList = extract.series.filter(item => {
-                    return item.type === 1
-                })
-                let legend = dataList.map(item => {
-                    return item.name
-                })
-                let col = ['#5B8FF9', '#5AD8A6', '#5D7092', '#F5222D','#FFAB2B','#B37FEB'];
-                let seriesData = []
-                dataList.map((item,index) => {
-                    let series = []
-                    Object.keys(item.value).forEach((key) => {
-                        series.push(Number(item.value[key]))
-                    })
-                    seriesData.push({
-                        name: item.name,
-                        type: 'line',
-                        data:  series,
-                        itemStyle: {
-                            normal: {
-                                color: col[index]
-                            }
-                        },
-                        smooth: true
-                    })
-                })
-                this.optionData = {
-                    tooltip: {
-                        trigger: 'axis',
-                        axisPointer: {
-                            type: 'cross',
-                            label: {
-                                backgroundColor: '#6a7985'
-                            }
-                        }
-                    },
-                    legend: {
-                        x:'center',
-                        data: legend
-                    },
-                    grid: {
-                        left: '3%',
-                        right: '4%',
-                        bottom: '3%',
-                        containLabel: true
-                    },
-                    toolbox: {
-											show: true,
-											right: '2%',
-											feature: {
-											    saveAsImage: {
-														name: '交易统计_'+formatDate(new Date(Number(new Date().getTime())), 'yyyyMMddhhmmss')
-													}
-											}
-                    },
-                    xAxis: {
-                        type: 'category',
-                        boundaryGap: true,
-                        axisLabel: {
-                            interval: 0,
-                            rotate: 40,
-                            textStyle: {
-                                color: '#000000'
-                            }
-                        },
-                        data: extract.x
-                    },
-                    yAxis: {
-                        type: 'value',
-                        axisLine: {
-                            show: false
-                        },
-                        axisTick: {
-                            show: false
-                        },
-                        axisLabel: {
-                            textStyle: {
-                                color: '#7F8B9C'
-                            }
-                        },
-                        splitLine: {
-                            show: true,
-                            lineStyle: {
-                                color: '#F5F7F9'
-                            }
-                        }
-                    },
-                    series: seriesData
-                }
-            },
-            excel(){
-                window.location.href = this.getExcel
-            },
-            // 统计图
-            getTrend() {
-                statisticTrendApi({data: this.dataTime}).then(async res => {
-                    let legend = res.data.series.map(item => {
-                        return item.name
-                    })
-                    let xAxis = res.data.xAxis;
-                    let col = ['#5B8FF9', '#5AD8A6', '#5D7092', '#5D7092'];
-                    let series = []
-                    res.data.series.map((item,index) => {
-                        series.push({
-                            name: item.name,
-                            type: 'line',
-                            data: item.value,
-                            itemStyle: {
-                                normal: {
-                                    color: col[index]
-                                }
-                            }
-                        })
-                    })
-                    this.optionData = {
-                        tooltip: {
-                            trigger: 'axis',
-                            axisPointer: {
-                                type: 'cross',
-                                label: {
-                                    backgroundColor: '#6a7985'
-                                }
-                            }
-                        },
-                        legend: {
-                            x: '1px',
-                            y: '10px',
-                            data: legend
-                        },
-                        grid: {
-                            left: '3%',
-                            right: '4%',
-                            bottom: '3%',
-                            containLabel: true
-                        },
-                        toolbox: {
-														show: true,
-														right: '2%',
-                            feature: {
-                                saveAsImage: {}
-                            }
-                        },
-                        xAxis: {
-                            type: 'category',
-                            boundaryGap: true,
-                            // axisTick:{
-                            //     show:false
-                            // },
-                            // axisLine:{
-                            //     show:false
-                            // },
-                            // splitLine: {
-                            //     show: false
-                            // },
-                            axisLabel: {
-                                interval: 0,
-                                rotate: 40,
-                                textStyle: {
-                                    color: '#000000'
-                                }
-                            },
-                            data: xAxis
-                        },
-                        yAxis: {
-                            type: 'value',
-                            splitLine: {
-                                show: false
-                            },
-                            axisLine: {
-                                show: false
-                            }
-                        },
-                        series: series
-                    }
-                    // this.TrendList =
-                }).catch(res => {
-                    this.$Message.error(res.msg)
-                })
-            },
-        }
-    }
+				getExcel: '',
+				spinShow: false
+			}
+		},
+		created() {
+			const end = new Date()
+			const start = new Date()
+			start.setTime(start.setTime(new Date(new Date().getFullYear(), new Date().getMonth(), new Date().getDate() -
+				29)));
+			this.timeVal = [start, end]
+			this.dataTime = formatDate(start, 'yyyy/MM/dd') + '-' + formatDate(end, 'yyyy/MM/dd');
+		},
+		mounted() {
+			this.getStatistics();
+		},
+		methods: {
+			onSeach() {
+				this.getStatistics();
+			},
+			// 具体日期
+			onchangeTime(e) {
+				this.timeVal = e
+				this.dataTime = this.timeVal.join('-');
+				this.name = this.dataTime;
+			},
+			// 统计
+			getStatistics() {
+				this.spinShow = true;
+				statisticBottomTradeApi({
+					data: this.dataTime
+				}).then(async res => {
+					const cardLists = res.data;
+					const incons = ['iconyingyee', 'iconjiaoyijine', 'iconshangpinzhifujine',
+						'icongoumaihuiyuanjine', 'iconchongzhijianshu', 'iconxianxiashouyinjine',
+						'iconzhichujine', 'iconyuezhifujine', 'iconzhifuyongjinjine',
+						'iconshangpintuikuanjine'
+					]
+					for (var i = 0; i < cardLists.series.length; i++) {
+						if(cardLists.series[i].name!='购买会员金额'){
+							this.$set(cardLists.series[i], 'icon', incons[i])
+						}
+					}
+					this.list = cardLists.series.filter((item)=>{
+						if(item.name!='购买会员金额'){
+							return true;
+						}else{
+							return false;
+						}
+					});
+					this.getExcel = cardLists.export;
+					this.get(cardLists);
+					this.spinShow = false;
+				}).catch(res => {
+					this.$Message.error(res.msg);
+					this.spinShow = false;
+				})
+			},
+			get(extract) {
+				let dataList = extract.series.filter(item => {
+					return item.type === 1
+				})
+				let legend = dataList.map(item => {
+					return item.name
+				})
+				let col = ['#5B8FF9', '#5AD8A6', '#5D7092', '#F5222D', '#FFAB2B', '#B37FEB'];
+				let seriesData = []
+				dataList.map((item, index) => {
+					if(item.name=='购买会员金额'){
+						return
+					}
+					let series = []
+					Object.keys(item.value).forEach((key) => {
+						series.push(Number(item.value[key]))
+					})
+					seriesData.push({
+						name: item.name,
+						type: 'line',
+						data: series,
+						itemStyle: {
+							normal: {
+								color: col[index]
+							}
+						},
+						smooth: true
+					})
+				})
+				this.optionData = {
+					tooltip: {
+						trigger: 'axis',
+						axisPointer: {
+							type: 'cross',
+							label: {
+								backgroundColor: '#6a7985'
+							}
+						}
+					},
+					legend: {
+						x: 'center',
+						data: legend
+					},
+					grid: {
+						left: '3%',
+						right: '4%',
+						bottom: '3%',
+						containLabel: true
+					},
+					toolbox: {
+						show: true,
+						right: '2%',
+						feature: {
+							saveAsImage: {
+								name: '交易统计_' + formatDate(new Date(Number(new Date().getTime())),
+									'yyyyMMddhhmmss')
+							}
+						}
+					},
+					xAxis: {
+						type: 'category',
+						boundaryGap: true,
+						axisLabel: {
+							interval: 0,
+							rotate: 40,
+							textStyle: {
+								color: '#000000'
+							}
+						},
+						data: extract.x
+					},
+					yAxis: {
+						type: 'value',
+						axisLine: {
+							show: false
+						},
+						axisTick: {
+							show: false
+						},
+						axisLabel: {
+							textStyle: {
+								color: '#7F8B9C'
+							}
+						},
+						splitLine: {
+							show: true,
+							lineStyle: {
+								color: '#F5F7F9'
+							}
+						}
+					},
+					series: seriesData
+				}
+			},
+			excel() {
+				window.location.href = this.getExcel
+			},
+			// 统计图
+			getTrend() {
+				statisticTrendApi({
+					data: this.dataTime
+				}).then(async res => {
+					let legend = res.data.series.map(item => {
+						return item.name
+					})
+					let xAxis = res.data.xAxis;
+					let col = ['#5B8FF9', '#5AD8A6', '#5D7092', '#5D7092'];
+					let series = []
+					res.data.series.map((item, index) => {
+						series.push({
+							name: item.name,
+							type: 'line',
+							data: item.value,
+							itemStyle: {
+								normal: {
+									color: col[index]
+								}
+							}
+						})
+					})
+					this.optionData = {
+						tooltip: {
+							trigger: 'axis',
+							axisPointer: {
+								type: 'cross',
+								label: {
+									backgroundColor: '#6a7985'
+								}
+							}
+						},
+						legend: {
+							x: '1px',
+							y: '10px',
+							data: legend
+						},
+						grid: {
+							left: '3%',
+							right: '4%',
+							bottom: '3%',
+							containLabel: true
+						},
+						toolbox: {
+							show: true,
+							right: '2%',
+							feature: {
+								saveAsImage: {}
+							}
+						},
+						xAxis: {
+							type: 'category',
+							boundaryGap: true,
+							// axisTick:{
+							//     show:false
+							// },
+							// axisLine:{
+							//     show:false
+							// },
+							// splitLine: {
+							//     show: false
+							// },
+							axisLabel: {
+								interval: 0,
+								rotate: 40,
+								textStyle: {
+									color: '#000000'
+								}
+							},
+							data: xAxis
+						},
+						yAxis: {
+							type: 'value',
+							splitLine: {
+								show: false
+							},
+							axisLine: {
+								show: false
+							}
+						},
+						series: series
+					}
+					// this.TrendList =
+				}).catch(res => {
+					this.$Message.error(res.msg)
+				})
+			},
+		}
+	}
 </script>
 
 <style scoped lang="less">
-    .one {
-        background: #1890FF;
-    }
-    .two {
-        background: #00C050;
-    }
-    .three {
-        background: #FFAB2B;
-    }
-    .four {
-        background: #B37FEB;
-    }
-    .up,
-    .el-icon-caret-top {
-        color: #F5222D;
-        font-size: 12px;
-        opacity: 1 !important;
-    }
+	.one {
+		background: #1890FF;
+	}
+
+	.two {
+		background: #00C050;
+	}
+
+	.three {
+		background: #FFAB2B;
+	}
+
+	.four {
+		background: #B37FEB;
+	}
+
+	.up,
+	.el-icon-caret-top {
+		color: #F5222D;
+		font-size: 12px;
+		opacity: 1 !important;
+	}
+
+	.down,
+	.el-icon-caret-bottom {
+		color: #39C15B;
+		font-size: 12px;
+	}
+
+	.curP {
+		cursor: pointer;
+	}
+
+	.header {
+		&-title {
+			font-size: 16px;
+			color: rgba(0, 0, 0, 0.85);
+		}
+
+		&-time {
+			font-size: 12px;
+			color: #000000;
+			opacity: 0.45;
+		}
+	}
+
+	.iconfont {
+		font-size: 16px;
+		color: #fff;
+	}
+
+	.iconCrl {
+		width: 32px;
+		height: 32px;
+		border-radius: 50%;
+		text-align: center;
+		line-height: 32px;
+		opacity: .7;
+	}
+
+	.lan {
+		background: #1890FF;
+	}
+
+	.iconshangpinliulanliang {
+		color: #fff;
+	}
 
-    .down,
-    .el-icon-caret-bottom {
-        color: #39C15B;
-        font-size: 12px;
-    }
-    .curP{
-        cursor: pointer;
-    }
-    .header{
-        &-title{
-            font-size: 16px;
-            color: rgba(0, 0, 0, 0.85);
-        }
-        &-time{
-            font-size:12px;
-            color: #000000;
-            opacity: 0.45;
-        }
-    }
+	.infoBox {
+		width: 20%;
 
-    .iconfont {
-        font-size: 16px;
-        color: #fff;
-    }
+		@media screen and (max-width: 1500px) {
+			width: 25%;
+		}
 
-    .iconCrl {
-        width: 32px;
-        height: 32px;
-        border-radius: 50%;
-        text-align: center;
-        line-height: 32px;
-        opacity: .7;
-    }
+		@media screen and (max-width: 1200px) {
+			width: 33%;
+		}
 
-    .lan {
-        background: #1890FF;
-    }
+		@media screen and (max-width: 900px) {
+			width: 50%;
+		}
+	}
 
-    .iconshangpinliulanliang {
-        color: #fff;
-    }
+	.info {
+		.sp1 {
+			color: #666;
+			font-size: 14px;
+			display: block;
+		}
 
-    .infoBox {
-        width: 20%;
-        @media screen and (max-width: 1500px) {
-            width: 25%;
-        }
-        @media screen and (max-width: 1200px) {
-            width: 33%;
-        }
-        @media screen and (max-width: 900px) {
-            width: 50%;
-        }
-    }
+		.sp2 {
+			font-weight: 400;
+			font-size: 30px;
+			color: rgba(0, 0, 0, 0.85);
+			display: block;
+		}
 
-    .info {
-        .sp1 {
-            color: #666;
-            font-size: 14px;
-            display: block;
-        }
-        .sp2 {
-            font-weight: 400;
-            font-size: 30px;
-            color: rgba(0, 0, 0, 0.85);
-            display: block;
-        }
-        .sp3 {
-            font-size: 12px;
-            font-weight: 400;
-            color: rgba(0, 0, 0, 0.45);
-            display: block;
-        }
-    }
-</style>
+		.sp3 {
+			font-size: 12px;
+			font-weight: 400;
+			color: rgba(0, 0, 0, 0.45);
+			display: block;
+		}
+	}
+</style>

+ 17 - 14
src/pages/statistic/user/components/userInfo.vue

@@ -118,13 +118,13 @@
                             colors: 'three',
 							txt: '在选定条件下,全部成交客户数 / 商城访客数'
                         },
-                        {
-                            name: '激活付费会员数',
-                            icon: 'iconfufeihuiyuanshu',
-                            list: cardLists.payUser,
-                            colors: 'four',
-							txt: '在选定条件下,通过各种方式成为付费会员的用户数'
-                        },
+       //                  {
+       //                      name: '激活付费会员数',
+       //                      icon: 'iconfufeihuiyuanshu',
+       //                      list: cardLists.payUser,
+       //                      colors: 'four',
+							// txt: '在选定条件下,通过各种方式成为付费会员的用户数'
+       //                  },
                         {
                             name: '充值用户数',
                             icon: 'iconchongzhiyonghushu',
@@ -146,13 +146,13 @@
                             colors: 'four',
 							txt: '商城的总用户'
                         },
-                        {
-                            name: '累计付费会员数',
-                            icon: 'iconfufeihuiyuanshu',
-                            list: cardLists.cumulativePayUser,
-                            colors: 'one',
-							txt: '筛选时间截止时,具有商城付费会员身份的用户数'
-                        },
+       //                  {
+       //                      name: '累计付费会员数',
+       //                      icon: 'iconfufeihuiyuanshu',
+       //                      list: cardLists.cumulativePayUser,
+       //                      colors: 'one',
+							// txt: '筛选时间截止时,具有商城付费会员身份的用户数'
+       //                  },
                         {
                             name: '累计充值用户数',
                             icon: 'iconchongzhiyonghushu',
@@ -183,6 +183,9 @@
                     let col = ['#5B8FF9', '#5AD8A6', '#FFAB2B', '#5D7092'];
                     let series = []
                     res.data.series.map((item,index) => {
+						if(item.name=='新增付费用户数'){
+							return
+						}
                         series.push({
                             name: item.name,
                             type: 'line',

+ 5 - 5
src/pages/user/list/index.vue

@@ -949,11 +949,11 @@ export default {
           slot: "nickname",
           minWidth: 150,
         },
-        {
-          title: "付费会员",
-          slot: "isMember",
-          minWidth: 90,
-        },
+        // {
+        //   title: "付费会员",
+        //   slot: "isMember",
+        //   minWidth: 90,
+        // },
         {
           title: "用户等级",
           key: "level",

+ 2 - 2
src/setting.js

@@ -12,7 +12,7 @@
  * */
 // 请求接口地址 如果没有配置自动获取当前网址路径
 // const VUE_APP_API_URL = process.env.VUE_APP_API_URL || `${location.origin}/adminapi`;
-const VUE_APP_API_URL = `https://hqgj.hqgjsmc.com/adminapi`;
+const VUE_APP_API_URL = `https://ygs.hqgjsmc.com/adminapi`;
 // 管理端ws
 const VUE_APP_WS_ADMIN_URL = process.env.VUE_APP_WS_ADMIN_URL || `ws:${location.hostname}/ws`
 
@@ -23,7 +23,7 @@ const Setting = {
      * 基础配置
      * */
     // 网页标题的后缀
-    titleSuffix: util.cookies.get('pageTitle') || 'CRMEB',
+    titleSuffix: util.cookies.get('pageTitle') || '易博优购',
     // 路由模式,可选值为 history 或 hash
     routerMode: 'history',
     // 页面切换时,是否显示模拟的进度条