|
|
@@ -50,10 +50,10 @@
|
|
|
<span class="order-no">订单号：{{ order.orderNo }}</span>
|
|
|
</div>
|
|
|
<div class="flex-row-start">
|
|
|
- <div class="expand-btn" @click="handleViewDetail(order)">
|
|
|
+ <!-- <div class="expand-btn" @click="handleViewDetail(order)">
|
|
|
<span style="margin-right: 5px; margin-bottom: 2px">订单详情</span>
|
|
|
<el-icon><ArrowRight /></el-icon>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
<div class="open-btn" v-if="order.products && order.products.length > 1" @click="order.expanded = !order.expanded">
|
|
|
<span style="margin-right: 5px"> {{ order.expanded ? '收起' : '展开' }}</span>
|
|
|
<el-icon v-if="order.expanded"><ArrowUp /></el-icon>
|
|
|
@@ -224,7 +224,7 @@ const getorders = async () => {
|
|
|
orderId: order.orderId || 0,
|
|
|
orderTime: order.createTime || '',
|
|
|
orderNo: order.orderNo || '',
|
|
|
- payAmount: order.payableAmount || 0,
|
|
|
+ payAmount: order.totalAmount || 0,
|
|
|
payMethod: getPayMethodText(order.payType || ''),
|
|
|
statusText: getStatusText(order.orderStatus || ''),
|
|
|
orderStatus: order.orderStatus || '',
|
|
|
@@ -276,7 +276,7 @@ const loadDeptTree = async () => {
|
|
|
};
|
|
|
|
|
|
const handleViewDetail = (order: any) => {
|
|
|
- router.push(`/order/orderManage/detail/${order.orderId}`);
|
|
|
+ router.push(`/order/orderManage/detail?orderId=${order.id}`);
|
|
|
};
|
|
|
const navigateToEvaluation = (order: any, type: number) => {
|
|
|
router.push({
|
hurx