From b546f7f03d08856b351555b1c7fb2163459fe7b8 Mon Sep 17 00:00:00 2001
From: dzl <786316265@qq.com>
Date: Mon, 29 Sep 2025 14:59:56 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Orders.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/Orders.vue b/src/views/Orders.vue
index fbb8c47..6794527 100644
--- a/src/views/Orders.vue
+++ b/src/views/Orders.vue
@@ -99,7 +99,7 @@
       </el-table-column>
       <el-table-column prop="producer" label="供应商">
         <template #default="{ row }">
-          {{ row.producer }}
+          {{ row.producer || '平台发货' }}
         </template>
       </el-table-column>
       <el-table-column prop="logistics_info" label="物流信息">
@@ -109,6 +109,11 @@
           物流公司：{{ row.logistics_company || '暂无' }}
         </template>
       </el-table-column>
+      <el-table-column prop="salesperson" label="分销员id">
+        <template #default="{ row }">
+          {{ row.salesperson || '无' }}
+        </template>
+      </el-table-column>
       <el-table-column label="操作" width="200" fixed="right">
         <template #default="{ row }">
           <el-button type="primary" size="small" @click="viewOrder(row)">
@@ -218,7 +223,7 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-button type="primary" size="small" @click="deliveryDialogVisible = true; deliveryForm.id = selectedOrder.id;" class="delivery-btn">
+        <el-button type="primary" size="small" @click="deliveryDialogVisible = true; deliveryForm.id = selectedOrder.id;" class="delivery-btn" v-if="pending">
           发货
         </el-button>
       </div>
@@ -400,7 +405,7 @@ const deliveryRules = reactive({
 
 const submitDelivery = async () => {
   try {
-    await api.products.delivery(deliveryForm);
+    await api.shop.delivery(deliveryForm);
     ElMessage.success('发货成功');
     closeDialog();
     loadOrders();