From d8853a5db173636560b43ed5dfcd0d483316f69a Mon Sep 17 00:00:00 2001
From: dzl <786316265@qq.com>
Date: Fri, 5 Sep 2025 11:40:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Orders.vue        | 20 +++++++++++++++++++-
 src/views/ProductDetail.vue | 30 ++++++++++++++++++++----------
 src/views/Transfers.vue     |  2 +-
 3 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/src/views/Orders.vue b/src/views/Orders.vue
index 8eb52f8..a857792 100644
--- a/src/views/Orders.vue
+++ b/src/views/Orders.vue
@@ -115,6 +115,13 @@
               >
                 立即支付
               </el-button>
+              <el-button 
+                v-if="order.status === 'pre_order'"
+                size="small"
+                @click="cancelOrder(order.id)"
+              >
+                取消订单
+              </el-button>
               <el-button 
                 v-if="order.status === 'pending'"
                 size="small"
@@ -1209,7 +1216,18 @@ onMounted(() => {
   }
   
   .order-actions {
-    flex-wrap: wrap;
+    display: flex;
+    justify-content: flex-end;
+    gap: 6px;
+    padding: 12px 16px;
+    flex-wrap: nowrap;
+  }
+  
+  .order-actions .el-button {
+    flex: 0 0 auto;
+    min-width: 70px;
+    font-size: 12px;
+    padding: 6px 12px;
   }
   
   .detail-item {
diff --git a/src/views/ProductDetail.vue b/src/views/ProductDetail.vue
index 3874669..59d79b0 100644
--- a/src/views/ProductDetail.vue
+++ b/src/views/ProductDetail.vue
@@ -98,16 +98,26 @@
             <!-- 第一组：商品详情图标 + 文本 -->
             <div class="detail-item-group"> <!-- 每组独立容器 -->
               <img src="/imgs/productdetail/shangpingxiangqing.png" alt="商品详情" class="detail-icon">
-              <span class="detail-text">{{product.material}}||
-              <el-tag
-                  v-for="tag in product.tags"
-                  :key="tag"
-                  size="small"
-                  class="product-tag"
-              >
-                {{ tag }}
-              </el-tag>||{{product.brand}}||{{product.origin}}
-            </span>
+              <!-- <span class="detail-text">{{product.material}}||
+                <el-tag
+                    v-for="tag in product.tags"
+                    :key="tag"
+                    size="small"
+                    class="product-tag"
+                >
+                  {{ tag }}
+                </el-tag>||{{product.brand}}||{{product.origin}}
+              </span> -->
+              <span class="detail-text">
+                <el-tag
+                    v-for="tag in product.tags"
+                    :key="tag"
+                    size="small"
+                    class="product-tag"
+                >
+                  {{ tag }}
+                </el-tag>
+              </span>
             </div>
           </div>
 
diff --git a/src/views/Transfers.vue b/src/views/Transfers.vue
index ff288fa..be633e7 100644
--- a/src/views/Transfers.vue
+++ b/src/views/Transfers.vue
@@ -721,7 +721,7 @@ const confirmNotReceived = async (transferId) => {
 }
 
 .transfer-list {
-  max-height: 400px;
+  max-height: 600px;
   overflow-y: auto;
 }