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

This commit is contained in:
wule committed 2026-10-13 18:24:17 +08:00
commit ade92facab
3 files changed
+11 -4

No files matched your search

@@ -183,9 +183,16 @@
<DataGridTextColumn <DataGridTextColumn
Width="1.1*" Width="1.1*"
Binding="{Binding Remark}" Binding="{Binding Remark}"
ElementStyle="{StaticResource CenterCellTextStyle}"
Header="备注" 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 <DataGridTemplateColumn
x:Name="colUpdateRefund" x:Name="colUpdateRefund"
@@ -379,7 +379,7 @@ class ShowOrderDialogViewModel : BindableBaseEx
private async Task UpdateRemark(ShopOrderDetailRow row) private async Task UpdateRemark(ShopOrderDetailRow row)
{ {
string? remark = InputDialog.ShowText("请输入备注:", "备注", row.Remark); string? remark = InputDialog.ShowText("请输入备注:", "备注", row.Remark, allowEmpty: true);
if (remark == null) if (remark == null)
return; return;
+1 -1
View File
@@ -37,7 +37,7 @@ namespace AllBase
/// 版本ID /// 版本ID
/// </summary> /// </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 ServerUrl { get; set; } = "http://1.13.195.131:9000";
public static string DebugUrl { get; set; } = "http://localhost:9000"; public static string DebugUrl { get; set; } = "http://localhost:9000";