Browse Source

在线采购预览

qianyi
shanji 3 years ago
parent
commit
186530c64c
  1. 2
      BBWY.Client/App.xaml.cs
  2. 7
      BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs
  3. 10
      BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs
  4. 11
      BBWY.Client/ViewModels/ViewModelLocator.cs
  5. 2
      BBWY.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs
  6. 28
      BBWY.Client/Views/Purchase/1688Purchase.xaml

2
BBWY.Client/App.xaml.cs

@ -66,9 +66,9 @@ namespace BBWY.Client
serviceCollection.AddSingleton<RestApiService>(); serviceCollection.AddSingleton<RestApiService>();
serviceCollection.AddSingleton(gl); serviceCollection.AddSingleton(gl);
serviceCollection.BatchRegisterServices(new Assembly[] { Assembly.Load("BBWY.Client") }, typeof(IDenpendency)); serviceCollection.BatchRegisterServices(new Assembly[] { Assembly.Load("BBWY.Client") }, typeof(IDenpendency));
serviceCollection.AddMapper(new MappingProfile()); serviceCollection.AddMapper(new MappingProfile());
serviceCollection.AddTransient<_1688PreviewPurchaseViewModel>();
ServiceProvider = serviceCollection.BuildServiceProvider(); ServiceProvider = serviceCollection.BuildServiceProvider();
base.OnStartup(e); base.OnStartup(e);
} }

7
BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs

@ -23,6 +23,7 @@ namespace BBWY.Client.ViewModels
public ICommand DeleteCommand { get; set; } public ICommand DeleteCommand { get; set; }
public ICommand EditCommand { get; set; } public ICommand EditCommand { get; set; }
public ICommand PreviewPurchaseCommand { get; set; }
public ChoosePurchaseSchemeViewModel(PurchaseService purchaseService, GlobalContext globalContext, BindingPurchaseProductViewModel bindingPurchaseProduct) public ChoosePurchaseSchemeViewModel(PurchaseService purchaseService, GlobalContext globalContext, BindingPurchaseProductViewModel bindingPurchaseProduct)
{ {
@ -32,6 +33,7 @@ namespace BBWY.Client.ViewModels
PurchaseSchemeList = new ObservableCollection<PurchaseScheme>(); PurchaseSchemeList = new ObservableCollection<PurchaseScheme>();
DeleteCommand = new RelayCommand<PurchaseScheme>(Delete); DeleteCommand = new RelayCommand<PurchaseScheme>(Delete);
EditCommand = new RelayCommand<PurchaseScheme>(Edit); EditCommand = new RelayCommand<PurchaseScheme>(Edit);
PreviewPurchaseCommand = new RelayCommand<PurchaseScheme>(PreviewPurchase);
} }
protected override void Load() protected override void Load()
@ -92,5 +94,10 @@ namespace BBWY.Client.ViewModels
if (r == true) if (r == true)
Task.Factory.StartNew(() => LoadPurchaseScheme(SkuId)); Task.Factory.StartNew(() => LoadPurchaseScheme(SkuId));
} }
public void PreviewPurchase(PurchaseScheme purchaseScheme)
{
}
} }
} }

10
BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs

@ -0,0 +1,10 @@
namespace BBWY.Client.ViewModels
{
public class _1688PreviewPurchaseViewModel : BaseVM
{
public _1688PreviewPurchaseViewModel()
{
}
}
}

11
BBWY.Client/ViewModels/ViewModelLocator.cs

@ -77,5 +77,16 @@ namespace BBWY.Client.ViewModels
} }
} }
} }
public _1688PreviewPurchaseViewModel _1688PreviewPurchase
{
get
{
using (var s = sp.CreateScope())
{
return s.ServiceProvider.GetRequiredService<_1688PreviewPurchaseViewModel>();
}
}
}
} }
} }

2
BBWY.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs

