From ac613f67e6cd68e531fd009695ad3f8877513a76 Mon Sep 17 00:00:00 2001
From: 13713575202 <1345916905@qq.com>
Date: Thu, 12 Jun 2025 13:11:02 +0800
Subject: [PATCH] xiabin

---
 sub-operation-service/src/utils/axios.js                 | 4 ++--
 sub-operation-service/src/views/userCenter/mySource.vue  | 2 +-
 .../src/views/userCenter/orderDetails.vue                | 8 ++------
 .../src/views/userCenter/userOrders.vue                  | 9 ++++++---
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/sub-operation-service/src/utils/axios.js b/sub-operation-service/src/utils/axios.js
index d4d4683..3200d9b 100644
--- a/sub-operation-service/src/utils/axios.js
+++ b/sub-operation-service/src/utils/axios.js
@@ -86,7 +86,7 @@ const formatResult = async (res) => {
     case 500:
     case 1:
       // code === 1 或 500 代表存在错误
-      ElNotification.error(res.data.message);
+      ElNotification.error(res.data.msg);
       break;
     case 401:
       // code === 401 代表登录过期
@@ -94,7 +94,7 @@ const formatResult = async (res) => {
       router.push('/login');
       break;
     default:
-      ElNotification.error(res.data.message);
+      ElNotification.error(res.data.msg);
       break;
   }
 };
diff --git a/sub-operation-service/src/views/userCenter/mySource.vue b/sub-operation-service/src/views/userCenter/mySource.vue
index 81e57fa..81ab83b 100644
--- a/sub-operation-service/src/views/userCenter/mySource.vue
+++ b/sub-operation-service/src/views/userCenter/mySource.vue
@@ -158,7 +158,7 @@ const columns = ref([
   { prop: 'status', label: '申请状态', slotName: 'status' },
   { prop: 'report', label: '检测报告', slotName: 'report' },
   { prop: 'sourceCode', label: '溯源码', slotName: 'sourceCode' },
-  { prop: 'action', label: '操作', slotName: 'action', width: '180' },
+  // { prop: 'action', label: '操作', slotName: 'action', width: '180' },
 ]);
 // 生成模拟数据
 const generateMockData = () => {
diff --git a/sub-operation-service/src/views/userCenter/orderDetails.vue b/sub-operation-service/src/views/userCenter/orderDetails.vue
index 6187790..bd124f0 100644
--- a/sub-operation-service/src/views/userCenter/orderDetails.vue
+++ b/sub-operation-service/src/views/userCenter/orderDetails.vue
@@ -156,14 +156,10 @@
               <div v-if="detailsData.orderStatus == '4' || detailsData.orderStatus == '5'" class="button-bottom" @click="confirmReceipt()">
                 确认收货
               </div>
-              <div v-if="detailsData.orderStatus == '2' || detailsData.orderStatus == '3'" class="button-bottoms" @click="reAddress()">修改地址</div>
+              <div v-if="detailsData.orderStatus == '2' || detailsData.orderStatus == '3'" class="button-bottom" @click="reAddress()">修改地址</div>
               <div
                 v-if="
-                  detailsData.orderStatus == '2' ||
-                  detailsData.orderStatus == '3' ||
-                  detailsData.orderStatus == '4' ||
-                  detailsData.orderStatus == '5' ||
-                  detailsData.orderStatus == '6'
+                  detailsData.orderStatus == '2' || detailsData.orderStatus == '3' || detailsData.orderStatus == '4' || detailsData.orderStatus == '5'
                 "
                 class="button-bottoms"
                 @click="refund()"
diff --git a/sub-operation-service/src/views/userCenter/userOrders.vue b/sub-operation-service/src/views/userCenter/userOrders.vue
index fe9a1e9..dc338e6 100644
--- a/sub-operation-service/src/views/userCenter/userOrders.vue
+++ b/sub-operation-service/src/views/userCenter/userOrders.vue
@@ -77,7 +77,6 @@
                         <div v-if="o.orderStatus == '1'" class="right-item do-btn">
                           <el-button @click="doCancel(o.id)">取消订单</el-button>
                         </div>
-
                         <div
                           v-if="o.orderStatus == '2' || o.orderStatus == '3' || o.orderStatus == '4' || o.orderStatus == '5'"
                           class="right-item do-btn"
@@ -88,6 +87,9 @@
                         <!-- <div v-if="o.orderStatus == '5'" class="right-item">已发货</div> -->
                         <!-- <div v-if="o.orderStatus == '5'" class="right-item text-link">快递单号</div> -->
                         <el-button type="primary" class="right-item do-btn" @click="goInfo(o.id)">订单详情</el-button>
+                        <div v-if="o.orderStatus == '3'" class="right-item do-btn">
+                          <el-button @click="doPay(o.id)">修改地址</el-button>
+                        </div>
                         <div class="right-item text-link">
                           {{
                             o.orderStatus == '7'
@@ -99,7 +101,7 @@
                                   : o.orderStatus == '5'
                                     ? '待收货'
                                     : o.orderStatus == '6'
-                                      ? '已收货'
+                                      ? '已完成'
                                       : o.orderStatus == '10'
                                         ? '退款中'
                                         : o.orderStatus == '11'
@@ -184,7 +186,8 @@ let bottomList = reactive([
   { title: '待发货', name: '3' },
   // { title: '已发货', name: '6' },
   { title: '待收货', name: '4' },
-  { title: '已收货', name: '6' },
+  { title: '已完成', name: '6' },
+  { title: '已取消', name: '7' },
   { title: '退款中', name: '10' },
   { title: '已退款', name: '11' },
 ]);