From 6df5e252dc249dc0521b1d05f7e8085ac40ae739 Mon Sep 17 00:00:00 2001
From: sunzhuangzhuang <961120009@qq.com>
Date: Mon, 25 Aug 2025 10:47:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production         |  8 ++++----
 src/views/Matching.vue  | 10 ++++++----
 src/views/MyProfile.vue |  2 +-
 src/views/Transfers.vue | 11 +++++++----
 4 files changed, 18 insertions(+), 13 deletions(-)

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 @@
           <div class="allocation-info">
             <div class="allocation-header">
               <span class="order-id">订单 #{{ allocation.matching_order_id }}</span>
-              <span class="cycle">第{{ allocation.cycle_number }}轮</span>
+              <!-- <span class="cycle">第{{ allocation.cycle_number }}轮</span> -->
             </div>
             <div class="allocation-details">
               <p>转账给: <strong>{{ allocation.to_user_real_name }}</strong></p>
@@ -195,7 +195,7 @@
               >
                 <div class="timeline-content">
                   <div class="timeline-header">
-                    <span class="cycle">第{{ allocation.cycle_number }}轮</span>
+                    <!-- <span class="cycle">第{{ allocation.cycle_number }}轮</span> -->
                     <span :class="['status', allocation.status]">{{ getStatusText(allocation.status) }}</span>
                   </div>
                   <p>{{ allocation.from_user_real_name }} → {{ allocation.to_user_real_name }}</p>
@@ -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 @@
     <div class="balance-section">
       <div class="balance-card">
         <div class="balance-item">
-          <span class="balance-label">我的余额</span>
+          <span class="balance-label">我的融豆</span>
           <div class="balance-content">
             <img src="/imgs/profile/融豆.png" alt="融豆" class="bean-image">
             <div class="balance-value">{{ Math.abs(accountInfo.balance) }}</div>
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 @@
                 <span class="to-user">{{ allocation.to_user_real_name || allocation.to_real_name }}</span>
                 <span class="amount">¥{{ allocation.amount }}</span>
                 <el-tag 
-                  :type="getOrderStatusType(allocation.order_status)" 
+                  :type="getOrderStatusType(allocation.status)" 
                   size="small"
                 >
-                  {{ getOrderStatusText(allocation.order_status) }}
+                  {{ getOrderStatusText(allocation.status) }}
                 </el-tag>
               </div>
               <div class="transfer-details">
@@ -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] || '未知状态'
 }