完成JDECard

Class/CardAmplificationViewController.m

@@ -36,6 +36,7 @@
 
 - (void)viewWillAppear:(BOOL)animated
 {
+    [super viewWillAppear:animated];
     self.view.superview.layer.cornerRadius = 15;
 }
 
@@ -81,7 +82,7 @@
     self.cardNumberLabel.text = _cardModel.cardNumber;
     self.cardPasswordLabel.text = _cardModel.cardPassword;
     //是否已查看
-    if ([_cardModel.state isEqualToString:@"looked"]) {
+    if ([_cardModel.state isEqualToString:LOOKED]) {
         [self.maskView removeFromSuperview];
     }
     self.amountLabel.text = [NSString stringWithFormat:@"￥%ld",_cardModel.denomation];

Class/CardAmplificationViewController.xib

@@ -68,8 +68,9 @@
                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12362514" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z4q-vO-5Wt">
+                <label opaque="NO" userInteractionEnabled="NO" alpha="0.29999999999999999" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="12362514" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="z4q-vO-5Wt">
                     <rect key="frame" x="18" y="265" width="110" height="26"/>
+                    <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="26" id="6fp-21-x2D"/>
                         <constraint firstAttribute="width" constant="110" id="yD7-fO-xTg"/>
@@ -78,15 +79,15 @@
                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" alpha="0.75" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="京东E卡" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CGQ-Gi-Un9">
+                <label opaque="NO" userInteractionEnabled="NO" alpha="0.75" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text=" 京东E卡" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CGQ-Gi-Un9">
                     <rect key="frame" x="18" y="11" width="120" height="24"/>
-                    <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                     <constraints>
                         <constraint firstAttribute="width" constant="120" id="AQS-uq-zTE"/>
                         <constraint firstAttribute="height" constant="24" id="zGQ-E9-8sS"/>
                     </constraints>
                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                    <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="￥100" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0aw-rU-2w8">

Class/CardBeenUseViewController.m

@@ -155,13 +155,10 @@
 
 - (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
 {
-    if (kind == UICollectionElementKindSectionHeader) {
     CardOrderInformationReusableView *headerView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"CardOrderInformationReusableView" forIndexPath:indexPath];
     headerView.model = self.datasArray[indexPath.section];
     headerView.uploadReceiptsButton.hidden = true;
     return headerView;
-    }
-    return nil;
 }
 
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section

Class/CardCollectionViewCell.m

@@ -31,7 +31,7 @@
     self.cardNumberLabel.text = _Cardmodel.cardNumber;
     self.cardPasswordLabel.text = _Cardmodel.cardPassword;
     //是否已查看
-    if ([_Cardmodel.state isEqualToString:@"looked"]) {
+    if ([_Cardmodel.state isEqualToString:LOOKED]) {
         [self.maskView removeFromSuperview];
     }
     self.amountLabel.text = [NSString stringWithFormat:@"￥%ld",_Cardmodel.denomation];

Class/CardDontUseViewController.m

@@ -154,14 +154,11 @@
 
 - (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString *)kind atIndexPath:(NSIndexPath *)indexPath
 {
-    if (kind == UICollectionElementKindSectionHeader) {
     CardOrderInformationReusableView *headerView = [collectionView dequeueReusableSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"CardOrderInformationReusableView" forIndexPath:indexPath];
     headerView.delegate = self;
     headerView.model = self.datasArray[indexPath.section];
     headerView.sectionIndex = indexPath.section;
     return headerView;
-    }
-    return nil;
 }
 
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section

Class/CardViewController.m

@@ -8,6 +8,7 @@
 
 #import "CardViewController.h"
 #import "CardCollectionViewCell.h"
+#import "CardDetailsViewController.h"
 
 @interface CardViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
 
@@ -29,9 +30,7 @@
         DataPage *page = [[DataPage alloc]init];
         page.page = 0;
         page.rows = 10;
-        page.order = @"desc";
         _requestModel.guideIdEquals = [Shoppersmanager manager].Shoppers.employee.fid;
-        _requestModel.stateEquals = @"dispensed";
         _requestModel.page = page;
     }
     return _requestModel;
@@ -47,6 +46,7 @@
 
 - (void)viewDidAppear:(BOOL)animated
 {
+    [super viewDidAppear:animated];
     [self getCardDatasAction];
 }
 
@@ -58,18 +58,17 @@
 - (void)getCardDatasAction
 {
     WS(weakSelf);
-    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CARDINFORMATION) WithRequestType:ZERO WithParameter:self.requestModel WithReturnValueBlock:^(id returnValue) {
+    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(QUERYALLJDECARD) WithRequestType:ZERO WithParameter:self.requestModel WithReturnValueBlock:^(id returnValue) {
         
-//        weakSelf.cardCollectionView.emptyDataSetSource = self;
-//        weakSelf.cardCollectionView.emptyDataSetDelegate = self;
+        weakSelf.cardCollectionView.emptyDataSetSource = weakSelf;
+        weakSelf.cardCollectionView.emptyDataSetDelegate = weakSelf;
         [weakSelf endRefreshingForTableView:weakSelf.cardCollectionView];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             [weakSelf.datasArray removeAllObjects];
-            RsJingDongECardResponse *cardInformation = [[RsJingDongECardResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
-            for (GroupByOrderNumber *order in cardInformation.list) {
-                for (TOJingdongEcardEntity *model in order.eCards) {
-                    [weakSelf.datasArray addObject:model];
-                }
+            
+            RsSimpleJingDongECardResponse *cardInformation = [[RsSimpleJingDongECardResponse alloc]initWithDictionary:returnValue[@"data"] error:nil];
+            for (TOJingdongEcardEntity *eCard in cardInformation.list) {
+                [weakSelf.datasArray addObject:eCard];
             }
             [weakSelf.cardCollectionView reloadData];
         }else{
@@ -96,21 +95,16 @@
     return cell;
 }
 
-
-#pragma mark -友好界面
-- (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
-{
-    return kNoDataImage;
-}
-
-- (BOOL)emptyDataSetShouldAllowScroll:(UIScrollView *)scrollView
+- (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
 {
-    return YES;
+    CardDetailsViewController *cardDetails = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"CardDetailsViewController"];
+    [self.navigationController pushViewController:cardDetails animated:YES];
 }
 
+#pragma mark -友好界面
 - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
 {
-    return [[NSAttributedString alloc]initWithString:@"暂无数据" attributes:nil];
+    return [[NSAttributedString alloc]initWithString:@"暂无卡劵记录~" attributes:nil];
 }
 
 @end

Class/ClientViewController.m

@@ -454,22 +454,24 @@
     MyclientEntityModel *customerEntity = [[MyclientEntityModel alloc]init];
     customerEntity = [Customermanager manager].model;
     customerEntity.picture = headerurl;
-    __weak typeof(self) weskSelf = self;
+    WS(weakSelf);
     [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(ADDCONSUMER) WithRequestType:0 WithParameter:customerEntity WithReturnValueBlock:^(id returnValue) {
         
-        [weskSelf RemoveMBProgressHUDLoding];
+        [weakSelf RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             block();
-            [weskSelf SuccessMBProgressView:@"修改成功"];
+            [weakSelf SuccessMBProgressView:@"修改成功"];
         }else
         {
-            [weskSelf ErrorMBProgressView:returnValue[@"message"]];
+            [weakSelf ErrorMBProgressView:returnValue[@"message"]];
         }
         
     } WithErrorCodeBlock:^(id errorCodeValue) {
-        [weskSelf RemoveMBProgressHUDLoding];
+        [weakSelf RemoveMBProgressHUDLoding];
+        [weakSelf ErrorMBProgressView:NETWORK];
     } WithFailureBlock:^(NSError *error) {
-        [weskSelf RemoveMBProgressHUDLoding];
+        [weakSelf RemoveMBProgressHUDLoding];
+        [weakSelf ErrorMBProgressView:error.localizedDescription];
     }];
 }
 

Class/CustomerManagementViewController.h

-//
-//  CustomerManagementViewController.h
-//  Lighting
-//
-//  Created by 曹云霄 on 16/5/4.
-//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
-//
-
-#import "BaseViewController.h"
-
-@interface CustomerManagementViewController : BaseViewController
-
-@end

Class/CustomerManagementViewController.m

-//
-//  CustomerManagementViewController.m
-//  Lighting
-//
-//  Created by 曹云霄 on 16/5/4.
-//  Copyright © 2016年 上海勾芒科技有限公司. All rights reserved.
-//
-
-#import "CustomerManagementViewController.h"
-
-@interface CustomerManagementViewController ()
-
-@end
-
-@implementation CustomerManagementViewController
-
-- (void)viewDidLoad {
-    [super viewDidLoad];
-    // Do any additional setup after loading the view.
-    self.view.backgroundColor = [UIColor greenColor];
-}
-
-- (void)didReceiveMemoryWarning {
-    [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
-}
-
-/*
-#pragma mark - Navigation
-
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
-
-@end

Class/CustomerOrderViewController.h

@@ -19,20 +19,17 @@
  */
 @property (weak, nonatomic) IBOutlet UITableView *customerOrderTableView;
 
-
 /**
  *  搜索客户订单
  */
 @property (weak, nonatomic) IBOutlet UITextField *searchCustomerOrder;
 
-
 /**
  *  订单状态排序背景
  */
 @property (weak, nonatomic) IBOutlet UIView *orderStateBackView;
 
 
-
 /**
  *  订单状态按钮
  */

Class/JDEcardViewController.h

@@ -10,4 +10,14 @@
 
 @interface JDEcardViewController : BaseViewController
 
+
+/**
+ *  JDE卡
+ */
+@property (weak, nonatomic) IBOutlet UIImageView *JDECardImageView;
+
+/**
+ *  dismiss
+ */
+@property (nonatomic,copy) void(^dismissJDECardBlock)();
 @end

Class/JDEcardViewController.m

@@ -16,22 +16,23 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-    // Do any additional setup after loading the view.
+    
+    [self.JDECardImageView addGestureRecognizer:[[UITapGestureRecognizer alloc]initWithTarget:self action:@selector(dismissJDECardImageView)]];
+}
+
+#pragma mark - dismiss
+- (void)dismissJDECardImageView
+{
+    if (self.dismissJDECardBlock) {
+        self.dismissJDECardBlock();
+    }
 }
 
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
-    // Dispose of any resources that can be recreated.
 }
 
-/*
-#pragma mark - Navigation
 
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
 
 @end

Class/Login/LoginViewController.m

@@ -14,6 +14,8 @@
 #import "ProductLibraryViewController.h"
 #import "AllCustomerViewController.h"
 #import "CustomerOrderViewController.h"
+#import <Bugly/Bugly.h>
+
 
 @interface LoginViewController ()<RightVCselectedDelegate>
 
@@ -199,6 +201,8 @@
         [weakSelf RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             
+            //设置检测用户标示
+            [Bugly setUserIdentifier:self.userName.text];
             
             //保持导购信息
             LoginResult *result = [[LoginResult alloc]initWithDictionary:returnValue[@"data"] error:nil];
@@ -217,15 +221,11 @@
         }
         
     } WithErrorCodeBlock:^(id errorCodeValue) {
-        
         [weakSelf RemoveMBProgressHUDLoding];
-        [weakSelf ErrorMBProgressView:@"网络中断"];
-        
+        [weakSelf ErrorMBProgressView:NETWORK];
     } WithFailureBlock:^(NSError *error) {
-        
-        [weakSelf ErrorMBProgressView:error.localizedDescription];
         [weakSelf RemoveMBProgressHUDLoding];
-        
+        [weakSelf ErrorMBProgressView:error.localizedDescription];
     }];
 }
 
@@ -243,8 +243,8 @@
         
     }else if ([Name isEqualToString:@"场景库"])
     {
-        selectedIndex = 6;
-        SceneLibraryViewController *sceneVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:6];
+        selectedIndex = 5;
+        SceneLibraryViewController *sceneVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:5];
         sceneVC.conditionModel.styleEquals = nil;
         sceneVC.conditionModel.spaceEquals = nil;
         [sceneVC.StyleButton setTitle:@"风格" forState:UIControlStateNormal];
@@ -253,8 +253,8 @@
        
     }else if ([Name isEqualToString:@"产品库"])
     {
-        selectedIndex = 5;
-        ProductLibraryViewController *productVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:5];
+        selectedIndex = 4;
+        ProductLibraryViewController *productVC = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:4];
         //默认加载全部数据
         productVC.barcode = nil;
         productVC.selectedCode = nil;
@@ -266,10 +266,6 @@
         productVC.condtionModel.endprice = nil;
         productVC.condtionModel.nameLike = nil;
         [productVC.productCollectionView.mj_header beginRefreshing];
-    }else if ([Name isEqualToString:@"客户管理"])
-    {
-       selectedIndex = 4;
-
     }else if ([Name isEqualToString:@"所有客户"])
     {
         selectedIndex = 3;
@@ -327,6 +323,7 @@
 #pragma mark -发送验证码
 - (void)SendButtonClick
 {
+    WS(weakSelf);
     NSString *inputPhoneNumber = self.identityView.bindingPhoneNumber.text;
     if (inputPhoneNumber.length == 0) {
         [self ErrorMBProgressView:@"手机号不能为空"];
@@ -340,25 +337,23 @@
     //发送验证码
     NSString *urlString = [NSString stringWithFormat:SERVERREQUESTURL(SENDSMS),inputPhoneNumber,self.identityView.userName.text];
     [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:urlString WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
-        [self RemoveMBProgressHUDLoding];
+        [weakSelf RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
-            [self ErrorMBProgressView:@"发送验证码成功"];
-            [self.identityView.SendButton setTitle:@"60" forState:UIControlStateNormal];
-            self.identityView.SendButton.enabled = NO;
-            self.sendTimer = [NSTimer scheduledTimerWithTimeInterval:1 target:self selector:@selector(SendbuttonChangetitle) userInfo:nil repeats:YES];
+            [weakSelf ErrorMBProgressView:@"发送验证码成功"];
+            [weakSelf.identityView.SendButton setTitle:@"60" forState:UIControlStateNormal];
+            weakSelf.identityView.SendButton.enabled = NO;
+            weakSelf.sendTimer = [NSTimer scheduledTimerWithTimeInterval:1 target:self selector:@selector(SendbuttonChangetitle) userInfo:nil repeats:YES];
         }else
         {
-            [self ErrorMBProgressView:returnValue[@"message"]];
+            [weakSelf ErrorMBProgressView:returnValue[@"message"]];
         }
     } WithErrorCodeBlock:^(id errorCodeValue) {
-        [self RemoveMBProgressHUDLoding];
-        [self ErrorMBProgressView:@"网络中断"];
+        [weakSelf RemoveMBProgressHUDLoding];
+        [weakSelf ErrorMBProgressView:NETWORK];
     } WithFailureBlock:^(NSError *error) {
-        [self ErrorMBProgressView:error.localizedDescription];
-        [self RemoveMBProgressHUDLoding];
+        [weakSelf RemoveMBProgressHUDLoding];
+        [weakSelf ErrorMBProgressView:error.localizedDescription];
     }];
-    
-
 }
 
 #pragma mark -倒计时

Class/OrderdetailsViewController.m

@@ -257,8 +257,12 @@ NSString *const lotteryAction = @"lotteryAction";
 #pragma mark - 显示京东E卡
 - (void)showJEDCard
 {
+    WS(weakSelf);
     JDEcardViewController *jdeCard = [[self getStoryboardWithName] instantiateViewControllerWithIdentifier:@"JDEcardViewController"];
-    jdeCard.preferredContentSize = CGSizeMake(345, 360);
+    [jdeCard setDismissJDECardBlock:^{
+        [weakSelf.settingsPopoverController dismissPopoverAnimated:YES];
+    }];
+    jdeCard.preferredContentSize = CGSizeMake(400, 247);
     self.settingsPopoverController = [[WYPopoverController alloc] initWithContentViewController:jdeCard];
     self.settingsPopoverController.popoverLayoutMargins = UIEdgeInsetsMake(10, 20, 10, 20);
     self.settingsPopoverController.wantsDefaultContentAppearance = NO;

Class/PaymentsViewController.m

@@ -65,6 +65,7 @@
 
 - (void)viewDidAppear:(BOOL)animated
 {
+    [super viewDidAppear:animated];
     [self.paymentsTableView.mj_header beginRefreshing];
 }
 

Class/ProductDetailsHeaderView.xib

@@ -84,13 +84,6 @@
                     <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="Rka-oV-nyM">
-                    <rect key="frame" x="588" y="151" width="163" height="20"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <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="530" y="227" width="56" height="17"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -112,22 +105,6 @@
                     <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="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="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="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="530" y="307" width="229" height="40"/>
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
@@ -146,6 +123,36 @@
                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <state key="normal" image="icon-2"/>
                 </button>
+                <view contentMode="scaleToFill" id="1dh-b6-rRU">
+                    <rect key="frame" x="588" y="220" width="116" height="30"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <subviews>
+                        <button opaque="NO" tag="101" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="SQd-9e-TXr">
+                            <rect key="frame" x="86" y="0.0" width="30" height="30"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="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="0.0" y="0.0" width="30" height="30"/>
+                            <autoresizingMask key="autoresizingMask" 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="33" y="0.0" width="50" height="30"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                            <textInputTraits key="textInputTraits"/>
+                        </textField>
+                    </subviews>
+                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                </view>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Rka-oV-nyM">
+                    <rect key="frame" x="588" y="151" width="163" height="20"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                    <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>
             </subviews>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>

Class/ProductDetailsViewController.m

@@ -92,9 +92,9 @@
     [self CreateMBProgressHUDLoding];
     NSString *url = [NSString stringWithFormat:@"%@%@",SERVERREQUESTURL(GOODSDETAILS),_goodsID];
     [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:url WithRequestType:1 WithParameter:nil WithReturnValueBlock:^(id returnValue) {
+        
         [weakSelf RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
-            
            weakSelf.entity = [[TOGoodsEntity alloc]initWithDictionary:returnValue[@"data"] error:nil];
             [weakSelf.productDetilsTableview reloadData];
             [weakSelf HeaderViewAssignment];
@@ -105,7 +105,7 @@
         }
     } WithErrorCodeBlock:^(id errorCodeValue) {
         [weakSelf RemoveMBProgressHUDLoding];
-        [weakSelf ErrorMBProgressView:@"无网络"];
+        [weakSelf ErrorMBProgressView:NETWORK];
          
     } WithFailureBlock:^(NSError *error) {
         [weakSelf RemoveMBProgressHUDLoding];
@@ -125,10 +125,8 @@
     //放大
     [self.headerView.amplificationButton addTarget:self action:@selector(amplificationButtonClick) forControlEvents:UIControlEventTouchUpInside];
     self.productDetilsTableview.tableHeaderView = self.headerView;
-    
     //添加至购物车
     [self.headerView.addGoodsShoppingbagsButton addTarget:self action:@selector(addGoodsShoppingbags:) forControlEvents:UIControlEventTouchUpInside];
-    
 }
 
 #pragma mark -header赋值
@@ -193,7 +191,6 @@
 }
 
 
-
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
 {
     if (indexPath.section == 0) {
@@ -202,14 +199,10 @@
         cell.datas = self.entity;
         return cell;
         
-    }else if (indexPath.section == 1)
-    {
+    }
     goodsDetailsTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"goodsdetailscell" forIndexPath:indexPath];
     [cell.detailsImageView sd_setImageWithURL:[NSURL URLWithString:[self.goodsDetailsArray objectAtIndex_opple:indexPath.row][@"image"]] placeholderImage:TCImage(@"bg-big")];
-        
     return cell;
-    }
-    return nil;
 }
 
 
@@ -244,7 +237,6 @@
 
 - (UIView *)tableView:(UITableView *)tableView viewForHeaderInSection:(NSInteger)section
 {
-    
     goodsDetailsSectionview *sectionView = [[[NSBundle mainBundle] loadNibNamed:@"goodsDetailsSectionview" owner:self options:nil] firstObject];
     sectionView.goodSectionLabe.text = section?@"图文详情":@"商品参数";
     return sectionView;
@@ -359,7 +351,6 @@
     animGroup.delegate = self;
     [imageView.layer addAnimation:animGroup forKey:nil];
     [self performSelector:@selector(removeFromLayer:) withObject:imageView.layer afterDelay:1];
-    
 }
 
 #pragma mark -动画完成后移除
@@ -393,8 +384,10 @@
     shopCar.goodsId = _goodsID;
     shopCar.count = self.headerView.goodsNumber.text;
     WS(weakSelf);
+    [self CreateMBProgressHUDLoding];
     [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(ADDSHOPPINGBAG) WithRequestType:0 WithParameter:shopCar WithReturnValueBlock:^(id returnValue) {
     
+        [weakSelf RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
             NSLog(@"添加购物车成功");
             [weakSelf StartAddShoppingCarAnimationWithimage:weakSelf.headerView.goodsImageview.image withStartpoint:[weakSelf.headerView convertPoint:[weakSelf.headerView.goodsImageview center] toView:weakSelf.view.window] withSize:weakSelf.headerView.goodsImageview.frame.size];
@@ -407,6 +400,7 @@
         [weakSelf RemoveMBProgressHUDLoding];
         [weakSelf ErrorMBProgressView:NETWORK];
     } WithFailureBlock:^(id error) {
+        [weakSelf RemoveMBProgressHUDLoding];
         [weakSelf ErrorMBProgressView:@"添加购物车失败"];
     }];
 }
@@ -419,7 +413,6 @@
     return[scan scanInt:&val] && [scan isAtEnd];
 }
 
-
 - (void)dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self];

Class/RebateViewController.m

@@ -88,6 +88,7 @@
 
 - (void)viewDidAppear:(BOOL)animated
 {
+    [super viewDidAppear:animated];
     [self getRebateDatasFromUser];
 }
 

Class/SceneLibraryViewController.m

@@ -317,7 +317,7 @@
 - (void)returnWithIndexSelected:(NSInteger)selectedIndex
 {
 
-    NSInteger showcellNumber;
+    NSInteger showcellNumber = 0;
     switch (selectedIndex) {
         case 0:
         {

Class/SearchViewController.m

@@ -181,14 +181,9 @@
         cell.searchLabe.text = [self.localSearchArray objectAtIndex_opple:indexPath.item];
         return cell;
     }
-    if ([collectionView isEqual:self.hotCollectionView]) {
-        
     HotCollectionViewCell  *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"secondcell" forIndexPath:indexPath];
     cell.responseDatas = [self.response.list objectAtIndex_opple:indexPath.item];
     return cell;
-    }
-    
-    return nil;
 }
 
 - (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section

Class/SettlementViewController.m

@@ -138,6 +138,7 @@
 
 - (void)viewWillAppear:(BOOL)animated
 {
+    [super viewWillAppear:animated];
     self.view.superview.layer.cornerRadius = 0;
 }
 
@@ -359,10 +360,11 @@
         
         [weakSelf RemoveMBProgressHUDLoding];
         if ([returnValue[@"code"] isEqualToNumber:@0]) {
+            [weakSelf dismissViewControllerAnimated:YES completion:^{
                 if (weakSelf.PaySuccessReturnBlock) {
                     weakSelf.PaySuccessReturnBlock();
                 }
-            [weakSelf dismissViewControllerAnimated:YES completion:nil];
+            }];
         }else{
             [weakSelf ErrorMBProgressView:returnValue[@"message"]];
         }

Class/Shoppingcart/AddressViewController.m

@@ -89,6 +89,7 @@
 #pragma mark -取消弹出的圆角
 - (void)viewWillAppear:(BOOL)animated
 {
+    [super viewWillAppear:animated];
     self.view.superview.layer.cornerRadius = 0;
 }
 

Class/Shoppingcart/GenerateOrdersViewController.m

@@ -199,8 +199,6 @@
         cell.NewModel = [self.datasArray objectAtIndex_opple:indexPath.section][indexPath.row];
         return cell;
     }
-    else if (indexPath.section == 2)
-    {
     NSArray *Addressarr = [self.datasArray objectAtIndex_opple:indexPath.section];
     if (indexPath.row == Addressarr.count-1) {
         
@@ -213,8 +211,6 @@
     cell.selectionStyle = UITableViewCellSelectionStyleNone;
     cell.model = [self.datasArray objectAtIndex_opple:indexPath.section][indexPath.row];
     return cell;
-    }
-    return nil;
 }
 
 

Class/Tabbar/CustomTabbarController.m

@@ -12,7 +12,6 @@
 #import "AppDelegate.h"
 #import "SceneLibraryViewController.h"
 #import "ProductLibraryViewController.h"
-#import "CustomerManagementViewController.h"
 #import "AboutViewController.h"
 #import "AllCustomerViewController.h"
 #import "CustomerOrderViewController.h"
@@ -57,7 +56,7 @@
 {
     if (_identifierArray == nil) {
         
-        _identifierArray = [NSArray arrayWithObjects:@"searchvc",@"shopping",@"Client",@"followheart",@"scenelibrary",@"productlibrary",@"customermanager",@"allcustomer",@"customerorder",@"about", nil];
+        _identifierArray = [NSArray arrayWithObjects:@"searchvc",@"shopping",@"Client",@"followheart",@"scenelibrary",@"productlibrary",@"allcustomer",@"customerorder",@"about", nil];
     }
     return _identifierArray;
 }
@@ -123,10 +122,9 @@
     ClientViewController *clientVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:2]];
     SceneLibraryViewController *sceneVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:4]];
     ProductLibraryViewController *productVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:5]];
-    CustomerManagementViewController *customerVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:6]];
-    AllCustomerViewController *allcustomerVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:7]];
-    CustomerOrderViewController *customerOrderVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:8]];
-    AboutViewController *aboutVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:9]];
+    AllCustomerViewController *allcustomerVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:6]];
+    CustomerOrderViewController *customerOrderVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:7]];
+    AboutViewController *aboutVC = [storyboard instantiateViewControllerWithIdentifier:[self.identifierArray objectAtIndex_opple:8]];
     //2016年08月26日15:13:04新增返利
     RebateViewController *rebateVC = [storyboard instantiateViewControllerWithIdentifier:@"RebateViewController"];
     
@@ -136,16 +134,15 @@
     UINavigationController *clientNav = [[UINavigationController alloc]initWithRootViewController:clientVC];
     UINavigationController *sceneNav = [[UINavigationController alloc]initWithRootViewController:sceneVC];
     UINavigationController *productNav = [[UINavigationController alloc]initWithRootViewController:productVC];
-    UINavigationController *customerNav = [[UINavigationController alloc]initWithRootViewController:customerVC];
     UINavigationController *allcustomerNav = [[UINavigationController alloc]initWithRootViewController:allcustomerVC];
     UINavigationController *cutomerorderNav = [[UINavigationController alloc]initWithRootViewController:customerOrderVC];
     UINavigationController *aboutNav = [[UINavigationController alloc]initWithRootViewController:aboutVC];
     UINavigationController *rebateNav = [[UINavigationController alloc]initWithRootViewController:rebateVC];
     
-    self.vcArray = [NSArray arrayWithObjects:rebateNav,aboutNav,cutomerorderNav,allcustomerNav,customerNav,productNav,sceneNav,clientNav,shoppingNav,searchNav, nil];
+    self.vcArray = [NSArray arrayWithObjects:rebateNav,aboutNav,cutomerorderNav,allcustomerNav,productNav,sceneNav,clientNav,shoppingNav,searchNav, nil];
     self.viewControllers = self.vcArray;
-    SHARED_APPDELEGATE.allControllerArray = [NSArray arrayWithObjects:rebateVC,aboutVC,customerOrderVC,allcustomerVC,customerVC,productVC,sceneVC,clientVC,shoppingVC,searchVC, nil];
-    self.selectedIndex = 7;
+    SHARED_APPDELEGATE.allControllerArray = [NSArray arrayWithObjects:rebateVC,aboutVC,customerOrderVC,allcustomerVC,productVC,sceneVC,clientVC,shoppingVC,searchVC, nil];
+    self.selectedIndex = 6;
 }
 
 
@@ -194,7 +191,7 @@
             //我的客户
         case 102:
             
-            self.selectedIndex = 7;
+            self.selectedIndex = 6;
             
             break;
             
@@ -216,7 +213,7 @@
             }else
             {
                 
-                self.selectedIndex = 8;
+                self.selectedIndex = 7;
             }
             
             break;
@@ -265,7 +262,7 @@
 #pragma mark -二维码扫描
 - (void)QrcodeButtonClick
 {
-    __weak typeof(self) weakSelf = self;
+    WS(weakSelf);
     //判断权限
     AVAuthorizationStatus status = [AVCaptureDevice authorizationStatusForMediaType:AVMediaTypeVideo];
     if(status !=AVAuthorizationStatusAuthorized) {
@@ -283,11 +280,11 @@
         
     }else {
         QRViewController *qrVC = [[QRViewController alloc] initWithScanCompleteHandler:^(NSString *url) {
-            [self dismissViewControllerAnimated:YES completion:^{
+            [weakSelf dismissViewControllerAnimated:YES completion:^{
                 
                 ProductLibraryViewController *product = [SHARED_APPDELEGATE.allControllerArray objectAtIndex_opple:4];
                 product.barcode = url;
-                self.selectedIndex = 4;
+                weakSelf.selectedIndex = 3;
             }];
         }];
         dispatch_async(dispatch_get_main_queue(), ^{
@@ -302,8 +299,7 @@
 {
     //返回根视图
     [[NSNotificationCenter defaultCenter] postNotificationName:POPROOTCONTROLLER object:nil];
-    self.selectedIndex = 9;
-    
+    self.selectedIndex = 8;
     return YES;
 }
 
@@ -346,7 +342,7 @@
     if (![Shoppersmanager manager].currentCustomer) {
         
         MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.view.window animated:YES];
-        hud.labelText = @"必须设置当前客户才能访问购物车";
+        hud.labelText = @"必须设置当前客户才能访问体验中心";
         hud.margin = 10.f;
         hud.color = [[UIColor blackColor] colorWithAlphaComponent:0.5];
         hud.minSize = CGSizeMake(200, 50);

Class/WithdrawalViewController.m

@@ -64,6 +64,7 @@
 
 - (void)viewDidAppear:(BOOL)animated
 {
+    [super viewDidAppear:animated];
     [self.withdrawalTableView.mj_header beginRefreshing];
 }
 

Lighting.xcodeproj/project.pbxproj

@@ -135,7 +135,6 @@
 		29BB27681CD9D38E009A0813 /* AllpriceTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BB27671CD9D38E009A0813 /* AllpriceTableViewCell.m */; };
 		29BB27741CD9DFAC009A0813 /* SceneLibraryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BB27731CD9DFAC009A0813 /* SceneLibraryViewController.m */; };
 		29BB27771CD9DFBA009A0813 /* ProductLibraryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BB27761CD9DFBA009A0813 /* ProductLibraryViewController.m */; };
-		29BB277D1CD9DFCB009A0813 /* CustomerManagementViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BB277C1CD9DFCB009A0813 /* CustomerManagementViewController.m */; };
 		29BB27801CD9DFD7009A0813 /* AboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BB277F1CD9DFD7009A0813 /* AboutViewController.m */; };
 		29BFBD871CE428B200C238FB /* Customermanager.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BFBD861CE428B200C238FB /* Customermanager.m */; };
 		29BFBD8F1CE44BA900C238FB /* goodsDetailsSectionview.m in Sources */ = {isa = PBXBuildFile; fileRef = 29BFBD8E1CE44BA900C238FB /* goodsDetailsSectionview.m */; };
