修改项说明：修复提示框

Class/CardBeenUseViewController.m

@@ -36,8 +36,8 @@
     if (!_requestModel) {
         _requestModel = [[RsJingDongECardRequest alloc]init];
         DataPage *page = [[DataPage alloc]init];
-        page.page = 0;
-        page.rows = 10;
+        page.page = ZERO;
+        page.rows = KROWS;
         page.order = @"desc";
         _requestModel.guideIdEquals = [Shoppersmanager manager].Shoppers.employee.fid;
         _requestModel.stateEquals = self.cardState;
@@ -72,7 +72,7 @@
 {
     WS(weakSelf);
     MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
-        weakSelf.requestModel.page.page = 0;
+        weakSelf.requestModel.page.page = ZERO;
         [weakSelf.beenUseCardCollectionView.mj_footer resetNoMoreData];
         [weakSelf getCardDatasAction:YES];
     }];
@@ -81,7 +81,7 @@
     self.beenUseCardCollectionView.mj_header = headerRefresh;
     
     MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
-        if (++ weakSelf.requestModel.page.page >= weakSelf.totalPage) {
+        if (++ weakSelf.requestModel.page.page > weakSelf.totalPage) {
             [weakSelf.beenUseCardCollectionView.mj_footer endRefreshingWithNoMoreData];
         }else
         {

Class/CardDontUseViewController.m

@@ -43,7 +43,7 @@
         _requestModel = [[RsJingDongECardRequest alloc]init];
         DataPage *page = [[DataPage alloc]init];
         page.page = ZERO;
-        page.rows = 10;
+        page.rows = KROWS;
         page.order = @"desc";
         _requestModel.guideIdEquals = [Shoppersmanager manager].Shoppers.employee.fid;
         _requestModel.stateEquals = DISPENSED;
@@ -90,7 +90,7 @@
 {
     WS(weakSelf);
     MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
-        weakSelf.requestModel.page.page = 0;
+        weakSelf.requestModel.page.page = ZERO;
         [weakSelf.dontUseCardCollectionView.mj_footer resetNoMoreData];
         [weakSelf getCardDatasAction:YES];
     }];
@@ -99,7 +99,7 @@
     self.dontUseCardCollectionView.mj_header = headerRefresh;
     
     MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
-        if (++ weakSelf.requestModel.page.page >= weakSelf.totalPage) {
+        if (++ weakSelf.requestModel.page.page > weakSelf.totalPage) {
             [weakSelf.dontUseCardCollectionView.mj_footer endRefreshingWithNoMoreData];
         }else
         {

Class/CardViewController.m

@@ -31,8 +31,8 @@
     if (!_requestModel) {
         _requestModel = [[RsJingDongECardRequest alloc]init];
         DataPage *page = [[DataPage alloc]init];
-        page.page = 0;
-        page.rows = 10;
+        page.page = ZERO;
+        page.rows = KROWS;
         _requestModel.guideIdEquals = [Shoppersmanager manager].Shoppers.employee.fid;
         _requestModel.page = page;
     }

Class/LuckyDrawDetailsViewController.m

@@ -40,7 +40,7 @@
         _drawModel.winnerIdEquals = [Shoppersmanager manager].Shoppers.employee.fid;
         DataPage *page = [[DataPage alloc]init];
         page.rows = KROWS;
-        page.page = ZERO;
+        page.page = ONE;
         page.order = SORTDIRECTION_DESC;
         _drawModel.page = page;
         switch (self.drawValue) {
@@ -105,7 +105,7 @@
 {
     WS(weakSelf);
     MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
-        weakSelf.drawModel.page.page = ZERO;
+        weakSelf.drawModel.page.page = ONE;
         [weakSelf.drawDetailsTableView.mj_footer resetNoMoreData];
         [weakSelf getDrawDatas:YES];
     }];
@@ -113,7 +113,7 @@
     headerRefresh.lastUpdatedTimeLabel.hidden = YES;
     self.drawDetailsTableView.mj_header = headerRefresh;
     MJRefreshAutoNormalFooter *footer = [MJRefreshAutoNormalFooter footerWithRefreshingBlock:^{
-        if (++ weakSelf.drawModel.page.page >= weakSelf.totalPage) {
+        if (++ weakSelf.drawModel.page.page > weakSelf.totalPage) {
             [weakSelf.drawDetailsTableView.mj_footer endRefreshingWithNoMoreData];
         }else
         {

Class/LuckyDrawModel.h

@@ -29,6 +29,7 @@
 /// 优先
 @property (nonatomic,copy) NSString *priority;
 
+
 @end
 
 

Class/OrderdetailsViewController.m

@@ -260,13 +260,19 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
                         deductionModel.type = @"deductionAction";
                         [weakSelf.promotionalArray addObject:deductionModel];
                         
-                    }else if (![BaseViewController isBlankString:[oldPromotion.jdecardDenomation stringValue]]) {
+                    } else if (![BaseViewController isBlankString:[oldPromotion.jdecardDenomation stringValue]]) {
                         /// 判断京东E卡
                         PromotionalDeductionModel *model = [[PromotionalDeductionModel alloc]init];
                         model.total = [oldPromotion.jdecardDenomation integerValue];
                         model.body = GUIDE;
                         model.type = JDECardAction;
                         [weakSelf.luckyDrawAndJDECardArray addObject:model];
+        
+                    } else if (![BaseViewController isBlankString:[oldPromotion.redPackageCount stringValue]]) {
+                        /// 导购抽奖数
+                        LuckyDrawModel *model = [[LuckyDrawModel alloc]init];
+                        model.body = GUIDE;
+                        [weakSelf.luckyDrawAndJDECardArray addObject:model];
                     }
                 }
             }
@@ -547,7 +553,6 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
             [weakSelf queryGuideLuckyDrawChanceisTrue:^{
                 isGuideDraw = YES;
             }];
-        }];
             /// 弹出框
             if (isJDEcard && isGuideDraw) {
                 [weakSelf rebateApplySuccess:@"京东E卡、抽奖机会已放到你的账户"];
@@ -557,6 +562,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
                 [weakSelf rebateApplySuccess:@"抽奖机会已放到你的账户"];
             }
         }];
