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

src/common/api/order.js

@@ -184,7 +184,7 @@ let orderApiFun = function(vm){
 	// 获取我的钱包-支付单一览
 	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 listPayableRecordByPayTime = 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/pages/mine/wallet/settlement.vue

@@ -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.payableRecord(self.params)
+				let res = await self.$u.api.listPayableRecordByPayTime(self.params)
 				self.loading = false
 				if(res && res.code == 200) {
 					self.info = res.data && res.data[self.date] || baseinfo