diff --git a/Lighting/Class/AllCustomerViewController.m b/Lighting/Class/AllCustomerViewController.m index f871ca257f24fc2a038282dd66f130676d01e5ef..132c95cc0c48b9ea08c14618a16e76ccecba9f81 100644 --- a/Lighting/Class/AllCustomerViewController.m +++ b/Lighting/Class/AllCustomerViewController.m @@ -52,41 +52,6 @@ } -#pragma mark -è§†å›¾æ¸²æŸ“å®Œæˆ -- (void)viewDidAppear:(BOOL)animated -{ - - //下拉刷新 - MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{ - ConsumerQueryCondition *condition = [[ConsumerQueryCondition alloc]init]; - DataPage *page = [[DataPage alloc]init]; - page.page = 1; - page.rows = 10; - condition.page = page; - [self getShoppersAssociatedCustomer:condition isRemove:YES]; - }]; - headerRefresh.stateLabel.hidden = YES; - headerRefresh.lastUpdatedTimeLabel.hidden = YES; - self.allCustomerTableview.mj_header = headerRefresh; - [self.allCustomerTableview.mj_header beginRefreshing]; - - //ä¸Šæ‹‰åŠ è½½ - self.allCustomerTableview.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ - - ConsumerQueryCondition *condition = [[ConsumerQueryCondition alloc]init]; - DataPage *page = [[DataPage alloc]init]; - page.rows = 10; - if (self.indexPage ++ > self.totalPages) { - [self.allCustomerTableview.mj_footer endRefreshingWithNoMoreData]; - }else - { - page.page = self.indexPage ++; - condition.page = page; - [self getShoppersAssociatedCustomer:condition isRemove:NO]; - } - - }]; -} #pragma mark -UI @@ -129,6 +94,36 @@ self.begindateButton.layer.cornerRadius = 10; self.enddateButton.layer.masksToBounds = YES; self.enddateButton.layer.cornerRadius = 10; + + //下拉刷新 + MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{ + ConsumerQueryCondition *condition = [[ConsumerQueryCondition alloc]init]; + DataPage *page = [[DataPage alloc]init]; + page.page = 1; + page.rows = 10; + condition.page = page; + [self getShoppersAssociatedCustomer:condition isRemove:YES]; + }]; + headerRefresh.stateLabel.hidden = YES; + headerRefresh.lastUpdatedTimeLabel.hidden = YES; + self.allCustomerTableview.mj_header = headerRefresh; + [self.allCustomerTableview.mj_header beginRefreshing]; + + //ä¸Šæ‹‰åŠ è½½ + self.allCustomerTableview.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ + + ConsumerQueryCondition *condition = [[ConsumerQueryCondition alloc]init]; + DataPage *page = [[DataPage alloc]init]; + page.rows = 10; + if (self.indexPage ++ > self.totalPages) { + [self.allCustomerTableview.mj_footer endRefreshingWithNoMoreData]; + }else + { + page.page = self.indexPage ++; + condition.page = page; + [self getShoppersAssociatedCustomer:condition isRemove:NO]; + } + }]; } diff --git a/Lighting/Class/ClientViewController.m b/Lighting/Class/ClientViewController.m index 5b38817ddec01401ef6d7a0e6b1f574a448dd2f0..270223cbe4c0df9f6a8b9ea5a98ceb3a098012e7 100644 --- a/Lighting/Class/ClientViewController.m +++ b/Lighting/Class/ClientViewController.m @@ -198,7 +198,8 @@ } } WithErrorCodeBlock:^(id errorCodeValue) { - + [self RemoveMBProgressHUDLoding]; + [self promptCustomerWithString:@"网络连接已æ–å¼€"]; } WithFailureBlock:^(id error) { @@ -313,6 +314,9 @@ } WithErrorCodeBlock:^(id errorCodeValue) { + [self RemoveMBProgressHUDLoding]; + [self promptCustomerWithString:@"网络连接已æ–å¼€"]; + } WithFailureBlock:^(id error) { NSLog(@"写入客户访问时间失败"); @@ -426,6 +430,7 @@ [self SetupUserShoppingCarNumberRequest]; [self SetupUserRequest]; [self ChangeCustomerName]; + [self addAddressInformationRequest]; } else { @@ -434,7 +439,8 @@ } WithErrorCodeBlock:^(id errorCodeValue) { - + [self RemoveMBProgressHUDLoding]; + [self promptCustomerWithString:@"网络连接已æ–å¼€"]; } WithFailureBlock:^(id error) { @@ -444,6 +450,38 @@ } +#pragma mark -新增客户æˆåŠŸå†™å…¥é»˜è®¤åœ°å€ä¿¡æ¯ +- (void)addAddressInformationRequest +{ + TOShippingAddrEntity *address = [[TOShippingAddrEntity alloc]init]; + address.consumerId = [Customermanager manager].customerID; + address.name = self.customerNameField.text; + address.miblephone = self.phoneNumberField.text; + address.address = self.customerAddress.text; + + [[NetworkRequestClassManager Manager] NetworkRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/shippingAddress/save"] WithRequestType:0 WithParameter:address WithReturnValueBlock:^(id returnValue) { + + if ([returnValue[@"code"] isEqualToNumber:@0]) { + + NSLog(@"å†™å…¥é»˜è®¤æ”¶è´§åœ°å€æˆåŠŸ"); + } + else + { + [self ErrorMBProgressView:returnValue[@"message"]]; + } + + } WithErrorCodeBlock:^(id errorCodeValue) { + + [self RemoveMBProgressHUDLoding]; + [self promptCustomerWithString:@"网络连接已æ–å¼€"]; + + } WithFailureBlock:^(id error) { + + NSLog(@"写入默认收货地å€å¤±è´¥"); + }]; +} + + #pragma mark -æ›´æ”¹å®¢æˆ·ä¿¡æ¯ - (IBAction)changeCustomerInformation:(UIButton *)sender { @@ -530,6 +568,9 @@ } WithErrorCodeBlock:^(id errorCodeValue) { + [self RemoveMBProgressHUDLoding]; + [self promptCustomerWithString:@"网络连接已æ–å¼€"]; + } WithFailureBlock:^(id error) { [self RemoveMBProgressHUDLoding]; diff --git a/Lighting/Class/FullScreenViewCell.h b/Lighting/Class/FullScreenViewCell.h index 874f5ecc75c548661f303049c46ad6a1e4b0b92d..a78c746ba00af5b7497d19b5edba044a0539dfac 100644 --- a/Lighting/Class/FullScreenViewCell.h +++ b/Lighting/Class/FullScreenViewCell.h @@ -10,4 +10,10 @@ @interface FullScreenViewCell : UICollectionViewCell + +/** + * 显示图片 + */ +@property (nonatomic,strong) UIImageView *imageView; + @end diff --git a/Lighting/Class/FullScreenViewCell.m b/Lighting/Class/FullScreenViewCell.m index c5fc3f00980024bc50b81a9971e59668fcabe0d2..fcb4ef009d126cbbebe6777eae154c1863b8255b 100644 --- a/Lighting/Class/FullScreenViewCell.m +++ b/Lighting/Class/FullScreenViewCell.m @@ -16,10 +16,9 @@ { if (self = [super initWithFrame:frame]) { - UIImageView *imageView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, ScreenHeight)]; - imageView.image = TCImage(@"登录"); - imageView.userInteractionEnabled = YES; - [self.contentView addSubview:imageView]; + self.imageView = [[UIImageView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, ScreenHeight)]; + self.imageView.userInteractionEnabled = YES; + [self.contentView addSubview:self.imageView]; } return self; } diff --git a/Lighting/Class/FullScreenViewController.h b/Lighting/Class/FullScreenViewController.h index 6608cb5f1b6629f06ad7bd502b1ba6b18c556439..e4383d71876e7f08aea5196f41da74aff786bae4 100644 --- a/Lighting/Class/FullScreenViewController.h +++ b/Lighting/Class/FullScreenViewController.h @@ -10,4 +10,11 @@ @interface FullScreenViewController : UICollectionViewController + +/** + * ä¼ å…¥æ•°æ®æºæ•°ç»„ + */ +@property (nonatomic,copy) NSArray *datasArray; + + @end diff --git a/Lighting/Class/FullScreenViewController.m b/Lighting/Class/FullScreenViewController.m index a9f7600acf68ac0d4c691886629029dff3ba24ea..cf4b8fa620366e5290fdc19c061b3fad831c3782 100644 --- a/Lighting/Class/FullScreenViewController.m +++ b/Lighting/Class/FullScreenViewController.m @@ -63,18 +63,23 @@ static NSString * const reuseIdentifier = @"Cell"; #pragma amrk 返回View - (void)CreateBackView { - self.backView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, 64)]; - self.backView.backgroundColor = kMainGrayColor; + self.backView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, ScreenWidth, 0)]; + self.backView.backgroundColor = [kMainGrayColor colorWithAlphaComponent:0.5]; [self.view addSubview:self.backView]; //返回按钮 UIButton *backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - backButton.frame = CGRectMake(50, 0, 100, 64); - [backButton setTitle:@"返回" forState:UIControlStateNormal]; - + backButton.frame = CGRectMake(30, 0, 100, 64); + [backButton setImage:TCImage(@"1") forState:UIControlStateNormal]; [backButton addTarget:self action:@selector(BackButtonClick) forControlEvents:UIControlEventTouchUpInside]; [self.backView addSubview:backButton]; - //éšå¿ƒé… + //体验ä¸å¿ƒ + UIButton *tiYanCenterButton = [UIButton buttonWithType:UIButtonTypeCustom]; + tiYanCenterButton.frame = CGRectMake(ScreenWidth-100, 0, 100, 64); + [tiYanCenterButton setImage:TCImage(@"1") forState:UIControlStateNormal]; + [tiYanCenterButton addTarget:self action:@selector(GotoTiYanCenterButtonClick) forControlEvents:UIControlEventTouchUpInside]; + [self.backView addSubview:tiYanCenterButton]; + } #pragma mark -返回 @@ -83,12 +88,17 @@ static NSString * const reuseIdentifier = @"Cell"; [self dismissViewControllerAnimated:YES completion:nil]; } - +#pragma mark -体验ä¸å¿ƒ +- (void)GotoTiYanCenterButtonClick +{ + +} #pragma mark -UI - (void)uiConfigAction { self.collectionView.pagingEnabled = YES; + self.collectionView.backgroundColor = [UIColor whiteColor]; [self.collectionView registerClass:[FullScreenViewCell class] forCellWithReuseIdentifier:reuseIdentifier]; } @@ -96,18 +106,38 @@ static NSString * const reuseIdentifier = @"Cell"; #pragma mark <UICollectionViewDataSource> - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section { - return 10; + return self.datasArray.count; } - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { FullScreenViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:reuseIdentifier forIndexPath:indexPath]; + cell.backgroundColor = kTCColor(251, 248, 241); + [cell.imageView sd_setImageWithURL:[NSURL URLWithString:[self.datasArray objectAtIndex_opple:indexPath.item]] placeholderImage:REPLACEIMAGE]; return cell; } - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath { NSLog(@"%ld",indexPath.item); + if (self.backView.frame.size.height == 0) { + + [UIView animateWithDuration:0.5 animations:^{ + + CGRect frame = self.backView.frame; + frame.size.height = 64; + self.backView.frame = frame; + }]; + + }else if (self.backView.frame.size.height == 64) + { + [UIView animateWithDuration:0.5 animations:^{ + + CGRect frame = self.backView.frame; + frame.size.height = 0; + self.backView.frame = frame; + }]; + } } #pragma mark <UICollectionViewDelegate> diff --git a/Lighting/Class/Login/LoginViewController.m b/Lighting/Class/Login/LoginViewController.m index 50afb65dbe548b05e59329efe0938186efb4a67c..c007b569eca22de40095c440c393de2a9417da47 100644 --- a/Lighting/Class/Login/LoginViewController.m +++ b/Lighting/Class/Login/LoginViewController.m @@ -11,6 +11,10 @@ #import "AppDelegate.h" #import "authenticateView.h" #import "FollowHeartViewController.h" +#import "SceneLibraryViewController.h" +#import "ProductLibraryViewController.h" +#import "AllCustomerViewController.h" +#import "CustomerOrderViewController.h" @interface LoginViewController ()<RightVCselectedDelegate> @@ -170,6 +174,7 @@ //ä¿å˜ç”¨æˆ·å密ç [[NSUserDefaults standardUserDefaults] setObject:self.userName.text forKey:USERNAME]; [[NSUserDefaults standardUserDefaults] setObject:self.passWord.text forKey:PASSWORD]; + [[NSUserDefaults standardUserDefaults] synchronize]; [self SetTheRootViewController]; }else @@ -200,19 +205,29 @@ }else if ([Name isEqualToString:@"场景库"]) { - selectedIndex = 5; + selectedIndex = 5; + SceneLibraryViewController *sceneVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:5]; + [sceneVC.seceneLibararyCollectionView.mj_header beginRefreshing]; + }else if ([Name isEqualToString:@"产å“库"]) { selectedIndex = 4; + ProductLibraryViewController *productVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:4]; + [productVC.productCollectionView.mj_header beginRefreshing]; }else if ([Name isEqualToString:@"客户管ç†"]) { selectedIndex = 3; + }else if ([Name isEqualToString:@"所有客户"]) { selectedIndex = 2; + AllCustomerViewController *AllcustomerVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:2]; + [AllcustomerVC.allCustomerTableview.mj_header beginRefreshing]; }else if ([Name isEqualToString:@"客户订å•"]) { selectedIndex = 1; + CustomerOrderViewController *customerVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:1]; + [customerVC.customerOrderTableView.mj_header beginRefreshing]; }else if ([Name isEqualToString:@"关于"]) { selectedIndex = 0; diff --git a/Lighting/Class/OrderTableViewCell.m b/Lighting/Class/OrderTableViewCell.m index b0178dbf440f0cccb84d68a5303b5548895c26ba..7e96d0e7793c9434d841656ba1e090b541799f2f 100644 --- a/Lighting/Class/OrderTableViewCell.m +++ b/Lighting/Class/OrderTableViewCell.m @@ -20,7 +20,7 @@ - (void)setModel:(OrderBill *)model { _model = model; - self.orderTime.text = [self dateAsString:_model.order.orderTime]; + self.orderTime.text = _model.order.orderTime; self.orderState.text = _model.order.orderState; self.customerName.text = _model.consumer.name; //æ€»æ•°é‡ diff --git a/Lighting/Class/ProductDetailsHeaderView.xib b/Lighting/Class/ProductDetailsHeaderView.xib index 4d032c1809e062171cb0ea84d190080c99b1a20c..f62c12fc7fda153ce0326f3bf6119f330b4b18fb 100644 --- a/Lighting/Class/ProductDetailsHeaderView.xib +++ b/Lighting/Class/ProductDetailsHeaderView.xib @@ -11,15 +11,15 @@ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> <subviews> <view contentMode="scaleToFill" id="NBT-2d-V2o"> - <rect key="frame" x="20" y="20" width="350" height="350"/> + <rect key="frame" x="20" y="21" width="385" height="358"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="140046029-MX260-D112-03-æ˜Ÿå† -5700K(4)" id="tLl-kB-n3W"> - <rect key="frame" x="0.0" y="0.0" width="350" height="350"/> - <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" heightSizable="YES"/> + <rect key="frame" x="0.0" y="0.0" width="385" height="358"/> + <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/> </imageView> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="JMO-LV-nJ6"> - <rect key="frame" x="270" y="0.0" width="80" height="80"/> + <rect key="frame" x="305" y="0.0" width="80" height="80"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <state key="normal" image="2"/> </button> @@ -27,109 +27,109 @@ <color key="backgroundColor" red="0.9882352941176471" green="0.97254901960784312" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/> </view> <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="tsa-PY-0mz"> - <rect key="frame" x="383" y="59" width="80" height="269"/> + <rect key="frame" x="413" y="59" width="80" height="269"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> </scrollView> <view contentMode="scaleToFill" id="hq9-lr-unI"> - <rect key="frame" x="487" y="15" width="1" height="350"/> + <rect key="frame" x="515" y="15" width="1" height="350"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <color key="backgroundColor" red="0.81960784313725488" green="0.81960784313725488" blue="0.81960784313725488" alpha="1" colorSpace="calibratedRGB"/> </view> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ç¼–å·ï¼š" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="usf-4V-c8q"> - <rect key="frame" x="514" y="44" width="56" height="17"/> + <rect key="frame" x="530" y="44" width="56" height="17"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="LAD-89757" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="b7B-yI-JEC"> - <rect key="frame" x="572" y="44" width="130" height="17"/> + <rect key="frame" x="588" y="42" width="163" height="20"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="14"/> + <fontDescription key="fontDescription" type="system" pointSize="20"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="å称:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5aK-6t-o1q"> - <rect key="frame" x="514" y="76" width="56" height="17"/> + <rect key="frame" x="530" y="76" width="56" height="17"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="åç§°å—æ®µ" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="NlJ-8b-gcl"> - <rect key="frame" x="572" y="76" width="130" height="17"/> + <rect key="frame" x="588" y="76" width="130" height="17"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="å“牌:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="hX3-Vg-O1n"> - <rect key="frame" x="514" y="106" width="56" height="17"/> + <rect key="frame" x="530" y="106" width="56" height="17"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="欧普" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Hf9-WK-7u5"> - <rect key="frame" x="572" y="106" width="130" height="17"/> + <rect key="frame" x="588" y="106" width="130" height="17"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="åŠç‰Œä»·ï¼š" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ol6-U8-o5v"> - <rect key="frame" x="514" y="137" width="56" height="17"/> + <rect key="frame" x="530" y="150" width="56" height="17"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ï¿¥12800" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Rka-oV-nyM"> - <rect key="frame" x="572" y="137" width="130" height="17"/> + <rect key="frame" x="588" y="148" width="163" height="20"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> - <fontDescription key="fontDescription" type="system" pointSize="14"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <fontDescription key="fontDescription" type="system" pointSize="20"/> + <color key="textColor" red="0.9882352941176471" green="0.33725490196078434" blue="0.12156862745098039" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="æ•°é‡ï¼š" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Vfu-v1-b5l"> - <rect key="frame" x="514" y="227" width="56" height="17"/> + <rect key="frame" x="530" y="227" width="56" height="17"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="库å˜ï¼š" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9XR-2D-r0I"> - <rect key="frame" x="514" y="272" width="56" height="17"/> + <rect key="frame" x="530" y="272" width="56" height="17"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> - <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> + <color key="textColor" red="0.59999999999999998" green="0.59999999999999998" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="34" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="zXN-Uh-XtZ"> - <rect key="frame" x="572" y="272" width="70" height="17"/> + <rect key="frame" x="588" y="272" width="70" height="17"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> <button opaque="NO" tag="101" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="SQd-9e-TXr"> - <rect key="frame" x="659" y="221" width="30" height="30"/> + <rect key="frame" x="675" y="221" width="30" height="30"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <state key="normal" backgroundImage="add"/> </button> <button opaque="NO" tag="100" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="rRp-ny-V8g"> - <rect key="frame" x="572" y="221" width="30" height="30"/> + <rect key="frame" x="588" y="221" width="30" height="30"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <state key="normal" backgroundImage="reduce"/> </button> <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="1" borderStyle="roundedRect" textAlignment="center" minimumFontSize="17" id="gOn-EI-HN5"> - <rect key="frame" x="604" y="221" width="50" height="30"/> + <rect key="frame" x="620" y="221" width="50" height="30"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <textInputTraits key="textInputTraits"/> </textField> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="frs-v4-sgw"> - <rect key="frame" x="514" y="307" width="229" height="40"/> + <rect key="frame" x="530" y="307" width="229" height="40"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> <color key="backgroundColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/> <state key="normal" title="æ·»åŠ è‡³è´ç‰©è½¦"> @@ -137,12 +137,12 @@ </state> </button> <button opaque="NO" tag="101" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="tM7-hf-9rp"> - <rect key="frame" x="398" y="328" width="50" height="50"/> + <rect key="frame" x="428" y="328" width="50" height="50"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/> - <state key="normal" image="矩形-3-副本"/> + <state key="normal" image="icondown"/> </button> <button opaque="NO" tag="101" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="0ee-HS-ilS"> - <rect key="frame" x="398" y="9" width="50" height="50"/> + <rect key="frame" x="428" y="9" width="50" height="50"/> <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <state key="normal" image="icon-2"/> </button> @@ -174,7 +174,7 @@ <image name="2" width="45" height="45"/> <image name="add" width="49" height="45"/> <image name="icon-2" width="25" height="15"/> + <image name="icondown" width="25" height="15"/> <image name="reduce" width="49" height="45"/> - <image name="矩形-3-副本" width="20" height="11"/> </resources> </document> diff --git a/Lighting/Class/ProductDetailsViewController.m b/Lighting/Class/ProductDetailsViewController.m index abb621c2dceda83cbc985119bd787ca54ba81a75..395cef7a4e0485ddf2204ba552dd881628c7fe5d 100644 --- a/Lighting/Class/ProductDetailsViewController.m +++ b/Lighting/Class/ProductDetailsViewController.m @@ -97,15 +97,12 @@ [self ErrorMBProgressView:returnValue[@"message"]]; } - - } WithErrorCodeBlock:^(id errorCodeValue) { } WithFailureBlock:^(id error) { [self RemoveMBProgressHUDLoding]; - NSLog(@"%@",error); }]; } @@ -133,15 +130,15 @@ self.headerView.serialNumber.text = self.entity.code; self.headerView.nameLabe.text = self.entity.name; self.headerView.brandName.text = self.entity.company; - self.headerView.dorpPriceLabe.text = [NSString stringWithFormat:@"%.2f",[self.entity.tagPrice floatValue]]; + self.headerView.dorpPriceLabe.text = [NSString stringWithFormat:@"ï¿¥%.2f",[self.entity.guidePrice floatValue]]; self.imagesArray = [NSMutableArray arrayWithArray:[self.entity.pictures componentsSeparatedByString:@","]]; [self.headerView.goodsImageview sd_setImageWithURL:[self.imagesArray firstObject] placeholderImage:REPLACEIMAGE]; //商å“å°å›¾ self.imagesArray = [NSMutableArray arrayWithArray:[self.entity.pictures componentsSeparatedByString:@","]]; for (int i=0; i<self.imagesArray.count; i++) { - UIImageView *subImageview = [[UIImageView alloc]initWithFrame:CGRectMake(0, i*100, 80, 80)]; - subImageview.backgroundColor = [UIColor redColor]; + UIImageView *subImageview = [[UIImageView alloc]initWithFrame:CGRectMake(0, i*100, 80, 60)]; subImageview.tag = 100+i; + subImageview.userInteractionEnabled = YES; [subImageview sd_setImageWithURL:[NSURL URLWithString:[self.imagesArray objectAtIndex_opple:i]] placeholderImage:REPLACEIMAGE]; [subImageview addGestureRecognizer:[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(SubimageViewClickAction:)]]; [self.headerView.goodsBrotherScrollview addSubview:subImageview]; @@ -157,20 +154,28 @@ } -#pragma mark -å°å›¾ç‚¹å‡»æ‰‹åŠ¿ +#pragma mark -å°å›¾ç‚¹å‡»æ‰‹åŠ¿ã€åˆ‡æ¢å›¾ç‰‡æ˜¾ç¤º - (void)SubimageViewClickAction:(UITapGestureRecognizer *)tap { - + [self.headerView.goodsImageview sd_setImageWithURL:[self.imagesArray objectAtIndex_opple:tap.view.tag-100] placeholderImage:REPLACEIMAGE]; } + + #pragma mark -图片放大点击 - (void)amplificationButtonClick { FullScreenViewController *fullScreenVC = [[FullScreenViewController alloc]init]; - [self presentViewController:fullScreenVC animated:YES completion:nil]; + fullScreenVC.datasArray = self.imagesArray; + dispatch_async(dispatch_get_main_queue(), ^{ + + [self presentViewController:fullScreenVC animated:YES completion:nil]; + }); + } + - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { if (indexPath.section == 0) { @@ -183,6 +188,7 @@ { goodsDetailsTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"goodsdetailscell" forIndexPath:indexPath]; [cell.detailsImageView sd_setImageWithURL:[NSURL URLWithString:[self.goodsDetailsArray objectAtIndex_opple:indexPath.row]] placeholderImage:REPLACEIMAGE]; + return cell; } return nil; diff --git a/Lighting/Class/ProductLibraryViewController.h b/Lighting/Class/ProductLibraryViewController.h index 6d4f30665e90fef92efccf8019ed242bd0a0dc5d..9df7e2ecbc94f4b1c1932244ea89b4b4ee9b18fa 100644 --- a/Lighting/Class/ProductLibraryViewController.h +++ b/Lighting/Class/ProductLibraryViewController.h @@ -27,4 +27,9 @@ */ @property (nonatomic,copy) NSString *selectedCode; +/** + * 二维ç code + */ +@property (nonatomic,copy) NSString *barcode; + @end diff --git a/Lighting/Class/ProductLibraryViewController.m b/Lighting/Class/ProductLibraryViewController.m index 58ee3872dfae1c17ce88b633c88a2d42b2c4d410..581da27a56b402a8ca0d96a17959933478bb1f72 100644 --- a/Lighting/Class/ProductLibraryViewController.m +++ b/Lighting/Class/ProductLibraryViewController.m @@ -88,15 +88,6 @@ } -- (void)viewWillAppear:(BOOL)animated -{ -// if (_screeningDatas != nil) { -// -// [self getGoodsListDatas]; -// } -} - - /** * åˆå§‹åŒ–商哿•°æ®æºæ•°ç»„ */ @@ -119,61 +110,10 @@ self.view.backgroundColor = [UIColor blueColor]; [self uiConfigAction]; + [self GetdatasAction]; } -#pragma mark è§†å›¾æ¸²æŸ“å®Œæˆ -- (void)viewDidAppear:(BOOL)animated -{ - - //下拉刷新 - MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{ - //é»˜è®¤æ•°æ® - GoodsCondition *conditon = [[GoodsCondition alloc]init]; - //åˆ†é¡µæ•°æ® - DataPage *Newpage = [[DataPage alloc]init]; - Newpage.page = 1; - Newpage.rows = 10; - conditon.page = Newpage; - self.indexPage = 1; - //æœç´¢ - if (_selectedCode) { - conditon.categoryEquals = _selectedCode; - conditon.nameLike = _selectedCode; - } - [self.productCollectionView.mj_footer resetNoMoreData]; - [self getScreeningdatasisRemoveArray:YES]; - [self getGoodsListDatasisRemove:YES Withobject:conditon]; - }]; - headerRefresh.stateLabel.hidden = YES; - headerRefresh.lastUpdatedTimeLabel.hidden = YES; - self.productCollectionView.mj_header = headerRefresh; - [self.productCollectionView.mj_header beginRefreshing]; - - //ä¸Šæ‹‰åŠ è½½ - self.productCollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ - - //é»˜è®¤æ•°æ® - GoodsCondition *conditon = [[GoodsCondition alloc]init]; - //åˆ†é¡µæ•°æ® - DataPage *Newpage = [[DataPage alloc]init]; - if (self.indexPage ++ > self.totalPages) { - [self.productCollectionView.mj_footer endRefreshingWithNoMoreData]; - }else - { - Newpage.page = self.indexPage ++; - Newpage.rows = 10; - conditon.page = Newpage; - //æœç´¢ - if (_selectedCode) { - conditon.categoryEquals = _selectedCode; - conditon.nameLike = _selectedCode; - } - [self getGoodsListDatasisRemove:NO Withobject:conditon]; - } - }]; -} - #pragma mark -获å–商å“åˆ—è¡¨æ•°æ® - (void)getGoodsListDatasisRemove:(BOOL)remove Withobject:(GoodsCondition *)conditon @@ -275,10 +215,82 @@ self.productCollectionView.delegate = self; self.productCollectionView.alwaysBounceVertical = YES; [self CreatescreeningButton]; +} +#pragma mark -èŽ·å–æ•°æ® +- (void)GetdatasAction +{ + + //下拉刷新 + MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{ + //é»˜è®¤æ•°æ® + GoodsCondition *conditon = [[GoodsCondition alloc]init]; + //åˆ†é¡µæ•°æ® + DataPage *Newpage = [[DataPage alloc]init]; + Newpage.page = 1; + Newpage.rows = 10; + conditon.page = Newpage; + self.indexPage = 1; + //æœç´¢ + if (_selectedCode) { + conditon.categoryEquals = _selectedCode; + conditon.nameLike = _selectedCode; + } + [self.productCollectionView.mj_footer resetNoMoreData]; + [self getScreeningdatasisRemoveArray:YES]; + [self getGoodsListDatasisRemove:YES Withobject:conditon]; + }]; + headerRefresh.stateLabel.hidden = YES; + headerRefresh.lastUpdatedTimeLabel.hidden = YES; + self.productCollectionView.mj_header = headerRefresh; + [self.productCollectionView.mj_header beginRefreshing]; + + //ä¸Šæ‹‰åŠ è½½ + self.productCollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ + + //é»˜è®¤æ•°æ® + GoodsCondition *conditon = [[GoodsCondition alloc]init]; + //åˆ†é¡µæ•°æ® + DataPage *Newpage = [[DataPage alloc]init]; + if (self.indexPage ++ > self.totalPages) { + [self.productCollectionView.mj_footer endRefreshingWithNoMoreData]; + }else + { + Newpage.page = self.indexPage ++; + Newpage.rows = 10; + conditon.page = Newpage; + //æœç´¢ + if (_selectedCode) { + conditon.categoryEquals = _selectedCode; + conditon.nameLike = _selectedCode; + } + [self getGoodsListDatasisRemove:NO Withobject:conditon]; + } + }]; } +#pragma mark å¡«æ¡å½¢ç æœç´¢ +- (void)barCodeSearchRequest +{ + if (self.barcode) { + + [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:@"%@%@",ServerAddress,@"/goods/getGoodsByCode/"] WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) { + + + + } WithErrorCodeBlock:^(id errorCodeValue) { + + + + } WithFailureBlock:^(id error) { + + + + }]; + } +} + #pragma mark -ç›é€‰æŒ‰é’® diff --git a/Lighting/Class/SceneLibraryViewController.m b/Lighting/Class/SceneLibraryViewController.m index 9542391dca2d74dbdcc33ffd215e53fdafec74e2..1e544860071290f7d214754fd0a3501a0cfed913 100644 --- a/Lighting/Class/SceneLibraryViewController.m +++ b/Lighting/Class/SceneLibraryViewController.m @@ -78,41 +78,6 @@ } -#pragma mark -è§†å›¾æ¸²æŸ“å®Œæˆ -- (void)viewDidAppear:(BOOL)animated -{ - //下拉刷新 - MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{ - //é»˜è®¤æ•°æ® - SceneCondition *condition = [[SceneCondition alloc]init]; - DataPage *page = [[DataPage alloc]init]; - page.page = 1; - page.rows = 10; - condition.page = page; - [self.seceneLibararyCollectionView.mj_footer resetNoMoreData]; - [self getSceneLibrarydatas:condition isRemove:YES]; - }]; - headerRefresh.stateLabel.hidden = YES; - headerRefresh.lastUpdatedTimeLabel.hidden = YES; - self.seceneLibararyCollectionView.mj_header = headerRefresh; - [self.seceneLibararyCollectionView.mj_header beginRefreshing]; - //ä¸Šæ‹‰åŠ è½½ - self.seceneLibararyCollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ - - //é»˜è®¤æ•°æ® - SceneCondition *condition = [[SceneCondition alloc]init]; - DataPage *page = [[DataPage alloc]init]; - if (self.indexPage ++ > self.totalPages) { - [self.seceneLibararyCollectionView.mj_footer endRefreshingWithNoMoreData]; - }else - { - page.page = self.indexPage ++; - page.rows = 10; - condition.page = page; - [self getSceneLibrarydatas:condition isRemove:NO]; - } - }]; -} #pragma mark -UI @@ -146,6 +111,39 @@ [self.backView addSubview:self.SpaceButton]; self.indexPage = 1; + + //下拉刷新 + MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{ + //é»˜è®¤æ•°æ® + SceneCondition *condition = [[SceneCondition alloc]init]; + DataPage *page = [[DataPage alloc]init]; + page.page = 1; + page.rows = 10; + condition.page = page; + [self.seceneLibararyCollectionView.mj_footer resetNoMoreData]; + [self getSceneLibrarydatas:condition isRemove:YES]; + }]; + headerRefresh.stateLabel.hidden = YES; + headerRefresh.lastUpdatedTimeLabel.hidden = YES; + self.seceneLibararyCollectionView.mj_header = headerRefresh; + [self.seceneLibararyCollectionView.mj_header beginRefreshing]; + //ä¸Šæ‹‰åŠ è½½ + self.seceneLibararyCollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{ + + //é»˜è®¤æ•°æ® + SceneCondition *condition = [[SceneCondition alloc]init]; + DataPage *page = [[DataPage alloc]init]; + if (self.indexPage ++ > self.totalPages) { + [self.seceneLibararyCollectionView.mj_footer endRefreshingWithNoMoreData]; + }else + { + page.page = self.indexPage ++; + page.rows = 10; + condition.page = page; + [self getSceneLibrarydatas:condition isRemove:NO]; + } + }]; + } #pragma mark -获å–场景ç›é€‰æ•°æ® - (void)getdatasAction diff --git a/Lighting/Class/SettlementViewController.h b/Lighting/Class/SettlementViewController.h index da9f48312db9fa514a239d60581c53c12bc10247..0d0f527afc60067bade6ba661258459dbe66812d 100644 --- a/Lighting/Class/SettlementViewController.h +++ b/Lighting/Class/SettlementViewController.h @@ -115,6 +115,10 @@ @property (nonatomic,copy) void(^PaySuccessReturnBlock)(); +/** + * 背景Scrollview + */ +@property (weak, nonatomic) IBOutlet UIScrollView *myScrollView; @end diff --git a/Lighting/Class/SettlementViewController.m b/Lighting/Class/SettlementViewController.m index c73cb29468fcd0422dba4dd05cb6beb2c2bff1ab..68af6b853de8a48d253a602556220fc1818b3398 100644 --- a/Lighting/Class/SettlementViewController.m +++ b/Lighting/Class/SettlementViewController.m @@ -62,7 +62,7 @@ self.cancelButton.layer.cornerRadius = kCornerRadius; self.sureButton.layer.masksToBounds = YES; self.sureButton.layer.cornerRadius = kCornerRadius; - + self.myScrollView.contentSize = CGSizeMake(0, self.view.frame.size.height+100); } diff --git a/Lighting/Class/SettlementViewController.xib b/Lighting/Class/SettlementViewController.xib index 4a24d4054ebcbe64ce7951c32bedaf597db9f894..6083260b73e5e2176f178b49a44c6d373759caad 100644 --- a/Lighting/Class/SettlementViewController.xib +++ b/Lighting/Class/SettlementViewController.xib @@ -16,6 +16,7 @@ <outlet property="invoiceBackView" destination="beF-Oa-HVo" id="m2o-SG-Fwk"/> <outlet property="invoiceHeader" destination="nrc-w9-AuC" id="bst-2e-Eeb"/> <outlet property="invoiceType" destination="h52-sh-k1p" id="JeZ-ug-MEv"/> + <outlet property="myScrollView" destination="Zin-kL-ulL" id="DbE-Wx-6aV"/> <outlet property="payTreasureButton" destination="u1Q-iA-oUv" id="kTp-v5-rTM"/> <outlet property="payTypeButton" destination="BtK-gu-0KG" id="kZG-tn-0Xt"/> <outlet property="showPayQrCodeImageView" destination="evA-uJ-YEb" id="nJS-kx-aPc"/> diff --git a/Lighting/Class/Shoppingcart/AddressViewController.m b/Lighting/Class/Shoppingcart/AddressViewController.m index 9036e0e7403777a6184eaa89ad64dcee07715771..ba0b1ab8db08e0070955554da98f5c07eba9702c 100644 --- a/Lighting/Class/Shoppingcart/AddressViewController.m +++ b/Lighting/Class/Shoppingcart/AddressViewController.m @@ -206,8 +206,6 @@ NSLog(@"%@",error); [self RemoveMBProgressHUDLoding]; }]; - - } //@synthesize fid; //@synthesize createDate; diff --git a/Lighting/Class/Tabbar/CustomTabbarController.m b/Lighting/Class/Tabbar/CustomTabbarController.m index 7a25b7c02a06d582e46b03bdf174f83e3702eedb..81f5b5e9ac5fbc7475a2fd523bf39611b4cc262b 100644 --- a/Lighting/Class/Tabbar/CustomTabbarController.m +++ b/Lighting/Class/Tabbar/CustomTabbarController.m @@ -132,6 +132,7 @@ self.vcArray = [NSArray arrayWithObjects:aboutNav,cutomerorderNav,allcustomerNav,customerNav,productNav,sceneNav,followNav,clientNav,shoppingNav,searchNav, nil]; self.viewControllers = self.vcArray; + SHARED_APPDELEGATE.allControllerArray = [NSArray arrayWithObjects:aboutVC,customerOrderVC,allcustomerVC,customerVC,productVC,sceneVC,followVC,clientVC,shoppingVC,searchVC, nil]; self.selectedIndex = 7; } diff --git a/Lighting/Lighting/AppDelegate.h b/Lighting/Lighting/AppDelegate.h index e41d2e4ec35ceeb8a14ca56748fe864582b889b1..41d9c629faaef1cf752a8484cda85fd1ffea2013 100644 --- a/Lighting/Lighting/AppDelegate.h +++ b/Lighting/Lighting/AppDelegate.h @@ -42,6 +42,10 @@ */ @property (nonatomic,assign) CGPoint shoppingCarPoint; +/** + * 所有控制器对象 + */ +@property (nonatomic,strong) NSArray *allControllerArray; - (void)saveContext; - (NSURL *)applicationDocumentsDirectory; diff --git a/Lighting/Lighting/Images.xcassets/icondown.imageset/Contents.json b/Lighting/Lighting/Images.xcassets/icondown.imageset/Contents.json new file mode 100644 index 0000000000000000000000000000000000000000..78603807ca085f664d6e7484d9e5514fb3151671 --- /dev/null +++ b/Lighting/Lighting/Images.xcassets/icondown.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "icondown.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "icondown@2x.png", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Lighting/Lighting/Images.xcassets/icondown.imageset/icondown.png b/Lighting/Lighting/Images.xcassets/icondown.imageset/icondown.png new file mode 100644 index 0000000000000000000000000000000000000000..8188823715ebdb560b0bdfec48b36e77aed6e080 Binary files /dev/null and b/Lighting/Lighting/Images.xcassets/icondown.imageset/icondown.png differ diff --git a/Lighting/Lighting/Images.xcassets/icondown.imageset/icondown@2x.png b/Lighting/Lighting/Images.xcassets/icondown.imageset/icondown@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..6be55098da38a6609e1793618a3a5fec015b1874 Binary files /dev/null and b/Lighting/Lighting/Images.xcassets/icondown.imageset/icondown@2x.png differ diff --git a/Lighting/Lighting/StoryboardwithCYX.storyboard b/Lighting/Lighting/StoryboardwithCYX.storyboard index 80778cd79620dd4d167aaaf7b88fa55ccb1c27ae..ed5ff23a633b8629730d1f3c0417fcdd64c02722 100644 --- a/Lighting/Lighting/StoryboardwithCYX.storyboard +++ b/Lighting/Lighting/StoryboardwithCYX.storyboard @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none"> +<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none"> <dependencies> <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/> </dependencies> @@ -153,7 +153,7 @@ <rect key="frame" x="0.0" y="28" width="721" height="100"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="NV8-I4-ig4" id="E0m-wU-1b5"> - <rect key="frame" x="0.0" y="0.0" width="721" height="99"/> + <rect key="frame" x="0.0" y="0.0" width="721" height="99.5"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产å“库-详情_03" id="F66-vh-va3"> @@ -420,7 +420,7 @@ <rect key="frame" x="0.0" y="28" width="717" height="100"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1Sl-4a-xI0" id="Kls-Lg-VEy"> - <rect key="frame" x="0.0" y="0.0" width="717" height="99"/> + <rect key="frame" x="0.0" y="0.0" width="717" height="99.5"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产å“库-详情_03" id="mhA-C1-oB5"> @@ -513,7 +513,7 @@ <rect key="frame" x="0.0" y="128" width="717" height="200"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1pL-BK-mae" id="zJa-bo-n5G"> - <rect key="frame" x="0.0" y="0.0" width="717" height="199"/> + <rect key="frame" x="0.0" y="0.0" width="717" height="199.5"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="䏋啿—¶é—´ï¼š" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="DqG-UR-Q08"> @@ -732,10 +732,10 @@ <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/> <prototypes> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="firstcell" rowHeight="84" id="XgA-9w-ut9" customClass="OrderInformationTableViewCell"> - <rect key="frame" x="0.0" y="114" width="1024" height="84"/> + <rect key="frame" x="0.0" y="49.5" width="1024" height="84"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XgA-9w-ut9" id="BWi-jv-OOH"> - <rect key="frame" x="0.0" y="0.0" width="1024" height="83"/> + <rect key="frame" x="0.0" y="0.0" width="1024" height="83.5"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订å•ç¼–å·ï¼š" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="KGm-XJ-NyV"> @@ -805,10 +805,10 @@ </connections> </tableViewCell> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="110" id="rIO-yd-hh7" customClass="PersonInformationTableViewCell"> - <rect key="frame" x="0.0" y="198" width="1024" height="110"/> + <rect key="frame" x="0.0" y="133.5" width="1024" height="110"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rIO-yd-hh7" id="mn8-g0-Zqo"> - <rect key="frame" x="0.0" y="0.0" width="1024" height="109"/> + <rect key="frame" x="0.0" y="0.0" width="1024" height="109.5"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产å“库-详情_03" id="Zdg-s0-xfD"> @@ -882,10 +882,10 @@ </connections> </tableViewCell> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="thirdcell" rowHeight="90" id="PfN-24-v5t" customClass="GoodsInformationTableViewCell"> - <rect key="frame" x="0.0" y="308" width="1024" height="90"/> + <rect key="frame" x="0.0" y="243.5" width="1024" height="90"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PfN-24-v5t" id="2Je-94-WVY"> - <rect key="frame" x="0.0" y="0.0" width="1024" height="89"/> + <rect key="frame" x="0.0" y="0.0" width="1024" height="89.5"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收货人:" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="tiK-JC-Jy4"> @@ -939,10 +939,10 @@ </connections> </tableViewCell> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fourthcell" rowHeight="80" id="47T-H0-tG7" customClass="CommodityListTableViewCell"> - <rect key="frame" x="0.0" y="398" width="1024" height="80"/> + <rect key="frame" x="0.0" y="333.5" width="1024" height="80"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="47T-H0-tG7" id="zXR-bC-Wdh"> - <rect key="frame" x="0.0" y="0.0" width="1024" height="79"/> + <rect key="frame" x="0.0" y="0.0" width="1024" height="79.5"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产å“库-详情_03" id="6MS-gq-TMk"> @@ -1003,10 +1003,10 @@ </connections> </tableViewCell> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="sixthcell" rowHeight="50" id="PNT-Fy-4Hi" customClass="AllpriceTableViewCell"> - <rect key="frame" x="0.0" y="478" width="1024" height="50"/> + <rect key="frame" x="0.0" y="413.5" width="1024" height="50"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PNT-Fy-4Hi" id="PxE-0c-Zdt"> - <rect key="frame" x="0.0" y="0.0" width="1024" height="49"/> + <rect key="frame" x="0.0" y="0.0" width="1024" height="49.5"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总数é‡ï¼š" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="rbZ-Pg-7Uu"> @@ -1164,7 +1164,7 @@ </collectionViewFlowLayout> <cells> <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="productcell" id="J5m-0M-uqb" customClass="ProductCollectionViewCell"> - <rect key="frame" x="0.0" y="64" width="300" height="300"/> + <rect key="frame" x="0.0" y="0.0" width="300" height="300"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center"> <rect key="frame" x="0.0" y="0.0" width="300" height="300"/> @@ -1246,10 +1246,10 @@ <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/> <prototypes> <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="productDetailscell" rowHeight="170" id="Sye-2R-IQf" customClass="ProductDetailsTableViewCell"> - <rect key="frame" x="0.0" y="114" width="768" height="170"/> + <rect key="frame" x="0.0" y="49.5" width="768" height="170"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Sye-2R-IQf" id="CXs-SR-gHP"> - <rect key="frame" x="0.0" y="0.0" width="768" height="169"/> + <rect key="frame" x="0.0" y="0.0" width="768" height="169.5"/> <autoresizingMask key="autoresizingMask"/> <subviews> <view contentMode="scaleToFill" id="2bG-Ip-ptr"> @@ -1636,7 +1636,7 @@ <rect key="frame" x="0.0" y="28" width="973" height="80"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ZT1-XJ-ObI" id="GWp-Jl-7br"> - <rect key="frame" x="0.0" y="0.0" width="973" height="79"/> + <rect key="frame" x="0.0" y="0.0" width="973" height="79.5"/> <autoresizingMask key="autoresizingMask"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="PkJ-eJ-ksY"> @@ -1857,7 +1857,7 @@ <rect key="frame" x="0.0" y="92" width="768" height="110"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LsY-i0-h5H" id="dPG-p9-V2i"> - <rect key="frame" x="0.0" y="0.0" width="768" height="109"/> + <rect key="frame" x="0.0" y="0.0" width="768" height="109.5"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产å“库-详情_03" id="qWT-p0-Gta"> @@ -1934,11 +1934,11 @@ <rect key="frame" x="0.0" y="202" width="768" height="56"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gfQ-UE-mXV" id="za6-HU-VEw"> - <rect key="frame" x="0.0" y="0.0" width="768" height="55"/> + <rect key="frame" x="0.0" y="0.0" width="768" height="55.5"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="手机å·ç :" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="X0Z-8j-BdI"> - <rect key="frame" x="236" y="18" width="72" height="21"/> + <rect key="frame" x="252" y="18" width="72" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> @@ -1952,21 +1952,21 @@ <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="uq3-fp-QuI"> - <rect key="frame" x="147" y="17" width="65" height="21"/> + <rect key="frame" x="147" y="17" width="92" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收货地å€ï¼š" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Qrd-yC-cV5"> - <rect key="frame" x="429" y="17" width="72" height="21"/> + <rect key="frame" x="438" y="17" width="72" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/> <nil key="highlightedColor"/> </label> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="上海市闵行区鹤å¡å—路闵铺二æ‘8å·æ¥¼401室" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="XKV-b4-HNM"> - <rect key="frame" x="499" y="17" width="252" height="21"/> + <rect key="frame" x="508" y="17" width="252" height="21"/> <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> @@ -1982,7 +1982,7 @@ </connections> </button> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="15121161964" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="1dD-es-x4K"> - <rect key="frame" x="301" y="18" width="103" height="21"/> + <rect key="frame" x="317" y="18" width="103" height="21"/> <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <fontDescription key="fontDescription" type="system" pointSize="14"/> <color key="textColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/> @@ -2002,7 +2002,7 @@ <rect key="frame" x="0.0" y="258" width="768" height="56"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Kk4-Fh-HhL" id="oRX-7p-HkY"> - <rect key="frame" x="0.0" y="0.0" width="768" height="55"/> + <rect key="frame" x="0.0" y="0.0" width="768" height="55.5"/> <autoresizingMask key="autoresizingMask"/> <subviews> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="m0f-EW-LM5"> @@ -2033,7 +2033,7 @@ <rect key="frame" x="0.0" y="314" width="768" height="80"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="G7o-xS-1mB" id="l3e-TL-GCT"> - <rect key="frame" x="0.0" y="0.0" width="768" height="79"/> + <rect key="frame" x="0.0" y="0.0" width="768" height="79.5"/> <autoresizingMask key="autoresizingMask"/> <subviews> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产å“库-详情_03" id="Un4-g0-sG6"> @@ -2105,7 +2105,7 @@ <rect key="frame" x="0.0" y="394" width="768" height="50"/> <autoresizingMask key="autoresizingMask"/> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6K9-mc-7RW" id="Vc7-f6-wGb"> - <rect key="frame" x="0.0" y="0.0" width="768" height="49"/> + <rect key="frame" x="0.0" y="0.0" width="768" height="49.5"/> <autoresizingMask key="autoresizingMask"/> <subviews> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总数é‡ï¼š" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ULe-0J-pCd">