From b38b62b972e84090f6b115c623f9d89fee8b9b79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Tue, 10 Feb 2026 12:15:47 +0800
Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=B7=BB=E5=8A=A0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=A7=A3=E5=86=BB=E5=8A=9F=E8=83=BD=E5=92=8C=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE=E7=94=B3=E8=AF=B7=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在订单模型中新增解冻状态字段(isUnfreeze)和解冻时间字段(unfreezeTime)
- 更新订单列表页面显示解冻状态标签
- 在订单列表中添加解冻时间显示
- 为商城订单添加退款申请功能入口
- 修改已结算订单标签颜色从success改为purple
- 将开发环境API地址配置从注释状态改为启用状态
---
 .env.development                            |  2 +-
 src/api/shop/shopDealerOrder/model/index.ts |  4 ++++
 src/views/shop/shopDealerOrder/index.vue    | 10 ++++++++--
 src/views/shop/shopOrder/index.vue          |  3 +++
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.env.development b/.env.development
index b8ccd8b..fbcc74b 100644
--- a/.env.development
+++ b/.env.development
@@ -1,5 +1,5 @@
 VITE_APP_NAME=后台管理(开发环境)
-#VITE_API_URL=http://127.0.0.1:9200/api
+VITE_API_URL=http://127.0.0.1:9200/api
 #VITE_SERVER_API_URL=http://127.0.0.1:8000/api
 
 
diff --git a/src/api/shop/shopDealerOrder/model/index.ts b/src/api/shop/shopDealerOrder/model/index.ts
index 2bf954c..31130c0 100644
--- a/src/api/shop/shopDealerOrder/model/index.ts
+++ b/src/api/shop/shopDealerOrder/model/index.ts
@@ -54,6 +54,10 @@ export interface ShopDealerOrder {
   isSettled?: number;
   // 结算时间
   settleTime?: number;
+  // 是否解冻(0否 1是)
+  isUnfreeze?: number;
+  // 解冻时间
+  unfreezeTime?: number;
   // 订单备注
   comments?: string;
   // 商城ID
diff --git a/src/views/shop/shopDealerOrder/index.vue b/src/views/shop/shopDealerOrder/index.vue
index c44b4da..45ef7cd 100644
--- a/src/views/shop/shopDealerOrder/index.vue
+++ b/src/views/shop/shopDealerOrder/index.vue
@@ -96,8 +96,11 @@
           </template>
 
           <template v-if="column.key === 'isSettled'">
-            <a-tag v-if="record.isSettled === 0" color="orange">未结算</a-tag>
-            <a-tag v-if="record.isSettled === 1" color="success">已结算</a-tag>
+            <div class="flex flex-col">
+              <a-tag v-if="record.isSettled === 0" color="orange">未结算</a-tag>
+              <a-tag v-if="record.isSettled === 1" color="purple">已结算</a-tag>
+              <a-tag v-if="record.isUnfreeze === 1" color="success">已解冻</a-tag>
+            </div>
           </template>
 
           <template v-if="column.key === 'createTime'">
@@ -108,6 +111,9 @@
               <a-tooltip title="结算时间">
                 <span class="text-purple-500">{{ record.settleTime }}</span>
               </a-tooltip>
+              <a-tooltip title="解冻时间">
+                <span class="text-green-500">{{ record.unfreezeTime }}</span>
+              </a-tooltip>
             </div>
           </template>
 
diff --git a/src/views/shop/shopOrder/index.vue b/src/views/shop/shopOrder/index.vue
index 2a5cae3..4bd776e 100644
--- a/src/views/shop/shopOrder/index.vue
+++ b/src/views/shop/shopOrder/index.vue
@@ -160,6 +160,9 @@
             <a-space>
               <!-- 查看详情 - 所有状态都可以查看 -->
               <a @click.stop="openEdit(record)"> <EyeOutlined /> 详情 </a>
+              <a @click.stop="handleApplyRefund(record)">
+                <UndoOutlined /> 退款
+              </a>
 
               <!-- 未付款状态的操作 -->
               <template v-if="!record.payStatus && record.orderStatus === 0">