Merge remote-tracking branch 'origin/master'

Lighting/Class/CommodityListTableViewCell.h

@@ -52,7 +52,10 @@
  */
 @property (weak, nonatomic) IBOutlet UILabel *specifications;
 
-
+/**
+ *  商品代码
+ */
+@property (weak, nonatomic) IBOutlet UILabel *goodsCode;
 
 
 

Lighting/Class/CommodityListTableViewCell.m

@@ -21,7 +21,8 @@
     _model = model;
     [self.goodsHeader sd_setImageWithURL:[NSURL URLWithString:_model.goods.pictures] placeholderImage:REPLACEIMAGE];
     self.goodsName.text = _model.goods.name;
-    self.specifications.text = [NSString stringWithFormat:@"%@(%@)",_model.goods.productProfile,_model.goods.spec];
+    self.specifications.text = _model.goods.size;
+    self.goodsCode.text = _model.goods.code;
     self.goodsNumber.text = [NSString stringWithFormat:@"数量   X%d",_model.goodsNum];
     self.clinchPrice.text = [NSString stringWithFormat:@"成交价   ￥%.2f",[_model.goods.costPrice floatValue]];
     //计算总价格
@@ -36,14 +37,16 @@
 #pragma mark -订单详情页赋值
 - (void)setOrderDetailslist:(TOOrderdetailEntity *)orderDetailslist
 {
+    
     _orderDetailslist = orderDetailslist;
-    [self.goodsHeader sd_setImageWithURL:[NSURL URLWithString:_orderDetailslist.goodsBrand] placeholderImage:ReplaceImage];
+    self.goodsName.text = _orderDetailslist.goodsName;
+    self.goodsCode.text = _orderDetailslist.goodsCode;
+    [self.goodsHeader sd_setImageWithURL:[NSURL URLWithString:_orderDetailslist.goodsBrand] placeholderImage:REPLACEIMAGE];
     self.goodsNumber.text = [NSString stringWithFormat:@"数量   X%@",_orderDetailslist.goodsNum];
     self.clinchPrice.text = [NSString stringWithFormat:@"成交价  ￥%.2f",[_orderDetailslist.goodsPrice floatValue]];
     //小计
     CGFloat totalPrice = [_orderDetailslist.goodsNum integerValue] * [_orderDetailslist.goodsPrice floatValue];
     self.totalPrice.text = [NSString stringWithFormat:@"￥%.2f",totalPrice];
-    self.goodsName.text = _orderDetailslist.goodsSpec;
     
     
     

Lighting/Class/Shoppingcart/ShoppingTableViewCell.h

@@ -105,5 +105,9 @@
  */
 @property (weak, nonatomic) IBOutlet UILabel *specifications;
 
+/**
+ *  商品代码
+ */
+@property (weak, nonatomic) IBOutlet UILabel *goodsCode;
 
 @end

Lighting/Class/Shoppingcart/ShoppingTableViewCell.m

@@ -33,7 +33,8 @@
     self.selectedButton.selected = _model.isSelected;
     [self.goodsImageView sd_setImageWithURL:[NSURL URLWithString:_model.goods.pictures] placeholderImage:REPLACEIMAGE];
     self.goodsInformationLabe.text = _model.goods.name;
-    self.specifications.text = [NSString stringWithFormat:@"%@(%@)",_model.goods.productProfile,_model.goods.spec];
+    self.specifications.text = _model.goods.size;
+    self.goodsCode.text = _model.goods.code;
     self.tagsPriceLabe.text = [_model.goods.tagPrice stringValue];
     self.clinchTextfield.text = [_model.goods.costPrice stringValue];
     self.goodsNumbersLabe.text = [NSString stringWithFormat:@"%d",_model.goodsNum];