From 4e122fce6e3643b0b3be02d42d8ad98458f70495 Mon Sep 17 00:00:00 2001
From: wule <jtt_fan@qq.com>
Date: Mon, 12 Oct 2026 18:51:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 AllBase/BaseClass.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index f613464..88d00d4 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -37,7 +37,7 @@ namespace AllBase
 		/// 版本ID
 		/// </summary>
 
-        public static int VersionCount = 311;
+        public static int VersionCount = 316;
 
 		public static string ServerUrl { get; set; } = "http://1.13.195.131:9000";
 		public static string DebugUrl { get; set; } = "http://localhost:9000";

From 6b36de24942d3edd2f88c667bc6b574f2ecf1d10 Mon Sep 17 00:00:00 2001
From: chfei <chaihongfei@126.com>
Date: Tue, 13 Oct 2026 16:58:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E5=A4=87=E6=B3=A8=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=20=E5=A4=87=E6=B3=A8=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Ctrls/Statistics/ShowOrderDialogView.xaml         | 11 +++++++++--
 .../Ctrls/Statistics/ShowOrderDialogView.xaml.cs      |  4 ++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/29WxOrderWpf/Ctrls/Statistics/ShowOrderDialogView.xaml b/29WxOrderWpf/Ctrls/Statistics/ShowOrderDialogView.xaml
index 5fa53bd..a4e4e65 100644
--- a/29WxOrderWpf/Ctrls/Statistics/ShowOrderDialogView.xaml
+++ b/29WxOrderWpf/Ctrls/Statistics/ShowOrderDialogView.xaml
@@ -183,9 +183,16 @@
 				<DataGridTextColumn
 					Width="1.1*"
 					Binding="{Binding Remark}"
-					ElementStyle="{StaticResource CenterCellTextStyle}"
 					Header="备注"
-					Visibility="{Binding Source={StaticResource ViewModel}, Path=Data.IsBuyerUnrefunded, Converter={StaticResource Boolean2VisibilityConverter}}" />
+					Visibility="{Binding Source={StaticResource ViewModel}, Path=Data.IsBuyerUnrefunded, Converter={StaticResource Boolean2VisibilityConverter}}">
+					<DataGridTextColumn.ElementStyle>
+						<Style TargetType="TextBlock">
+							<Setter Property="HorizontalAlignment" Value="Center" />
+							<Setter Property="VerticalAlignment" Value="Center" />
+							<Setter Property="ToolTip" Value="{Binding Remark}" />
+						</Style>
+					</DataGridTextColumn.ElementStyle>
+				</DataGridTextColumn>
 				<!--  操作：仅“买手未退回金额的订单”弹窗显示（列可见性在构造函数里按订单明细类型设置）  -->
 				<DataGridTemplateColumn
 					x:Name="colUpdateRefund"
diff --git a/29WxOrderWpf/Ctrls/Statistics/ShowOrderDialogView.xaml.cs b/29WxOrderWpf/Ctrls/Statistics/ShowOrderDialogView.xaml.cs
index 80ec4e6..3d77b33 100644
--- a/29WxOrderWpf/Ctrls/Statistics/ShowOrderDialogView.xaml.cs
+++ b/29WxOrderWpf/Ctrls/Statistics/ShowOrderDialogView.xaml.cs
@@ -379,7 +379,7 @@ class ShowOrderDialogViewModel : BindableBaseEx
 
 	private async Task UpdateRemark(ShopOrderDetailRow row)
 	{
-		string? remark = InputDialog.ShowText("请输入备注：", "备注", row.Remark);
+		string? remark = InputDialog.ShowText("请输入备注：", "备注", row.Remark, allowEmpty: true);
 		if (remark == null)
 			return;
 
@@ -412,7 +412,7 @@ class ShowOrderDialogViewModel : BindableBaseEx
 		bool includeRemark = _detailType == ShopOrderDetailType.BuyerUnrefunded;
 
 		// 表头
-		List<string> headers = [ "店名", "订单", "创建时间", "金额", "退款金额", "平台费用", "利润", "买手单号", "外采金额", "买手退款", "退款状态" ];
+		List<string> headers = ["店名", "订单", "创建时间", "金额", "退款金额", "平台费用", "利润", "买手单号", "外采金额", "买手退款", "退款状态"];
 		if (includeRemark)
 			headers.Add("备注");
 		sb.AppendLine(string.Join("\t", headers));