fix: 修复平台端商户订单与打印页测试问题
修复平台管理员在商户订单页查看详情等操作时出现“订单不存在”的问题,并完善商户订单查询筛选逻辑。同步修复商户订单打印页电话展示与积分信息展示,满足测试项要求。 Made-with: Cursor
This commit is contained in:
@@ -10,6 +10,17 @@
|
||||
|
||||
import request from '@/utils/request';
|
||||
|
||||
function normalizeMerchantOrderParams(params = {}) {
|
||||
const normalized = { ...params };
|
||||
const merId = Number(normalized.merId);
|
||||
if (!Number.isFinite(merId) || merId <= 0) {
|
||||
delete normalized.merId;
|
||||
} else {
|
||||
normalized.merId = merId;
|
||||
}
|
||||
return normalized;
|
||||
}
|
||||
|
||||
/**
|
||||
* 商户订单 列表
|
||||
* @param params
|
||||
@@ -18,7 +29,7 @@ export function merchantOrderListApi(params) {
|
||||
return request({
|
||||
url: '/admin/merchant/order/list',
|
||||
method: 'get',
|
||||
params,
|
||||
params: normalizeMerchantOrderParams(params),
|
||||
});
|
||||
}
|
||||
|
||||
@@ -30,7 +41,7 @@ export function merchantOrderStatusNumApi(params) {
|
||||
return request({
|
||||
url: '/admin/merchant/order/status/num',
|
||||
method: 'get',
|
||||
params,
|
||||
params: normalizeMerchantOrderParams(params),
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -33,6 +33,12 @@
|
||||
<td class="label">支付时间:</td>
|
||||
<td>{{ orderData.payTime || '-' }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="label">使用积分:</td>
|
||||
<td>{{ orderData.useIntegral || 0 }}</td>
|
||||
<td class="label">积分抵扣:</td>
|
||||
<td>¥ {{ orderData.integralPrice || '0.00' }}</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
@@ -44,7 +50,7 @@
|
||||
<td class="label">收货人:</td>
|
||||
<td>{{ orderData.realName }}</td>
|
||||
<td class="label">联系电话:</td>
|
||||
<td>{{ orderData.userPhone }}</td>
|
||||
<td>{{ orderData.userPhone || '-' }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="label">收货地址:</td>
|
||||
|
||||
Reference in New Issue
Block a user