From bb12ebe636bd3071fe761c80a3b956b055224bdb Mon Sep 17 00:00:00 2001
From: dzl <786316265@qq.com>
Date: Tue, 14 Oct 2025 16:27:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8F=91=E8=B4=A7=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Orders.vue | 77 ++++++++++++++++++--------------------------
 1 file changed, 31 insertions(+), 46 deletions(-)

diff --git a/src/views/Orders.vue b/src/views/Orders.vue
index 6794527..0d642e9 100644
--- a/src/views/Orders.vue
+++ b/src/views/Orders.vue
@@ -130,7 +130,7 @@
               <el-dropdown-menu>
                 <el-dropdown-item
                   v-if="row.status === 'pending'"
-                  @click="updateOrderStatus(row, 'shipped')"
+                  @click="deliveryDialogVisible = true; selectedOrder = {id: row.id};"
                 >
                   标记为已发货
                 </el-dropdown-item>
@@ -223,34 +223,32 @@
             </template>
           </el-table-column>
         </el-table>
-        <el-button type="primary" size="small" @click="deliveryDialogVisible = true; deliveryForm.id = selectedOrder.id;" class="delivery-btn" v-if="pending">
+        <el-button type="primary" size="small" @click="deliveryDialogVisible = true; deliveryForm.id = selectedOrder.id;" class="delivery-btn" v-if="selectedOrder.status === 'pending'">
           发货
         </el-button>
       </div>
+    </el-dialog>
 
-      <!-- 发货对话框 -->
-      <el-dialog
-        v-model="deliveryDialogVisible"
-        title="发货"
-        width="400px"
-        :before-close="closeDialog"
-      >
-        <el-form :model="deliveryForm" :rules="deliveryRules" ref="deliveryFormRef">
-          <el-form-item label="物流公司" prop="logistics_company">
-            <el-input v-model="deliveryForm.logistics_company" placeholder="请输入物流公司名称" />
-          </el-form-item>
-          <el-form-item label="物流单号" prop="logistics_no">
-            <el-input v-model="deliveryForm.logistics_no" placeholder="请输入物流单号" />
-          </el-form-item>
-        </el-form>
-        <template #footer>
-          <el-button type="primary" @click="submitDelivery">
-            提交发货
-          </el-button>
-        </template>
-      </el-dialog>
-
-
+    <!-- 发货对话框 -->
+    <el-dialog
+      v-model="deliveryDialogVisible"
+      title="发货"
+      width="400px"
+      :before-close="closeDialog"
+    >
+      <el-form :model="deliveryForm" :rules="deliveryRules" ref="deliveryFormRef">
+        <el-form-item label="物流公司" prop="logistics_company">
+          <el-input v-model="deliveryForm.logistics_company" placeholder="请输入物流公司名称" />
+        </el-form-item>
+        <el-form-item label="物流单号" prop="logistics_no">
+          <el-input v-model="deliveryForm.logistics_no" placeholder="请输入物流单号" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button type="primary" @click="updateOrderStatus(selectedOrder, 'shipped', deliveryForm.logistics_company, deliveryForm.logistics_no)">
+          提交发货
+        </el-button>
+      </template>
     </el-dialog>
   </div>
 </template>
@@ -276,7 +274,7 @@ const filters = reactive({
   dateRange: null,
 });
 
-const pagination = reactive({
+const pagination = ref({
   page: 1,
   limit: 20,
   total: 0,
@@ -284,8 +282,7 @@ const pagination = reactive({
 
 const deliveryForm = reactive({
   logistics_company: '',
-  logistics_no: '',
-  id: '',
+  logistics_no: ''
 });
 
 // 加载订单列表
@@ -293,8 +290,8 @@ const loadOrders = async () => {
   loading.value = true;
   try {
     const params = {
-      page: pagination.page,
-      limit: pagination.limit,
+      page: pagination.value.page,
+      limit: pagination.value.limit,
       orderNumber: filters.orderNumber,
       username: filters.username,
       status: filters.status,
@@ -307,7 +304,7 @@ const loadOrders = async () => {
 
     const { data } = await api.get('/orders', { params });
     orders.value = data.data.orders;
-    pagination.total = data.data.total;
+    pagination.value.total = data.data.pagination.total;
   } catch (error) {
     ElMessage.error('加载订单列表失败');
     console.error('加载订单列表失败:', error);
@@ -340,7 +337,7 @@ const viewOrder = async (order) => {
 };
 
 // 更新订单状态
-const updateOrderStatus = async (order, newStatus) => {
+const updateOrderStatus = async (order, newStatus, logistics_company, logistics_no) => {
   const statusText = getStatusText(newStatus);
   try {
     await ElMessageBox.confirm(
@@ -352,12 +349,12 @@ const updateOrderStatus = async (order, newStatus) => {
         type: 'warning',
       }
     );
-
-    await api.put(`/orders/${order.id}/status`, { status: newStatus });
+    await api.put(`/orders/${order.id}/status`, { status: newStatus, logistics_company: logistics_company, logistics_no: logistics_no });
     ElMessage.success('订单状态更新成功');
     loadOrders();
   } catch (error) {
     if (error !== 'cancel') {
+      console.log('更新订单状态失败:', error);
       ElMessage.error('更新订单状态失败');
     }
   }
@@ -403,18 +400,6 @@ const deliveryRules = reactive({
   logistics_no: [{ required: true, message: '请输入物流单号', trigger: 'blur' }],
 });
 
-const submitDelivery = async () => {
-  try {
-    await api.shop.delivery(deliveryForm);
-    ElMessage.success('发货成功');
-    closeDialog();
-    loadOrders();
-  } catch (error) {
-    ElMessage.error('发货失败');
-    console.error('发货失败:', error);
-  }
-};
-
 // 格式化日期
 const formatDate = (dateString) => {
   return dayjs(dateString).format('YYYY-MM-DD HH:mm:ss');