+    }];
 }
 
 #pragma mark - 抽奖界面

Class/PaymentsViewController.m

@@ -40,7 +40,7 @@
     if (!_model) {
         _model = [[RsCommissionRequest alloc]init];
         DataPage *page = [[DataPage alloc]init];
-        page.page = ZERO;
+        page.page = ONE;
         page.rows = KROWS;
         _model.page = page;
         _model.emploreeId = [Shoppersmanager manager].Shoppers.employee.fid;
@@ -74,7 +74,7 @@
 {
     WS(weakSelf);
     MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
-        weakSelf.model.page.page = 0;
+        weakSelf.model.page.page = ONE;
         [weakSelf.paymentsTableView.mj_footer resetNoMoreData];
         [weakSelf getDatasAction:YES];
     }];

Class/ProductLibraryViewController.m

@@ -201,7 +201,7 @@
 #pragma mark -布局
 - (void)uiConfigAction
 {
-    self.indexPage = 1;
+    self.indexPage = ONE;
     self.selectedIndex = 9999;//无任何意义
     self.productCollectionLayout.itemSize = CGSizeMake((ScreenWidth-100)/3, (ScreenWidth-100)/3);
     self.productCollectionLayout.sectionInset = UIEdgeInsetsMake(20, 30, 20, 30);
@@ -226,10 +226,10 @@
         {
             //分页数据
             DataPage *Newpage = [[DataPage alloc]init];
-            Newpage.page = 1;
+            Newpage.page = ONE;
             Newpage.rows = KROWS;
             weakSelf.condtionModel.page = Newpage;
-            weakSelf.indexPage = 1;
+            weakSelf.indexPage = ONE;
             //搜索
             if (_selectedCode) {
                 switch (weakSelf.selectedIndex) {

Class/SettlementViewController.m

@@ -387,7 +387,6 @@
     }
     [self CreateMBProgressHUDLoding];
     WS(weakSelf);
-    NSLog(@"%@",[order toDictionary]);
     [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(CONFIRMPAY) WithCallClass:weakSelf WithRequestType:0 WithParameter:order WithReturnValueBlock:^(id returnValue) {
         
         [weakSelf RemoveMBProgressHUDLoding];

Class/WithdrawalViewController.m

@@ -39,7 +39,7 @@
     if (!_model) {
         _model = [[RsApplyBillRequest alloc]init];
         DataPage *page = [[DataPage alloc]init];
-        page.page = ZERO;
+        page.page = ONE;
         page.rows = KROWS;
         _model.page = page;
         _model.employeeId = [Shoppersmanager manager].Shoppers.employee.fid;
@@ -73,7 +73,7 @@
 {
     WS(weakSelf);
     MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
-        weakSelf.model.page.page = 0;
+        weakSelf.model.page.page = ONE;
         [weakSelf.withdrawalTableView.mj_footer resetNoMoreData];
         [weakSelf getDatasAction:YES];
     }];

Tools/PrefixHeader.pch

@@ -47,13 +47,13 @@
 /**
  *  禁止所有的打印,打包时使用
  */
-#ifdef DEBUG
-#define NSLog(...) NSLog(__VA_ARGS__)
-#define debugMethod() NSLog(@"%s", __func__)
-#else
-#define NSLog(...)
-#define debugMethod()
-#endif
+//#ifdef DEBUG
+//#define NSLog(...) NSLog(__VA_ARGS__)
+//#define debugMethod() NSLog(@"%s", __func__)
+//#else
+//#define NSLog(...)
+//#define debugMethod()
+//#endif
 
 
 /**
@@ -130,13 +130,13 @@
 /**
  *  服务器开发地址
  */
-#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]
 
 ///**
 // *  服务器正式地址

Tools/opple_objc_json_client.h

@@ -2177,6 +2177,12 @@ extern NSString * const SORTDIRECTION_DESC;
  *
  */
 @property (nonatomic, strong) NSNumber *jdecardDenomation;
+
+
+/**
+ 红包数
+ */
+@property (nonatomic,strong) NSNumber *redPackageCount;
 @end /* interface TOOrderPromotionEntity */
 
 

Tools/opple_objc_json_client.m

@@ -819,6 +819,7 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 @synthesize wxcardDenomation;
 @synthesize wxcardRealDeduction;
 @synthesize jdecardDenomation;
+@synthesize redPackageCount;
 
 +(BOOL)propertyIsOptional:(NSString*)propertyName
 {