Commit 1542ad37 authored by 曹云霄's avatar 曹云霄

修改项说明:

parent 96d801bf
......@@ -74,13 +74,13 @@
self.shoppingCar.model = self.model;
[self addChildViewController:self.shoppingCar];
self.currentVC = self.shoppingCar;
self.shoppingCar.view.frame = CGRectMake(0, self.shoppingAndRecordBackview.mj_y + self.shoppingAndRecordBackview.mj_h, self.controllerBackgroundView.mj_w, self.controllerBackgroundView.mj_h-self.shoppingAndRecordBackview.mj_y-self.shoppingAndRecordBackview.mj_h);
[self.controllerBackgroundView addSubview:self.shoppingCar.view];
self.currentVC.view.frame = CGRectMake(0, 176, ScreenWidth-40, self.controllerBackgroundView.height-176);
self.orderRecord = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"OrderRecordViewController"];
[self addChildViewController:self.orderRecord];
self.orderRecord.model = self.model;
self.orderRecord.view.frame = CGRectMake(0, self.shoppingAndRecordBackview.mj_y + self.shoppingAndRecordBackview.mj_h, self.controllerBackgroundView.mj_w, self.controllerBackgroundView.mj_h-self.shoppingAndRecordBackview.mj_y-self.shoppingAndRecordBackview.mj_h);
self.orderRecord.view.frame = CGRectMake(0, 176, ScreenWidth-40, self.controllerBackgroundView.height-176);
}
#pragma mark - 切换子视图
......
......@@ -13,7 +13,6 @@
#import <AssetsLibrary/AssetsLibrary.h>
#import <Photos/Photos.h>
#import "MWPhotoBrowser.h"
#import <AssetsLibrary/AssetsLibrary.h>
#import "OSSHelper.h"
#import "UIImage+Fit.h"
......
......@@ -192,11 +192,6 @@
return YES;
}
- (CGFloat)verticalOffsetForEmptyDataSet:(UIScrollView *)scrollView
{
return 100;
}
- (void)didReceiveMemoryWarning {
[super didReceiveMemoryWarning];
......
......@@ -10,13 +10,6 @@
@implementation ProductDetailsHeaderView
/*
// Only override drawRect: if you perform custom drawing.
// An empty implementation adversely affects performance during animation.
- (void)drawRect:(CGRect)rect {
// Drawing code
}
*/
#pragma mark -UI
- (void)uiConfigAction
......@@ -24,15 +17,6 @@
{
self.addGoodsShoppingbagsButton.layer.masksToBounds = YES;
self.addGoodsShoppingbagsButton.layer.cornerRadius = kCornerRadius;
[self.addGoodsShoppingbagsButton mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.inventoryLabe);
make.top.equalTo(self.inventoryLabe).offset(40);
make.width.mas_equalTo(200);
make.height.mas_equalTo(40);
}];
}
......@@ -45,23 +29,6 @@
......
This diff is collapsed.
......@@ -81,7 +81,7 @@
self.productDetilsTableview.dataSource = self;
self.productDetilsTableview.delegate = self;
[self.productDetilsTableview registerNib:[UINib nibWithNibName:@"goodsDetailsTableViewCell" bundle:nil] forCellReuseIdentifier:@"goodsdetailscell"];
[self CreateHeaderView];
[self createHeaderView];
}
......@@ -110,7 +110,7 @@
#pragma mark -头部视图
- (void)CreateHeaderView
- (void)createHeaderView
{
self.headerView = [[[NSBundle mainBundle] loadNibNamed:@"ProductDetailsHeaderView" owner:self options:nil] lastObject];
self.headerView.goodsNumber.delegate = self;
......@@ -213,13 +213,17 @@
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
{
if (indexPath.section == 0) {
return 170;
return 182;
}
NSDictionary *dict = [self.goodsDetailsArray objectAtIndex_opple:indexPath.row];
return [dict[@"height"] floatValue];
}
- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section
{
return 0.01;
}
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
{
return 2;
......
......@@ -110,32 +110,16 @@
[self setupChildViewController];
[self uiConfigAction];
[self addConstraint];
}
#pragma mark - UI
- (void)uiConfigAction
{
[[NSNotificationCenter defaultCenter] postNotificationName:PROMPTDRAWINFORMATION object:@(0)];
[self setupInstructionsViewOrigin:self.paymentsButton];
[self.headerImageView sd_setImageWithURL:[NSURL URLWithString:[Shoppersmanager manager].Shoppers.employee.picture] placeholderImage:ReplaceImage];
self.instructionsLinesView.frame = CGRectMake(8, 37, 88, 2);
}
#pragma mark - 添加约束
- (void)addConstraint
{
[self.cardBackgroundView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.mas_equalTo(23);
make.top.equalTo(self.accountAmountView.mas_bottom).offset(13);
make.size.mas_equalTo(CGSizeMake((ScreenWidth-23*2-20)/2, 200));
}];
[self.drawBackgroundView mas_makeConstraints:^(MASConstraintMaker *make) {
make.left.equalTo(self.cardBackgroundView.mas_right).offset(20);
make.top.equalTo(self.accountAmountView.mas_bottom).offset(13);
make.size.mas_equalTo(CGSizeMake((ScreenWidth-23*2-20)/2, 200));
}];
}
#pragma mark - 设置收支明细、提现进度、卡劵包
- (void)setupChildViewController
......@@ -156,12 +140,12 @@
cardVc.view.frame = CGRectMake(0, 40, self.cardBackgroundView.mj_w, self.cardBackgroundView.mj_h-50);
[self.cardBackgroundView addSubview:cardVc.view];
/// 我的抽奖
LuckyDrawDetailsViewController *draw = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"LuckyDrawDetailsViewController"];
[self addChildViewController:draw];
draw.drawValue = 0;
draw.view.frame = CGRectMake(0, 40, self.drawBackgroundView.mj_w, self.drawBackgroundView.mj_h-50);
[self.drawBackgroundView addSubview:draw.view];
// /// 我的抽奖
// LuckyDrawDetailsViewController *draw = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"LuckyDrawDetailsViewController"];
// [self addChildViewController:draw];
// draw.drawValue = 0;
// draw.view.frame = CGRectMake(0, 40, self.drawBackgroundView.mj_w, self.drawBackgroundView.mj_h-50);
// [self.drawBackgroundView addSubview:draw.view];
}
......@@ -195,7 +179,7 @@
- (void)setupInstructionsViewOrigin:(UIButton *)sender
{
[UIView animateWithDuration:0.5 delay:0.1f usingSpringWithDamping:0.5f initialSpringVelocity:0.5f options:UIViewAnimationOptionCurveEaseInOut animations:^{
self.instructionsLinesView.frame = CGRectMake(sender.mj_origin.x+(sender.mj_w-self.instructionsLinesView.mj_w)/2, self.instructionsLinesView.mj_origin.y, self.instructionsLinesView.mj_w, 2);
self.instructionsLinesView.frame = CGRectMake(sender.left, sender.bottom+2, sender.width, 2);
} completion:nil];
}
......
This diff is collapsed.
This diff is collapsed.
......@@ -57,8 +57,9 @@
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view.
self.automaticallyAdjustsScrollViewInsets = NO;
self.navigationController.navigationBarHidden = YES;
//检测登陆超时通知
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(logintimeoutNotification:) name:LOGINTIMEOUT object:nil];
}
......
......@@ -157,7 +157,7 @@
/**
* 服务器开发地址
*/
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
//#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
/**
......@@ -168,7 +168,7 @@
//**
// * 服务器正式地址
// */
//#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL]
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL]
/**
* 搜索框输入通知
......
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