@ -125,7 +125,7 @@ namespace BBWY.Client.ViewModels
} }
} }
private void LoadPurchaseProduct(PurchaseSchemeProduct purchaseSchemeProduct, IList<PurchaseSchemeProductSku> skuList = null) public void LoadPurchaseProduct(PurchaseSchemeProduct purchaseSchemeProduct, IList<PurchaseSchemeProductSku> skuList = null)
{ {
App.Current.Dispatcher.Invoke(() => App.Current.Dispatcher.Invoke(() =>
{ {

28
BBWY.Client/Views/Purchase/1688Purchase.xaml

@ -6,11 +6,12 @@
xmlns:local="clr-namespace:BBWY.Client.Views.Purchase" xmlns:local="clr-namespace:BBWY.Client.Views.Purchase"
xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls" xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
mc:Ignorable="d" mc:Ignorable="d"
Title="提交订单" Height="450" Width="800" Title="提交订单" Height="600" Width="800"
Style="{StaticResource bwstyle}" Style="{StaticResource bwstyle}"
MinButtonVisibility="Collapsed" MinButtonVisibility="Collapsed"
MaxButtonVisibility="Collapsed"> MaxButtonVisibility="Collapsed"
<Grid> DataContext="{Binding _1688PreviewPurchase,Source={StaticResource Locator}}">
<Grid Margin="-4,-1,4,1">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="30"/> <RowDefinition Height="30"/>
<RowDefinition/> <RowDefinition/>
@ -30,21 +31,32 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<c:BTextBox Text="留言信息" <c:BTextBox Text="留言信息"
WaterRemark="留言信息" WaterRemark="留言信息"
VerticalAlignment="Stretch" Height="Auto" VerticalContentAlignment="Top" Padding="3,5,0,0" Height="60"
VerticalContentAlignment="Top"
Padding="3,5,0,0"
TextWrapping="Wrap"/> TextWrapping="Wrap"/>
<TextBlock Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">
<Run Text="货品总运费"/>
<Run Text="132.3" Foreground="#EC808D"/>
<Run Text="元"/>
<LineBreak/>
<Run Text="运费共计"/>
<Run Text="20" Foreground="#EC808D"/>
<Run Text="元"/>
</TextBlock>
</Grid> </Grid>
<StackPanel HorizontalAlignment="Left" VerticalAlignment="Center" Grid.Row="3" Margin="5,0"> <StackPanel HorizontalAlignment="Stretch" VerticalAlignment="Center" Grid.Row="3" Margin="5,0">
<c:BTextBox Text="收货人" WaterRemark="收货人"/> <c:BTextBox Text="收货人" WaterRemark="收货人"/>
<c:BTextBox Text="福建泉州鲤城区浮桥街龙景华庭B栋1008" Margin="0,2.5" Width="300" WaterRemark="地址"/> <c:BTextBox Text="福建泉州鲤城区浮桥街龙景华庭B栋1008" Margin="0,2.5" WaterRemark="地址"/>
<c:BTextBox Text="18996038927" WaterRemark="电话"/> <c:BTextBox Text="18996038927" WaterRemark="电话"/>
</StackPanel> </StackPanel>
<TextBlock Grid.Row="4" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,0,0,0" FontSize="16"> <TextBlock Grid.Row="4" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,0,0,0" FontSize="16">
<Run Text="应付总额(含运费)"/> <Run Text="应付总额(含运费)"/>
<Run Text="163.3" Foreground="Pink"/> <Run Text="163.3" Foreground="#EC808D"/>
<Run Text="元"/> <Run Text="元"/>
</TextBlock> </TextBlock>
<c:BButton Content="提交订单" Grid.Row="4" Width="80" HorizontalAlignment="Right" Margin="0,0,8,0"/> <c:BButton Content="提交订单" Grid.Row="4" Width="80" HorizontalAlignment="Right" Margin="0,0,5,0"/>
</Grid> </Grid>
</c:BWindow> </c:BWindow>

Loading…
Cancel
Save