diff --git a/BBWY.Client/App.xaml.cs b/BBWY.Client/App.xaml.cs
index e658f3fc..80a08e61 100644
--- a/BBWY.Client/App.xaml.cs
+++ b/BBWY.Client/App.xaml.cs
@@ -66,9 +66,9 @@ namespace BBWY.Client
serviceCollection.AddSingleton<RestApiService>();
serviceCollection.AddSingleton(gl);
serviceCollection.BatchRegisterServices(new Assembly[] { Assembly.Load("BBWY.Client") }, typeof(IDenpendency));
-
serviceCollection.AddMapper(new MappingProfile());
+ serviceCollection.AddTransient<_1688PreviewPurchaseViewModel>();
ServiceProvider = serviceCollection.BuildServiceProvider();
base.OnStartup(e);
}
diff --git a/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs b/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs
index a417ea42..65af59f7 100644
--- a/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs
+++ b/BBWY.Client/ViewModels/Order/ChoosePurchaseSchemeViewModel.cs
@@ -23,6 +23,7 @@ namespace BBWY.Client.ViewModels
public ICommand DeleteCommand { get; set; }
public ICommand EditCommand { get; set; }
+ public ICommand PreviewPurchaseCommand { get; set; }
public ChoosePurchaseSchemeViewModel(PurchaseService purchaseService, GlobalContext globalContext, BindingPurchaseProductViewModel bindingPurchaseProduct)
{
@@ -32,6 +33,7 @@ namespace BBWY.Client.ViewModels
PurchaseSchemeList = new ObservableCollection<PurchaseScheme>();
DeleteCommand = new RelayCommand<PurchaseScheme>(Delete);
EditCommand = new RelayCommand<PurchaseScheme>(Edit);
+ PreviewPurchaseCommand = new RelayCommand<PurchaseScheme>(PreviewPurchase);
}
protected override void Load()
@@ -92,5 +94,10 @@ namespace BBWY.Client.ViewModels
if (r == true)
Task.Factory.StartNew(() => LoadPurchaseScheme(SkuId));
}
+
+ public void PreviewPurchase(PurchaseScheme purchaseScheme)
+ {
+
+ }
}
}
diff --git a/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs b/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs
new file mode 100644
index 00000000..df303037
--- /dev/null
+++ b/BBWY.Client/ViewModels/Purchase/1688PreviewPurchaseViewModel.cs
@@ -0,0 +1,10 @@
+namespace BBWY.Client.ViewModels
+{
+ public class _1688PreviewPurchaseViewModel : BaseVM
+ {
+ public _1688PreviewPurchaseViewModel()
+ {
+
+ }
+ }
+}
diff --git a/BBWY.Client/ViewModels/ViewModelLocator.cs b/BBWY.Client/ViewModels/ViewModelLocator.cs
index bd3abc2e..851d87c1 100644
--- a/BBWY.Client/ViewModels/ViewModelLocator.cs
+++ b/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>();
+ }
+ }
+ }
}
}
diff --git a/BBWY.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs b/BBWY.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs
index 6876c687..a23d4a25 100644
--- a/BBWY.Client/ViewModels/Ware/BindingPurchaseProductViewModel.cs
+++ b/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(() =>
{
diff --git a/BBWY.Client/Views/Purchase/1688Purchase.xaml b/BBWY.Client/Views/Purchase/1688Purchase.xaml
index 6b02d674..f618e654 100644
--- a/BBWY.Client/Views/Purchase/1688Purchase.xaml
+++ b/BBWY.Client/Views/Purchase/1688Purchase.xaml
@@ -6,11 +6,12 @@
xmlns:local="clr-namespace:BBWY.Client.Views.Purchase"
xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"
mc:Ignorable="d"
- Title="提交订单" Height="450" Width="800"
+ Title="提交订单" Height="600" Width="800"
Style="{StaticResource bwstyle}"
MinButtonVisibility="Collapsed"
- MaxButtonVisibility="Collapsed">
- <Grid>
+ MaxButtonVisibility="Collapsed"
+ DataContext="{Binding _1688PreviewPurchase,Source={StaticResource Locator}}">
+ <Grid Margin="-4,-1,4,1">
<Grid.RowDefinitions>
<RowDefinition Height="30"/>
<RowDefinition/>
@@ -30,21 +31,32 @@
</Grid.ColumnDefinitions>
<c:BTextBox Text="留言信息"
WaterRemark="留言信息"
- VerticalAlignment="Stretch" Height="Auto" VerticalContentAlignment="Top" Padding="3,5,0,0"
+ Height="60"
+ VerticalContentAlignment="Top"
+ Padding="3,5,0,0"
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>
- <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="福建泉州鲤城区浮桥街龙景华庭B栋1008" Margin="0,2.5" Width="300" WaterRemark="地址"/>
+ <c:BTextBox Text="福建泉州鲤城区浮桥街龙景华庭B栋1008" Margin="0,2.5" WaterRemark="地址"/>
<c:BTextBox Text="18996038927" WaterRemark="电话"/>
</StackPanel>
<TextBlock Grid.Row="4" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5,0,0,0" FontSize="16">
<Run Text="应付总额(含运费)"/>
- <Run Text="163.3" Foreground="Pink"/>
+ <Run Text="163.3" Foreground="#EC808D"/>
<Run Text="元"/>
</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>
</c:BWindow>