合并代码

src/views/Matching.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="matching-container">
     <div class="header">
-      <h1>资金循环匹配</h1>
-      <p class="subtitle">智能匹配，循环增值</p>
+      <h1>货款匹配</h1>
+      <!-- <p class="subtitle">智能匹配，循环增值</p> -->
     </div>
 
     <!-- 统计卡片 -->
-    <div class="stats-cards">
+    <!-- <div class="stats-cards">
       <div class="stat-card">
         <div class="stat-number">{{ stats.userStats?.initiated_orders || 0 }}</div>
         <div class="stat-label">发起订单</div>
@@ -15,20 +15,12 @@
         <div class="stat-number">{{ stats.userStats?.participated_allocations || 0 }}</div>
         <div class="stat-label">参与分配</div>
       </div>
-      <div class="stat-card">
-        <div class="stat-number">¥{{ formatAmount(stats.userStats?.total_initiated_amount) }}</div>
-        <div class="stat-label">发起总额</div>
-      </div>
-      <div class="stat-card">
-        <div class="stat-number">¥{{ formatAmount(stats.userStats?.total_participated_amount) }}</div>
-        <div class="stat-label">参与总额</div>
-      </div>
-    </div>
+    </div> -->
 
     <!-- 操作区域 -->
     <div class="action-section">
       <div class="create-order-card">
-        <h3>资金匹配</h3>
+        <h3>货款匹配</h3>
         
         <!-- 匹配类型选择 -->
         <div class="matching-type-selector">
@@ -101,9 +93,9 @@
         
         <!-- 小额匹配提示 -->
         <div v-if="matchingType === 'small'" class="tips">
-          <p>• 系统将为您匹配3笔转账，总金额5000元</p>
-          <p>• 优先匹配已完成出款的用户</p>
-          <p>• 每笔金额随机分配，确保资金循环</p>
+          <p>• 系统将为您匹配3笔货款，总金额5000元</p>
+          <p>• 优先匹配已完成进货的用户</p>
+          <!-- <p>• 每笔金额随机分配，确保货款循环</p> -->
         </div>
         
         <!-- 大额匹配提示 -->
@@ -180,9 +172,9 @@
           </div>
           <div class="order-info">
             <p>金额: ¥{{ order.amount }}</p>
-            <p>发起人: {{ order.initiator_name }}</p>
+            <p>发起人: {{ order.initiator_real_name }}</p>
             <p v-if="!order.is_system_reverse">轮次: {{ order.cycle_count + 1 }}/{{ order.max_cycles }}</p>
-            <p v-if="order.is_system_reverse" class="system-note">系统自动发起，向负余额用户补充资金</p>
+            <p v-if="order.is_system_reverse" class="system-note">系统自动发起，向负余额用户补充货款</p>
             <p>创建时间: {{ formatDate(order.created_at) }}</p>
           </div>
         </div>
@@ -204,7 +196,7 @@
           <div class="order-summary">
             <p><strong>状态:</strong> {{ getStatusText(selectedOrder.order.status) }}</p>
             <p><strong>金额:</strong> ¥{{ selectedOrder.order.amount }}</p>
-            <p><strong>发起人:</strong> {{ selectedOrder.order.initiator_name }}</p>
+            <p><strong>发起人:</strong> {{ selectedOrder.order.initiator_real_name }}</p>
             <p><strong>轮次:</strong> {{ selectedOrder.order.cycle_count + 1 }}/{{ selectedOrder.order.max_cycles }}</p>
           </div>
           
@@ -221,7 +213,7 @@
                     <span class="cycle">第{{ allocation.cycle_number }}轮</span>
                     <span :class="['status', allocation.status]">{{ getStatusText(allocation.status) }}</span>
                   </div>
-                  <p>{{ allocation.from_user_name }} → {{ allocation.to_user_name }}</p>
+                  <p>{{ allocation.from_user_real_name }} → {{ allocation.to_user_real_name }}</p>
                   <p class="amount">¥{{ allocation.amount }}</p>
                 </div>
               </div>
@@ -238,7 +230,7 @@
               >
                 <div class="record-info">
                   <span class="action">{{ getActionText(record.action) }}</span>
-                  <span class="user">{{ record.username }}</span>
+                  <span class="user">{{ record.real_name }}</span>
                   <span class="time">{{ formatDate(record.created_at) }}</span>
                 </div>
                 <div v-if="record.amount" class="record-amount">¥{{ record.amount }}</div>