feat: 收益全额直入商城余额、存量结转与奖项名称全局规范化对齐
这个提交包含在:
@@ -4,7 +4,7 @@
|
||||
<view class="header-box ss-flex ss-row-center ss-col-center">
|
||||
<view class="card-box ui-BG-Main ui-Shadow-Main">
|
||||
<view class="card-head ss-flex ss-col-center">
|
||||
<view class="card-title ss-m-r-10">可提现收益(元)</view>
|
||||
<view class="card-title ss-m-r-10">商城可用余额(元)</view>
|
||||
<view
|
||||
@tap="state.showMoney = !state.showMoney"
|
||||
class="ss-eye-icon"
|
||||
@@ -12,31 +12,37 @@
|
||||
></view>
|
||||
</view>
|
||||
<view class="ss-flex ss-row-between ss-col-center ss-m-t-30">
|
||||
<view class="money-num">{{ state.showMoney ? userInfo.commission : '*****' }}</view>
|
||||
<view class="money-num">{{ state.showMoney ? (userInfo.money || '0.00') : '*****' }}</view>
|
||||
<view class="ss-flex">
|
||||
<view class="ss-m-r-20">
|
||||
<button
|
||||
class="ss-reset-button withdraw-btn"
|
||||
@tap="sheep.$router.go('/pages/pay/withdraw')"
|
||||
>
|
||||
提现
|
||||
<view class="ss-m-r-20" v-if="Number(userInfo.commission || 0) > 0">
|
||||
<button class="ss-reset-button balance-btn" @tap="state.showModal = true">
|
||||
转余额
|
||||
</button>
|
||||
</view>
|
||||
<button class="ss-reset-button balance-btn ss-m-l-20" @tap="state.showModal = true">
|
||||
转余额
|
||||
<button
|
||||
class="ss-reset-button withdraw-btn"
|
||||
@tap="sheep.$router.go('/pages/goods/list')"
|
||||
>
|
||||
去消费
|
||||
</button>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="ss-flex">
|
||||
<view class="ss-flex ss-row-between ss-m-t-30">
|
||||
<view class="loading-money">
|
||||
<view class="loading-money-title">待结算收益</view>
|
||||
<view class="loading-money-num">{{
|
||||
state.showMoney ? agentInfo.pending_reward || '0.00' : '*****'
|
||||
}}</view>
|
||||
</view>
|
||||
<view class="loading-money ss-m-l-100">
|
||||
<view class="loading-money-title">可提现收益</view>
|
||||
<view class="loading-money">
|
||||
<view class="loading-money-title">累计总收益</view>
|
||||
<view class="loading-money-num">{{
|
||||
state.showMoney ? agentInfo.total_income || userInfo.total_income || '0.00' : '*****'
|
||||
}}</view>
|
||||
</view>
|
||||
<view class="loading-money" v-if="Number(userInfo.commission || 0) > 0">
|
||||
<view class="loading-money-title">历史未转佣金</view>
|
||||
<view class="loading-money-num">{{
|
||||
state.showMoney ? userInfo.commission || '0.00' : '*****'
|
||||
}}</view>
|
||||
@@ -60,8 +66,8 @@
|
||||
</uni-datetime-picker>
|
||||
|
||||
<view class="total-box">
|
||||
<view class="ss-m-b-10">总收入¥{{ state.pagination.income.toFixed(2) }}</view>
|
||||
<view>总支出¥{{ (-state.pagination.expense).toFixed(2) }}</view>
|
||||
<view class="ss-m-b-10">周期收益¥{{ (state.pagination.income || 0).toFixed(2) }}</view>
|
||||
<view v-if="state.pagination.expense < 0">退回扣减¥{{ (-state.pagination.expense).toFixed(2) }}</view>
|
||||
</view>
|
||||
</view>
|
||||
<su-tabs
|
||||
@@ -114,9 +120,17 @@
|
||||
>
|
||||
<view class="list-content">
|
||||
<view class="title-box ss-flex ss-row-between ss-m-b-20">
|
||||
<text class="title ss-line-1"
|
||||
>{{ item.event_text }}{{ item.memo ? '-' + item.memo : '' }}</text
|
||||
>
|
||||
<view class="ss-flex ss-col-center">
|
||||
<text class="title ss-line-1"
|
||||
>{{ item.event_text }}{{ item.memo ? '-' + item.memo : '' }}</text
|
||||
>
|
||||
<text
|
||||
v-if="item.type === 'money'"
|
||||
class="reward-tag ss-m-l-10"
|
||||
style="font-size: 20rpx; color: #ff5722; background: #fff0eb; padding: 2rpx 8rpx; border-radius: 6rpx;"
|
||||
>已入余额</text
|
||||
>
|
||||
</view>
|
||||
<view class="money">
|
||||
<text v-if="item.amount >= 0" class="add">+{{ item.amount }}</text>
|
||||
<text v-else class="minus">{{ item.amount }}</text>
|
||||
@@ -135,7 +149,7 @@
|
||||
contentdown: '上拉加载更多',
|
||||
}"
|
||||
/>
|
||||
<view class="wallet-tip">马豆与兑换券不在本页,请到收益中心查看。</view>
|
||||
<view class="wallet-tip">收益分成已全额直接入账商城可用余额,可用于下单消费抵扣。马豆与兑换券请前往收益中心查看。</view>
|
||||
</s-layout>
|
||||
</template>
|
||||
|
||||
@@ -172,6 +186,10 @@
|
||||
name: '全部',
|
||||
value: 'all',
|
||||
},
|
||||
{
|
||||
name: '收益分成',
|
||||
value: 'reward',
|
||||
},
|
||||
{
|
||||
name: '收入',
|
||||
value: 'income',
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
<view class="rate-capsule ss-flex ss-row-between ss-col-center">
|
||||
<view class="capsule-left ss-flex ss-col-center">
|
||||
<text class="capsule-dot"></text>
|
||||
<text class="capsule-text">线上充值与消费余额 · 下单直接抵扣</text>
|
||||
<text class="capsule-text">线上充值与收益分成全额入账 · 下单直接抵扣</text>
|
||||
</view>
|
||||
<text class="capsule-tag">即时可用</text>
|
||||
</view>
|
||||
@@ -185,6 +185,10 @@
|
||||
name: '全部',
|
||||
value: 'all',
|
||||
},
|
||||
{
|
||||
name: '收益分成',
|
||||
value: 'reward',
|
||||
},
|
||||
{
|
||||
name: '收入',
|
||||
value: 'income',
|
||||
|
||||
在新工单中引用
屏蔽一个用户