feat: 收益全额直入商城余额、存量结转与奖项名称全局规范化对齐

这个提交包含在:
chen
2026-09-19 11:49:57 +08:00
父节点 85947e43ae
当前提交 aca0d3c671
共有 83 个文件被更改,包括 4146 次插入 和 443 次删除

查看文件

@@ -4,7 +4,7 @@
<view class="cashier-container">
<!-- 1. 顶部待支付金额卡片 -->
<view class="amount-card ss-flex-col ss-col-center">
<view class="amount-label">应付金额</view>
<view class="amount-label">{{ currentAmountLabel }}</view>
<view class="amount-val-wrap ss-flex ss-col-bottom ss-row-center">
<text class="currency-symbol">¥</text>
<text class="amount-integer">{{ priceParts.integer }}</text>
@@ -68,6 +68,22 @@
<text class="meta-label">订单内容</text>
<text class="meta-val ellipsis-1">{{ orderSubject }}</text>
</view>
<!-- 历史已付金额明细 -->
<view
class="order-meta-row ss-flex ss-row-between ss-col-center ss-m-t-12"
v-if="alreadyPaidFee > 0"
>
<text class="meta-label">已付金额</text>
<text class="meta-val text-success font-bold">¥{{ alreadyPaidFee.toFixed(2) }}</text>
</view>
<!-- 开启混合支付时的抵扣明细 -->
<view
class="order-meta-row ss-flex ss-row-between ss-col-center ss-m-t-12"
v-if="isMixedPaySupported && useMixedPay && deductMoney > 0"
>
<text class="meta-label">余额抵扣</text>
<text class="meta-val text-orange font-bold">-¥{{ deductMoney.toFixed(2) }}</text>
</view>
</view>
</view>
@@ -84,6 +100,39 @@
</view>
</view>
<!-- 余额不足全额支付时:专属余额混合支付抵扣卡片 -->
<view
class="mixed-pay-card ss-flex ss-row-between ss-col-center ss-m-t-24"
v-if="isMixedPaySupported"
>
<view class="mixed-left ss-flex ss-col-center">
<view class="mixed-icon-wrap ss-flex ss-row-center ss-col-center">
<image
class="mixed-icon-img"
:src="sheep.$url.static('/assets/addons/shopro/uniapp/pay/wallet.png')"
mode="aspectFit"
></image>
</view>
<view class="mixed-info ss-flex-col">
<view class="mixed-title-row ss-flex ss-col-center">
<text class="mixed-title">余额混合支付</text>
<text class="mixed-tag">组合立省</text>
</view>
<text class="mixed-desc">
可用余额 ¥{{ userBalance.toFixed(2) }},本单可抵扣 ¥{{ deductMoney.toFixed(2) }}
</text>
</view>
</view>
<view class="mixed-right ss-flex ss-col-center">
<switch
:checked="useMixedPay"
@change="onToggleMixedPay"
color="var(--ui-BG-Main, #ff3000)"
style="transform: scale(0.8); transform-origin: right center;"
/>
</view>
</view>
<!-- 支付列表 -->
<view class="payment-list">
<view
@@ -120,6 +169,13 @@
>
推荐
</text>
<!-- 混合支付下第三方需补足金额标签 -->
<text
class="method-tag mixed-amount-tag"
v-if="isMixedPaySupported && useMixedPay && ['wechat', 'alipay', 'apple'].includes(item.value)"
>
需付 ¥{{ thirdPayFee.toFixed(2) }}
</text>
</view>
<!-- 余额支付专享余额状态展示 -->
@@ -140,6 +196,15 @@
<text>余额充足</text>
</view>
<!-- 混合支付抵扣中 -->
<view
class="balance-badge mixed ss-flex ss-col-center"
v-else-if="isMixedPaySupported && useMixedPay"
>
<text class="cicon-check ss-m-r-4"></text>
<text>已启用抵扣</text>
</view>
<!-- 余额不足 -->
<view
class="balance-badge danger ss-flex ss-col-center"
@@ -158,12 +223,22 @@
<text>去充值</text>
<text class="cicon-forward"></text>
</view>
<!-- 快捷开启混合支付入口 -->
<view
class="mixed-link-btn ss-flex ss-col-center ss-m-l-10"
v-if="isMixedPaySupported && !useMixedPay"
@tap.stop="onEnableMixedPay"
>
<text>开启混合支付</text>
<text class="cicon-forward"></text>
</view>
</view>
<!-- 余额充足时的扣款提示 -->
<view
class="balance-deduct-tip ss-m-t-4"
v-if="item.value === 'money' && isBalanceEnough && payFee > 0"
v-if="item.value === 'money' && isBalanceEnough && remainPayFee > 0"
>
<text>支付后剩余 ¥{{ remainingBalance }}</text>
</view>
@@ -254,29 +329,85 @@ const userBalance = computed(() => {
return isNaN(m) ? 0 : m;
});
const payFee = computed(() => {
// 订单原始总应付金额
const payTotalFee = computed(() => {
const f = parseFloat(state.orderInfo?.pay_fee);
return isNaN(f) ? 0 : f;
});
// 余额是否充足
const isBalanceEnough = computed(() => {
return userBalance.value >= payFee.value && payFee.value > 0;
// 订单当前剩余应付金额
const remainPayFee = computed(() => {
const rf =
state.orderInfo?.remain_pay_fee !== undefined
? parseFloat(state.orderInfo.remain_pay_fee)
: parseFloat(state.orderInfo?.pay_fee);
return isNaN(rf) ? 0 : Math.max(0, rf);
});
// 扣减后剩余余额
// 历史已付金额
const alreadyPaidFee = computed(() => {
const diff = payTotalFee.value - remainPayFee.value;
return diff > 0 ? diff : 0;
});
// 余额是否充足(是否可全额支付当前剩余待付金额)
const isBalanceEnough = computed(() => {
return userBalance.value >= remainPayFee.value && remainPayFee.value > 0;
});
// 扣减后剩余余额(若全额使用余额支付)
const remainingBalance = computed(() => {
const rem = userBalance.value - payFee.value;
const rem = userBalance.value - remainPayFee.value;
return rem >= 0 ? rem.toFixed(2) : "0.00";
});
// 是否支持混合支付:商品订单、有可用余额但不足以全额付清、且剩余待付款大于0
const isMixedPaySupported = computed(() => {
return (
state.orderType === "goods" &&
userBalance.value > 0 &&
userBalance.value < remainPayFee.value &&
remainPayFee.value > 0
);
});
// 用户是否启用混合支付开关(满足条件时默认开启)
const useMixedPay = ref(true);
// 混合支付下抵扣的余额金额
const deductMoney = computed(() => {
if (!isMixedPaySupported.value || !useMixedPay.value) return 0;
return Math.min(userBalance.value, remainPayFee.value);
});
// 混合支付下第三方渠道需补足支付的金额
const thirdPayFee = computed(() => {
const diff = remainPayFee.value - deductMoney.value;
return diff > 0 ? diff : 0;
});
// 顶部卡片展示的当前待付金额
const currentDueFee = computed(() => {
if (isMixedPaySupported.value && useMixedPay.value && deductMoney.value > 0) {
return thirdPayFee.value;
}
return remainPayFee.value;
});
// 顶部金额标题
const currentAmountLabel = computed(() => {
if (isMixedPaySupported.value && useMixedPay.value && deductMoney.value > 0) {
return "在线待付金额";
}
if (alreadyPaidFee.value > 0) {
return "剩余应付金额";
}
return "应付金额";
});
// 金额拆分整数与小数
const priceParts = computed(() => {
const fee = state.orderInfo?.pay_fee;
if (fee === undefined || fee === null || fee === "") {
return { integer: "0", decimal: "00" };
}
const num = parseFloat(fee);
const num = currentDueFee.value;
if (isNaN(num)) return { integer: "0", decimal: "00" };
const str = num.toFixed(2);
const parts = str.split(".");
@@ -382,6 +513,18 @@ const orderSubject = computed(() => {
return state.orderInfo.order_title || "商城商品订单";
});
// 支付方式名称映射
function getMethodTitle(val) {
const map = {
wechat: "微信支付",
alipay: "支付宝",
money: "余额支付",
apple: "Apple Pay",
offline: "货到付款",
};
return map[val] || "在线支付";
}
// 3. 实时平滑倒计时逻辑
let countdownTimer = null;
const countdownStr = ref("");
@@ -442,9 +585,39 @@ function autoSelectPayment() {
return;
}
// 若开启了混合支付,优先确保选择有效的第三方通道(非 money)
if (isMixedPaySupported.value && useMixedPay.value) {
if (
state.payment &&
state.payment !== "money" &&
list.some((item) => item.value === state.payment)
) {
return;
}
if (isWechatEnv.value) {
const wechatItem = list.find((item) => item.value === "wechat");
if (wechatItem) {
state.payment = "wechat";
return;
}
}
const alipayItem = list.find((item) => item.value === "alipay");
if (alipayItem) {
state.payment = "alipay";
return;
}
const nonMoneyItem = list.find((item) => item.value !== "money");
if (nonMoneyItem) {
state.payment = nonMoneyItem.value;
return;
}
}
// 若当前已选中的支付方式依然可用且非禁用
if (state.payment && list.some((item) => item.value === state.payment)) {
// 若当前选中的是余额支付但余额不足,尝试智能自动切换至微信支付
if (state.payment === "money" && !isBalanceEnough.value) {
const wechatItem = list.find((item) => item.value === "wechat");
if (wechatItem) {
@@ -500,7 +673,47 @@ function autoSelectPayment() {
state.payment = list[0].value;
}
// 5. 点击切换支付方式
// 5. 混合支付开关与交互
function onToggleMixedPay(e) {
useMixedPay.value = e.detail.value;
if (useMixedPay.value) {
if (state.payment === "money") {
const nonMoney = visiblePayMethods.value.find(
(i) => !i.disabled && i.value !== "money",
);
if (nonMoney) {
state.payment =
isWechatEnv.value &&
visiblePayMethods.value.some((i) => i.value === "wechat")
? "wechat"
: nonMoney.value;
}
}
} else {
if (state.payment === "money" && !isBalanceEnough.value) {
sheep.$helper.toast("已关闭混合支付,当前可用余额不足以全额付款");
}
}
}
function onEnableMixedPay() {
useMixedPay.value = true;
if (state.payment === "money") {
const nonMoney = visiblePayMethods.value.find(
(i) => !i.disabled && i.value !== "money",
);
if (nonMoney) {
state.payment =
isWechatEnv.value &&
visiblePayMethods.value.some((i) => i.value === "wechat")
? "wechat"
: nonMoney.value;
}
}
sheep.$helper.toast("已开启余额混合支付");
}
// 6. 点击切换支付方式
function onSelectPay(item) {
if (item.disabled) {
if (item.value === "offline") {
@@ -508,26 +721,55 @@ function onSelectPay(item) {
}
return;
}
state.payment = item.value;
if (item.value === "money" && !isBalanceEnough.value) {
if (item.value === "money") {
if (isBalanceEnough.value) {
state.payment = "money";
return;
}
if (isMixedPaySupported.value) {
if (!useMixedPay.value) {
uni.showModal({
title: "混合支付推荐",
content: `当前可用余额 ¥${userBalance.value.toFixed(2)} 不足全额支付该订单(待付 ¥${remainPayFee.value.toFixed(2)})。是否启用【余额混合支付】抵扣 ¥${deductMoney.value.toFixed(2)},剩余 ¥${(remainPayFee.value - deductMoney.value).toFixed(2)} 通过微信/支付宝支付?`,
confirmText: "启用混合支付",
cancelText: "去充值",
confirmColor: "var(--ui-BG-Main, #ff3000)",
success: (res) => {
if (res.confirm) {
onEnableMixedPay();
} else {
onGoRecharge();
}
},
});
} else {
sheep.$helper.toast("已启用余额抵扣,请选择补足方式(如微信或支付宝)");
}
return;
}
sheep.$helper.toast("可用余额不足,可前往充值或切换支付方式");
return;
}
state.payment = item.value;
}
// 6. 复制订单号
// 7. 复制订单号
function onCopyOrderSn() {
if (!state.orderInfo?.order_sn) return;
sheep.$helper.copyText(state.orderInfo.order_sn);
sheep.$helper.toast("订单号已复制");
}
// 7. 前往充值页面
// 8. 前往充值页面
function onGoRecharge() {
sheep.$router.go("/pages/pay/recharge");
}
// 8. 检查订单支付状态
// 9. 检查订单支付状态
function checkPayStatus() {
if (state.orderInfo.status === "unpaid") {
state.payStatus = 1;
@@ -547,7 +789,7 @@ function checkPayStatus() {
state.payStatus = 2;
}
// 9. 获取充值订单信息
// 10. 获取充值订单信息
async function setRechargeOrder(id) {
state.loading = true;
try {
@@ -567,7 +809,7 @@ async function setRechargeOrder(id) {
}
}
// 10. 获取商品订单信息
// 11. 获取商品订单信息
async function setGoodsOrder(id) {
state.loading = true;
try {
@@ -598,7 +840,7 @@ async function setGoodsOrder(id) {
}
}
// 11. 底部按钮文案与可用性计算
// 12. 底部按钮文案与可用性计算
const isButtonDisabled = computed(() => {
if (state.isSubmitting) return true;
if (state.payStatus !== 1) return true;
@@ -624,13 +866,19 @@ const payButtonText = computed(() => {
// 选中余额支付且余额不足时
if (state.payment === "money" && !isBalanceEnough.value) {
return "余额不足 · 去充值";
return isMixedPaySupported.value ? "余额不足 · 开启混合支付" : "余额不足 · 去充值";
}
return `立即支付 ¥${payFee.value.toFixed(2)}`;
// 混合支付模式
if (isMixedPaySupported.value && useMixedPay.value && deductMoney.value > 0) {
const title = getMethodTitle(state.payment);
return `混合支付 · ${title}付 ¥${thirdPayFee.value.toFixed(2)} (已抵余额¥${deductMoney.value.toFixed(2)})`;
}
return `立即支付 ¥${remainPayFee.value.toFixed(2)}`;
});
// 12. 支付流程核心入口
// 13. 支付流程核心入口
async function onPay() {
if (state.payStatus !== 1 || state.isSubmitting) return;
@@ -639,27 +887,58 @@ async function onPay() {
return;
}
// 余额支付流程
// 混合支付流程
if (isMixedPaySupported.value && useMixedPay.value && deductMoney.value > 0) {
if (state.payment === "money") {
sheep.$helper.toast("请选择补足剩余款项的支付通道(微信或支付宝)");
return;
}
if (state.payment === "offline") {
sheep.$helper.toast("货到付款不支持混合支付");
return;
}
const title = getMethodTitle(state.payment);
uni.showModal({
title: "混合支付确认",
content: `本次将扣除账户可用余额 ¥${deductMoney.value.toFixed(2)},并通过 ${title} 支付剩余 ¥${thirdPayFee.value.toFixed(2)}。确定发起支付吗?`,
confirmText: "确认支付",
cancelText: "取消",
confirmColor: "var(--ui-BG-Main, #ff3000)",
success: (res) => {
if (res.confirm) {
submitPayment({ money: deductMoney.value });
}
},
});
return;
}
// 纯余额支付流程
if (state.payment === "money") {
if (!isBalanceEnough.value) {
uni.showModal({
title: "余额不足",
content: `当前可用余额为 ¥${userBalance.value.toFixed(2)},不足以支付该订单(¥${payFee.value.toFixed(2)}),是否前往充值?`,
confirmText: "去充值",
cancelText: "取消",
confirmColor: "var(--ui-BG-Main, #ff3000)",
success: (res) => {
if (res.confirm) {
onGoRecharge();
}
},
});
if (isMixedPaySupported.value) {
onEnableMixedPay();
} else {
uni.showModal({
title: "余额不足",
content: `当前可用余额为 ¥${userBalance.value.toFixed(2)},不足以支付该订单(待付 ¥${remainPayFee.value.toFixed(2)}),是否前往充值?`,
confirmText: "去充值",
cancelText: "取消",
confirmColor: "var(--ui-BG-Main, #ff3000)",
success: (res) => {
if (res.confirm) {
onGoRecharge();
}
},
});
}
return;
}
uni.showModal({
title: "余额支付确认",
content: `本次将扣除 ¥${payFee.value.toFixed(2)},支付后账户剩余 ¥${remainingBalance.value}。确定支付吗?`,
content: `本次将扣除 ¥${remainPayFee.value.toFixed(2)},支付后账户剩余 ¥${remainingBalance.value}。确定支付吗?`,
confirmText: "确认支付",
cancelText: "取消",
confirmColor: "var(--ui-BG-Main, #ff3000)",
@@ -689,18 +968,19 @@ async function onPay() {
return;
}
// 微信支付、支付宝支付等常规通道
// 微信支付、支付宝支付等常规全额通道
submitPayment();
}
// 提交支付
async function submitPayment() {
async function submitPayment(options = {}) {
state.isSubmitting = true;
try {
await sheep.$platform.pay(
state.payment,
state.orderType,
state.orderInfo.order_sn,
options,
);
} catch (err) {
console.error("支付发起异常:", err);
@@ -709,7 +989,7 @@ async function submitPayment() {
}
}
// 13. 生命周期钩子
// 14. 生命周期钩子
onLoad((options) => {
// 微信公众号 iOS 路由刷新边缘兼容
if (
@@ -864,6 +1144,18 @@ onUnmounted(() => {
color: #333333;
max-width: 440rpx;
text-align: right;
&.text-success {
color: #52c41a;
}
&.text-orange {
color: #fa8c16;
}
&.font-bold {
font-weight: 600;
}
}
.copy-btn {
@@ -925,6 +1217,63 @@ onUnmounted(() => {
}
}
// 专属混合支付卡片
.mixed-pay-card {
background: linear-gradient(135deg, #fff9f6 0%, #fff4ef 100%);
border: 2rpx solid rgba(255, 87, 34, 0.22);
border-radius: 18rpx;
padding: 20rpx 22rpx;
box-sizing: border-box;
.mixed-left {
flex: 1;
.mixed-icon-wrap {
width: 56rpx;
height: 56rpx;
background: #ffffff;
border-radius: 50%;
margin-right: 18rpx;
box-shadow: 0 2rpx 8rpx rgba(255, 87, 34, 0.12);
.mixed-icon-img {
width: 38rpx;
height: 38rpx;
}
}
.mixed-info {
flex: 1;
.mixed-title-row {
.mixed-title {
font-size: 28rpx;
font-weight: bold;
color: #333333;
}
.mixed-tag {
font-size: 20rpx;
font-weight: 500;
color: #ffffff;
background: linear-gradient(90deg, #ff7a45, #ff4d4f);
padding: 2rpx 10rpx;
border-radius: 6rpx;
margin-left: 12rpx;
line-height: 28rpx;
}
}
.mixed-desc {
font-size: 22rpx;
color: #777777;
margin-top: 6rpx;
font-family: OPPOSANS, sans-serif;
}
}
}
}
.payment-list {
.pay-option-item {
padding: 28rpx 0;
@@ -972,6 +1321,13 @@ onUnmounted(() => {
color: #1890ff;
border: 1rpx solid #91d5ff;
}
&.mixed-amount-tag {
background: #fff7e6;
color: #fa8c16;
border: 1rpx solid #ffd591;
font-weight: 600;
}
}
}
@@ -1008,6 +1364,13 @@ onUnmounted(() => {
border: 1rpx solid #b7eb8f;
}
&.mixed {
background: #e6f7ff;
color: #1890ff;
border: 1rpx solid #91d5ff;
font-weight: 500;
}
&.danger {
background: #fff2f0;
color: #ff4d4f;
@@ -1028,6 +1391,20 @@ onUnmounted(() => {
margin-left: 2rpx;
}
}
.mixed-link-btn {
font-size: 22rpx;
color: #fa8c16;
font-weight: 600;
background: rgba(250, 140, 22, 0.1);
padding: 4rpx 12rpx;
border-radius: 16rpx;
.cicon-forward {
font-size: 18rpx;
margin-left: 2rpx;
}
}
}
.balance-deduct-tip {

查看文件

@@ -11,8 +11,11 @@
]"
>
<view class="">
<view class="num-title">可提现金额(元)</view>
<view class="num-title">可提现佣金(元)</view>
<view class="wallet-num">{{ userInfo.commission || '0.00' }}</view>
<view class="ss-m-t-10" style="font-size: 22rpx; color: rgba(255,255,255,0.85);">
商城可用余额:¥{{ userInfo.money || '0.00' }}
</view>
</view>
<button class="ss-reset-button log-btn" @tap="sheep.$router.go('/pages/pay/withdraw-log')"
>提现记录</button
@@ -57,7 +60,10 @@
<!-- 提现说明 -->
<view class="draw-notice">
<view class="title ss-m-b-30">提现说明</view>
<view class="title ss-m-b-20">提现说明</view>
<view class="tip-banner ss-m-b-20" style="background: #fff8f2; color: #ff6000; font-size: 22rpx; padding: 16rpx 20rpx; border-radius: 12rpx; line-height: 1.5;">
💡 提示:商城收益分成已全额直接入账商城余额,可用于下单直接抵扣。历史存量佣金可转入商城余额消费。
</view>
<view class="draw-list" v-for="(rule, index) in state.rulesList" :key="index">
{{ index + 1 }}.{{ rule }}
</view>