feat: 收益全额直入商城余额、存量结转与奖项名称全局规范化对齐
这个提交包含在:
@@ -16,7 +16,7 @@
|
||||
></uni-icons>
|
||||
</button>
|
||||
</view>
|
||||
<view class="ss-flex" @tap="sheep.$router.go('/pages/user/wallet/commission')">
|
||||
<view class="ss-flex" @tap="sheep.$router.go('/pages/commission/rewards')">
|
||||
<view class="header-title ss-m-r-4">查看明细</view>
|
||||
<text class="cicon-play-arrow"></text>
|
||||
</view>
|
||||
@@ -26,20 +26,20 @@
|
||||
<view class="metric-row ss-flex">
|
||||
<view
|
||||
class="ss-flex-1 ss-flex-col ss-col-center metric-item"
|
||||
@tap="sheep.$router.go('/pages/user/wallet/commission')"
|
||||
@tap="sheep.$router.go('/pages/commission/rewards')"
|
||||
>
|
||||
<view class="item-title">累计收益(元)</view>
|
||||
<view class="item-detail">
|
||||
{{ state.showMoney ? agentInfo?.total_income || '0.00' : '***' }}
|
||||
{{ state.showMoney ? agentInfo?.total_income || userInfo?.total_income || '0.00' : '***' }}
|
||||
</view>
|
||||
</view>
|
||||
<view
|
||||
class="ss-flex-1 ss-flex-col ss-col-center metric-item"
|
||||
@tap="sheep.$router.go('/pages/user/wallet/commission')"
|
||||
@tap="sheep.$router.go('/pages/user/wallet/money')"
|
||||
>
|
||||
<view class="item-title">可提现(元)</view>
|
||||
<view class="item-title">商城余额(元)</view>
|
||||
<view class="item-detail">
|
||||
{{ state.showMoney ? userInfo?.commission || '0.00' : '***' }}
|
||||
{{ state.showMoney ? userInfo?.money || '0.00' : '***' }}
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -61,7 +61,7 @@
|
||||
class="ss-flex-1 ss-flex-col ss-col-center metric-item"
|
||||
@tap="sheep.$router.go('/pages/commission/voucher')"
|
||||
>
|
||||
<view class="item-title">可用兑换券(元)</view>
|
||||
<view class="item-title">可用兑换券(个)</view>
|
||||
<view class="item-detail">
|
||||
{{
|
||||
state.showMoney
|
||||
|
||||
@@ -143,8 +143,8 @@
|
||||
title: '收益奖励已暂停',
|
||||
badge: '暂缓计奖',
|
||||
btnText: '去选购恢复',
|
||||
tip: '次日完成任意一笔本人自购订单即可自动恢复保活',
|
||||
lastOrderText: lastTime > 0 ? `上次自购: ${dayjs(lastTime * 1000).format('MM-DD HH:mm')}` : '暂无自购记录',
|
||||
tip: '完成任意一笔自购或直推订单即可自动恢复保活',
|
||||
lastOrderText: lastTime > 0 ? `上次有效订单: ${dayjs(lastTime * 1000).format('MM-DD HH:mm')}` : '暂无有效订单记录',
|
||||
};
|
||||
}
|
||||
|
||||
@@ -164,8 +164,8 @@
|
||||
title: '收益奖励已暂停',
|
||||
badge: '暂缓计奖',
|
||||
btnText: '去选购恢复',
|
||||
tip: '近30日暂无本人自购,次日下单后即可自动激活',
|
||||
lastOrderText: lastTime > 0 ? `上次自购: ${dayjs(lastTime * 1000).format('MM-DD HH:mm')}` : '',
|
||||
tip: '近30日暂无自购或直推订单,完成下单后即可自动激活',
|
||||
lastOrderText: lastTime > 0 ? `上次有效订单: ${dayjs(lastTime * 1000).format('MM-DD HH:mm')}` : '',
|
||||
};
|
||||
}
|
||||
|
||||
@@ -175,8 +175,8 @@
|
||||
title: '30天保活临期预警',
|
||||
badge: `仅剩 ${remainingDays} 天`,
|
||||
btnText: '立即自购保活',
|
||||
tip: '即将暂停分润!请在倒计时结束前完成自购续期',
|
||||
lastOrderText: lastTime > 0 ? `上次自购: ${dayjs(lastTime * 1000).format('MM-DD HH:mm')}` : '',
|
||||
tip: '即将暂停分润!请在倒计时结束前完成自购或直推续期',
|
||||
lastOrderText: lastTime > 0 ? `上次有效订单: ${dayjs(lastTime * 1000).format('MM-DD HH:mm')}` : '',
|
||||
};
|
||||
}
|
||||
|
||||
@@ -185,8 +185,8 @@
|
||||
title: '30天收益资格生效中',
|
||||
badge: '正常活跃',
|
||||
btnText: '去自购续期',
|
||||
tip: '已满足30日保活,享有全部团队分红与奖项',
|
||||
lastOrderText: lastTime > 0 ? `上次自购: ${dayjs(lastTime * 1000).format('MM-DD HH:mm')}` : '',
|
||||
tip: '已满足30日保活(自购/直推有效),享有全部团队分红与奖项',
|
||||
lastOrderText: lastTime > 0 ? `上次有效订单: ${dayjs(lastTime * 1000).format('MM-DD HH:mm')}` : '',
|
||||
};
|
||||
});
|
||||
|
||||
|
||||
@@ -22,7 +22,10 @@
|
||||
</view>
|
||||
|
||||
<!-- 马币市值动态指示胶囊 -->
|
||||
<view class="rate-capsule ss-flex ss-row-between ss-col-center">
|
||||
<view
|
||||
class="rate-capsule ss-flex ss-row-between ss-col-center"
|
||||
v-if="state.info.show_madow_rate !== false && state.info.show_madow_rate !== 0 && state.info.show_madow_rate !== '0'"
|
||||
>
|
||||
<view class="capsule-left ss-flex ss-col-center">
|
||||
<text class="capsule-dot"></text>
|
||||
<text class="capsule-text">马币市值 1 马豆 ≈ {{ state.info.madow_rate || '0' }} 元</text>
|
||||
@@ -178,6 +181,7 @@
|
||||
madow: sheep.$store('user').userInfo?.madow || '0',
|
||||
madow_rate: sheep.$store('user').userInfo?.madow_rate || '0',
|
||||
madow_value: sheep.$store('user').userInfo?.madow_value || '0.00',
|
||||
show_madow_rate: sheep.$store('user').userInfo?.show_madow_rate ?? 1,
|
||||
},
|
||||
list: [],
|
||||
inited: false,
|
||||
@@ -214,6 +218,9 @@
|
||||
state.info.madow = data.madow ?? state.info.madow;
|
||||
state.info.madow_rate = data.madow_rate ?? state.info.madow_rate;
|
||||
state.info.madow_value = data.madow_value ?? state.info.madow_value;
|
||||
if (data.show_madow_rate !== undefined) {
|
||||
state.info.show_madow_rate = data.show_madow_rate;
|
||||
}
|
||||
const list = pickList(data);
|
||||
state.list = page === 1 ? list : _.concat(state.list, list);
|
||||
state.page = data.list?.current_page || data.current_page || page;
|
||||
|
||||
@@ -3,11 +3,12 @@
|
||||
<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">本月已结算收益(元)</view>
|
||||
<view class="card-title">累计已结算收益(元)</view>
|
||||
</view>
|
||||
<view class="money-num ss-m-t-24">{{ state.overview.month_income || '0.00' }}</view>
|
||||
<view class="card-sub ss-m-t-20">
|
||||
本月未达成 {{ state.overview.skip_count || 0 }} 笔
|
||||
<view class="money-num ss-m-t-24">{{ displayTotalIncome }}</view>
|
||||
<view class="card-sub ss-flex ss-row-between ss-col-center ss-m-t-20">
|
||||
<text>本月已结算: ¥{{ state.overview.month_income || '0.00' }}</text>
|
||||
<text v-if="Number(state.overview.skip_count || 0) > 0">本月未达成 {{ state.overview.skip_count }} 笔</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -131,13 +132,22 @@
|
||||
|
||||
const tabMaps = computed(() => [
|
||||
{ name: '全部', value: 'all' },
|
||||
{ name: '开拓奖', value: 'push3' },
|
||||
{ name: '推荐提成', value: 'push3' },
|
||||
{ name: roleNames.value.maker || '创客', value: 'maker' },
|
||||
{ name: roleNames.value.venue || '酒道馆', value: 'venue' },
|
||||
{ name: roleNames.value.county || '区县', value: 'county' },
|
||||
{ name: '加权奖励', value: 'share' },
|
||||
{ name: '加权奖', value: 'share' },
|
||||
]);
|
||||
|
||||
const displayTotalIncome = computed(() => {
|
||||
return (
|
||||
state.overview.total_income ||
|
||||
agentInfo.value?.total_income ||
|
||||
userInfo.value?.total_income ||
|
||||
'0.00'
|
||||
);
|
||||
});
|
||||
|
||||
const emptyPagination = {
|
||||
data: [],
|
||||
current_page: 1,
|
||||
@@ -155,6 +165,7 @@
|
||||
buyerId: 0,
|
||||
buyerName: '',
|
||||
overview: {
|
||||
total_income: '0.00',
|
||||
month_income: '0.00',
|
||||
skip_count: 0,
|
||||
},
|
||||
@@ -185,6 +196,7 @@
|
||||
try {
|
||||
const res = await sheep.$api.partner.overview();
|
||||
if (res?.code === 1) {
|
||||
state.overview.total_income = res.data?.total_income || '0.00';
|
||||
state.overview.month_income = res.data?.month_income || '0.00';
|
||||
state.overview.skip_count = res.data?.skip_count || 0;
|
||||
}
|
||||
@@ -209,6 +221,9 @@
|
||||
...pageData,
|
||||
data: page === 1 ? pageData.data : _.concat(state.pagination.data, pageData.data),
|
||||
};
|
||||
if (res.data?.total_income !== undefined) {
|
||||
state.overview.total_income = res.data.total_income;
|
||||
}
|
||||
if (res.data?.month_income !== undefined) {
|
||||
state.overview.month_income = res.data.month_income;
|
||||
}
|
||||
|
||||
@@ -328,7 +328,7 @@
|
||||
<view class="metric-val">
|
||||
{{ item.agent?.direct_order_seq !== undefined ? '第' + item.agent.direct_order_seq + '单' : '--' }}
|
||||
</view>
|
||||
<view class="metric-lbl">开拓循环序号</view>
|
||||
<view class="metric-lbl">提成循环序号</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@@ -472,10 +472,10 @@
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<!-- 30天自购保活详情 -->
|
||||
<!-- 30天收益保活详情 -->
|
||||
<view class="drawer-section ss-m-b-24">
|
||||
<view class="section-title ss-flex ss-row-between ss-col-center">
|
||||
<text>30天自购保活状态</text>
|
||||
<text>30天收益保活状态</text>
|
||||
<text
|
||||
class="status-text-bold"
|
||||
:class="{
|
||||
@@ -495,13 +495,13 @@
|
||||
</view>
|
||||
<view class="section-box active-detail-box">
|
||||
<view class="detail-line ss-flex ss-row-between">
|
||||
<text class="line-label">最近本人下单时间:</text>
|
||||
<text class="line-label">最近有效订单时间:</text>
|
||||
<text class="line-val">
|
||||
{{ formatLastOrderTime(state.currentMember.agent?.last_self_order_time) }}
|
||||
</text>
|
||||
</view>
|
||||
<view class="detail-line ss-flex ss-row-between ss-m-t-12">
|
||||
<text class="line-label">推荐开拓序号:</text>
|
||||
<text class="line-label">推荐提成序号:</text>
|
||||
<text class="line-val">
|
||||
{{ state.currentMember.agent?.direct_order_seq !== undefined ? '当前第 ' + state.currentMember.agent.direct_order_seq + ' 单' : '0 单' }}
|
||||
</text>
|
||||
|
||||
@@ -18,9 +18,8 @@
|
||||
<!-- 兑换券核心大字数 -->
|
||||
<view class="voucher-hero ss-flex ss-col-bottom ss-row-between">
|
||||
<view class="hero-left ss-flex ss-col-bottom">
|
||||
<text class="hero-symbol">¥</text>
|
||||
<text class="hero-num">{{ state.info.voucher_available || '0.00' }}</text>
|
||||
<text class="hero-unit">元</text>
|
||||
<text class="hero-unit">个</text>
|
||||
</view>
|
||||
<button
|
||||
class="ss-reset-button exchange-btn ss-flex ss-row-center ss-col-center"
|
||||
@@ -45,22 +44,22 @@
|
||||
<view class="footer-metric">
|
||||
<text class="metric-label">累计获得</text>
|
||||
<view class="metric-val-wrap ss-flex ss-col-bottom">
|
||||
<text class="currency-symbol">¥</text>
|
||||
<text class="metric-val">{{ state.info.voucher_total || '0.00' }}</text>
|
||||
<text class="metric-unit">个</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="footer-metric">
|
||||
<text class="metric-label">已释放</text>
|
||||
<view class="metric-val-wrap ss-flex ss-col-bottom">
|
||||
<text class="currency-symbol">¥</text>
|
||||
<text class="metric-val">{{ state.info.voucher_released || '0.00' }}</text>
|
||||
<text class="metric-unit">个</text>
|
||||
</view>
|
||||
</view>
|
||||
<view class="footer-metric">
|
||||
<text class="metric-label">已使用</text>
|
||||
<view class="metric-val-wrap ss-flex ss-col-bottom">
|
||||
<text class="currency-symbol">¥</text>
|
||||
<text class="metric-val">{{ state.info.voucher_used || '0.00' }}</text>
|
||||
<text class="metric-unit">个</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -102,7 +101,7 @@
|
||||
</view>
|
||||
</view>
|
||||
<view class="log-amount ss-flex ss-col-center">
|
||||
<text class="amount-num">¥{{ item.total_amount || item.total || item.voucher_total || '0.00' }}</text>
|
||||
<text class="amount-num">{{ item.total_amount || item.total || item.voucher_total || '0.00' }} 个</text>
|
||||
<text class="amount-status ss-m-l-12" :class="item.status === 2 ? 'finished' : 'releasing'">
|
||||
{{ item.status_text || (item.status === 2 ? '已完成' : '释放中') }}
|
||||
</text>
|
||||
@@ -123,13 +122,13 @@
|
||||
<!-- 详细指标标签 -->
|
||||
<view class="log-tags ss-flex ss-col-center ss-m-t-16">
|
||||
<view class="tag-item">
|
||||
<text class="tag-txt">已释放 ¥{{ item.released_amount || item.released || '0.00' }}</text>
|
||||
<text class="tag-txt">已释放 {{ item.released_amount || item.released || '0.00' }} 个</text>
|
||||
</view>
|
||||
<view class="tag-item" v-if="item.daily_amount">
|
||||
<text class="tag-txt">每日释放 ¥{{ item.daily_amount }}</text>
|
||||
<text class="tag-txt">每日释放 {{ item.daily_amount }} 个</text>
|
||||
</view>
|
||||
<view class="tag-item" v-if="calcRemain(item) !== null">
|
||||
<text class="tag-txt">待释放 ¥{{ calcRemain(item) }}</text>
|
||||
<text class="tag-txt">待释放 {{ calcRemain(item) }} 个</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -448,6 +447,14 @@
|
||||
color: #f4d397;
|
||||
font-family: OPPOSANS, DIN, -apple-system, sans-serif;
|
||||
}
|
||||
|
||||
.metric-unit {
|
||||
font-size: 22rpx;
|
||||
color: #f4d397;
|
||||
font-weight: 500;
|
||||
margin-left: 4rpx;
|
||||
margin-bottom: 2rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
在新工单中引用
屏蔽一个用户