diff --git a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
index ee96144..69f40e0 100644
--- a/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
+++ b/29WxOrderWpf/Ctrls/OrderCtrls/OrderListRowItemCtrl.xaml.cs
@@ -233,6 +233,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 					txtShopRemark.SetValue(WidthProperty, Double.NaN);
 					txtShopRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(0, 0, 50, 150));
 					txtShopRemark.IsReadOnly = true;
+					if (txtShopRemark.Text.IsNullOrEmpty())
+						txtShopRemark.Visibility = Visibility.Collapsed;
 				}
 				else
 				{
@@ -241,6 +243,7 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 					txtShopRemark.SetValue(WidthProperty, 135.0);
 					txtShopRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(50, 0, 50, 150));
 					txtShopRemark.IsReadOnly = false;
+					txtShopRemark.Visibility = Visibility.Visible;
 				}
 			}
 		}
@@ -252,6 +255,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			txtShopRemark.SetValue(WidthProperty, Double.NaN);
 			txtShopRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(0, 0, 50, 150));
 			txtShopRemark.IsReadOnly = true;
+			if (txtShopRemark.Text.IsNullOrEmpty())
+				txtShopRemark.Visibility = Visibility.Collapsed;
 		}
 
 		private void btnEditAppRemark_Click(object sender, RoutedEventArgs e)
@@ -289,6 +294,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 					txtAppRemark.SetValue(WidthProperty, Double.NaN);
 					txtAppRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(0, 0, 50, 150));
 					txtAppRemark.IsReadOnly = true;
+					if (txtAppRemark.Text.IsNullOrEmpty())
+						txtAppRemark.Visibility = Visibility.Collapsed;
 				}
 				else
 				{
@@ -296,7 +303,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 					btnEditAppRemark.Content = "保存";
 					txtAppRemark.SetValue(WidthProperty, 135.0);
 					txtAppRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(50, 0, 50, 150));
-					txtAppRemark.IsReadOnly = false;
+					txtAppRemark.IsReadOnly = false; 
+					txtAppRemark.Visibility = Visibility.Visible;
 				}
 			}
 		}
@@ -308,6 +316,8 @@ namespace _29WxOrderWpf.Ctrls.OrderCtrls
 			txtAppRemark.SetValue(WidthProperty, Double.NaN);
 			txtAppRemark.BorderBrush = new SolidColorBrush(Color.FromArgb(0, 0, 50, 150));
 			txtAppRemark.IsReadOnly = true;
+			if (txtAppRemark.Text.IsNullOrEmpty())
+				txtAppRemark.Visibility = Visibility.Collapsed;
 		}
 
 		private async void btnBuyOrder_Click(object sender, RoutedEventArgs e)
diff --git a/AllBase/Model/DBModel/oms_wei_order_item_info.cs b/AllBase/Model/DBModel/oms_wei_order_item_info.cs
index e162798..27bff17 100644
--- a/AllBase/Model/DBModel/oms_wei_order_item_info.cs
+++ b/AllBase/Model/DBModel/oms_wei_order_item_info.cs
@@ -320,7 +320,7 @@ namespace AllBase.Model.DBModel
 				AddEditTransitWarehouseAfterSaleStr = "已添加";
 			if (this.ItemTransitOrderAfterSale != null && (ItemTransitOrderWithVoid.intercept_return_status == 1 || !string.IsNullOrEmpty(ItemTransitOrderAfterSale.downstream_waybill)))
 				AddEditTransitWarehouseAfterSaleStr = "拦截成功";
-			if (this.ItemTransitOrderAfterSale != null && (ItemTransitOrderWithVoid.intercept_return_status == 2 || ItemTransitOrderWithVoid.intercept_return_status == 3))
+			if (this.ItemTransitOrderAfterSale != null && ItemTransitOrderWithVoid.intercept_return_status == 2)
 				AddEditTransitWarehouseAfterSaleStr = "拦截失败";
 			if (this.ItemTransitOrderWithVoid == null || (this.ItemRefund?.type != "REFUND" && !this.ItemOrder.IsAbnormal) ||
 				TransitRefundStatusStr.Contains("退款成功") ||