From 21404d22f655e7004bfe5a4ac1b32bf60c8ec492 Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Thu, 12 Dec 2024 09:10:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                                        |  7 +++++++
 .../user/orderManagement/components/order-home.vue     |  5 ++---
 .../user/orderManagementCz/components/order-home.vue   | 10 +++-------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index a1551a3..aa4561c 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -18,10 +18,13 @@ declare module 'vue' {
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
+    ElCountdown: typeof import('element-plus/es')['ElCountdown']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
     ElDialog: typeof import('element-plus/es')['ElDialog']
+    ElEmpty: typeof import('element-plus/es')['ElEmpty']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
+    ElHeader: typeof import('element-plus/es')['ElHeader']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
@@ -29,13 +32,17 @@ declare module 'vue' {
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
+    ElPageHeader: typeof import('element-plus/es')['ElPageHeader']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
     ElProgress: typeof import('element-plus/es')['ElProgress']
+    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
+    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElStep: typeof import('element-plus/es')['ElStep']
     ElSteps: typeof import('element-plus/es')['ElSteps']
+    ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ElTag: typeof import('element-plus/es')['ElTag']
diff --git a/src/views/user/orderManagement/components/order-home.vue b/src/views/user/orderManagement/components/order-home.vue
index 8781e0e..4e62867 100644
--- a/src/views/user/orderManagement/components/order-home.vue
+++ b/src/views/user/orderManagement/components/order-home.vue
@@ -693,9 +693,8 @@ const costSubmit = () => {
                         <div :class="item.orderStatus == 4 ? 'handle-btn-4' : 'handle-btn'">
                             <el-button
                                 v-if="item.orderStatus == '3'"
-                                class="item"
-                                type="success"
-                                size="mimi"
+                                type="primary"
+                                size="small"
                                 @click="confirmReceipt(index)"
                                 >确认收货</el-button
                             >
diff --git a/src/views/user/orderManagementCz/components/order-home.vue b/src/views/user/orderManagementCz/components/order-home.vue
index 449f78f..a78148f 100644
--- a/src/views/user/orderManagementCz/components/order-home.vue
+++ b/src/views/user/orderManagementCz/components/order-home.vue
@@ -866,11 +866,7 @@ const downloadContract = () => {}
                         </div>
                     </el-col>
 
-                    <el-col
-                        :span="2"
-                        class="order-items-info"
-                        v-if="item.orderStatus != 2 && item.orderStatus != 1"
-                    >
+                    <el-col :span="2" class="order-items-info" v-if="item.orderStatus == 5">
                         <div
                             v-for="(goods, j) in item.detailsList"
                             :key="j"
@@ -894,8 +890,8 @@ const downloadContract = () => {}
                         </div>
                     </el-col>
 
-                    <el-col :span="4" class="handle-btn" style="display: flex; align-items: center">
-                        <div class="handle-btn-4">
+                    <el-col :span="4" style="display: flex; align-items: center">
+                        <div :class="item.orderStatus == 5 ? 'handle-btn-4 ' : 'handle-btn'">
                             <el-button
                                 v-if="item.orderStatus == '1'"
                                 type="primary"