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

src/common/api/order.js

@@ -183,6 +183,8 @@ let orderApiFun = function(vm){
 	let listStatementDetails = async (params = {}) => await vm.$u.get(settle + vm.vuex_token + '/queryStatementByPayableNo', params);
 	// 获取我的钱包-支付单一览
 	let payableRecord = async (params = {}) => await vm.$u.post(settle + vm.vuex_token + '/payable/v2/queryPayableRecord', params, formType);
+	// 获取我的钱包-支付单一览版本3
+	let payableRecord = async (params = {}) => await vm.$u.post(settle + vm.vuex_token + '/payable/v3/queryPayableRecord', params, formType);
 	// 获取我的钱包-师傅提现
 	let workerApplyPay = async () => await vm.$u.get(prefix + vm.vuex_token + '/applypay/batch/workerApplyPay');
 	// 是否有特殊登录权限

src/components/mine/settlement.vue

@@ -10,7 +10,7 @@
 			</view>
 			<view class="right-view">
 				<view :class="['settlement-status-view', settlementTypeClass]">{{data.payableRecordStatusText}}</view>
-				<view class="settlement-amount-view">￥{{data.settlementAmount}}</view>
+				<view class="settlement-amount-view">￥{{ data.paidAmount || 0}}</view>
 			</view>
 		</view>
 		<view class="line-view"></view>
@@ -24,11 +24,11 @@
 				type: Object,
 				default () {
 					return {
-						paymentTime: new Date().getTime(),
-						payableRecordStatusText: '提现',
-						payableRecordNumber: 'EE999777',
 						payableRecordId: '',
-						settlementAmount: 9899
+						paidTime: new Date().getTime(),
+						payableRecordStatusText: '提现',
+						payableRecordNumber: '',
+						paidAmount: 0
 					}
 				},
 			}
@@ -56,13 +56,13 @@
 			timeText() {
 				let now = this.moment().startOf('day').unix()
 				let yesterday = this.moment(now*1000).subtract(1, 'days').unix()
-				let date = this.moment(this.data.updateDatetime).startOf('day').unix()
+				let date = this.moment(this.data.paidTime).startOf('day').unix()
 				if(date == now) {
 					return '今天'
 				} else if(date == yesterday) {
 					return '昨天'
 				} else {
-					return this.$u.timeFormat(this.data.updateDatetime, 'mm.dd')
+					return this.$u.timeFormat(this.data.paidTime, 'mm.dd')
 				}
 			}
 		},

src/pages/mine/wallet/settlement.vue

@@ -13,11 +13,14 @@
 							</view>
 						</picker>
 					</view>
-					<view class="head-bottom-view">
+					<view class="head-bottom-view u-flex u-row-between">
 						<view class="head-amount-view">
 							<view><text>已结算金额（元）</text></view>
-							<view class="head-amount-text"><text>{{info.totalAmount}}</text></view>
-						</view>
+							<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>
 				</view>
 				<image :src="qnFile('liushuibeijing.png')" class="head-back-image" mode="widthFix"></image>
@@ -46,7 +49,7 @@
 	let now = new Date(new Date().toLocaleDateString()).getTime();
 	import util from '@/utils/util.js'
 	import Settlement from "@/components/mine/settlement.vue"
-	const baseinfo = {totalAmount: 0, payableRecordExtendDtos: []}
+	const baseinfo = {totalAmount: 0, waitPaidAmount: 0, payableRecordExtendDtos: []}
 	export default {
 		components: {
 			Settlement