diff --git a/pagesOrder/detail/components/list.vue b/pagesOrder/detail/components/list.vue
index 0e733ac..8b2eaee 100644
--- a/pagesOrder/detail/components/list.vue
+++ b/pagesOrder/detail/components/list.vue
@@ -92,7 +92,7 @@
退款原因
- 0.00
+ {{orderInfo.refundRemark||''}}
diff --git a/pagesOrder/detail/components/order.vue b/pagesOrder/detail/components/order.vue
index 4143de0..7b44686 100644
--- a/pagesOrder/detail/components/order.vue
+++ b/pagesOrder/detail/components/order.vue
@@ -20,10 +20,10 @@
支付方式
{{data.payType||''}}
-
+
下单时间
@@ -32,10 +32,10 @@
订单编号
{{data.orderNo}}
-
+
diff --git a/pagesOrder/detail/detail.vue b/pagesOrder/detail/detail.vue
index 9412ce8..22c32d9 100644
--- a/pagesOrder/detail/detail.vue
+++ b/pagesOrder/detail/detail.vue
@@ -12,7 +12,7 @@
:data="orderDetail.seatFee">
-
+
@@ -95,8 +95,8 @@
salePrice
} = seatFee
go.to('PAGES_ORDER_TUIKUAN', {
- id:orderDetail.info.id,
- cartId:seatFee.id,
+ orderId:orderDetail.info.id,
+ id:seatFee.id,
productId,
productSkuId,
productName:name,
@@ -253,7 +253,6 @@
for (let i in res.detailList) {
const goods = res.detailList[i]
if (goods.productName != '客座费') {
- console.log(goods);
if (goodsMap.hasOwnProperty(goods.placeNum)) {
goodsMap[goods.placeNum].push(goods)
} else {
diff --git a/pagesOrder/tuikuan/tuikuan.vue b/pagesOrder/tuikuan/tuikuan.vue
index 97b4dff..dc2feee 100644
--- a/pagesOrder/tuikuan/tuikuan.vue
+++ b/pagesOrder/tuikuan/tuikuan.vue
@@ -160,9 +160,13 @@
return infoBox.showToast('退款商品数量不能为0!')
}
const selTag=tuikuan.list[tuikuan.sel]
+ const noteResult=`${selTag?selTag:''}${note.value?(','+note.value):''}`
+ if (!noteResult) {
+ return infoBox.showToast('请输入或选择退款原因!')
+ }
await $returnOrder({
"orderId": option.orderId,
- "note":`${selTag?selTag:''}${note.value?(','+note.value):''}` ,
+ "note":noteResult,
"orderDetails":orderDetail.goodsList.filter(v=>v.number*1).map(v=>{
return {
id:v.id,