|  | @@ -2,8 +2,8 @@
 | 
	
		
			
				|  |  |  	<view class="page" :style="{'min-height':(h)+'px','padding-top':mt+'px'}">
 | 
	
		
			
				|  |  |  		<c-nav-bar title="核销记录"></c-nav-bar>
 | 
	
		
			
				|  |  |  		<view class="top">
 | 
	
		
			
				|  |  | -			<!-- <view class="time" @click="show=true"> -->
 | 
	
		
			
				|  |  | -			<view class="time">
 | 
	
		
			
				|  |  | +			<view class="time" @click="show=true">
 | 
	
		
			
				|  |  | +				<!-- <view class="time"> -->
 | 
	
		
			
				|  |  |  				<u-icon name="calendar" :label="dateStr" labelPos="right" labelColor="#666" color="#666" space="7px"
 | 
	
		
			
				|  |  |  					size="25px"></u-icon>
 | 
	
		
			
				|  |  |  				<!-- <u-icon name="arrow-down" color="#999" size="20px" style="margin-left: 20rpx;"></u-icon> -->
 | 
	
	
		
			
				|  | @@ -26,6 +26,9 @@
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  			</view>
 | 
	
		
			
				|  |  |  		</view>
 | 
	
		
			
				|  |  | +		<view class="nodata" v-if='data.length==0'>
 | 
	
		
			
				|  |  | +			<NoData></NoData>
 | 
	
		
			
				|  |  | +		</view>
 | 
	
		
			
				|  |  |  		<u-datetime-picker @confirm="confirmDate" @cancel="show=false" :show="show" v-model="value1"
 | 
	
		
			
				|  |  |  			visibleItemCount="6" mode="year-month"></u-datetime-picker>
 | 
	
		
			
				|  |  |  	</view>
 | 
	
	
		
			
				|  | @@ -44,6 +47,7 @@
 | 
	
		
			
				|  |  |  				merchantId: uni.getStorageSync('merchantId'),
 | 
	
		
			
				|  |  |  				totalAmount: 0,
 | 
	
		
			
				|  |  |  				totalNum: 0,
 | 
	
		
			
				|  |  | +				repastMonth: ''
 | 
	
		
			
				|  |  |  			}
 | 
	
		
			
				|  |  |  		},
 | 
	
		
			
				|  |  |  		onLoad() {
 | 
	
	
		
			
				|  | @@ -56,8 +60,8 @@
 | 
	
		
			
				|  |  |  					page: 1,
 | 
	
		
			
				|  |  |  					homestayId: uni.getStorageSync('homestayId'),
 | 
	
		
			
				|  |  |  					orderStatus: 2,
 | 
	
		
			
				|  |  | -					orderType: 201
 | 
	
		
			
				|  |  | -
 | 
	
		
			
				|  |  | +					orderType: 201,
 | 
	
		
			
				|  |  | +					repastMonth: this.date
 | 
	
		
			
				|  |  |  				}).then(res => {
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  					if (res.data.code == 0) {
 | 
	
	
		
			
				|  | @@ -85,6 +89,7 @@
 | 
	
		
			
				|  |  |  				formattedTime = `${year}-${month}`;
 | 
	
		
			
				|  |  |  				this.dateStr = `${year}年-${month}月`
 | 
	
		
			
				|  |  |  				this.date = formattedTime;
 | 
	
		
			
				|  |  | +				console.log(this.date);
 | 
	
		
			
				|  |  |  				this.show = false;
 | 
	
		
			
				|  |  |  				this.getdata()
 | 
	
		
			
				|  |  |  			},
 |