diff --git a/.env.production b/.env.production index e315c75..8c9f662 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,5 @@ # 生产环境配置 -# VITE_API_BASE_URL=https://www.zrbjr.com/api -# VITE_UPLOAD_BASE_URL=https://www.zrbjr.com/api/upload -VITE_API_BASE_URL=http://114.55.111.44:3001/api -VITE_UPLOAD_BASE_URL=http://114.55.111.44:3001/api/upload +VITE_API_BASE_URL=https://www.zrbjr.com/api +VITE_UPLOAD_BASE_URL=https://www.zrbjr.com/api/upload +# VITE_API_BASE_URL=http://114.55.111.44:3001/api +# VITE_UPLOAD_BASE_URL=http://114.55.111.44:3001/api/upload diff --git a/src/views/Matching.vue b/src/views/Matching.vue index a9db3e9..2091713 100644 --- a/src/views/Matching.vue +++ b/src/views/Matching.vue @@ -107,7 +107,7 @@
订单 #{{ allocation.matching_order_id }} - 第{{ allocation.cycle_number }}轮 +

转账给: {{ allocation.to_user_real_name }}

@@ -195,7 +195,7 @@ >
- 第{{ allocation.cycle_number }}轮 + {{ getStatusText(allocation.status) }}

{{ allocation.from_user_real_name }} → {{ allocation.to_user_real_name }}

@@ -629,7 +629,8 @@ export default { completed: '已完成', cancelled: '已取消', confirmed: '已确认', - failed: '匹配失败' + failed: '匹配失败', + received: '已收款', } return statusMap[status] || status }, @@ -638,7 +639,8 @@ export default { const actionMap = { join: '加入', confirm: '确认', - complete: '完成' + complete: '完成', + confirm: '确认收款', } return actionMap[action] || action }, diff --git a/src/views/MyProfile.vue b/src/views/MyProfile.vue index 42340ff..6d75754 100644 --- a/src/views/MyProfile.vue +++ b/src/views/MyProfile.vue @@ -62,7 +62,7 @@
- 我的余额 + 我的融豆
融豆
{{ Math.abs(accountInfo.balance) }}
diff --git a/src/views/Transfers.vue b/src/views/Transfers.vue index 751594b..c5bbdee 100644 --- a/src/views/Transfers.vue +++ b/src/views/Transfers.vue @@ -32,10 +32,10 @@ {{ allocation.to_user_real_name || allocation.to_real_name }} ¥{{ allocation.amount }} - {{ getOrderStatusText(allocation.order_status) }} + {{ getOrderStatusText(allocation.status) }}
@@ -482,7 +482,8 @@ const getOrderStatusType = (status) => { 'completed': 'success', 'failed': 'danger', 'cancelled': 'info', - 'rejected': 'warning' + 'rejected': 'warning', + 'pending': 'warning' } return statusMap[status] || 'info' } @@ -493,7 +494,9 @@ const getOrderStatusText = (status) => { 'completed': '已完成', 'failed': '已失败', 'cancelled': '已取消', - 'rejected': '已拒绝' + 'rejected': '已拒绝', + 'pending': '待处理', + 'confirmed': '已确认' } return statusMap[status] || '未知状态' }