@@ -426,8 +425,6 @@
 		29BB27731CD9DFAC009A0813 /* SceneLibraryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SceneLibraryViewController.m; sourceTree = "<group>"; };
 		29BB27751CD9DFBA009A0813 /* ProductLibraryViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProductLibraryViewController.h; sourceTree = "<group>"; };
 		29BB27761CD9DFBA009A0813 /* ProductLibraryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProductLibraryViewController.m; sourceTree = "<group>"; };
-		29BB277B1CD9DFCB009A0813 /* CustomerManagementViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomerManagementViewController.h; sourceTree = "<group>"; };
-		29BB277C1CD9DFCB009A0813 /* CustomerManagementViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomerManagementViewController.m; sourceTree = "<group>"; };
 		29BB277E1CD9DFD7009A0813 /* AboutViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutViewController.h; sourceTree = "<group>"; };
 		29BB277F1CD9DFD7009A0813 /* AboutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutViewController.m; sourceTree = "<group>"; };
 		29BFBD851CE428B200C238FB /* Customermanager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Customermanager.h; sourceTree = "<group>"; };
@@ -1343,7 +1340,6 @@
 			children = (
 				29EAAE9D1CDC79C500C4DBA2 /* CustomerOrder */,
 				29EAAE991CDC74A700C4DBA2 /* AllCustomer */,
