营销统计模块增加日/月/年分时段统计功能。

pagesFinance/statistics/index.vue

@@ -693,8 +693,22 @@
 
 		<view class="statisticsChart chargingpile"  v-if="info.accountType==1" >
 			<view class="statisticsChart-head" style="margin-top: 40rpx;">
-				<h4>充值送折扣卡活动营销统计</h4>
-
+				<h4>充值活动营销统计</h4>
+				<view class="navbar-screen headbottonMain " >
+					<!-- 个人 -->
+					<u-button text="月落" size="mini" class="headbotton headbotton1"
+						style="border-radius: 10px 0 0 10px;" :type="current2==1?'success':'info'"
+						@click="changesub2(1)">日报</u-button>
+				
+					<u-button text="月落" size="mini" class="headbotton headbotton2"
+						style="border-radius: 0 0 0 0;" :type="current2==2?'success':'info'"
+						@click="changesub2(2)">月报</u-button>
+				
+					<u-button text="月落" size="mini" class="headbotton headbotton3"
+						style="border-radius: 0 10px 10px 0;" :type="current2==3?'success':'info'"
+						@click="changesub2(3)">年报</u-button>
+				
+				</view>
 			</view>
 
 
@@ -1001,7 +1015,8 @@
 				endTime3: '',
 				endTime3Temp: '',
 				stationId3: "",
-				current: 1,
+				current: 1,
+				current2: 1,
 				background: {
 					background: 'none'
 				},
@@ -1673,12 +1688,28 @@
 				this.endTime3Temp = e.endDate
 
 			},
-			getData4() {
-				API.markingCardStatistics({
-					endDate:parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}')
-				}).then((res) => {
+			getData4(bl) {
+				if (bl) {
+				uni.showLoading()
+				}
+				
+				var obj={}
+				obj.type=this.current2
+				if(this.current2==1){
+					
+					obj.startDate= parseUnixTime(beforeTimeStamp(30), '{y}-{m}-{d}')
+					obj.endDate=parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}')
+				}
+				if(this.current2==2){
+					
+					obj.startDate= parseUnixTime(beforeTimeStamp(366), '{y}-{m}-{d}')
+					obj.endDate=parseUnixTime(currentTimeStamp(), '{y}-{m}-{d}')
+				}
+				API.markingCardStatistics(obj).then((res) => {
 					this.indexData7 = res.data
-
+					if(bl){
+						uni.hideLoading()
+					}
 
 					this.getPie3()
 
@@ -1756,6 +1787,10 @@
 				}
 				//	this.getPie()
 				this.getDataHome2(1)
+			},
+			changesub2(e){
+					this.current2 = e
+					this.getData4(1)
 			},
 			changedate4(e) {
 				this.startTime = e.startDate
@@ -1891,7 +1926,7 @@
 				var series = []
 				
 				var obj = {
-					
+					  barMaxWidth: 50, // 柱子最大宽度
 					type: 'bar',
 				
 					data: []
@@ -1910,7 +1945,13 @@
 				series.push(obj)
 
 
-				var data1 = []
+				var data1 = []
+				var axisLabel={}
+				if(this.current2==1){
+					axisLabel.rotate=30
+				}
+				
+				
 				this.myChart3.clear();
 				var option = {
 					tooltip: {
@@ -1982,7 +2023,7 @@
 					
 					xAxis: {
 						type: 'category',
-
+						axisLabel:axisLabel,
 						data: dates
 					},
 					yAxis: {
@@ -3325,7 +3366,10 @@
 	.headbotton1:after {
 		border-radius: 15px 0 0 15px;
 	}
-
+	.headbotton2{
+		border-left:0px ;
+		border-right: 0px;
+	}
 	.headbotton2:after {
 		border-radius: 0;
 	}