Commit 9f2814d8 authored by 曹云霄's avatar 曹云霄

优化生成订单,attachmentUrl字段

parent 18dacf69
...@@ -226,7 +226,7 @@ ...@@ -226,7 +226,7 @@
}else }else
{ {
[self.shareGoodsArray addObject:model]; [self.shareGoodsArray addObject:model];
[self.lampArray addObject:imageView]; [self.lampArray addObject:imageView];
} }
NSArray *imags = [model.pictures componentsSeparatedByString:@","]; NSArray *imags = [model.pictures componentsSeparatedByString:@","];
[imageView sd_setImageWithURL:[NSURL URLWithString:[imags firstObject]] placeholderImage:REPLACEIMAGE]; [imageView sd_setImageWithURL:[NSURL URLWithString:[imags firstObject]] placeholderImage:REPLACEIMAGE];
...@@ -264,7 +264,6 @@ ...@@ -264,7 +264,6 @@
- (void)dismissController - (void)dismissController
{ {
self.shoppingbagButton.selected = NO; self.shoppingbagButton.selected = NO;
} }
- (void)addToShoppingCar:(NSArray<ShopcarModel *> *)selectGoods finish:(void (^)(NSString *))completed - (void)addToShoppingCar:(NSArray<ShopcarModel *> *)selectGoods finish:(void (^)(NSString *))completed
...@@ -359,6 +358,10 @@ ...@@ -359,6 +358,10 @@
{ {
if (error != NULL) { if (error != NULL) {
[XBLoadingView showHUDViewWithText:@"保存相册失败"]; [XBLoadingView showHUDViewWithText:@"保存相册失败"];
}else {
for (UIImageView *imageView in self.selectedGoodsArray) {
[imageView setHidden:NO];
}
} }
} }
......
...@@ -223,7 +223,6 @@ ...@@ -223,7 +223,6 @@
} }
#pragma mark -获取商品列表数据 #pragma mark -获取商品列表数据
- (void)getGoodsListdatas:(GoodsCondition *)conditon completed:(void(^)(GoodsResponse *result))completed - (void)getGoodsListdatas:(GoodsCondition *)conditon completed:(void(^)(GoodsResponse *result))completed
{ {
......
...@@ -351,6 +351,7 @@ ...@@ -351,6 +351,7 @@
orderGoods.goodsPrice = model.costPrice; orderGoods.goodsPrice = model.costPrice;
orderGoods.remark = model.goods.spec; orderGoods.remark = model.goods.spec;
orderGoods.goodsUnit = model.goods.unit; orderGoods.goodsUnit = model.goods.unit;
orderGoods.attachmentUrl = model.attachmentUrl;
//总价 //总价
allPrice += model.goodsNum *[model.costPrice floatValue]; allPrice += model.goodsNum *[model.costPrice floatValue];
//总数量 //总数量
......
...@@ -3816,6 +3816,8 @@ extern NSString * const GRADEMETHOD_MANUL; ...@@ -3816,6 +3816,8 @@ extern NSString * const GRADEMETHOD_MANUL;
* *
*/ */
@property (nonatomic, strong) NSNumber *costPrice; @property (nonatomic, strong) NSNumber *costPrice;
@property (nonatomic,copy) NSString *attachmentUrl;
@end /* interface TOShopcartEntity */ @end /* interface TOShopcartEntity */
...@@ -5022,6 +5024,8 @@ extern NSString * const GRADEMETHOD_MANUL; ...@@ -5022,6 +5024,8 @@ extern NSString * const GRADEMETHOD_MANUL;
* *
*/ */
@property (nonatomic, copy) NSString *remark; @property (nonatomic, copy) NSString *remark;
@property (nonatomic,copy) NSString *attachmentUrl;
@end /* interface TOOrderdetailEntity */ @end /* interface TOOrderdetailEntity */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment