拍单功能继续优化
This commit is contained in:
1 parent
29042424dc
commit
34c51c6fcd
64 files changed
+7138
-305
No files matched your search
@@ -10,6 +10,7 @@ using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using System.Windows;
|
||||
using System.Windows.Media;
|
||||
|
||||
namespace AllBase.Model
|
||||
{
|
||||
@@ -29,16 +30,49 @@ namespace AllBase.Model
|
||||
public Visibility order_item5_visibility { get { return order_item5 == null ? Visibility.Collapsed : Visibility.Visible; } }
|
||||
|
||||
public ObservableCollection<oms_wei_refund_info> refunds { get; set; } = new ObservableCollection<oms_wei_refund_info>();
|
||||
//public oms_wei_refund_info refund
|
||||
//{
|
||||
// get
|
||||
// {
|
||||
// if (refunds.FirstOrDefault() != null)
|
||||
// return refunds.FirstOrDefault();
|
||||
// return new oms_wei_refund_info();
|
||||
// }
|
||||
//}
|
||||
|
||||
/// <summary>
|
||||
/// 待采购
|
||||
/// </summary>
|
||||
public bool IsWaitBuy
|
||||
{
|
||||
get
|
||||
{
|
||||
if (order_items.All(oi => oi.item_transit_order != null)) return false;
|
||||
if (purchase_status != 0) return false;
|
||||
if (!out_order_no.IsNullOrEmpty()) return false;
|
||||
if (status != 20 && status != 21) return false;
|
||||
return true;
|
||||
}
|
||||
set { }
|
||||
}
|
||||
/// <summary>
|
||||
/// 待发货
|
||||
/// </summary>
|
||||
public bool IsWaitSend
|
||||
{
|
||||
//get { return (purchase_status == 1 || !string.IsNullOrEmpty(out_order_no)) && (status == 20 || status == 21); }
|
||||
get
|
||||
{
|
||||
if (purchase_status != 1 && string.IsNullOrEmpty(out_order_no) && !order_items.All(oi => oi.item_transit_order != null)) return false;
|
||||
if (status != 20 && status != 21) return false;
|
||||
return true;
|
||||
}
|
||||
set { }
|
||||
}
|
||||
/// <summary>
|
||||
/// 待收货
|
||||
/// </summary>
|
||||
public bool IsWaitReceive
|
||||
{
|
||||
get { return status == 30 || status == 100; }
|
||||
set { }
|
||||
}
|
||||
public bool IsRefund
|
||||
{
|
||||
get { return refunds?.Count > 0; }
|
||||
set { }
|
||||
}
|
||||
|
||||
public string orderStatusStr
|
||||
{
|
||||
@@ -90,7 +124,7 @@ namespace AllBase.Model
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 订单延迟发货时间状态文本
|
||||
/// 订单总状态文本
|
||||
/// </summary>
|
||||
public string delivery_deadline_status_str
|
||||
{
|
||||
@@ -100,6 +134,8 @@ namespace AllBase.Model
|
||||
return "退款中";
|
||||
else if (this.refunds.Any(r => r.statusStr == "退款完成" || r.statusStr == "退货退款完成"))
|
||||
return "退款完成";
|
||||
else if (this.refunds.Any(r => !r.statusStr.IsNullOrEmpty()))
|
||||
return this.refunds.FirstOrDefault(r => !r.statusStr.IsNullOrEmpty()).statusStr;
|
||||
if (this.status == 20 || this.status == 21)
|
||||
{
|
||||
return "剩余";
|
||||
@@ -108,6 +144,7 @@ namespace AllBase.Model
|
||||
}
|
||||
set { /*delivery_deadline_status_str = value;*/ }
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 延迟发货时间(微信小店:商品发货时效,超时此时间未发货即为发货超时)文本
|
||||
/// </summary>
|
||||
@@ -134,6 +171,54 @@ namespace AllBase.Model
|
||||
set { /*delivery_deadline_str = value;*/ }
|
||||
}
|
||||
|
||||
public SolidColorBrush StatusBoxForeColor
|
||||
{
|
||||
get
|
||||
{
|
||||
if (delivery_deadline_status_str == "退款中" || delivery_deadline_str == "已超时")
|
||||
return new SolidColorBrush(Color.FromRgb(250, 71, 51)); // #fa4733
|
||||
else if (delivery_deadline_status_str == "退款完成" || delivery_deadline_str == "已发货")
|
||||
return new SolidColorBrush(Color.FromRgb(103, 194, 58)); // #67c23a
|
||||
else
|
||||
return new SolidColorBrush(Color.FromRgb(3, 151, 181)); // #0397b5
|
||||
}
|
||||
set { }
|
||||
}
|
||||
public SolidColorBrush StatusBoxBackColor
|
||||
{
|
||||
get
|
||||
{
|
||||
if (delivery_deadline_status_str == "退款中" || delivery_deadline_str == "已超时")
|
||||
return new SolidColorBrush(Color.FromArgb(26, 250, 71, 51)); // #fa4733 0.2
|
||||
else if (delivery_deadline_status_str == "退款完成" || delivery_deadline_str == "已发货")
|
||||
return new SolidColorBrush(Color.FromArgb(26, 103, 194, 58)); // #67c23a 0.2
|
||||
else
|
||||
return new SolidColorBrush(Color.FromArgb(26, 3, 151, 181)); // #0397b5 0.2
|
||||
}
|
||||
set { }
|
||||
}
|
||||
public SolidColorBrush StatusBoxBorderColor
|
||||
{
|
||||
get
|
||||
{
|
||||
//if (delivery_deadline_status_str == "退款中" || delivery_deadline_str == "已超时")
|
||||
// return new SolidColorBrush(Color.FromRgb(246, 212, 210)); // #f6d4d2
|
||||
//else if (delivery_deadline_status_str == "退款完成" || delivery_deadline_str == "已发货")
|
||||
// return new SolidColorBrush(Color.FromRgb(217, 237, 212)); // #d9edd4
|
||||
//else
|
||||
// return new SolidColorBrush(Color.FromRgb(232, 251, 249)); // #e8fbf9
|
||||
|
||||
if (delivery_deadline_status_str == "退款中" || delivery_deadline_str == "已超时")
|
||||
return new SolidColorBrush(Color.FromArgb(50, 250, 71, 51)); // #fa4733 0.2
|
||||
else if (delivery_deadline_status_str == "退款完成" || delivery_deadline_str == "已发货")
|
||||
return new SolidColorBrush(Color.FromArgb(50, 103, 194, 58)); // #67c23a 0.2
|
||||
else
|
||||
return new SolidColorBrush(Color.FromArgb(50, 3, 151, 181)); // #0397b5 0.2
|
||||
}
|
||||
set { }
|
||||
}
|
||||
|
||||
|
||||
public string address_str
|
||||
{
|
||||
get { return user_name + " " + tel_number + " " + province_name + " " + city_name + " " + county_name + " " + detail_info; }
|
||||
@@ -145,8 +230,6 @@ namespace AllBase.Model
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
///// <summary>
|
||||
///// 订单中所有商品加起来的总售价文本
|
||||
///// </summary>
|
||||
|
||||
Reference in new issue
Block a user