|
|
@@ -62,14 +62,14 @@
|
|
|
|
|
|
- (void)changePriceType:(NSInteger)type {
|
|
|
|
|
|
- NSString *title = @"提货价";
|
|
|
+ NSString *title = ab_lager;
|
|
|
switch (type) {
|
|
|
case 0: {
|
|
|
- title = @"提货价";
|
|
|
+ title = ab_lager;
|
|
|
}
|
|
|
break;
|
|
|
case 1: {
|
|
|
- title = @"统一价";
|
|
|
+ title = flat_price;
|
|
|
}
|
|
|
break;
|
|
|
|
|
|
@@ -115,8 +115,8 @@
|
|
|
|
|
|
enumvc.cadedate = @{
|
|
|
@"count" : @"2",
|
|
|
- @"val_0" : @{@"value" : @"提货价",@"value_code" : @"0",@"check" : [self checkPriceType:0]},
|
|
|
- @"val_1" : @{@"value" : @"统一价",@"value_code" : @"1",@"check" : [self checkPriceType:1]}
|
|
|
+ @"val_0" : @{@"value" : ab_lager,@"value_code" : @"0",@"check" : [self checkPriceType:0]},
|
|
|
+ @"val_1" : @{@"value" : flat_price,@"value_code" : @"1",@"check" : [self checkPriceType:1]}
|
|
|
}.mutableCopy;
|
|
|
enumvc.title = @"";
|
|
|
|
|
|
@@ -164,6 +164,12 @@
|
|
|
|
|
|
}
|
|
|
- (IBAction)saveButtonClick:(UIButton *)sender {
|
|
|
+
|
|
|
+ // 向服务器提交数据
|
|
|
+
|
|
|
+ // 将数据返回
|
|
|
+ if (self.returnBlock)
|
|
|
+ self.returnBlock(self.categoryPrice);
|
|
|
}
|
|
|
|
|
|
#pragma mark - text field delegate
|
|
|
@@ -175,74 +181,68 @@
|
|
|
if (newText.length == 0)
|
|
|
return YES;
|
|
|
|
|
|
- // 第一个字符不能为小数点
|
|
|
- if ([newText isEqualToString:@"."])
|
|
|
- return NO;
|
|
|
- if ([newText componentsSeparatedByString:@"."].count > 2) {
|
|
|
- return NO;
|
|
|
- } // 不能有多个小数点
|
|
|
-
|
|
|
- // 只能第一个字符为减号
|
|
|
- if (newText.length > 1 && [string isEqualToString:@"-"]) {
|
|
|
- return NO;
|
|
|
- }
|
|
|
-
|
|
|
- // 校验正数
|
|
|
- NSCharacterSet *cs;
|
|
|
- cs = [[NSCharacterSet characterSetWithCharactersInString:NUMBERS]invertedSet];
|
|
|
- NSString *filtered = [[string componentsSeparatedByCharactersInSet:cs]componentsJoinedByString:@""];
|
|
|
- BOOL canChange = [string isEqualToString:filtered];
|
|
|
+// // 第一个字符不能为小数点
|
|
|
+// if ([newText isEqualToString:@"."])
|
|
|
+// return NO;
|
|
|
+// if ([newText componentsSeparatedByString:@"."].count > 2) {
|
|
|
+// return NO;
|
|
|
+// } // 不能有多个小数点
|
|
|
+//
|
|
|
+// // 只能第一个字符为减号
|
|
|
+// if (newText.length > 1 && [string isEqualToString:@"-"]) {
|
|
|
+// return NO;
|
|
|
+// }
|
|
|
+// // 不能为 0123
|
|
|
+// if (newText.length > 1 && [newText hasPrefix:@"0"] && [newText characterAtIndex:1] != '.') {
|
|
|
+// return NO;
|
|
|
+// }
|
|
|
+// // 不能为 -0123
|
|
|
+// if (newText.length > 2 && [newText hasPrefix:@"-0"] && [newText characterAtIndex:2] != '.') {
|
|
|
+// return NO;
|
|
|
+// }
|
|
|
+//
|
|
|
+// // 校验正数
|
|
|
+// NSCharacterSet *cs;
|
|
|
+// cs = [[NSCharacterSet characterSetWithCharactersInString:NUMBERS]invertedSet];
|
|
|
+// NSString *filtered = [[string componentsSeparatedByCharactersInSet:cs]componentsJoinedByString:@""];
|
|
|
+// BOOL canChange = [string isEqualToString:filtered];
|
|
|
+//
|
|
|
+// if ([textField isEqual:self.floatTextField]) {
|
|
|
+//
|
|
|
+// // 校验负数
|
|
|
+// NSCharacterSet *negative_cs;
|
|
|
+//
|
|
|
+// negative_cs = [[NSCharacterSet characterSetWithCharactersInString:NEGATIVE_NUMBERS]invertedSet];
|
|
|
+// NSString *negative_filtered = [[string componentsSeparatedByCharactersInSet:negative_cs]componentsJoinedByString:@""];
|
|
|
+//
|
|
|
+// BOOL negative_canChange = [string isEqualToString:negative_filtered];
|
|
|
+//
|
|
|
+// // 只能第一个字符为减号
|
|
|
+// if ([string isEqualToString:@"-"]) {
|
|
|
+//
|
|
|
+// if (newText.length == 1 && [string isEqualToString:@"-"]) {
|
|
|
+// negative_canChange = YES && negative_canChange;
|
|
|
+// } else {
|
|
|
+// negative_canChange = NO;
|
|
|
+// }
|
|
|
+// }
|
|
|
+//
|
|
|
+//
|
|
|
+// return canChange || negative_canChange;
|
|
|
+// } else {
|
|
|
+// return canChange;
|
|
|
+// }
|
|
|
|
|
|
- if ([textField isEqual:self.floatTextField]) {
|
|
|
-
|
|
|
- // 校验负数
|
|
|
- NSCharacterSet *negative_cs;
|
|
|
-
|
|
|
- negative_cs = [[NSCharacterSet characterSetWithCharactersInString:NEGATIVE_NUMBERS]invertedSet];
|
|
|
- NSString *negative_filtered = [[string componentsSeparatedByCharactersInSet:negative_cs]componentsJoinedByString:@""];
|
|
|
-
|
|
|
- BOOL negative_canChange = [string isEqualToString:negative_filtered];
|
|
|
-
|
|
|
- // 只能第一个字符为减号
|
|
|
- if ([string isEqualToString:@"-"]) {
|
|
|
-
|
|
|
- if (newText.length == 1 && [string isEqualToString:@"-"]) {
|
|
|
- negative_canChange = YES && negative_canChange;
|
|
|
- } else {
|
|
|
- negative_canChange = NO;
|
|
|
- }
|
|
|
- }
|
|
|
|
|
|
-
|
|
|
- return canChange || negative_canChange;
|
|
|
- } else {
|
|
|
- return canChange;
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
// 正则表达式
|
|
|
- BOOL plus = YES; // 正数
|
|
|
- NSString *plus_match = @"^[0-9]+(\\.[0-9]+){0,1}$";
|
|
|
- NSPredicate *plus_predicate = [NSPredicate predicateWithFormat:@"SELF MATCHES %@",plus_match];
|
|
|
-
|
|
|
- plus = [plus_predicate evaluateWithObject:newText];
|
|
|
-
|
|
|
- BOOL negative = YES; // 负数
|
|
|
- NSString *negative_match = @"^-([0-9]+(\\.[0-9]+){0,1})$";
|
|
|
- NSPredicate *negative_predicate = [NSPredicate predicateWithFormat:@"SELF MATCHES %@",negative_match];
|
|
|
- negative = [negative_predicate evaluateWithObject:newText];
|
|
|
+ NSString *match = @"-[1-9]+(\\.[0-9]*)?|-0\\.[0-9]+|[1-9]+(\\.[0-9]*)?|0\\.[0-9]{0,}|0{1,1}|-{1,1}|-0{1,1}|-0\\.{1,1}";
|
|
|
|
|
|
- BOOL zerobegin = NO; // 01231
|
|
|
- NSString *zerobegin_match = @"^0[1-9]+(\\.[0-9]+){0,1}$";
|
|
|
- NSPredicate *zerobegin_predicate = [NSPredicate predicateWithFormat:@"SELF MATCHES %@",zerobegin_match];
|
|
|
+ if ([textField isEqual:self.percentageTextField])
|
|
|
+ match = @"[1-9]+(\\.[0-9]*)?|0(\\.[0-9]*)?";
|
|
|
|
|
|
- zerobegin = [zerobegin_predicate evaluateWithObject:newText];
|
|
|
-
|
|
|
- if (zerobegin) {
|
|
|
- return NO;
|
|
|
- }
|
|
|
+ NSPredicate *predicate = [NSPredicate predicateWithFormat:@"SELF MATCHES %@",match];
|
|
|
|
|
|
- return plus || negative;
|
|
|
+ return [predicate evaluateWithObject:newText];
|
|
|
}
|
|
|
|
|
|
@end
|