Commit c11d352c authored by Sandy's avatar Sandy

bug fix

parent b10258bc
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.2.32</string> <string>1.2.33</string>
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>1.2.32</string> <string>1.2.33</string>
<key>NSAppTransportSecurity</key> <key>NSAppTransportSecurity</key>
<dict> <dict>
<key>NSAllowsArbitraryLoads</key> <key>NSAllowsArbitraryLoads</key>
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
hud.mode = MBProgressHUDModeText; hud.mode = MBProgressHUDModeText;
hud.margin = 10.0f; hud.margin = 10.0f;
hud.yOffset = 60.0f; hud.yOffset = 60.0f;
[hud hide:YES afterDelay:1]; [hud hide:YES afterDelay:4];
} }
+ (void)showProgressLabel:(NSString *)text { + (void)showProgressLabel:(NSString *)text {
......
...@@ -433,6 +433,9 @@ typedef enum : NSUInteger { ...@@ -433,6 +433,9 @@ typedef enum : NSUInteger {
_measureUnitLabel = label; _measureUnitLabel = label;
textField.placeholder = @"输入包装规格"; textField.placeholder = @"输入包装规格";
textField.tag =111; textField.tag =111;
textField.userInteractionEnabled = self.intertype != ShopDetailInterTypeTranfer;
[textField addTarget:self action:@selector(textChange:) forControlEvents:UIControlEventAllEditingEvents]; [textField addTarget:self action:@selector(textChange:) forControlEvents:UIControlEventAllEditingEvents];
packageSpecification=textField;//包装规格 packageSpecification=textField;//包装规格
}else if ([title isEqualToString:@"包装数量"]) { }else if ([title isEqualToString:@"包装数量"]) {
......
...@@ -166,7 +166,8 @@ ...@@ -166,7 +166,8 @@
[cell.editBtn addTarget:self action:@selector(editClick:) forControlEvents:UIControlEventTouchUpInside]; [cell.editBtn addTarget:self action:@selector(editClick:) forControlEvents:UIControlEventTouchUpInside];
if (self.productArr.count > 0) { if (self.productArr.count > 0) {
TransferPdtDetail *billP = self.productArr[indexPath.row]; NSMutableArray *arrSection = [self.dictData objectForKey:self.arrBillNumber[indexPath.section]];
TransferPdtDetail *billP = arrSection[indexPath.row];
[cell setBillProduct:billP row:indexPath.row defaultState:self.defaultState[indexPath.row]]; [cell setBillProduct:billP row:indexPath.row defaultState:self.defaultState[indexPath.row]];
} }
// cell.backgroundColor = [UIColor redColor]; // cell.backgroundColor = [UIColor redColor];
...@@ -174,7 +175,7 @@ ...@@ -174,7 +175,7 @@
} }
- (BOOL)isHaveIndexPath:(NSIndexPath *)indexPath{ - (BOOL)isHaveIndexPath:(NSIndexPath *)indexPath{
for (NSIndexPath *path in _selectRowArr) { for (NSIndexPath *path in _selectRowArr) {
if (path.row == indexPath.row) { if (path == indexPath) {
return YES; return YES;
} }
} }
......
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
} }
- (BOOL)isHaveIndexPath:(NSIndexPath *)indexPath{ - (BOOL)isHaveIndexPath:(NSIndexPath *)indexPath{
for (NSIndexPath *path in _selectRowArr) { for (NSIndexPath *path in _selectRowArr) {
if (path.row == indexPath.row) { if (path == indexPath) {
return YES; return YES;
} }
} }
......
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
__weak TransportPurchaseCell *weakSelf = self; __weak TransportPurchaseCell *weakSelf = self;
self.headCell = [[HeaderCell alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, 38) WithCheckBoxArr:arr checkBox:^(BOOL isSelect) { self.headCell = [[HeaderCell alloc]initWithFrame:CGRectMake(0, 0, ScreenSize.width, 38) WithCheckBoxArr:arr checkBox:^(BOOL isSelect) {
if (isSelect) { if (isSelect) {
[weakSelf.selectArr removeAllObjects]; // [weakSelf.selectArr removeAllObjects];
for (TransportPdtDetail *pdt in weakSelf.secondArr) { for (TransportPdtDetail *pdt in weakSelf.secondArr) {
if (pdt.shippedFlag.boolValue) { if (pdt.shippedFlag.boolValue) {
...@@ -74,7 +74,13 @@ ...@@ -74,7 +74,13 @@
} }
} }
[weakSelf.selectArr addObjectsFromArray:weakSelf.secondArr]; for (TransportPdtDetail *pdt in weakSelf.secondArr) {
if (![weakSelf.selectArr containsObject:pdt]) {
[weakSelf.selectArr addObject:pdt];
}
}
// [weakSelf.selectArr addObjectsFromArray:weakSelf.secondArr];
}else{ }else{
[weakSelf.selectArr removeObjectsInArray:weakSelf.secondArr]; [weakSelf.selectArr removeObjectsInArray:weakSelf.secondArr];
......
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