Commit b5dbce4f authored by 高铭波's avatar 高铭波

feat: 钱包优化

parent d1e50a71
;(function() { ;(function() {
let NODE_ENV = 'prod' // dev:开发环境 | test:测试环境 | prod:生产环境 let NODE_ENV = 'test' // dev:开发环境 | test:测试环境 | prod:生产环境
let ENV_VAR = null let ENV_VAR = null
let VERSION_NUMBER = '1.4.10' //版本号 let VERSION_NUMBER = '1.4.10' //版本号
//小程序是否审核通过,参数配置在ucenter库version表,对应版本号的is_audit设置为1,将显示学习视频 //小程序是否审核通过,参数配置在ucenter库version表,对应版本号的is_audit设置为1,将显示学习视频
......
...@@ -172,6 +172,8 @@ let orderApiFun = function(vm){ ...@@ -172,6 +172,8 @@ let orderApiFun = function(vm){
let listStatementDetails = async (params = {}) => await vm.$u.get(settle + vm.vuex_token + '/queryStatementByPayableNo', params); 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); 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'); let workerApplyPay = async () => await vm.$u.get(prefix + vm.vuex_token + '/applypay/batch/workerApplyPay');
// 是否有特殊登录权限 // 是否有特殊登录权限
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</view> </view>
<view class="right-view"> <view class="right-view">
<view :class="['settlement-status-view', settlementTypeClass]">{{data.payableRecordStatusText}}</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> </view>
<view class="line-view"></view> <view class="line-view"></view>
...@@ -24,11 +24,11 @@ ...@@ -24,11 +24,11 @@
type: Object, type: Object,
default () { default () {
return { return {
paymentTime: new Date().getTime(),
payableRecordStatusText: '提现',
payableRecordNumber: 'EE999777',
payableRecordId: '', payableRecordId: '',
settlementAmount: 9899 paidTime: new Date().getTime(),
payableRecordStatusText: '提现',
payableRecordNumber: '',
paidAmount: 0
} }
}, },
} }
...@@ -56,13 +56,13 @@ ...@@ -56,13 +56,13 @@
timeText() { timeText() {
let now = this.moment().startOf('day').unix() let now = this.moment().startOf('day').unix()
let yesterday = this.moment(now*1000).subtract(1, 'days').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) { if(date == now) {
return '今天' return '今天'
} else if(date == yesterday) { } else if(date == yesterday) {
return '昨天' return '昨天'
} else { } else {
return this.$u.timeFormat(this.data.updateDatetime, 'mm.dd') return this.$u.timeFormat(this.data.paidTime, 'mm.dd')
} }
} }
}, },
......
...@@ -13,11 +13,14 @@ ...@@ -13,11 +13,14 @@
</view> </view>
</picker> </picker>
</view> </view>
<view class="head-bottom-view"> <view class="head-bottom-view u-flex u-row-between">
<view class="head-amount-view"> <view class="head-amount-view">
<view><text>已结算金额(元)</text></view> <view><text>已结算金额(元)</text></view>
<view class="head-amount-text"><text>{{info.totalAmount}}</text></view> <view class="head-amount-text"><text>{{info.totalAmount || 0}}</text></view>
</view> <!-- <view class="head-amount-view">
<view><text>待结算金额(元)</text></view>
<view class="head-amount-text"><text>{{info.waitPaidAmount || 0}}</text></view>
</view> -->
</view> </view>
</view> </view>
<image :src="qnFile('liushuibeijing.png')" class="head-back-image" mode="widthFix"></image> <image :src="qnFile('liushuibeijing.png')" class="head-back-image" mode="widthFix"></image>
...@@ -46,7 +49,7 @@ ...@@ -46,7 +49,7 @@
let now = new Date(new Date().toLocaleDateString()).getTime(); let now = new Date(new Date().toLocaleDateString()).getTime();
import util from '@/utils/util.js' import util from '@/utils/util.js'
import Settlement from "@/components/mine/settlement.vue" import Settlement from "@/components/mine/settlement.vue"
const baseinfo = {totalAmount: 0, payableRecordExtendDtos: []} const baseinfo = {totalAmount: 0, waitPaidAmount: 0, payableRecordExtendDtos: []}
export default { export default {
components: { components: {
Settlement Settlement
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment