Skip to content

O
Opple-iOS
Commit c7d75cd2 authored by 曹云霄's avatar 曹云霄
Browse files
Options

debug

parent baf011ea
Show whitespace changes
Inline Side-by-side
Showing with 98 additions and 136 deletions
Lighting/Class/AllCustomerViewController.m
View file @ c7d75cd2
......@@ -121,7 +121,7 @@
headerRefresh.lastUpdatedTimeLabel.hidden = YES;
self.allCustomerTableview.mj_header = headerRefresh;
[self.allCustomerTableview.mj_header beginRefreshing];
self.allCustomerTableview.mj_footer.automaticallyHidden = YES;
//上拉加载
self.allCustomerTableview.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
......@@ -187,7 +187,8 @@
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
[self endRefreshingForTableView:self.allCustomerTableview];
......
Lighting/Class/ChangePasswordViewController.m
View file @ c7d75cd2
......@@ -103,7 +103,8 @@
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
......
Lighting/Class/ClientViewController.m
View file @ c7d75cd2
......@@ -59,21 +59,13 @@
- (void)viewDidAppear:(BOOL)animated
{
[super viewDidAppear:animated];
// 禁用 iOS7 返回手势
if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
self.navigationController.interactivePopGestureRecognizer.enabled = NO;
}
self.navigationController.fd_fullscreenPopGestureRecognizer.enabled = NO;
}
- (void)viewWillDisappear:(BOOL)animated
{
[super viewWillDisappear:animated];
// 开启
if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
self.navigationController.interactivePopGestureRecognizer.enabled = YES;
}
self.navigationController.fd_fullscreenPopGestureRecognizer.enabled = YES;
}
......@@ -127,7 +119,7 @@
headerRefresh.stateLabel.hidden = YES;
headerRefresh.lastUpdatedTimeLabel.hidden = YES;
self.informationTableview.mj_header =headerRefresh;
self.informationTableview.mj_footer.automaticallyHidden = YES;
//进入刷新状态
[self.informationTableview.mj_header beginRefreshing];
//上拉加载
......@@ -147,9 +139,6 @@
}];
}
#pragma mark -获取导购关联客户
- (void)getShoppersAssociatedCustomer:(ConsumerQueryCondition *)condition isRemoveArray:(BOOL)remove
{
......@@ -620,7 +609,6 @@
self.customerAddress.enabled = NO;
self.phoneNumberField.enabled = NO;
self.companyNameField.enabled = NO;
[self SetupUserShoppingCarNumberRequest];
[self SetupUserRequest];
[self ChangeCustomerName];
......
Lighting/Class/ClientdetailsViewController.m
View file @ c7d75cd2
......@@ -156,7 +156,7 @@
headerRefresh.stateLabel.hidden = YES;
headerRefresh.lastUpdatedTimeLabel.hidden = YES;
self.ClientdetailsTableview.mj_header =headerRefresh;
self.ClientdetailsTableview.mj_footer.automaticallyHidden = YES;
//进入刷新状态
[self.ClientdetailsTableview.mj_header beginRefreshing];
//上拉加载
......@@ -253,7 +253,6 @@
ProductDetailsViewController *productDetails = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"productdetails"];
ShopcarModel *model = [self.shopResponseArray objectAtIndex_opple:indexPath.row];
productDetails.goodsID = model.goods.fid;
productDetails.inventory = model.goods.inv;
[self.navigationController pushViewController:productDetails animated:YES];
}else if (self.orderRecordButton.selected)
......@@ -323,7 +322,8 @@
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
[self RemoveMBProgressHUDLoding];
......@@ -361,7 +361,8 @@
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
[self RemoveMBProgressHUDLoding];
......
Lighting/Class/CustomerOrderViewController.m
View file @ c7d75cd2
......@@ -111,6 +111,7 @@
headerRefresh.lastUpdatedTimeLabel.hidden = YES;
self.customerOrderTableView.mj_header = headerRefresh;
[self.customerOrderTableView.mj_header beginRefreshing];
self.customerOrderTableView.mj_footer.automaticallyHidden = YES;
//上拉加载
self.customerOrderTableView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
......@@ -156,7 +157,8 @@
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
[self endRefreshingForTableView:self.customerOrderTableView];
......@@ -326,7 +328,8 @@
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
[weakSelf RemoveMBProgressHUDLoding];
......
Lighting/Class/Login/LoginViewController.m
View file @ c7d75cd2
......@@ -187,6 +187,7 @@
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"网络中断"];
} WithFailureBlock:^(NSError *error) {
......@@ -328,8 +329,9 @@
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self ErrorMBProgressView:@"网络中断"];
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"网络中断"];
} WithFailureBlock:^(NSError *error) {
......
Lighting/Class/OrderdetailsViewController.m
View file @ c7d75cd2
......@@ -43,11 +43,7 @@
[super viewDidAppear:animated];
if (self.isSliding) {
// 禁用 iOS7 返回手势
if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
self.navigationController.interactivePopGestureRecognizer.enabled = NO;
}
self.navigationController.fd_fullscreenPopGestureRecognizer.enabled = NO;
}
}
......@@ -56,9 +52,7 @@
{
[super viewWillDisappear:animated];
// 开启
if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
self.navigationController.interactivePopGestureRecognizer.enabled = YES;
}
self.navigationController.fd_fullscreenPopGestureRecognizer.enabled = YES;
}
......
Lighting/Class/ProductDetailsViewController.h
View file @ c7d75cd2
......@@ -25,12 +25,6 @@
@property (nonatomic,copy) NSString *goodsID;
/**
* 商品库存
*/
@property (nonatomic,assign) NSInteger inventory;
@end
Lighting/Class/ProductDetailsViewController.m
View file @ c7d75cd2
......@@ -105,7 +105,8 @@
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
......@@ -137,7 +138,7 @@
self.headerView.serialNumber.text = self.entity.code;
self.headerView.nameLabe.text = self.entity.name;
self.headerView.brandName.text = self.entity.company;
self.headerView.inventoryNumber.text = [NSString stringWithFormat:@"%ld",self.inventory];
self.headerView.inventoryNumber.text = [NSString stringWithFormat:@"%ld",self.entity.inv];
self.headerView.dorpPriceLabe.text = [NSString stringWithFormat:@"￥%.2f",[self.entity.tagPrice floatValue]];
self.imagesArray = [NSMutableArray arrayWithArray:[self.entity.pictures componentsSeparatedByString:@","]];
[self.headerView.goodsImageview sd_setImageWithURL:[self.imagesArray firstObject] placeholderImage:REPLACEIMAGE];
......@@ -482,7 +483,8 @@
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
[self ErrorMBProgressView:@"添加购物车失败"];
......
Lighting/Class/ProductLibraryViewController.m
View file @ c7d75cd2
......@@ -158,7 +158,8 @@
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(NSError *error) {
[self ErrorMBProgressView:error.localizedDescription];
......@@ -283,7 +284,7 @@
headerRefresh.lastUpdatedTimeLabel.hidden = YES;
self.productCollectionView.mj_header = headerRefresh;
[self.productCollectionView.mj_header beginRefreshing];
self.productCollectionView.mj_footer.automaticallyHidden = YES;
//上拉加载
self.productCollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
......@@ -431,6 +432,11 @@
[self ErrorMBProgressView:@"必须设置当前客户"];
return;
}
//库存为0时不能加入购物车
if (model.number >= 0) {
[self ErrorMBProgressView:@"此商品库存不足"];
return;
}
TOGoodsEntity *model = [self.datasArray objectAtIndex_opple:cellindex];
[self addGoodsShoppingbags:model complate:^{
NSLog(@"加入购物车完成");
......@@ -503,12 +509,9 @@
#pragma mark -完成加入购物车动画完成后回调
- (void)animationDidStop:(CAAnimation *)anim finished:(BOOL)flag
{
NSLog(@"动画完成了");
[[NSNotificationCenter defaultCenter]postNotificationName:@"ADDGOODSNUMBER" object:@(1)];
}
- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
{
return self.datasArray.count;
......@@ -517,10 +520,8 @@
- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
{
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
ProductDetailsViewController *productDetails = [storyboard instantiateViewControllerWithIdentifier:@"productdetails"];
ProductDetailsViewController *productDetails = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"productdetails"];
productDetails.goodsID = [[self.datasArray objectAtIndex_opple:indexPath.item] fid];
productDetails.inventory = [[self.datasArray objectAtIndex_opple:indexPath.item] inv];
[self.navigationController pushViewController:productDetails animated:YES];
}
......
Lighting/Class/SceneLibraryViewController.m
View file @ c7d75cd2
......@@ -144,6 +144,7 @@
headerRefresh.lastUpdatedTimeLabel.hidden = YES;
self.seceneLibararyCollectionView.mj_header = headerRefresh;
[self.seceneLibararyCollectionView.mj_header beginRefreshing];
self.seceneLibararyCollectionView.mj_footer.automaticallyHidden = YES;
//上拉加载
self.seceneLibararyCollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
......@@ -176,7 +177,8 @@
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
}];
......
Lighting/Class/SearchViewController.m
View file @ c7d75cd2
......@@ -56,21 +56,14 @@
- (void)viewDidAppear:(BOOL)animated
{
[super viewDidAppear:animated];
// 禁用 iOS7 返回手势
if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
self.navigationController.interactivePopGestureRecognizer.enabled = NO;
}
self.navigationController.fd_fullscreenPopGestureRecognizer.enabled = NO;
}
#pragma mark -视图即将消失
- (void)viewWillDisappear:(BOOL)animated
{
[super viewWillDisappear:animated];
// 开启
if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
self.navigationController.interactivePopGestureRecognizer.enabled = YES;
}
self.navigationController.fd_fullscreenPopGestureRecognizer.enabled = YES;
}
......@@ -81,19 +74,16 @@
self.hotCollectionviewLayout.minimumLineSpacing = 10;
self.hotCollectionviewLayout.minimumInteritemSpacing = 10;
self.hotCollectionviewLayout.sectionInset = UIEdgeInsetsMake(10, 10, 10, 10);
self.historyLayout.itemSize = CGSizeMake(120, 44);
self.historyLayout.minimumLineSpacing = 10;
self.historyLayout.minimumInteritemSpacing = 10;
self.historyLayout.sectionInset = UIEdgeInsetsMake(10, 10, 10, 10);
self.historyCollectionView.delegate = self;
self.historyCollectionView.dataSource = self;
self.hotCollectionView.dataSource = self;
self.hotCollectionView.delegate = self;
self.hotCollectionView.alwaysBounceVertical = YES;
self.historyCollectionView.alwaysBounceVertical = YES;
//保存输入内容
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(searchInputString:) name:SEARCHSTRING object:nil];
}
......@@ -150,8 +140,6 @@
}
#pragma mark -获取热门搜索数据
- (void)getHotSearchdatas
{
......@@ -170,7 +158,8 @@
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
[self RemoveMBProgressHUDLoding];
}];
......@@ -224,16 +213,12 @@
}
}
#pragma mark -释放
- (void)dealloc
{
[[NSNotificationCenter defaultCenter]removeObserver:self];
}
#pragma mark -清除搜索历史
- (IBAction)delecteSearchHistoryButtonClick:(UIButton *)sender {
......
Lighting/Class/Shoppingcart/AddressViewController.m
View file @ c7d75cd2
......@@ -218,7 +218,8 @@
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
......@@ -275,7 +276,8 @@
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
......@@ -319,7 +321,8 @@
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
[self RemoveMBProgressHUDLoding];
......
Lighting/Class/Shoppingcart/GenerateOrdersViewController.m
View file @ c7d75cd2
......@@ -69,21 +69,16 @@
- (void)viewDidAppear:(BOOL)animated
{
[super viewDidAppear:animated];
self.navigationController.fd_fullscreenPopGestureRecognizer.enabled = NO;
// 禁用 iOS7 返回手势
if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
self.navigationController.interactivePopGestureRecognizer.enabled = NO;
}
}
#pragma mark -视图即将消失
- (void)viewWillDisappear:(BOOL)animated
{
[super viewWillDisappear:animated];
// 开启
if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
self.navigationController.interactivePopGestureRecognizer.enabled = YES;
}
self.navigationController.fd_fullscreenPopGestureRecognizer.enabled = YES;
}
- (void)viewDidLoad {
......@@ -152,7 +147,8 @@
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
NSLog(@"%@",error);
......@@ -438,7 +434,8 @@
[self ErrorMBProgressView:returnValue[@"message"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
[self RemoveMBProgressHUDLoding];
}];
......
Lighting/Class/Shoppingcart/ShoppingViewController.m
View file @ c7d75cd2
......@@ -12,6 +12,7 @@
#import "GenerateOrdersViewController.h"
#import "ShopcarModel.h"
#import "AddressModel.h"
#import "ProductDetailsViewController.h"
@interface ShoppingViewController ()<UITableViewDelegate,UITableViewDataSource,ChangeGoodsNumberDelegate,DZNEmptyDataSetSource>
......@@ -57,11 +58,7 @@
- (void)viewDidAppear:(BOOL)animated
{
[super viewDidAppear:animated];
// 禁用 iOS7 返回手势
if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
self.navigationController.interactivePopGestureRecognizer.enabled = NO;
}
self.navigationController.fd_fullscreenPopGestureRecognizer.enabled = NO;
[self.shopResponseArray removeAllObjects];
[self InitializeState];
[self getShoppingCardata];
......@@ -71,10 +68,7 @@
- (void)viewWillDisappear:(BOOL)animated
{
[super viewWillDisappear:animated];
// 开启
if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
self.navigationController.interactivePopGestureRecognizer.enabled = YES;
}
self.navigationController.fd_fullscreenPopGestureRecognizer.enabled = YES;
}
#pragma mark -初始化状态
......@@ -147,7 +141,8 @@
[self ErrorMBProgressView:returnValue[@"message"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
[self RemoveMBProgressHUDLoding];
......@@ -188,13 +183,19 @@
return 80;
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
ProductDetailsViewController *productDetails = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"productdetails"];
productDetails.goodsID = [[self.shopResponseArray objectAtIndex_opple:indexPath.row] goodsId];
// productDetails.inventory = [[self.shopResponseArray objectAtIndex_opple:indexPath.row] inv];
[self.navigationController pushViewController:productDetails animated:YES];
}
- (void)tableView:(UITableView *)tableView didDeselectRowAtIndexPath:(NSIndexPath *)indexPath
{
[self.shoppingTableview deselectRowAtIndexPath:indexPath animated:YES];
}
#pragma mark -选中商品回调
- (void)setSelectedButton:(NSInteger)index;
{
......@@ -269,7 +270,8 @@
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
......@@ -380,7 +382,8 @@
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
......@@ -424,7 +427,8 @@
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
......@@ -439,6 +443,7 @@
- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
{
return kNoDataImage;
}
......
Lighting/Class/UserViewController.m
View file @ c7d75cd2
......@@ -36,8 +36,6 @@
self.passWordBack.layer.cornerRadius = kCornerRadius;
self.passWordBack.layer.borderWidth = 0.5;
self.passWordBack.layer.borderColor = kMainBlueColor.CGColor;
self.cancellationButton.layer.masksToBounds = YES;
self.cancellationButton.layer.cornerRadius = kCornerRadius;
self.switchUser.layer.masksToBounds = YES;
self.switchUser.layer.cornerRadius = kCornerRadius;
self.changePassword.layer.masksToBounds = YES;
......@@ -195,8 +193,6 @@
}];
}
#pragma mark -修改密码
- (IBAction)ChangPasswordButtonClick:(UIButton *)sender {
......@@ -205,12 +201,10 @@
}
}
#pragma mark -注销
#pragma mark -注销《切换用户》
- (IBAction)cancellationButtonClick:(UIButton *)sender {
UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"提示" message:@"注销将清空用户数据，是否继续?" preferredStyle:UIAlertControllerStyleAlert];
UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:@"提示" message:@"切换用户将清空用户数据，是否继续?" preferredStyle:UIAlertControllerStyleAlert];
__weak typeof(self) weakSelf = self;
[alertVC addAction:[UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
[weakSelf dismissViewControllerAnimated:YES completion:nil];
......@@ -232,7 +226,7 @@
[weakSelf restoreRootViewController:loginVC];
}else
{
[weakSelf promptCustomerWithString:@"注销失败"];
[weakSelf promptCustomerWithString:@"切换用户失败"];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
......
Lighting/Class/UserViewController.xib
View file @ c7d75cd2
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="UserViewController">
<connections>
<outlet property="cancellationButton" destination="m0J-Ji-o4P" id="sjF-hF-f7G"/>
<outlet property="changePassword" destination="MmS-T7-ieX" id="FlY-Na-P0f"/>
<outlet property="passWord" destination="iPT-ib-2cp" id="H67-mf-uqf"/>
<outlet property="passWordBack" destination="6JT-hH-lKv" id="af3-IA-3s3"/>
......@@ -37,7 +36,7 @@
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</imageView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="7l0-kF-pfD">
<rect key="frame" x="10" y="125" width="80" height="30"/>
<rect key="frame" x="10" y="125" width="110" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.34901960780000002" green="0.67450980390000004" blue="0.86274509799999999" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
......@@ -45,13 +44,12 @@
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="switchUserButtonClick:" destination="-1" eventType="touchUpInside" id="jyo-VR-2Gk"/>
<action selector="cancellationButtonClick:" destination="-1" eventType="touchUpInside" id="wTq-e7-u0Q"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="MmS-T7-ieX">
<rect key="frame" x="172" y="125" width="80" height="30"/>
<rect key="frame" x="142" y="125" width="110" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<state key="normal" title="修改密码">
<color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
......@@ -60,23 +58,11 @@
<action selector="ChangPasswordButtonClick:" destination="-1" eventType="touchUpInside" id="FcS-nR-vDN"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="m0J-Ji-o4P">
<rect key="frame" x="107" y="125" width="46" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" red="0.34901960784313724" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<state key="normal" title="注销">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="cancellationButtonClick:" destination="-1" eventType="touchUpInside" id="iQU-lO-tNY"/>
</connections>
</button>
<view contentMode="scaleToFill" id="6JT-hH-lKv">
<rect key="frame" x="34" y="62" width="130" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="密码" minimumFontSize="17" id="iPT-ib-2cp">
<textField opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="密码" minimumFontSize="17" id="iPT-ib-2cp">
<rect key="frame" x="10" y="0.0" width="120" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
......@@ -90,7 +76,7 @@
<rect key="frame" x="34" y="21" width="130" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<subviews>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="用户名" textAlignment="natural" minimumFontSize="17" clearButtonMode="always" id="cgR-tl-g1N">
<textField opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="用户名" textAlignment="natural" minimumFontSize="17" id="cgR-tl-g1N">
<rect key="frame" x="10" y="0.0" width="120" height="30"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
......
Lighting/Podfile.lock
View file @ c7d75cd2
......@@ -16,6 +16,7 @@ PODS:
- AFNetworking/NSURLSession
- Bugly (2.2.3)
- DZNEmptyDataSet (1.8.1)
- FDFullscreenPopGesture (1.1)
- IQKeyboardManager (4.0.4)
- JSONModel (1.2.0)
- Masonry (0.6.4)
......@@ -44,6 +45,7 @@ DEPENDENCIES:
- AFNetworking (~> 3.1.0)
- Bugly (~> 2.2.3)
- DZNEmptyDataSet (~> 1.8.1)
- FDFullscreenPopGesture (~> 1.1)
- IQKeyboardManager (~> 4.0.0)
- JSONModel (~> 1.2.0)
- Masonry (~> 0.6.4)
......@@ -59,6 +61,7 @@ SPEC CHECKSUMS:
AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
Bugly: db578ea92b2a6b132cc19f79adf3bcd3b0fe6769
DZNEmptyDataSet: 9525833b9e68ac21c30253e1d3d7076cc828eaa7
FDFullscreenPopGesture: a8a620179e3d9c40e8e00256dcee1c1a27c6d0f0
IQKeyboardManager: 4a6f83b540283c2645aaeba2bd8dc0f09b5c77f8
JSONModel: 12523685c4b623553ccf844bbbf7007624317b2c
Masonry: 281802d04d787ea2973179ee8bcb50500579ede2
......
Lighting/Tools/BaseViewController.m
View file @ c7d75cd2
......@@ -158,13 +158,9 @@
self.TCHud.removeFromSuperViewOnHide = YES;
}
#pragma mark -移除MBProgressHUD等待视图
- (void)RemoveMBProgressHUDLoding;
{
// [self.TCHud hide:YES afterDelay:0.5];
[_TCHud hide:YES];
_TCHud = nil;
}
......@@ -474,7 +470,8 @@
[[NSNotificationCenter defaultCenter]postNotificationName:REFRESHSHOPPINGCAR object:returnValue[@"data"]];
}
} WithErrorCodeBlock:^(id errorCodeValue) {
[self RemoveMBProgressHUDLoding];
[self ErrorMBProgressView:@"无网络"];
} WithFailureBlock:^(id error) {
NSLog(@"更新购物车数量失败");
}];
......
Lighting/Tools/PrefixHeader.pch
View file @ c7d75cd2
......@@ -32,6 +32,8 @@
#import "MjRefreshHeaderCustom.h"
#import "UIScrollView+EmptyDataSet.h"
#import "HeaderforURL.h"
#import "UINavigationController+FDFullscreenPopGesture.h"
// Include any system framework and library headers here that should be included in all compilation units.
// You will also need to set the Prefix Header build setting of one or more of your targets to reference this file.
......
Lighting/Tools/SceneViewController.m
View file @ c7d75cd2
......@@ -289,6 +289,7 @@
headerRefresh.lastUpdatedTimeLabel.hidden = YES;
self.sceneOrProductClollectionView.mj_header = headerRefresh;
[self.sceneOrProductClollectionView.mj_header beginRefreshing];
self.sceneOrProductClollectionView.mj_footer.automaticallyHidden = YES;
//上拉加载
self.sceneOrProductClollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
......@@ -381,7 +382,7 @@
headerRefresh.lastUpdatedTimeLabel.hidden = YES;
self.sceneOrProductClollectionView.mj_header = headerRefresh;
[self.sceneOrProductClollectionView.mj_header beginRefreshing];
self.sceneOrProductClollectionView.mj_footer.automaticallyHidden = YES;
//上拉加载
self.sceneOrProductClollectionView.mj_footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
......
Lighting/Tools/ShoppingBagViewController.m
View file @ c7d75cd2
......@@ -147,7 +147,7 @@
self.totalSelectedButton.selected = NO;
}
[self CalculateSelectedGoodsAllprice];
[self.sureButton setTitle:[NSString stringWithFormat:@"去结算(%ld)",goodsNumber] forState:UIControlStateNormal];
[self.sureButton setTitle:[NSString stringWithFormat:@"确认添加(%ld)",goodsNumber] forState:UIControlStateNormal];
}
#pragma mark -计算选中后的商品总金额
......
Lighting/podfile
View file @ c7d75cd2
platform:ios,'9.0'
pod 'FDFullscreenPopGesture', '~> 1.1'
pod 'MBProgressHUD', '~> 0.9.2'
pod 'SVProgressHUD', '~> 2.0.3'
pod 'IQKeyboardManager', '~> 4.0.0’
......
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