放开淘宝直拍,优化拍单按钮显示逻辑
This commit is contained in:
1 parent
518365a0d3
commit
7ac3c67242
3 files changed
+6
-7
No files matched your search
@@ -1512,8 +1512,7 @@
|
|||||||
Click="btnDirectBuyOrder_Click"
|
Click="btnDirectBuyOrder_Click"
|
||||||
Content="直发拍单"
|
Content="直发拍单"
|
||||||
Style="{StaticResource BasePageButtonLightStyle}"
|
Style="{StaticResource BasePageButtonLightStyle}"
|
||||||
Visibility="Collapsed" />
|
Visibility="{Binding BtnDirectBuyOrderVisibility}"/>
|
||||||
<!-- Visibility="{Binding BtnDirectBuyOrderVisibility}" -->
|
|
||||||
|
|
||||||
<!-- 礼品发货 -->
|
<!-- 礼品发货 -->
|
||||||
<Button
|
<Button
|
||||||
|
|||||||
@@ -1557,7 +1557,10 @@ namespace AllBase.Model.DBModel
|
|||||||
|
|
||||||
// 直拍按钮
|
// 直拍按钮
|
||||||
BtnDirectBuyOrderVisibility = Visibility.Collapsed;
|
BtnDirectBuyOrderVisibility = Visibility.Collapsed;
|
||||||
//if (GlobalConfig.CurrentBuyPlatform == "pdd")
|
if (GlobalConfig.CurrentBuyPlatform == "pdd")
|
||||||
|
{
|
||||||
|
}
|
||||||
|
else if (GlobalConfig.CurrentBuyPlatform == "tb")
|
||||||
{
|
{
|
||||||
if (_itemOrderIsWaitBuy == true && this.BuyGoodsBtnTxt != "关联拍单")
|
if (_itemOrderIsWaitBuy == true && this.BuyGoodsBtnTxt != "关联拍单")
|
||||||
BtnDirectBuyOrderVisibility = Visibility.Visible;
|
BtnDirectBuyOrderVisibility = Visibility.Visible;
|
||||||
@@ -1568,9 +1571,6 @@ namespace AllBase.Model.DBModel
|
|||||||
BtnDirectBuyOrderVisibility = Visibility.Visible;
|
BtnDirectBuyOrderVisibility = Visibility.Visible;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//else if (GlobalConfig.CurrentBuyPlatform == "tb")
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public string RefundStatusStr
|
public string RefundStatusStr
|
||||||
|
|||||||
@@ -181,7 +181,7 @@ public class oms_wei_order_item_transit_model : PropertyNotifyObject
|
|||||||
// Visibility.Visible : Visibility.Collapsed; /* 额外发货包裹按钮 */
|
// Visibility.Visible : Visibility.Collapsed; /* 额外发货包裹按钮 */
|
||||||
|
|
||||||
transitDetail.VoidPackageBtnVisibility = transitOrder.warehouse_status == 0 && transitOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废发货包裹按钮 */
|
transitDetail.VoidPackageBtnVisibility = transitOrder.warehouse_status == 0 && transitOrder.order_void_status != 1 ? Visibility.Visible : Visibility.Collapsed; /* 作废发货包裹按钮 */
|
||||||
transitDetail.RejectPackageBtnVisibility = transitOrder.warehouse_status == 0 ? Visibility.Visible : Visibility.Collapsed; /* 拒收发货包裹按钮 */
|
transitDetail.RejectPackageBtnVisibility = OrderItem?.ItemOrder?.GetIsWaitBuy() != true && transitOrder.warehouse_status == 0 ? Visibility.Visible : Visibility.Collapsed; /* 拒收发货包裹按钮 */
|
||||||
transitDetail.ReturnPackageBtnVisibility = (transitOrder.warehouse_status == 1 || transitOrder.warehouse_status == 3) &&
|
transitDetail.ReturnPackageBtnVisibility = (transitOrder.warehouse_status == 1 || transitOrder.warehouse_status == 3) &&
|
||||||
!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
|
!OrderItem.ItemTransitOrderAfterSales.Any(af => af.pack_type == 1 && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) &&
|
||||||
!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "1" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
|
!OrderItem.ItemTransitExtraOrders.Any(af => af.pack_type == "1" && af.order_code == transitDetail.OrderCode && af.order_void_status != 1) ?
|
||||||
|
|||||||
Reference in new issue
Block a user