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 @@
- 未结算
- 已结算
+
@@ -108,6 +111,9 @@
{{ record.settleTime }}
+
+ {{ record.unfreezeTime }}
+
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 @@
详情
+
+ 退款
+