Merge branch 'dev-zypt-v1.5.2' into tmp-test

src/pages/mine/wallet/settlement.vue

@@ -19,8 +19,8 @@
 							<view class="head-amount-text"><text>{{info.totalAmount || 0}}</text></view>
 						<!-- <view class="head-amount-view">
 							<view><text>待结算金额（元）</text></view>
-							<view class="head-amount-text"><text>{{info.waitPaidAmount || 0}}</text></view>
-						</view> -->
+							<view class="head-amount-text"><text>{{info.waitPaidAmount || 0}}</text></view> -->
+						</view>
 					</view>
 				</view>
 				<image :src="qnFile('liushuibeijing.png')" class="head-back-image" mode="widthFix"></image>
@@ -93,7 +93,7 @@
 				let endTime = self.moment(self.date).endOf('month').format('YYYY-MM-DD')
 				self.params.starDate = startTime
 				self.params.endDate = endTime
-				let res = await self.$u.api.listPayableRecordByPayTime(self.params)
+				let res = await self.$u.api.payableRecord(self.params)
 				self.loading = false
 				if(res && res.code == 200) {
 					self.info = res.data && res.data[self.date] || baseinfo