From 97a154b83ff9ec6b375b035066cb7e5e2881e1b4 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 11 六月 2025 16:53:06 +0800
Subject: [PATCH] Merge branch 'dev-ui' of http://120.26.58.240:8888/r/LifePaymentFront into dev-ui
---
packages/components/src/views/Order/components/ElectricOrder.vue | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/packages/components/src/views/Order/components/ElectricOrder.vue b/packages/components/src/views/Order/components/ElectricOrder.vue
index 30153e0..adabbe8 100644
--- a/packages/components/src/views/Order/components/ElectricOrder.vue
+++ b/packages/components/src/views/Order/components/ElectricOrder.vue
@@ -6,7 +6,8 @@
<template #renderItem="{ item }">
<OrderCard
title="鐢佃垂鍏呭��"
- :status="item?.frontStatus"
+ :status="item?.lifePayOrderStatus"
+ :frontStatus="item?.frontStatus"
:order-no="item?.orderNo"
:id="item?.id"
@goApplyRefund="emit('goApplyRefund', $event)"
@@ -60,7 +61,7 @@
item.frontStatus === BlLifeRecharge.constants.LifePayOrderFrontStatusEnum.閫�娆惧け璐�
"
label="閫�娆惧彂璧锋椂闂�:"
- labelWidth="110px"
+ :labelWidth="200"
:value="
item?.refundApplyTime && dayjs(item?.refundApplyTime).format('YYYY-MM-DD HH:mm:ss')
"
@@ -86,6 +87,7 @@
import { BlLifeRecharge } from '@life-payment/core-vue';
import dayjs from 'dayjs';
import { toThousand, convertOrderFrontStatus } from '../../../utils';
+import Taro from '@tarojs/taro';
defineOptions({
name: 'ElectricOrder',
--
Gitblit v1.9.1