Commit bc1e4887 authored by Sandy's avatar Sandy

【我的】界面完善

parent aec37142
...@@ -22,7 +22,7 @@ static NSString *const reuseIdentifier = @"Cell"; ...@@ -22,7 +22,7 @@ static NSString *const reuseIdentifier = @"Cell";
- (void)viewDidLoad - (void)viewDidLoad
{ {
[super viewDidLoad]; [super viewDidLoad];
self.tabBarController.title = @"业务";
self.layout.itemSize = CGSizeMake((kWidth - 5 * 10) / 4, (kWidth - 5 * 10) / 4 + 25); self.layout.itemSize = CGSizeMake((kWidth - 5 * 10) / 4, (kWidth - 5 * 10) / 4 + 25);
self.layout.minimumLineSpacing = 10; self.layout.minimumLineSpacing = 10;
self.layout.minimumInteritemSpacing = 10; self.layout.minimumInteritemSpacing = 10;
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
self.title = @"新建销售录入";
self.tableView.contentInset = UIEdgeInsetsMake(0, 0, 84, 0); self.tableView.contentInset = UIEdgeInsetsMake(0, 0, 84, 0);
UIBarButtonItem *rightBtn = [[UIBarButtonItem alloc] initWithTitle:@"历史查询" style:UIBarButtonItemStylePlain target:self action:@selector(actionGoHistory)]; UIBarButtonItem *rightBtn = [[UIBarButtonItem alloc] initWithTitle:@"历史查询" style:UIBarButtonItemStylePlain target:self action:@selector(actionGoHistory)];
self.navigationItem.rightBarButtonItem = rightBtn; self.navigationItem.rightBarButtonItem = rightBtn;
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
self.title = @"销售录入详情";
self.viewModel.type = SaleInputTypeReadOnly; self.viewModel.type = SaleInputTypeReadOnly;
self.viewModel.picVM.type = kPicCellTypeRead; self.viewModel.picVM.type = kPicCellTypeRead;
self.topView.right1.hidden = YES; self.topView.right1.hidden = YES;
......
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
// self.request.tenant = [HMSaleInputDetail_tenant modelWithDic:AppGlobal.user.tenant.toDictionary]; // self.request.tenant = [HMSaleInputDetail_tenant modelWithDic:AppGlobal.user.tenant.toDictionary];
self.request.receiver = @"contract"; self.request.receiver = @"contract";
self.request.balance = false; self.request.balance = false;
self.request.saleDate = [[NSDate date] httpParameterString]; self.request.saleDate = [[NSDate date] yearMonthDayString];
self.request.payments = (id)[NSMutableArray array]; self.request.payments = (id)[NSMutableArray array];
for (HMSaleInputDetail_payments *payments in self.arrPayments) { for (HMSaleInputDetail_payments *payments in self.arrPayments) {
HMSaleInputDetail_payments *paymentsCopy = [HMSaleInputDetail_payments modelWithDic:payments.toDictionary]; HMSaleInputDetail_payments *paymentsCopy = [HMSaleInputDetail_payments modelWithDic:payments.toDictionary];
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
for (UIImage *img in self.picVM.arrPics) { for (UIImage *img in self.picVM.arrPics) {
ZJBaseFileModel *file = [ZJBaseFileModel new]; ZJBaseFileModel *file = [ZJBaseFileModel new];
file.data = [img imageDataForUpload]; file.data = [img imageDataForUpload];
file.name = [file.data md5String]; file.name = [[file.data md5String] stringByAppendingString:@".jpg"];
file.keyName = @"file"; file.keyName = @"file";
file.mimeType = @"image/jpeg"; file.mimeType = @"image/jpeg";
[arrImage addObject:file]; [arrImage addObject:file];
......
...@@ -20,13 +20,20 @@ ...@@ -20,13 +20,20 @@
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
// self.imgViewTopIcon.image = APP_ICON; self.tabBarController.title = @"我的";
self.imgViewTopIcon.image = APP_ICON;
self.tenant.text = [NSString stringWithFormat:@"公司:%@",
AppGlobal.user.tenant.name ? AppGlobal.user.tenant.name : @"总部"];
self.userName.text = [NSString stringWithFormat:@"用户:%@",
AppGlobal.user.name];
self.userCode.text = [NSString stringWithFormat:@"用户代码:%@",
AppGlobal.user.code];
} }
- (void)viewWillAppear:(BOOL)animated { - (void)viewWillAppear:(BOOL)animated
{
[super viewWillAppear:animated]; [super viewWillAppear:animated];
// self.navigationController.navigationBar.barTintColor = kMainBlueColor; [self.navigationController setNavigationBarHidden:NO animated:NO];
} }
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
[tableView deselectRowAtIndexPath:indexPath animated:YES]; [tableView deselectRowAtIndexPath:indexPath animated:YES];
......
{
"images" : [
{
"idiom" : "universal",
"filename" : "SystemImage.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "SystemImage@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
\ No newline at end of file
HDMall/Supporting Files/Assets.xcassets/SystemImage.imageset/SystemImage.png

54.7 KB

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