1中转仓订单退货功能 2中转仓订单运费根据oem或管理员设定调整 3其他一些问题修复

This commit is contained in:
wule committed 2026-07-18 18:31:29 +08:00
1 parent d6f81f9ef4
commit 2e20cbdf68
24 files changed
+834 -292

No files matched your search

+10 -2
View File
@@ -168,7 +168,7 @@
<Compile Include="Ctrls\ShopCtrls\ShopListCtrl.xaml.cs">
<DependentUpon>ShopListCtrl.xaml</DependentUpon>
</Compile>
<Compile Include="LoginWindows\LoginWindow.xaml.cs">
<Compile Include="Windows\LoginWindows\LoginWindow.xaml.cs">
<DependentUpon>LoginWindow.xaml</DependentUpon>
</Compile>
<Compile Include="Ctrls\OrderCtrls\OrderListCtrl.xaml.cs">
@@ -184,6 +184,9 @@
<DependentUpon>UcWindowBoxes.xaml</DependentUpon>
</Compile>
<Compile Include="Utils\UiCtrlUtils.cs" />
<Compile Include="Windows\OrderWindows\TransitAfterSaleWindow.xaml.cs">
<DependentUpon>TransitAfterSaleWindow.xaml</DependentUpon>
</Compile>
<Page Include="BaseWindows\BaseMsgWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -216,7 +219,7 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="LoginWindows\LoginWindow.xaml">
<Page Include="Windows\LoginWindows\LoginWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
@@ -284,6 +287,10 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Windows\OrderWindows\TransitAfterSaleWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs">
@@ -379,6 +386,7 @@
<ItemGroup>
<Resource Include="29_common_icon.ico" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>