|
|
@@ -6,7 +6,7 @@
|
|
|
|
|
|
<image class="avatar" mode="aspectFit" :src="item.customAvatarUrl"></image>
|
|
|
<view class="tit"> {{ item.customName || '' }}</view>
|
|
|
- <view class="other-refund" v-if="item.refund == 2">有售后</view>
|
|
|
+ <view class="other-refund" v-if="item.refund == 2">有退款</view>
|
|
|
<view class="other-status" v-if="item.debt == 1">挂账</view>
|
|
|
<text class="other-book" v-if="item.book == 1">预订单</text>
|
|
|
<text class="other-presell" v-if="item.presell == 1">预售单</text>
|
|
|
@@ -68,11 +68,6 @@
|
|
|
}}</text>
|
|
|
</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>
|
|
|
@@ -84,9 +79,17 @@
|
|
|
<text class="price-original">¥{{ item.orderPrice ? parseFloat(item.orderPrice) : 0 }}</text>
|
|
|
<text class="price-discount">¥{{ item.actPrice ? parseFloat(item.actPrice) : 0 }}</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"
|
|
|
@@ -380,6 +383,18 @@ export default {
|
|
|
this.currentStatus = this.item.status;
|
|
|
}
|
|
|
},
|
|
|
+ computed: {
|
|
|
+ /**
|
|
|
+ * 扣除结后退款后的实付款:actPrice - nextDayTkPrice
|
|
|
+ * 隔天售后不改 actPrice,列表用差值让店员看到净实付
|
|
|
+ */
|
|
|
+ afterNextDayPayPrice() {
|
|
|
+ const act = Number(this.item.actPrice) || 0
|
|
|
+ const next = Number(this.item.nextDayTkPrice) || 0
|
|
|
+ const pay = act - next
|
|
|
+ return parseFloat((pay > 0 ? pay : 0).toFixed(2))
|
|
|
+ }
|
|
|
+ },
|
|
|
methods: {
|
|
|
modifyAddress(item) {
|
|
|
this.closeExpressPop()
|
|
|
@@ -870,6 +885,17 @@ 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: 500;
|
|
|
+}
|
|
|
+
|
|
|
.remark-box {
|
|
|
background-color: #ffebee;
|
|
|
border-left: 4upx solid #d32f2f;
|
|
|
@@ -1131,7 +1157,7 @@ export default {
|
|
|
align-items: center;
|
|
|
justify-content: flex-end;
|
|
|
.price-dist-name {
|
|
|
- margin-right: 60upx;
|
|
|
+ margin-right: 230upx;
|
|
|
font-size: 28upx;
|
|
|
color: #999999;
|
|
|
flex-shrink: 0;
|