Merge branch 'main' of github.com:KJD2025/29WxOrder

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"

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));

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";