This commit is contained in:
魏啾 2024-03-16 12:07:44 +08:00
parent 426e1d59a9
commit 19b71d754f
2 changed files with 11 additions and 10 deletions

View File

@ -32,8 +32,8 @@
</div>
<div style="color:#ff9e01;">
<span v-if="item.status == 'pending'">挂单</span>
<span style="color: red;" v-if="item.status == 'refund'">退单</span>
<span style="color:#21c36b;" v-if="item.status == 'closed'">订单完成</span>
<span style="color: red;" v-if="item.status == 'refund' && item.orderType == 'return'">退单</span>
<span style="color:#21c36b;" v-if="item.status == 'closed' || item.status == 'refund'">订单完成</span>
</div>
</div>
</div>

View File

@ -69,8 +69,8 @@
</div>
<div class="orderbox_right_top" style="margin-top: 20px; border-bottom: 2px solid #ccc;">
<span style="font-size: 16px;" v-if="orderDetaildata.status == 'pending'">挂单</span>
<span style="font-size: 16px; color: red;" v-if="orderDetaildata.status == 'refund'">退单</span>
<span style="font-size: 16px; color:#21c36b;" v-if="orderDetaildata.status == 'closed'">订单完成</span>
<span style="font-size: 16px; color: red;" v-if="orderDetaildata.status == 'refund' && orderDetaildata.orderType == 'return'">退单</span>
<span style="font-size: 16px; color:#21c36b;" v-if="orderDetaildata.status == 'closed' || orderDetaildata.status == 'refund'">订单完成</span>
</div>
<div class="orderbox_right_top" style="margin-top: 20px;">
<span>商品明细</span>
@ -87,13 +87,13 @@
<div>{{ item.productName }}-{{ item.productSkuName }}</div>
<div style="text-align: center;">{{ item.num }}</div>
<div style="text-align: center;">{{ item.price }}</div>
<div v-if="item.status == 'refund'"><span
<div v-if="item.status == 'refund' && item.orderType == 'return'"><span
style="border: 2px solid red; color: red; padding: 4px 2px;">已退</span></div>
<div v-else>{{ item.priceAmount }}</div>
</div>
</div>
<div class="orderbox_right_button">
<el-button style="width: 100%;" v-if="orderDetaildata.status != 'refund'" type="primary"
<el-button style="width: 100%;" v-if="orderDetaildata.status == 'refund' && orderDetaildata.orderType == 'return'" type="primary"
@click="recharge = true">退单</el-button>
<div class="orderbox_right_buttonbutton">
<!-- // -->
@ -186,7 +186,7 @@
v-for="(item, index) in orderDetaildata.detailList" :key="index">
<div class="recharge_footer_itemright_botton_itemone">
<el-checkbox @change="changezong(item, index, 1)"
:disabled="item.status == 'refund' ? true : false" v-model="item.checked"
:disabled="item.status == 'refund' && item.orderType == 'return' ? true : false" v-model="item.checked"
size="large" />
<span style="margin-left: 10px;">{{ item.productName }}</span>
</div>
@ -258,8 +258,9 @@ const payreturnOrderclick = async () => {
}
return obj
})
arr = arr.filter(item => { return item && item })
if (arr.length != 0) {
await payreturnOrder(arr.filter(item => { return item && item }))
await payreturnOrder()
changechecked.value = false
recharge.value = false
itemboxshow.value = false
@ -331,7 +332,7 @@ const changezong = (e, b, c) => {
} else {
refundamount.value = clearNoNum({ value: JSON.stringify(Number(refundamount.value) - (Number(e.num) * Number(e.price))) })
}
if (orderDetaildata.value.detailList.every(item => item.checked == true || item.status == 'refund')) {//
if (orderDetaildata.value.detailList.every(item => item.checked == true || item.status == 'refund' || item.orderType == 'return' )) {//
changechecked.value = true
} else {
changechecked.value = false
@ -341,7 +342,7 @@ const changezong = (e, b, c) => {
orderDetaildata.value.detailList.forEach((e, a, b) => {
console.log(e, refundamount.value)
if (changechecked.value) {
if (e.status == 'refund') {
if (e.status == 'refund' && e.orderType == 'return') {
e.checked = false
} else {
e.checked = true