|
|
|
@ -56,7 +56,7 @@ |
|
|
|
<view class="card-title">配送可提现佣金</view> |
|
|
|
<view class="card-value">{{ showBalance ? formatMoney(balanceWorker.depoBalRel) : '••••' }}</view> |
|
|
|
<view class="worker-today-line"> |
|
|
|
今日佣金{{ showBalance ? formatMoney(workerTodayCommission) : '••••' }}<text>次日可提现</text> |
|
|
|
今日佣金{{ showBalance ? formatMoney(balanceWorker.depoBal) : '••••' }}<text>次日可提现</text> |
|
|
|
</view> |
|
|
|
<view class="card-link-btn" @tap.stop="userCommion('worker', balanceWorker.depoBalRel, balanceWorker)">提现</view> |
|
|
|
<view class="card-illus">🛵</view> |
|
|
|
@ -92,7 +92,7 @@ |
|
|
|
</view> |
|
|
|
|
|
|
|
<view class="timeline-list"> |
|
|
|
<view class="flow-card" v-for="(item,index) in displayRewardLists" :key="index" :style="{animationDelay: item.delay}"> |
|
|
|
<view class="flow-card" :class="{clickable: canOpenShopOrder(item)}" v-for="(item,index) in displayRewardLists" :key="index" :style="{animationDelay: item.delay}" @tap="handleFlowTap(item)"> |
|
|
|
<view class="flow-icon" :class="'type-' + item.flowIconKey"> |
|
|
|
<text>{{item.flowEmoji}}</text> |
|
|
|
</view> |
|
|
|
@ -187,6 +187,8 @@ |
|
|
|
submittingWithdraw: false, |
|
|
|
withdrawRequestId: '', |
|
|
|
showBalance: true, |
|
|
|
resolvingSettlementOrderId: false, |
|
|
|
skipWalletRefreshOnShow: false, |
|
|
|
} |
|
|
|
}, |
|
|
|
computed: { |
|
|
|
@ -251,6 +253,10 @@ |
|
|
|
}, |
|
|
|
onShow() { |
|
|
|
this.menuButtonInfo = uni.getMenuButtonBoundingClientRect() |
|
|
|
if (this.skipWalletRefreshOnShow) { |
|
|
|
this.skipWalletRefreshOnShow = false |
|
|
|
return |
|
|
|
} |
|
|
|
this.balanceUser = 0 |
|
|
|
this.balanceWorker = 0 |
|
|
|
this.balanceShop = [] |
|
|
|
@ -497,6 +503,33 @@ |
|
|
|
toggleBalance() { |
|
|
|
this.showBalance = !this.showBalance |
|
|
|
}, |
|
|
|
canOpenShopOrder(item) { |
|
|
|
if (this.activeWalletType !== 'shop' || !item || !item.linkId) return false |
|
|
|
const text = item.dealingsWay || '' |
|
|
|
return text.indexOf('商家结算') !== -1 || text.indexOf('商家退款') !== -1 || text.indexOf('售后扣款') !== -1 |
|
|
|
}, |
|
|
|
handleFlowTap(item) { |
|
|
|
if (!this.canOpenShopOrder(item)) return |
|
|
|
if (this.resolvingSettlementOrderId) return |
|
|
|
this.resolvingSettlementOrderId = true |
|
|
|
this.tui.request("/mall/order/orderIdBySettlementRecord/" + item.linkId, "GET", {}, false, true).then((res) => { |
|
|
|
if (res.code == 200 && res.result) { |
|
|
|
this.skipWalletRefreshOnShow = true |
|
|
|
uni.navigateTo({ |
|
|
|
url: '/package2/shop/orderDetail?id=' + res.result, |
|
|
|
fail: () => { |
|
|
|
this.skipWalletRefreshOnShow = false |
|
|
|
} |
|
|
|
}) |
|
|
|
} else { |
|
|
|
this.tui.toast(res.message || '未找到关联订单') |
|
|
|
} |
|
|
|
this.resolvingSettlementOrderId = false |
|
|
|
}).catch((res) => { |
|
|
|
this.tui.toast(res && res.message ? res.message : '未找到关联订单') |
|
|
|
this.resolvingSettlementOrderId = false |
|
|
|
}) |
|
|
|
}, |
|
|
|
rewardList(){ |
|
|
|
this.loadStatus = 'loading' |
|
|
|
let that = this |
|
|
|
@ -1136,6 +1169,10 @@ |
|
|
|
border-bottom: 0; |
|
|
|
} |
|
|
|
|
|
|
|
.flow-card.clickable:active { |
|
|
|
opacity: 0.72; |
|
|
|
} |
|
|
|
|
|
|
|
.flow-icon { |
|
|
|
flex: none; |
|
|
|
width: 88rpx; |
|
|
|
|
wangfukang
2 weeks ago