Merge branch 'main' of github.com:jtt-fan/29WxOrder
This commit is contained in:
commit
3579fac394
2 files changed
+27
-3
No files matched your search
@@ -472,8 +472,8 @@
|
|||||||
SelectedIndex="0"
|
SelectedIndex="0"
|
||||||
SelectionChanged="ComboBox_SelectionChanged"
|
SelectionChanged="ComboBox_SelectionChanged"
|
||||||
Style="{StaticResource RoundedComboBox}">
|
Style="{StaticResource RoundedComboBox}">
|
||||||
<ComboBoxItem Content="1.55" />
|
<ComboBoxItem Content="礼品一" />
|
||||||
<ComboBoxItem Content="1.6" />
|
<ComboBoxItem Content="礼品二(实物)" />
|
||||||
</ComboBox>
|
</ComboBox>
|
||||||
</wpf:TitleContent>
|
</wpf:TitleContent>
|
||||||
<Button
|
<Button
|
||||||
@@ -607,7 +607,26 @@
|
|||||||
Click="chkMapProd_Click"
|
Click="chkMapProd_Click"
|
||||||
Content="已关联拍单"
|
Content="已关联拍单"
|
||||||
FontSize="12" />
|
FontSize="12" />
|
||||||
|
<Button
|
||||||
|
Width="Auto"
|
||||||
|
Height="22"
|
||||||
|
MinWidth="48"
|
||||||
|
Margin="8,0,4,0"
|
||||||
|
Padding="4,0"
|
||||||
|
c:DebugVisibility.Enable="True"
|
||||||
|
Click="Button_Click"
|
||||||
|
Command="{Binding MultipleShipGiftCommand}"
|
||||||
|
Content="自动拍单"
|
||||||
|
FontSize="12"
|
||||||
|
Style="{StaticResource BasePageButtonStyle}" />
|
||||||
|
<Polyline
|
||||||
|
Grid.Column="5"
|
||||||
|
Width="10"
|
||||||
|
Margin="2,0"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Points="5,0 5,4 5,0"
|
||||||
|
Stroke="{StaticResource mainColorBrush}"
|
||||||
|
StrokeThickness="2" />
|
||||||
<Button
|
<Button
|
||||||
Width="Auto"
|
Width="Auto"
|
||||||
Height="22"
|
Height="22"
|
||||||
|
|||||||
@@ -2705,6 +2705,11 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
|
|||||||
}
|
}
|
||||||
FilterOrders();
|
FilterOrders();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async void Button_Click(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public class OrderFilterConfig : PropertyNotifyObject
|
public class OrderFilterConfig : PropertyNotifyObject
|
||||||
|
|||||||
Reference in new issue
Block a user