|
@@ -235,7 +235,7 @@
|
|
|
appDelegate=(AppDelegate*)[[UIApplication sharedApplication] delegate];
|
|
appDelegate=(AppDelegate*)[[UIApplication sharedApplication] delegate];
|
|
|
});
|
|
});
|
|
|
// AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
|
|
// AppDelegate *appDelegate = (AppDelegate *)[UIApplication sharedApplication].delegate;
|
|
|
- NSDictionary *urgencyDic = [RASingleton.sharedInstance globalParameterForKey:@"urgencyDic"];
|
|
|
|
|
|
|
+ NSDictionary *urgencyDic = [appDelegate globalParameterForKey:@"urgencyDic"];
|
|
|
|
|
|
|
|
id count = [urgencyDic objectForKey:@"count"];
|
|
id count = [urgencyDic objectForKey:@"count"];
|
|
|
|
|
|
|
@@ -3846,8 +3846,8 @@ if(!self.alert.isBeingDismissed)
|
|
|
// 此处应移动到erp mobile 项目内
|
|
// 此处应移动到erp mobile 项目内
|
|
|
if([type isEqualToString:@"price"])
|
|
if([type isEqualToString:@"price"])
|
|
|
{
|
|
{
|
|
|
- BOOL can_see_price = [[RASingleton.sharedInstance globalParameterForKey:@"can_see_price"] boolValue];
|
|
|
|
|
- BOOL price_hidden = [[RASingleton.sharedInstance globalParameterForKey:@"price_hidden"] boolValue];
|
|
|
|
|
|
|
+ BOOL can_see_price = [[appDelegate globalParameterForKey:@"can_see_price"] boolValue];
|
|
|
|
|
+ BOOL price_hidden = [[appDelegate globalParameterForKey:@"price_hidden"] boolValue];
|
|
|
|
|
|
|
|
if(can_see_price&&price_hidden==false)
|
|
if(can_see_price&&price_hidden==false)
|
|
|
{
|
|
{
|
|
@@ -4285,8 +4285,8 @@ if(!self.alert.isBeingDismissed)
|
|
|
NSString* totalprice = [NSString stringWithFormat:@"%.2f",(unitprice* (1.0-discount/100)+dprice)*count];
|
|
NSString* totalprice = [NSString stringWithFormat:@"%.2f",(unitprice* (1.0-discount/100)+dprice)*count];
|
|
|
|
|
|
|
|
|
|
|
|
|
- BOOL can_see_price = [[RASingleton.sharedInstance globalParameterForKey:@"can_see_price"] boolValue];
|
|
|
|
|
- BOOL price_hidden = [[RASingleton.sharedInstance globalParameterForKey:@"price_hidden"] boolValue];
|
|
|
|
|
|
|
+ BOOL can_see_price = [[appDelegate globalParameterForKey:@"can_see_price"] boolValue];
|
|
|
|
|
+ BOOL price_hidden = [[appDelegate globalParameterForKey:@"price_hidden"] boolValue];
|
|
|
|
|
|
|
|
if(can_see_price&&price_hidden==false)
|
|
if(can_see_price&&price_hidden==false)
|
|
|
{
|
|
{
|
|
@@ -5084,8 +5084,8 @@ if(!self.alert.isBeingDismissed)
|
|
|
|
|
|
|
|
NSMutableDictionary* params = [[NSMutableDictionary alloc] init];
|
|
NSMutableDictionary* params = [[NSMutableDictionary alloc] init];
|
|
|
AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
|
|
AppDelegate *appDelegate = (AppDelegate*)[[UIApplication sharedApplication] delegate];
|
|
|
- NSString *user = [RASingleton.sharedInstance globalParameterForKey:@"user"];
|
|
|
|
|
- NSString *password = [RASingleton.sharedInstance globalParameterForKey:@"password"];
|
|
|
|
|
|
|
+ NSString *user = [appDelegate globalParameterForKey:@"user"];
|
|
|
|
|
+ NSString *password = [appDelegate globalParameterForKey:@"password"];
|
|
|
|
|
|
|
|
if(user!=nil)
|
|
if(user!=nil)
|
|
|
[params setValue:user forKey:@"user"];
|
|
[params setValue:user forKey:@"user"];
|