-				29EAAE981CDC749E00C4DBA2 /* controller */,
 			);
 			name = CustomerManagementVC;
 			sourceTree = "<group>";
@@ -1502,15 +1498,6 @@
 			name = view;
 			sourceTree = "<group>";
 		};
-		29EAAE981CDC749E00C4DBA2 /* controller */ = {
-			isa = PBXGroup;
-			children = (
-				29BB277B1CD9DFCB009A0813 /* CustomerManagementViewController.h */,
-				29BB277C1CD9DFCB009A0813 /* CustomerManagementViewController.m */,
-			);
-			name = controller;
-			sourceTree = "<group>";
-		};
 		29EAAE991CDC74A700C4DBA2 /* AllCustomer */ = {
 			isa = PBXGroup;
 			children = (
@@ -1930,7 +1917,6 @@
 				29834EC51CDF76C1001A484F /* UserViewController.m in Sources */,
 				29A974CA1D72F9C80012AFA1 /* RebateSuccessTableViewController.m in Sources */,
 				29E2D3271DB88D8B00443170 /* CardOrderInformationReusableView.m in Sources */,
-				29BB277D1CD9DFCB009A0813 /* CustomerManagementViewController.m in Sources */,
 				2962D06D1CD1A43A0058829D /* ClientViewController.m in Sources */,
 				29A8D3981CD85A58004D558F /* ClientdetailsViewController.m in Sources */,
 			);
@@ -2043,8 +2029,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
 				CLANG_ENABLE_OBJC_WEAK = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
+				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
 				COMPRESS_PNG_FILES = NO;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@@ -2086,7 +2072,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "ce8104e7-12c7-4aa2-a135-c4d3731e559c";
+				PROVISIONING_PROFILE = "10361169-d429-4810-90f6-528335fe4062";
 				STRIP_PNG_TEXT = NO;
 				TARGETED_DEVICE_FAMILY = 2;
 				USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";
@@ -2100,8 +2086,8 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "Brand Assets";
 				CLANG_ENABLE_OBJC_WEAK = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: 云霄 曹 (WM8ZU7YY98)";
+				CODE_SIGN_IDENTITY = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Shanghai Gomore Information Technology Co.,Ltd";
 				COMPRESS_PNG_FILES = NO;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
@@ -2143,7 +2129,7 @@
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.gomore.opple;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "ce8104e7-12c7-4aa2-a135-c4d3731e559c";
+				PROVISIONING_PROFILE = "10361169-d429-4810-90f6-528335fe4062";
 				STRIP_PNG_TEXT = NO;
 				TARGETED_DEVICE_FAMILY = 2;
 				USER_HEADER_SEARCH_PATHS = "$(PODS_ROOT)/**";

Lighting/Images.xcassets/JDECard.imageset/Contents.json → Lighting/Images.xcassets/NewJDECard.imageset/Contents.json

@@ -2,7 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "JDECard.png",
+      "filename" : "NewJDECard.png",
       "scale" : "1x"
     },
     {

Lighting/Info.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleName</key>
 	<string>欧立方</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.2</string>
+	<string>1.1.3</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

Tools/CYConstManager.h

@@ -242,6 +242,11 @@ extern NSString *const ACTIVIATIONJDECARD;
  *  领取京东E卡
  */
 extern NSString *const  RECEIVEJDECARD;
+
+/**
+ *  查询所有京东E卡
+ */
+extern NSString *const QUERYALLJDECARD;
 /*****************************************接口地址*****************************************/
 
 

Tools/CYConstManager.m

@@ -241,6 +241,11 @@ NSString *const ACTIVIATIONJDECARD = @"/jingdongecard/active?orderNumber=%@&orde
  *  领取京东E卡
  */
 NSString *const  RECEIVEJDECARD = @"/jingdongecard/look?cardNumber=%@";
+
+/**
+ *  查询所有京东E卡
+ */
+NSString *const QUERYALLJDECARD = @"/jingdongecard/simpleQuery";
 /*****************************************接口地址*****************************************/
 
 
@@ -267,7 +272,7 @@ NSString *const ACTIVED = @"actived";
 /**
  *  京东卡状态<查看>
  */
-NSString *const LOOKED = @"looked";
+NSString *const LOOKED = @"used";
 
 /**
  *  更新购物车商品

Tools/PrefixHeader.pch

@@ -115,12 +115,12 @@
 /**
  *  服务器开发地址
  */
-#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]
 
 /**
  *  服务器测试地址
  */
-//#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
+#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
 
 ///**
 // *  服务器正式地址
@@ -142,19 +142,16 @@
  */
 #define SEARCHHISTORY @"searchhistory"
 
-
 /**
  *  默认图
  */
 #define REPLACEIMAGE [UIImage imageNamed:@"bg-img 副本"]
 
-
 /**
  *  刷新购物车通知
  */
 #define REFRESHSHOPPINGCAR @"GOODSNUMBER"
 
-
 /**
  *  保存用户名key
  */
@@ -165,7 +162,6 @@
  */
 #define PASSWORD @"password"
 
-
 /**
  *  网络请求返回个数
  */

Tools/ShoppingBagViewController.m

@@ -351,22 +351,12 @@
     return YES;
 }
 
