diff --git a/vanke/view_iPhone/templates/salesInput/Controller/ChooseShopViewController.m b/vanke/view_iPhone/templates/salesInput/Controller/ChooseShopViewController.m index 1847ab5e1fb10a54a41b0340f9c04a100c04d6b7..a22521ac531d2ac9524a2d049e25803179257552 100644 --- a/vanke/view_iPhone/templates/salesInput/Controller/ChooseShopViewController.m +++ b/vanke/view_iPhone/templates/salesInput/Controller/ChooseShopViewController.m @@ -78,7 +78,8 @@ } - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - + self.chooseBlock(@"选择好了商铺"); + [self.navigationController popViewControllerAnimated:YES]; } - (void)didReceiveMemoryWarning { diff --git a/vanke/view_iPhone/templates/salesInput/Controller/SalesInputViewController.m b/vanke/view_iPhone/templates/salesInput/Controller/SalesInputViewController.m index 2235b9c1e8384fd5d06125432d8f5f132de1cd47..4af7169fc8774213cee54a582e7100d7773aabb1 100644 --- a/vanke/view_iPhone/templates/salesInput/Controller/SalesInputViewController.m +++ b/vanke/view_iPhone/templates/salesInput/Controller/SalesInputViewController.m @@ -101,6 +101,12 @@ ON_WILL_APPEAR( signal ) - (void)chooseShopAction { ChooseShopViewController *chooseVC = [[ChooseShopViewController alloc] init]; + + + chooseVC.chooseBlock = ^(NSString *string){ + [self.topView setShopName:string]; + }; + [self.navigationController pushViewController:chooseVC animated:YES]; } diff --git a/vanke/view_iPhone/templates/salesInput/View/SalesInputTopView.h b/vanke/view_iPhone/templates/salesInput/View/SalesInputTopView.h index 86fd7d261108007f0a1498266c58f092c9d4480c..a3269185d8adf7d66814dae3a4722de48030133b 100644 --- a/vanke/view_iPhone/templates/salesInput/View/SalesInputTopView.h +++ b/vanke/view_iPhone/templates/salesInput/View/SalesInputTopView.h @@ -12,4 +12,8 @@ typedef void (^tapBlock)(void); @interface SalesInputTopView : UIView @property (nonatomic, copy) tapBlock nameTapActionBlock; @property (nonatomic, copy) tapBlock dateTapActionBlock; + +- (void)setShopName:(NSString *)name; +- (void)setDate:(NSString *)date; + @end diff --git a/vanke/view_iPhone/templates/salesInput/View/SalesInputTopView.m b/vanke/view_iPhone/templates/salesInput/View/SalesInputTopView.m index 1a4eccdff0144e90f515b3823104959a6c46ef52..b8d5e8f83e96c9c15c4d3166ce0298c03e8f4075 100644 --- a/vanke/view_iPhone/templates/salesInput/View/SalesInputTopView.m +++ b/vanke/view_iPhone/templates/salesInput/View/SalesInputTopView.m @@ -18,6 +18,15 @@ @implementation SalesInputTopView +- (void)setShopName:(NSString *)name +{ + self.labelShopName.text = name; +} +- (void)setDate:(NSString *)date +{ + self.labelDate.text = date; +} + - (void)awakeFromNib { self.viewRedBac.layer.cornerRadius = 7; }