Merge branch 'dev-bills-1.4.4' into test

src/pages/mine/wallet/settlement.vue

@@ -55,7 +55,7 @@
 			return {
 				loading: true,
 				info: baseinfo,
-				date: '2021-05',
+				date: '',
 				params: {
 					payableRecordStatus: null,
 					starDate: null,
@@ -76,6 +76,7 @@
 		},
 		onLoad() {
 			getApp().trackPage('结算账单列表页')
+			this.date = this.moment().format('YYYY-MM')
 			this.loadPayRecord()
 		},
 		methods: {

src/pages/mine/wallet/statement.vue

 <template>
 	<view class="statement-view">
 		<u-navbar back-icon-color="#333333" background="#F4F5F7" title="收入流水" titleColor="#333333"
-			:border-bottom="false" title-bold></u-navbar>
+			:border-bottom="false" title-bold></u-navbar>
 		<view class="statement-conten">
-			<view class="statement-content-view">
+			<view class="statement-content-view">
 				<view class="head-view">
-					<view class="head-top-view">
-						<picker mode="date" :value="date" fields="month" @change="bindDateChange" :end="endTime">
-						    <view class="date-input">
-								<text class="date-text">{{date}}</text>
-								<u-icon name="arrow-down"></u-icon>
-							</view>
+					<view class="head-top-view">
+						<picker mode="date" :value="date" fields="month" @change="bindDateChange" :end="endTime">
+						    <view class="date-input">
+								<text class="date-text">{{date}}</text>
+								<u-icon name="arrow-down"></u-icon>
+							</view>
 						</picker>
 					</view>
 					<view class="head-bottom-view">
@@ -19,16 +19,16 @@
 							<view class="head-amount-text"><text>{{info[key]}}</text></view>
 						</view>
 					</view>
-				</view>
-				<image :src="qnFile('liushuibeijing.png')" class="head-back-image" mode="widthFix"></image>
-				<view class="list-view"  v-if="hasInfo">
+				</view>
+				<image :src="qnFile('liushuibeijing.png')" class="head-back-image" mode="widthFix"></image>
+				<view class="list-view"  v-if="hasInfo">
 					<view class="u-flex u-row-center" v-if="loading">
 						<u-gap height="20"></u-gap>
 						<u-loading color="#2272FF" :show="loading"></u-loading>
 					</view>
-					<view v-else v-for="(item, index) in data.statementList" :key="index">
-						<Statement :data="item" @click="handleClickCell"></Statement>
-					</view>
+					<view v-else v-for="(item, index) in data.statementList" :key="index">
+						<Statement :data="item" @click="handleClickCell"></Statement>
+					</view>
 				</view>
 				<view class="list-view-empty" v-else>
 					<u-image class="empty-image" :src="banner" width="374" height="246" mode="widthFix" :fade="false">
@@ -37,7 +37,7 @@
 					</u-image>
 					<text class="desc">本月没有流水信息</text>
 				</view>
-			</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -53,12 +53,12 @@
 		},
 		data() {
 			return {
-				data: {
-					expectedAmount: 0,
-					settledAmount: 0,
-					statementList: []
-				},
-				date: '2021-05',
+				data: {
+					expectedAmount: 0,
+					settledAmount: 0,
+					statementList: []
+				},
+				date: '',
 				params: {
 					starDate: null,
 					endDate: null,
@@ -72,9 +72,9 @@
 					...this.data,
 					number: this.data.statementList.length
 				}
-			},
+			},
 			endTime() {
-				this.moment().format('YYYY-MM-DD')
+				this.moment().format('YYYY-MM-DD')
 			},
 			items() {
 				return {
@@ -96,21 +96,22 @@
 		},
 		onLoad() {
 			getApp().trackPage('收入流水列表页')
+			this.date = this.moment().format('YYYY-MM')
 			this.loadStatement()
-		},
+		},
 		methods: {
 			qnFile(src) {
 				return process.uniEnv.qn_base_url + src
-			},
-			bindDateChange: function(e) {
+			},
+			bindDateChange: function(e) {
 			   this.date = e.target.value
-			   this.loadStatement()
-			},
+			   this.loadStatement()
+			},
 			handleClickCell(orderId) {
-				
-				uni.navigateTo({
-					url: 'pages/order/detail?isFromMine=1&id=' + orderId + '&type=other'
-				})
+				
+				uni.navigateTo({
+					url: 'pages/order/detail?isFromMine=1&id=' + orderId + '&type=other'
+				})
 			},
 			async loadStatement() {
 				let self = this
@@ -127,7 +128,7 @@
 					self.data.expectedAmount = data && data.expectedAmount || 0
 					self.data.statementList = data && data.orderList || []
 				}
-			},
+			},
 		}
 	}
 </script>
@@ -137,24 +138,24 @@
 		display: flex;
 		flex-direction: column;
 		height: 100vh;
-		background-color: #F4F5F7;
-		.statement-conten {
-		overflow: auto;
+		background-color: #F4F5F7;
+		.statement-conten {
+		overflow: auto;
 
 		.statement-content-view {
 			margin: 10rpx 30rpx 30rpx 30rpx;
-			border-radius: 12rpx;
-			position: relative;
-			
-			border-radius: 12rpx;
+			border-radius: 12rpx;
+			position: relative;
+			
+			border-radius: 12rpx;
 			background-color: #FFFFFF;
 				.head-back-image {
-					position: relative;
-					width: 100%;
-					z-index: 0;
+					position: relative;
+					width: 100%;
+					z-index: 0;
 				}
 
-			.head-view {
+			.head-view {
 				z-index: 1;
 				padding: 30rpx;
 				color: #FFFFFF;
@@ -163,14 +164,14 @@
 					width: 100%;
 
 				.head-top-view {
-					margin-top: 10rpx;
-					margin-bottom: 50rpx;
-					.date-input {
-						.date-text {
-							padding-right: 10rpx;
-							font-size: 28rpx;
-						}
-					}
+					margin-top: 10rpx;
+					margin-bottom: 50rpx;
+					.date-input {
+						.date-text {
+							padding-right: 10rpx;
+							font-size: 28rpx;
+						}
+					}
 				}
 
 				.head-bottom-view {
@@ -188,11 +189,11 @@
 						}
 					}
 				}
-			}
-			.list-view {
-				position: relative;
-				z-index: 1;
-				padding-bottom: 20rpx;
+			}
+			.list-view {
+				position: relative;
+				z-index: 1;
+				padding-bottom: 20rpx;
 			}
 			.list-view-empty {
 				position: relative;
@@ -213,7 +214,7 @@
 					line-height: 40px;
 				}
 			}
-		}
+		}
 		}
 	}
-</style>
+</style>