修改项说明：修复提示框

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];
     }];

Lighting/StoryboardwithCYX.storyboard

@@ -808,7 +808,7 @@
                                             <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="iOu-WG-fyV">
-                                                    <frame key="frameInset" minX="13" minY="12" height="21" maxX="118"/>
+                                                    <frame key="frameInset" minX="12.5" minY="12" height="21" maxX="-42.5"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="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="custom" customColorSpace="sRGB"/>
@@ -843,7 +843,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" id="dXn-DO-sRi">
-                                <frame key="frameInset" minY="64" height="50"/>
+                                <frame key="frameInset" minX="-0.5" minY="64" height="50" maxX="0.5"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="BF5-8S-7Vt">
@@ -858,7 +858,7 @@
                                 <color key="backgroundColor" red="0.96470588235294119" green="0.96470588235294119" blue="0.96470588235294119" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </view>
                             <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="plO-JS-1cR">
-                                <frame key="frameInset" minY="114"/>
+                                <frame key="frameInset" minX="-0.5" minY="114" maxX="0.5" maxY="0.5"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="tt4-xx-j4O">
@@ -1004,10 +1004,10 @@
                                 <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <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="56" width="1024" height="170"/>
+                                        <rect key="frame" x="0.0" y="55.5" width="1024" height="170"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Sye-2R-IQf" id="CXs-SR-gHP">
-                                            <frame key="frameInset" width="1024" height="169"/>
+                                            <frame key="frameInset" width="1024" height="169.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" id="2bG-Ip-ptr">
@@ -1312,7 +1312,7 @@
                                         <rect key="frame" x="0.0" y="28" width="1024" height="100"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="EPc-Ii-VaY" id="e8t-Pc-QPv">
-                                            <frame key="frameInset" width="1024" height="99"/>
+                                            <frame key="frameInset" width="1024" height="99.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="S6q-gC-tBB">
@@ -1449,7 +1449,7 @@
                                         <rect key="frame" x="0.0" y="28" width="1024" height="200"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0Oq-z4-T96" id="GEp-Hp-EdS">
-                                            <frame key="frameInset" width="1024" height="199"/>
+                                            <frame key="frameInset" width="1024" 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="wXj-VY-jlJ">
@@ -2337,7 +2337,7 @@
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                     </imageView>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="qian" id="N12-vr-9mx">
-                                        <frame key="frameInset" minX="12.10%" minY="31.79%" width="14.5" height="14.5"/>
+                                        <frame key="frameInset" minX="12.05%" minY="31.79%" width="14.5" height="14.5"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                     </imageView>
                                     <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="all" id="euc-cv-Yab">
@@ -2366,7 +2366,7 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <view contentMode="scaleToFill" id="AwP-sa-g7C">
-                                        <frame key="frameInset" minX="57.43%" minY="50.00%" width="1" height="50"/>
+                                        <frame key="frameInset" minX="57.38%" minY="50.00%" width="1" height="50"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                         <color key="backgroundColor" red="0.87058823529999996" green="0.87058823529999996" blue="0.87058823529999996" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     </view>
@@ -2480,7 +2480,7 @@
                                         </connections>
                                     </button>
                                     <view contentMode="scaleToFill" id="1OU-Hd-sE5">
-                                        <frame key="frameInset" minX="3.12%" minY="35" width="64.5" height="2"/>
+                                        <frame key="frameInset" minX="3.07%" minY="35" width="64.5" height="2"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <color key="backgroundColor" red="0.21568627450980393" green="0.46274509803921571" blue="0.6705882352941176" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     </view>
@@ -2523,7 +2523,7 @@
                                 </userDefinedRuntimeAttributes>
                             </view>
                             <view contentMode="scaleToFill" id="ucO-Pc-uYr">
-                                <frame key="frameInset" minX="23.5" minY="183" width="47.48%" height="200"/>
+                                <frame key="frameInset" minX="23.5" minY="183" width="47.43%" height="200"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我的卡劵包" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Ecj-ik-kYa">
@@ -3006,7 +3006,7 @@
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="卡号:   12345678987643677" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="84x-Z3-2D8">
                                                     <frame key="frameInset" minX="17" minY="74.56%" width="59.61%" height="17"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="10"/>
                                                     <color key="textColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
@@ -3018,7 +3018,7 @@
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="密码:   2FF0-3F9D-DCC6-D1CD" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="j4H-VG-erX">
                                                     <frame key="frameInset" minX="17" minY="86.71%" width="59.61%" height="13"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="10"/>
                                                     <color key="textColor" red="0.33333333333333331" green="0.33333333333333331" blue="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
@@ -3384,10 +3384,10 @@
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="WithdrawalTableViewCell" rowHeight="70" id="jHf-PW-bB3" customClass="WithdrawalTableViewCell">
-                                        <rect key="frame" x="0.0" y="28" width="1024" height="70"/>
+                                        <rect key="frame" x="0.0" y="28" width="1023.5" height="70"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jHf-PW-bB3" id="GzY-E9-F2n">
-                                            <frame key="frameInset" width="1024" height="69.5"/>
+                                            <frame key="frameInset" width="1023.5" height="69.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="Ssz-VZ-85R">
@@ -3405,7 +3405,7 @@
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="nw7-yq-t8s">
-                                                    <frame key="frameInset" minY="43.30%" width="18.78%" height="21" maxX="23"/>
+                                                    <frame key="frameInset" minY="43.30%" width="18.78%" height="21" maxX="22.5"/>
                                                     <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="16"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -3857,7 +3857,7 @@
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="最近到访时间:" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="vtg-a5-Yir">
-                                        <frame key="frameInset" minX="45.31%" minY="23" width="96" height="21"/>
+                                        <frame key="frameInset" minX="45.26%" minY="23" width="96" height="21"/>
                                         <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="custom" customColorSpace="sRGB"/>
@@ -3914,14 +3914,14 @@
                                 <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="allcustomercell" rowHeight="125" id="OYf-pc-4my" customClass="AllCutomerTableViewCell">
-                                        <rect key="frame" x="0.0" y="28" width="976" height="125"/>
+                                        <rect key="frame" x="0.0" y="28" width="977" height="125"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="OYf-pc-4my" id="hCr-QB-Gld">
-                                            <frame key="frameInset" width="976" height="125"/>
+                                            <frame key="frameInset" width="977" height="125"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" id="Dcm-cA-leg">
-                                                    <frame key="frameInset" minX="-1.5" minY="17" height="110" maxX="1.5"/>
+                                                    <frame key="frameInset" minX="-1.5" minY="17" height="110" maxX="2.5"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                                     <subviews>
                                                         <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" id="Dlq-ef-un8">

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
 {