|
@@ -2,7 +2,7 @@
|
|
|
* @Author: wj 1454560336@qq.com
|
|
|
* @Date: 2023-11-01 14:21:43
|
|
|
* @LastEditors: wenjie 1454560336@qq.com
|
|
|
- * @LastEditTime: 2024-07-29 15:58:58
|
|
|
+ * @LastEditTime: 2024-08-26 16:07:32
|
|
|
* @FilePath: \admin-manage\src\views\operationManage\orderManage\orderDetail.vue
|
|
|
* @Description:
|
|
|
*
|
|
@@ -336,8 +336,8 @@ import {auditRefund,transfer,orderDetail,subOrdersConfirm} from '@/api/order'
|
|
|
if(val.refundLog&&val.refundLog.refund == 'REFUSAL_REFUND'&&!val.change){
|
|
|
return '拒绝退款'
|
|
|
}
|
|
|
- else if(val.jobFlowMap == 'Hotel'&&JSON.parse(val.extend).orderInfo){
|
|
|
- return JSON.parse(val.extend).orderInfo.orderStatus
|
|
|
+ else if(val.jobFlowMap == 'Hotel'&&val.extend.orderInfo){
|
|
|
+ return val.extend.orderInfo.orderStatus
|
|
|
}
|
|
|
else if(val.goodsState == 'APPLY_REFUND'){
|
|
|
return '退款审核中'
|
|
@@ -418,9 +418,9 @@ import {auditRefund,transfer,orderDetail,subOrdersConfirm} from '@/api/order'
|
|
|
},
|
|
|
formatData(row){
|
|
|
if(row.goodsList[0].jobFlowMap == 'XiaoJu'){
|
|
|
- if(JSON.parse(row.goodsList[0].extend).hasOwnProperty('notifyOrderInfo')){
|
|
|
+ if(row.goodsList[0].extend.hasOwnProperty('notifyOrderInfo')){
|
|
|
return {
|
|
|
- paymentTime:JSON.parse(row.goodsList[0].extend).notifyOrderInfo.payTime,
|
|
|
+ paymentTime:row.goodsList[0].extend.notifyOrderInfo.payTime,
|
|
|
paymentWay:'-',
|
|
|
price:(row.goodsList[0].goodsInfo.storePrice/100).toFixed(2) +'/L',
|
|
|
goodsName:row.goodsList[0].goodsInfo.goodsName,
|