From 0d16961cd695927dd235c6c9e0d70f488ada15e3 Mon Sep 17 00:00:00 2001
From: yuanteng <1876787513@qq.com>
Date: Thu, 13 Mar 2025 10:29:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=99=E7=9C=9F=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E7=9A=84=E6=93=8D=E4=BD=9C=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/myAxios.ts                                 | 4 ++--
 src/views/Commodity/MerchandiseCenter.vue          | 1 +
 src/views/CostumeAppointments/AppointmentOrder.vue | 8 +++++++-
 src/views/CostumeAppointments/ClothingGrade.vue    | 3 +--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/api/myAxios.ts b/src/api/myAxios.ts
index 5cb4688..0a72ae1 100644
--- a/src/api/myAxios.ts
+++ b/src/api/myAxios.ts
@@ -4,8 +4,8 @@ import router from '../router'
 
 const myAxios = axios.create({
     withCredentials:true,
-    // baseURL: 'http://localhost:9092/api'
-    baseURL: 'http://123.249.108.160:8888/api' //测试服务器
+    baseURL: 'http://localhost:9092/api'
+    // baseURL: 'http://123.249.108.160:8888/api' //测试服务器
     // baseURL: 'http://154.8.193.216:9092/api',  //隋雨霏服务器
     // baseURL: 'http://154.8.193.216:9093/api'  //隋雨霏服务器测试环境
 });
diff --git a/src/views/Commodity/MerchandiseCenter.vue b/src/views/Commodity/MerchandiseCenter.vue
index a0f9e49..815177e 100644
--- a/src/views/Commodity/MerchandiseCenter.vue
+++ b/src/views/Commodity/MerchandiseCenter.vue
@@ -259,6 +259,7 @@ const saveEdit = async () => { //编辑商品
       message: '更新成功'
     })
     DialogVisible.value = false
+    getProductList()
   } else {
     ElMessage.error('更新失败，请检查字段')
   }
diff --git a/src/views/CostumeAppointments/AppointmentOrder.vue b/src/views/CostumeAppointments/AppointmentOrder.vue
index 3e52a36..40686d8 100644
--- a/src/views/CostumeAppointments/AppointmentOrder.vue
+++ b/src/views/CostumeAppointments/AppointmentOrder.vue
@@ -28,6 +28,12 @@
         <el-button size="small" @click="showDetail(scope.row)">
           详情
         </el-button>
+        <el-popconfirm confirm-button-text='是' cancel-button-text='否' icon="InfoFilled" icon-color="red"
+                       title="是否取消订单？" @confirm="deleteOrder(scope.row)" width=180 v-if="['待支付'].includes(scope.row.orderStatus)">
+          <template #reference>
+            <el-button size="small" type="primary" plain>取消订单</el-button>
+          </template>
+        </el-popconfirm>
         <el-popconfirm confirm-button-text='是' cancel-button-text='否' icon="InfoFilled" icon-color="red"
                        title="拍摄是否完成？" @confirm="changeOrderStatus(scope.row)" width=180 v-if="['待发货'].includes(scope.row.orderStatus)">
           <template #reference>
@@ -37,7 +43,7 @@
         <el-popconfirm confirm-button-text='确定' cancel-button-text='取消' icon="InfoFilled" icon-color="red"
           title="确定要退款吗？" @confirm="deleteOrder(scope.row)" width=180>
           <template #reference>
-            <el-button :disabled="!['待发货'].includes(scope.row.orderStatus)" size="small" type="danger" plain>退款</el-button>
+            <el-button v-if="['待发货','待收货'].includes(scope.row.orderStatus)" size="small" type="danger" plain>退款</el-button>
           </template>
         </el-popconfirm>
       </template>
diff --git a/src/views/CostumeAppointments/ClothingGrade.vue b/src/views/CostumeAppointments/ClothingGrade.vue
index a7fa6b9..08f4e16 100644
--- a/src/views/CostumeAppointments/ClothingGrade.vue
+++ b/src/views/CostumeAppointments/ClothingGrade.vue
@@ -91,9 +91,8 @@ const cancel = () => {
   dialogVisible.value = false
   resetForm()
 }
-//新增类别  很繁杂 不知道怎么改 只能不断判空
+//新增类别
 const addOrUpdateType = async () => {
-  //判空(*后期引入对象判空)
   if (typeForm.value.name?.indexOf(' ') !== -1 ||
     typeForm.value.name == '' ) {
     ElMessage({