From 58d63637b67a7c565618379268da604e6231fc4c Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 27 八月 2025 18:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/business/orders.vue |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/src/views/business/orders.vue b/admin/src/views/business/orders.vue
index 037ccd1..ed2d66e 100644
--- a/admin/src/views/business/orders.vue
+++ b/admin/src/views/business/orders.vue
@@ -89,14 +89,14 @@
           </template>
         </el-table-column>
         <el-table-column prop="orderContent" label="璁㈠崟鍐呭"  width="200px" :show-overflow-tooltip='true'></el-table-column>
-        <el-table-column prop="releaseName" label="鍙戝崟鏂�"  width="200px">
+        <el-table-column prop="releaseName" label="鍙戝崟鏂�"  min-width="100px" :show-overflow-tooltip='true'>
           <template slot-scope="{row}">
-            {{(row.releaseName||'鍖垮悕') +' - ' +(row.releasePhone||'鏃�')  }}
+           <span v-if="row.releaseName || row.releasePhone">{{(row.releaseName||'') +' - ' +(row.releasePhone||'')  }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="acceptName" label="鎺ュ崟鏂�" width="200px">
+        <el-table-column prop="acceptName" label="鎺ュ崟鏂�" min-width="100px" :show-overflow-tooltip='true'>
           <template slot-scope="{row}">
-            {{(row.acceptName||'鍖垮悕') +' - ' +(row.acceptPhone ||'鏃�')  }}
+            <span v-if="row.acceptName || row.acceptPhone">{{(row.acceptName||'') +' - ' +(row.acceptPhone ||'')  }}</span>
           </template>
         </el-table-column>
         <el-table-column prop="createTime" label="鍙戝竷鏃堕棿" min-width="150px"></el-table-column>

--
Gitblit v1.9.3