-
-
-
-
-
-
-
-
-
 #pragma mark -友好界面
 - (UIImage *)imageForEmptyDataSet:(UIScrollView *)scrollView
 {
     return kNoDataImage;
 }
 
-
 - (NSAttributedString *)titleForEmptyDataSet:(UIScrollView *)scrollView
 {
     return [[NSAttributedString alloc]initWithString:@"暂无数据" attributes:nil];

Tools/opple_objc_json_client.h

@@ -33,6 +33,7 @@ extern NSString * const SORTDIRECTION_DESC;
 @class GoodsFilter;
 @class HotFilter;
 @class RsJingDongECardRequest;
+@class RsSimpleJingDongECardRequest;
 @class Draw;
 @class RsLotteryRequest;
 @class OrderFilter;
@@ -76,6 +77,7 @@ extern NSString * const SORTDIRECTION_DESC;
 @class EarningsResponse;
 @class ApplyRequest;
 @class RsJingDongECardResponse;
+@class RsSimpleJingDongECardResponse;
 @class TSBaseUser;
 @class TSDepart;
 @class OrderResponse;
@@ -102,6 +104,7 @@ extern NSString * const SORTDIRECTION_DESC;
 @protocol GoodsFilter @end
 @protocol HotFilter @end
 @protocol RsJingDongECardRequest @end
+@protocol RsSimpleJingDongECardRequest @end
 @protocol Draw @end
 @protocol RsLotteryRequest @end
 @protocol OrderFilter @end
@@ -145,6 +148,7 @@ extern NSString * const SORTDIRECTION_DESC;
 @protocol EarningsResponse @end
 @protocol ApplyRequest @end
 @protocol RsJingDongECardResponse @end
+@protocol RsSimpleJingDongECardResponse @end
 @protocol TSBaseUser @end
 @protocol TSDepart @end
 @protocol OrderResponse @end
@@ -492,6 +496,32 @@ extern NSString * const SORTDIRECTION_DESC;
 
 
 
+/**
+ * (no documentation provided)
+ */
+@interface RsSimpleJingDongECardRequest : JSONModel
+/**
+ * (no documentation provided)
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *guideIdEquals;
+/**
+ * (no documentation provided)
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *stateEquals;
+/**
+ * (no documentation provided)
+ *
+ *
+ */
+@property (nonatomic, strong) DataPage *page;
+@end /* interface RsSimpleJingDongECardRequest */
+
+
+
 /**
  *  查询京东E卡对象
  
@@ -3044,6 +3074,24 @@ extern NSString * const SORTDIRECTION_DESC;
 
 
 
+/**
+ *  查询京东E卡分页
+ 
+ @author nevermore
+ @since 0.1
+ 
+ */
+@interface RsSimpleJingDongECardResponse : PageRows
+/**
+ * (no documentation provided)
+ * @see TOJingdongEcardEntity
+ *
+ */
+@property (nonatomic, strong) NSArray<TOJingdongEcardEntity> *list;
+@end /* interface RsSimpleJingDongECardResponse */
+
+
+
 /**
  *  系统用户父类表
  @author  张代浩

Tools/opple_objc_json_client.m

@@ -169,6 +169,19 @@
 }
 
 
+@end
+
+@implementation RsSimpleJingDongECardRequest
+@synthesize guideIdEquals;
+@synthesize stateEquals;
+@synthesize page;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+    return YES;
+}
+
+
 @end
 
 @implementation Draw
@@ -1119,6 +1132,17 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 }
 
 
+@end
+
+@implementation RsSimpleJingDongECardResponse
+@synthesize list;
+
++(BOOL)propertyIsOptional:(NSString*)propertyName
+{
+    return YES;
+}
+
+
 @end
 
 @implementation TSBaseUser