diff --git a/pages/index/index.vue b/pages/index/index.vue
index 38fb314..26c0b04 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -38,7 +38,7 @@
{{ item.name }}
{{ index !== 0 ? item.value : fen2yuan(item.value) }}
- 昨日 {{ item.last }}
+ 昨日 {{ index === 0 ? fen2yuan(item.last) : item.last }}
diff --git a/pages/index/order.vue b/pages/index/order.vue
index e715ac9..9378608 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -22,7 +22,7 @@
v-for="order in state.pagination.list"
:key="order.id"
>
-
+
+
+
+
+
+
+
diff --git a/peach/hooks/useGoods.js b/peach/hooks/useGoods.js
index 1fdb6c8..45ea332 100644
--- a/peach/hooks/useGoods.js
+++ b/peach/hooks/useGoods.js
@@ -88,6 +88,12 @@ export function formatOrderStatusDescription(order) {
}
export function formatOrderStatus(order) {
+ if (order.refundStatus === 10) {
+ return '部分退款'
+ }
+ if (order.refundStatus === 20) {
+ return '整单退款'
+ }
if (order.status === 0) {
return '待付款'
}
@@ -104,7 +110,7 @@ export function formatOrderStatus(order) {
return '待评价'
}
if (order.status === 30 && order.commentStatus) {
- return '已完成'
+ return '已评价'
}
if (order.status === 50) {
return '待核销'
@@ -116,6 +122,10 @@ export function formatOrderStatus(order) {
}
export function formatOrderColor(order) {
+ if (order.refundStatus === 10 || order.refundStatus === 20) {
+ return 'danger-color'
+ }
+
if (order.status === 0) {
return 'info-color'
}