iOS Team / CNLiveMyOrder · Commits

Commit 21a2f81a97e0ac534631637795b5f723f4e208fc

Authored by yinqiaojuan
1 parent 5079b895

no message

Inline Side-by-side
Showing 5 changed files with 6 additions and 3 deletions
CNLiveMyOrder/Assets/CNLiveMyOrder.bundle/dd_gengduo2.png 0 → 100644
View file @21a2f81

1.01 KB
CNLiveMyOrder/Assets/CNLiveMyOrder.bundle/dd_gengduo2@2x.png 0 → 100644
View file @21a2f81

1.13 KB
CNLiveMyOrder/Assets/CNLiveMyOrder.bundle/dd_gengduo2@3x.png 0 → 100644
View file @21a2f81

1.32 KB
CNLiveMyOrder/Classes/Controller/CNLiveEvaluateController.m
  View file @21a2f81
... ... @@ -122,6 +122,7 @@
122 122 @"comment":_textView.text ?: @"",
123 123 @"plat":@"i"
124 124 };
  125 +
125 126 [CNLiveNetworking uploadNetworkWithURLString:CNCommentDarenUrl Param:param FormDataBlock:^(id<AFMultipartFormData> formData) {
126 127 [self->_images enumerateObjectsUsingBlock:^(UIImage *image, NSUInteger idx, BOOL * _Nonnull stop) {
127 128 ///压缩(lxg)
... ...
CNLiveMyOrder/Classes/Controller/CNLiveOrderDetailController.m
  View file @21a2f81
... ... @@ -26,6 +26,7 @@
26 26 #import "CommonLibrary.h"
27 27 #import "CNLiveApplyRefundController.h"
28 28 #import "FBRetainCycleDetector.h"
  29 +#import "CNLiveGetImage.h"
29 30 #define Default_H 45
30 31 #define OrderIdKey @"OrderIdKey" //订单号
31 32 @interface CNLiveOrderDetailController ()<CNLiveRefundVoucherViewDelegate,CNAddPopFuncViewDelegate>
... ... @@ -116,7 +117,8 @@
116 117 {
117 118 _moreBtn = [UIButton buttonWithType:UIButtonTypeCustom];
118 119 _moreBtn.frame = CGRectMake(0, 0, 30, 30);
119   - [_moreBtn setImage:[UIImage imageNamed:@"dd_gengduo2"] forState:UIControlStateNormal];
  120 +// [_moreBtn setImage:[UIImage imageNamed:@"dd_gengduo2"] forState:UIControlStateNormal];
  121 + [_moreBtn setImage:[CNLiveGetImage cnliveGetImageWithName:@"dd_gengduo2" bundle:@"CNLiveMyOrder.bundle/CNLiveMyOrder" targetClass:[self class]] forState:UIControlStateNormal];
120 122 [_moreBtn addTarget:self action:@selector(rightNavItemAction:) forControlEvents:UIControlEventTouchUpInside];
121 123 _moreBtn.hidden = YES;
122 124 UIBarButtonItem *item = [[UIBarButtonItem alloc] initWithCustomView:_moreBtn];
... ... @@ -457,7 +459,7 @@
457 459 };
458 460 [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNOrderCheckUrl Param:param CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
459 461 NSLog(@"打印这个页面%@-----%@",responseObject, error);
460   -
  462 + _moreBtn.hidden = NO;
461 463 [QMUITips hideAllToastInView:self.view animated:YES];
462 464 NSDictionary *data = [responseObject objectForKey:@"data"];
463 465 NSString *errMessage =[responseObject objectForKey:@"errorMessage"];
... ... @@ -648,7 +650,7 @@
648 650 }
649 651  
650 652 - (void)rightNavItemAction:(UIButton *)sender {
651   -
  653 + [self.popFunItemView showPopupViewInPosition:sender];
652 654 }
653 655 /**
654 656 * （（0-待确认，1-允许修改,2-取消订单，3-待支付，4-取消确认, 5-待发货，6-待收货,7-已收货,8-申请退款,9-确认退款,10-拒绝退款,11-退款失败,12-退款成功）
... ...