feat: 收益全额直入商城余额、存量结转与奖项名称全局规范化对齐
这个提交包含在:
@@ -101,7 +101,7 @@
|
||||
<view class="item-title">兑换券</view>
|
||||
<view class="ss-flex ss-col-center" @tap="openVoucher">
|
||||
<text class="item-value text-red" v-if="Number(state.orderInfo.voucher_fee || state.orderPayload.voucher_fee) > 0"
|
||||
>-¥{{ state.orderInfo.voucher_fee || state.orderPayload.voucher_fee }}</text
|
||||
>-{{ state.orderInfo.voucher_fee || state.orderPayload.voucher_fee }} 个</text
|
||||
>
|
||||
<text
|
||||
class="item-value"
|
||||
@@ -109,7 +109,7 @@
|
||||
v-else
|
||||
>{{
|
||||
Number(state.orderInfo.voucher_available) > 0
|
||||
? '可用 ¥' + (state.orderInfo.voucher_available || '0.00')
|
||||
? '可用 ' + (state.orderInfo.voucher_available || '0.00') + ' 个'
|
||||
: '暂无可用兑换券'
|
||||
}}</text
|
||||
>
|
||||
@@ -169,17 +169,17 @@
|
||||
<view class="ss-p-x-20 ss-p-y-30">
|
||||
<view class="ss-m-b-16 ss-m-l-20" style="font-size: 32rpx; font-weight: 600">兑换券抵扣</view>
|
||||
<view class="ss-m-b-30 ss-m-l-20" style="color: #999; font-size: 24rpx">
|
||||
可用 ¥{{ state.orderInfo.voucher_available || '0.00' }},先用商城优惠券再用兑换券
|
||||
可用 {{ state.orderInfo.voucher_available || '0.00' }} 个,先用商城优惠券再用兑换券
|
||||
</view>
|
||||
<view class="ss-flex ss-col-center ss-m-x-20 ss-m-b-40" style="border-bottom: 1px solid #eee">
|
||||
<view style="font-size: 40rpx; font-weight: 600">¥</view>
|
||||
<uni-easyinput
|
||||
:inputBorder="false"
|
||||
class="ss-flex-1"
|
||||
type="digit"
|
||||
v-model="state.voucherInput"
|
||||
placeholder="请输入抵扣金额"
|
||||
placeholder="请输入使用数量"
|
||||
/>
|
||||
<view style="font-size: 32rpx; font-weight: 600; color: #333; margin-left: 8rpx">个</view>
|
||||
</view>
|
||||
<button class="ss-reset-button ui-BG-Main-Gradient ss-r-40 ui-Shadow-Main" style="height: 80rpx" @tap="onConfirmVoucher">
|
||||
确定
|
||||
@@ -317,9 +317,9 @@
|
||||
const voucherFee = Number(state.orderInfo.voucher_fee || state.orderPayload.voucher_fee || 0);
|
||||
let confirmContent = '确定立即兑换此商品?';
|
||||
if (hasScore && voucherFee > 0) {
|
||||
confirmContent = `确定使用 ${voucherFee} 元兑换券与 ${state.orderInfo.score_amount} 积分立即兑换?`;
|
||||
confirmContent = `确定使用 ${voucherFee} 个兑换券与 ${state.orderInfo.score_amount} 积分立即兑换?`;
|
||||
} else if (voucherFee > 0) {
|
||||
confirmContent = `确定使用 ${voucherFee} 元兑换券立即兑换(现金实付 0 元)?`;
|
||||
confirmContent = `确定使用 ${voucherFee} 个兑换券立即兑换(现金实付 0 元)?`;
|
||||
} else if (hasScore) {
|
||||
confirmContent = `确定使用 ${state.orderInfo.score_amount} 积分立即兑换?`;
|
||||
}
|
||||
|
||||
在新工单中引用
屏蔽一个用户