|
|
@@ -70,27 +70,25 @@
|
|
|
<!-- 客户片区:放配送方式行右侧,避免与价格挤在一起 -->
|
|
|
<view v-if="item.customDistName" class="dist-name">{{ item.customDistName }}</view>
|
|
|
</view>
|
|
|
+ <view class="order-info_box">
|
|
|
+ <view>开单:</view>
|
|
|
+ <view v-if="item.shopAdminId > 0">{{ item.shopAdminName }}</view>
|
|
|
+ <view v-else>{{ item.customShopAdminName }}</view>
|
|
|
+ </view>
|
|
|
<view class="order-info_box">
|
|
|
<view>数量:</view>
|
|
|
<view v-if="item.smallNum > 0">{{ `${item.bigNum}/${item.smallNum}` }}</view>
|
|
|
<view v-else>{{ item.bigNum }}</view>
|
|
|
<view class="price">
|
|
|
- <view v-if="item.orderPrice == item.actPrice">¥{{ item.orderPrice ? parseFloat(item.orderPrice) : 0 }}</view>
|
|
|
+ <!-- 列表展示价 = actPrice - 封账退款(nextDayTkPrice),与详情「最终金额」对齐 -->
|
|
|
+ <view v-if="Number(item.orderPrice) == displayActPrice">¥{{ displayActPrice }}</view>
|
|
|
<view v-else>
|
|
|
<text class="price-original">¥{{ item.orderPrice ? parseFloat(item.orderPrice) : 0 }}</text>
|
|
|
- <text class="price-discount">¥{{ item.actPrice ? parseFloat(item.actPrice) : 0 }}</text>
|
|
|
+ <text class="price-discount">¥{{ displayActPrice }}</text>
|
|
|
</view>
|
|
|
+ <i class="iconfont iconxiangyou"></i>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="order-info_box">
|
|
|
- <view>开单:</view>
|
|
|
- <view v-if="item.shopAdminId > 0">{{ item.shopAdminName }}</view>
|
|
|
- <view v-else>{{ item.customShopAdminName }}</view>
|
|
|
- <view
|
|
|
- v-if="Number(item.nextDayTkPrice) > 0"
|
|
|
- class="next-day-refund"
|
|
|
- >封账后退款 ¥{{ parseFloat(item.nextDayTkPrice) }},实付 ¥{{ afterNextDayPayPrice }}</view>
|
|
|
- </view>
|
|
|
<!-- 点击备注区域编辑,阻止冒泡避免进入订单详情 -->
|
|
|
<view
|
|
|
class="order-info_box remark-box remark-box--editable"
|
|
|
@@ -386,10 +384,10 @@ export default {
|
|
|
},
|
|
|
computed: {
|
|
|
/**
|
|
|
- * 扣除封账后退款后的实付款:actPrice - nextDayTkPrice
|
|
|
- * 隔天售后不改 actPrice,列表用差值让店员看到净实付
|
|
|
+ * 列表展示价:actPrice - 封账退款(nextDayTkPrice)
|
|
|
+ * 封账退款不改 actPrice,这里扣减后与详情「最终金额」一致
|
|
|
*/
|
|
|
- afterNextDayPayPrice() {
|
|
|
+ displayActPrice() {
|
|
|
const act = Number(this.item.actPrice) || 0
|
|
|
const next = Number(this.item.nextDayTkPrice) || 0
|
|
|
const pay = act - next
|
|
|
@@ -896,17 +894,6 @@ export default {
|
|
|
margin-left: 10upx;
|
|
|
}
|
|
|
|
|
|
-/* 开单行右侧:隔天售后金额(对齐账单日期靠右布局) */
|
|
|
-.next-day-refund {
|
|
|
- flex: 1;
|
|
|
- color: #e67e22;
|
|
|
- display: flex;
|
|
|
- align-items: center;
|
|
|
- justify-content: flex-end;
|
|
|
- font-size: 30upx;
|
|
|
- font-weight: 600;
|
|
|
-}
|
|
|
-
|
|
|
.remark-box {
|
|
|
background-color: #ffebee;
|
|
|
border-left: 4upx solid #d32f2f;
|