京东E卡积分类型开发

Lighting.xcodeproj/project.pbxproj

@@ -19,6 +19,12 @@
 		292F6E391F274E4100943353 /* CustomVDesignerEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = 292F6E381F274E4100943353 /* CustomVDesignerEntity.m */; };
 		292F6E3A1F274E4100943353 /* CustomVDesignerEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = 292F6E381F274E4100943353 /* CustomVDesignerEntity.m */; };
 		292F6E3B1F274E4100943353 /* CustomVDesignerEntity.m in Sources */ = {isa = PBXBuildFile; fileRef = 292F6E381F274E4100943353 /* CustomVDesignerEntity.m */; };
+		292FFD511F7899BE00E40CE3 /* IntegralCardCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 292FFD4F1F7899BE00E40CE3 /* IntegralCardCollectionViewCell.m */; };
+		292FFD521F7899BE00E40CE3 /* IntegralCardCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 292FFD4F1F7899BE00E40CE3 /* IntegralCardCollectionViewCell.m */; };
+		292FFD531F7899BE00E40CE3 /* IntegralCardCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 292FFD4F1F7899BE00E40CE3 /* IntegralCardCollectionViewCell.m */; };
+		292FFD541F7899BE00E40CE3 /* IntegralCardCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 292FFD501F7899BE00E40CE3 /* IntegralCardCollectionViewCell.xib */; };
+		292FFD551F7899BE00E40CE3 /* IntegralCardCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 292FFD501F7899BE00E40CE3 /* IntegralCardCollectionViewCell.xib */; };
+		292FFD561F7899BE00E40CE3 /* IntegralCardCollectionViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 292FFD501F7899BE00E40CE3 /* IntegralCardCollectionViewCell.xib */; };
 		29ACE2D01F14BB9200BE8DB0 /* AnnouncementContentTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29ACDFE61F14BB9000BE8DB0 /* AnnouncementContentTableViewCell.m */; };
 		29ACE2D11F14BB9200BE8DB0 /* AnnouncementContentTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29ACDFE61F14BB9000BE8DB0 /* AnnouncementContentTableViewCell.m */; };
 		29ACE2D21F14BB9200BE8DB0 /* AnnouncementContentTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 29ACDFE61F14BB9000BE8DB0 /* AnnouncementContentTableViewCell.m */; };
@@ -968,6 +974,9 @@
 		292F6E331F27472900943353 /* InviterTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InviterTableViewCell.m; sourceTree = "<group>"; };
 		292F6E371F274E4100943353 /* CustomVDesignerEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CustomVDesignerEntity.h; sourceTree = "<group>"; };
 		292F6E381F274E4100943353 /* CustomVDesignerEntity.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CustomVDesignerEntity.m; sourceTree = "<group>"; };
+		292FFD4E1F7899BE00E40CE3 /* IntegralCardCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IntegralCardCollectionViewCell.h; sourceTree = "<group>"; };
+		292FFD4F1F7899BE00E40CE3 /* IntegralCardCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = IntegralCardCollectionViewCell.m; sourceTree = "<group>"; };
+		292FFD501F7899BE00E40CE3 /* IntegralCardCollectionViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = IntegralCardCollectionViewCell.xib; sourceTree = "<group>"; };
 		29ACDFDE1F14BB6800BE8DB0 /* LightingDis.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LightingDis.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		29ACDFDF1F14BB6800BE8DB0 /* LightingDev.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LightingDev.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		29ACDFE01F14BB6800BE8DB0 /* Lighting.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Lighting.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -2772,6 +2781,9 @@
 				29ACE1BD1F14BB9100BE8DB0 /* CardOrderInformationReusableView.h */,
 				29ACE1BE1F14BB9100BE8DB0 /* CardOrderInformationReusableView.m */,
 				29ACE1BF1F14BB9100BE8DB0 /* CardOrderInformationReusableView.xib */,
+				292FFD4E1F7899BE00E40CE3 /* IntegralCardCollectionViewCell.h */,
+				292FFD4F1F7899BE00E40CE3 /* IntegralCardCollectionViewCell.m */,
+				292FFD501F7899BE00E40CE3 /* IntegralCardCollectionViewCell.xib */,
 			);
 			path = Cells;
 			sourceTree = "<group>";
@@ -3562,6 +3574,7 @@
 				29ACE6041F14BB9300BE8DB0 /* GetJDCardView.xib in Resources */,
 				29ACE4181F14BB9200BE8DB0 /* BillingInfoView.xib in Resources */,
 				29ACE4C61F14BB9300BE8DB0 /* screeningSecondView.xib in Resources */,
+				292FFD551F7899BE00E40CE3 /* IntegralCardCollectionViewCell.xib in Resources */,
 				29ACE6461F14BB9300BE8DB0 /* reference.png in Resources */,
 				29ACE5141F14BB9300BE8DB0 /* CardAmplificationViewController.xib in Resources */,
 				29ACE5D11F14BB9300BE8DB0 /* UserStoryboard.storyboard in Resources */,
@@ -3603,6 +3616,7 @@
 				29ACE6051F14BB9300BE8DB0 /* GetJDCardView.xib in Resources */,
 				29ACE4191F14BB9200BE8DB0 /* BillingInfoView.xib in Resources */,
 				29ACE4C71F14BB9300BE8DB0 /* screeningSecondView.xib in Resources */,
+				292FFD561F7899BE00E40CE3 /* IntegralCardCollectionViewCell.xib in Resources */,
 				29ACE6471F14BB9300BE8DB0 /* reference.png in Resources */,
 				29ACE5151F14BB9300BE8DB0 /* CardAmplificationViewController.xib in Resources */,
 				29ACE5D21F14BB9300BE8DB0 /* UserStoryboard.storyboard in Resources */,
@@ -3644,6 +3658,7 @@
 				29ACE6031F14BB9300BE8DB0 /* GetJDCardView.xib in Resources */,
 				29ACE4171F14BB9200BE8DB0 /* BillingInfoView.xib in Resources */,
 				29ACE4C51F14BB9300BE8DB0 /* screeningSecondView.xib in Resources */,
+				292FFD541F7899BE00E40CE3 /* IntegralCardCollectionViewCell.xib in Resources */,
 				29ACE6451F14BB9300BE8DB0 /* reference.png in Resources */,
 				29ACE5131F14BB9300BE8DB0 /* CardAmplificationViewController.xib in Resources */,
 				29ACE5D01F14BB9300BE8DB0 /* UserStoryboard.storyboard in Resources */,
@@ -4068,6 +4083,7 @@
 				29ACE6731F14BB9400BE8DB0 /* VIResourceLoader.m in Sources */,
 				29ACE3DF1F14BB9200BE8DB0 /* VideoListSectionHeaderView.m in Sources */,
 				29ACE2FB1F14BB9200BE8DB0 /* SceneViewController.m in Sources */,
+				292FFD521F7899BE00E40CE3 /* IntegralCardCollectionViewCell.m in Sources */,
 				29ACE6761F14BB9400BE8DB0 /* VIResourceLoaderManager.m in Sources */,
 				29ACE4451F14BB9200BE8DB0 /* PromotionChooseTableViewCell.m in Sources */,
 				29ACE32E1F14BB9200BE8DB0 /* HomeViewController.m in Sources */,
@@ -4356,6 +4372,7 @@
 				29ACE6741F14BB9400BE8DB0 /* VIResourceLoader.m in Sources */,
 				29ACE3E01F14BB9200BE8DB0 /* VideoListSectionHeaderView.m in Sources */,
 				29ACE2FC1F14BB9200BE8DB0 /* SceneViewController.m in Sources */,
+				292FFD531F7899BE00E40CE3 /* IntegralCardCollectionViewCell.m in Sources */,
 				29ACE6771F14BB9400BE8DB0 /* VIResourceLoaderManager.m in Sources */,
 				29ACE4461F14BB9200BE8DB0 /* PromotionChooseTableViewCell.m in Sources */,
 				29ACE32F1F14BB9200BE8DB0 /* HomeViewController.m in Sources */,
@@ -4644,6 +4661,7 @@
 				29ACE3DE1F14BB9200BE8DB0 /* VideoListSectionHeaderView.m in Sources */,
 				29ACE2FA1F14BB9200BE8DB0 /* SceneViewController.m in Sources */,
 				29ACE6751F14BB9400BE8DB0 /* VIResourceLoaderManager.m in Sources */,
+				292FFD511F7899BE00E40CE3 /* IntegralCardCollectionViewCell.m in Sources */,
 				29ACE4441F14BB9200BE8DB0 /* PromotionChooseTableViewCell.m in Sources */,
 				29ACE32D1F14BB9200BE8DB0 /* HomeViewController.m in Sources */,
 				29ACE6331F14BB9300BE8DB0 /* BaseViewController.m in Sources */,

Lighting/Class/Login/Controller/LoginViewController.m

@@ -417,7 +417,7 @@
     NSString *version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
     //获取服务端版本大小
     WS(weakSelf);
-    NSString *string = [NSString stringWithFormat:@"/employee/getUpgrade?apptype=ipa&version=%@",version];
+    NSString *string = [NSString stringWithFormat:@"/employee/getUpgrade?apptype=ios&version=%@",version];
     [HTTP networkWithDictionaryRequestWithURL:SERVERREQUESTURL(string)  withRequestType:ONE withParameter:nil withReturnValueBlock:^(id returnValue) {
         if (RESULT(returnValue)) {
             NSDictionary *dict = RESPONSE(returnValue);

Lighting/Class/XXuserController/CardStock/CardBeenUseViewController.m

@@ -10,6 +10,7 @@
 #import "CardCollectionViewCell.h"
 #import "CardOrderInformationReusableView.h"
 #import "CardAmplificationViewController.h"
+#import "IntegralCardCollectionViewCell.h"
 
 @interface CardBeenUseViewController ()<UICollectionViewDataSource,UICollectionViewDelegate>
 
@@ -139,14 +140,22 @@
     self.beenUseLayout.minimumLineSpacing = 20;
     self.beenUseLayout.minimumInteritemSpacing = 20;
     [self.collectionView registerNib:[UINib nibWithNibName:@"CardOrderInformationReusableView" bundle:nil] forSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"CardOrderInformationReusableView"];
+    [self.collectionView registerNib:[UINib nibWithNibName:@"IntegralCardCollectionViewCell" bundle:nil] forCellWithReuseIdentifier:@"IntegralCardCollectionViewCell"];
+
 }
 
 
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
 {
+    GroupByOrderNumber *sectionModel = self.datasArray[indexPath.section];
+    TOJingdongEcardEntity *model = sectionModel.eCards[indexPath.row];
+    if (model.denomation == 10 || model.denomation == 20 || model.denomation == 30) {
+        IntegralCardCollectionViewCell *integralCardCell = [collectionView dequeueReusableCellWithReuseIdentifier:@"IntegralCardCollectionViewCell" forIndexPath:indexPath];
+        [integralCardCell updateIntegralCardImageView:model];
+        return integralCardCell;
+    }
     CardCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"CardCollectionViewCell" forIndexPath:indexPath];
-    GroupByOrderNumber *model = self.datasArray[indexPath.section];
-    cell.Cardmodel = model.eCards[indexPath.row];
+    cell.Cardmodel = model;
     return cell;
 }
 
@@ -176,6 +185,11 @@
 
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
 {
+    GroupByOrderNumber *sectionModel = self.datasArray[indexPath.section];
+    TOJingdongEcardEntity *model = sectionModel.eCards[indexPath.row];
+    if (model.denomation == 10 || model.denomation == 20 || model.denomation == 30) {
+        return;
+    }
     if ([self.cardState isEqualToString:CHECK]) {
         return;
     }
@@ -186,8 +200,7 @@
     [self.settingsPopoverController presentPopoverAsDialogAnimated:YES
                                                            options:WYPopoverAnimationOptionFadeWithScale];
     [self.settingsPopoverController beginThemeUpdates];
-    GroupByOrderNumber *model = self.datasArray[indexPath.section];
-    cardVC.cardModel = model.eCards[indexPath.row];
+    cardVC.cardModel = model;
     cardVC.preferredContentSize = CGSizeMake(500, 370);
     [self.settingsPopoverController endThemeUpdates];
     // 更新E卡状态

Lighting/Class/XXuserController/CardStock/CardDontUseViewController.m

@@ -11,6 +11,7 @@
 #import "CardOrderInformationReusableView.h"
 #import "DeviceDirectionManager.h"
 #import "CardAmplificationViewController.h"
+#import "IntegralCardCollectionViewCell.h"
 
 @interface CardDontUseViewController ()<UICollectionViewDataSource,UICollectionViewDelegate,UploadReceiptsDelegate,UINavigationControllerDelegate,UIImagePickerControllerDelegate>
 
@@ -66,11 +67,12 @@
 #pragma mark - UICollectionView
 - (void)setupCollectionView
 {
-    self.dontUseFlowLayout.itemSize = CGSizeMake((ScreenWidth-48-20*4)/3, 200);
+    self.dontUseFlowLayout.itemSize = CGSizeMake((ScreenWidth-48-20*4)/3, 180);
     self.dontUseFlowLayout.sectionInset = UIEdgeInsetsMake(20, 20, 20, 20);
     self.dontUseFlowLayout.minimumLineSpacing = 20;
     self.dontUseFlowLayout.minimumInteritemSpacing = 20;
     [self.collectionView registerNib:[UINib nibWithNibName:@"CardOrderInformationReusableView" bundle:nil] forSupplementaryViewOfKind:UICollectionElementKindSectionHeader withReuseIdentifier:@"CardOrderInformationReusableView"];
+    [self.collectionView registerNib:[UINib nibWithNibName:@"IntegralCardCollectionViewCell" bundle:nil] forCellWithReuseIdentifier:@"IntegralCardCollectionViewCell"];
 }
 
 #pragma mark -获取数据
@@ -111,9 +113,15 @@
 
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
 {
+    GroupByOrderNumber *sectionModel = self.datasArray[indexPath.section];
+    TOJingdongEcardEntity *model = sectionModel.eCards[indexPath.row];
+    if (model.denomation == 10 || model.denomation == 20 || model.denomation == 30) {
+        IntegralCardCollectionViewCell *integralCardCell = [collectionView dequeueReusableCellWithReuseIdentifier:@"IntegralCardCollectionViewCell" forIndexPath:indexPath];
+        [integralCardCell updateIntegralCardImageView:model];
+        return integralCardCell;
+    }
     CardCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"CardCollectionViewCell" forIndexPath:indexPath];
-    GroupByOrderNumber *model = self.datasArray[indexPath.section];
-    cell.Cardmodel = model.eCards[indexPath.row];
+    cell.Cardmodel = model;
     return cell;
 }
 
@@ -134,7 +142,7 @@
 
 - (CGSize)collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section
 {
-    return CGSizeMake(0, 80);
+    return CGSizeMake(0, 44);
 }
 
 - (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView
@@ -144,7 +152,11 @@
 
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
 {
-    GroupByOrderNumber *model = self.datasArray[indexPath.section];
+    GroupByOrderNumber *sectionModel = self.datasArray[indexPath.section];
+    TOJingdongEcardEntity *model = sectionModel.eCards[indexPath.row];
+    if (model.denomation == 10 || model.denomation == 20 || model.denomation == 30) {
+        return;
+    }
     if ([[self class] isBlankString:model.orderReceiptUrl]) {
         [XBLoadingView showHUDViewWithText:@"不能查看未激活卡劵,请先上传小票激活卡劵"];
     }

Lighting/Class/XXuserController/CardStock/CardViewController.m

@@ -11,6 +11,8 @@
 #import "CardDetailsViewController.h"
 #import "CardAmplificationViewController.h"
 #import "LuckyDrawViewController.h"
+#import "IntegralCardCollectionViewCell.h"
+
 
 @interface CardViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
 
@@ -55,6 +57,15 @@
 
 - (void)viewDidLoad {
     [super viewDidLoad];
+    
+    [self setupTableView];
+}
+
+
+#pragma mark -设置tableview
+- (void)setupTableView
+{
+    [self.cardCollectionView registerNib:[UINib nibWithNibName:@"IntegralCardCollectionViewCell" bundle:nil] forCellWithReuseIdentifier:@"IntegralCardCollectionViewCell"];
 }
 
 #pragma mark - 查询卡劵
@@ -128,6 +139,12 @@
 
 - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
 {
+    TOJingdongEcardEntity *model = self.datasArray[indexPath.row];
+    if (model.denomation == 10 || model.denomation == 20 || model.denomation == 30) {
+        IntegralCardCollectionViewCell *integralCardCell = [collectionView dequeueReusableCellWithReuseIdentifier:@"IntegralCardCollectionViewCell" forIndexPath:indexPath];
+        [integralCardCell updateIntegralCardImageView:model];
+        return integralCardCell;
+    }
     CardCollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"CardCollectionViewCell" forIndexPath:indexPath];
     cell.Cardmodel = self.datasArray[indexPath.row];
     return cell;
@@ -137,6 +154,9 @@
 {
     WS(weakSelf);
     TOJingdongEcardEntity *model = self.datasArray[indexPath.row];
+    if (model.denomation == 10 || model.denomation == 20 || model.denomation == 30) {
+        return;
+    }
     if ([[self class] isBlankString:model.orderReceiptUrl]) {
         ShowAlertView(@"提示", @"不能查看未激活卡劵,请先上传小票激活卡劵", @[@"我知道了"], UIAlertControllerStyleAlert, ^(NSInteger index) {
             CardDetailsViewController *cardDetails = [CardDetailsViewController viewControllerWithStoryBoardType:STORYBOARD_TYPE_MAIN];

Lighting/Class/XXuserController/CardStock/Cells/CardOrderInformationReusableView.h

@@ -51,6 +51,16 @@
  */
 @property (weak, nonatomic) IBOutlet UILabel *customerNameLabel;
 
+/**
+ 客户姓名标题
+ */
+@property (weak, nonatomic) IBOutlet UILabel *customerTitleLabel;
+
+/**
+ 订单总额标题
+ */
+@property (weak, nonatomic) IBOutlet UILabel *orderTotalPriceTitleLabel;
+
 /**
  订单总额
  */

Lighting/Class/XXuserController/CardStock/Cells/CardOrderInformationReusableView.m

@@ -25,9 +25,10 @@
     self.orderTimelabel.text = model.orderTime;
     self.uploadReceiptsButton.hidden = [BaseViewController isBlankString:model.orderReceiptUrl]?NO:YES;
     self.rejectNoteLabel.hidden = YES;
+    self.customerTitleLabel.hidden = YES;
+    self.orderTotalPriceTitleLabel.hidden = YES;
 }
 
-
 - (void)refreshHeaderView:(id<UploadReceiptsDelegate>)delegate withEntity:(RedPackageGroupbyOrderNumber *)model withSectionIndex:(NSInteger)section
 {
     self.sectionIndex = section;
@@ -44,7 +45,6 @@
         noteString = @"暂无";
     }
     self.rejectNoteLabel.text = [NSString stringWithFormat:@"拒绝原因：%@",noteString];
-
 }
 
 

Lighting/Class/XXuserController/CardStock/Cells/CardOrderInformationReusableView.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
         <capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -35,8 +36,8 @@
                         <action selector="uploadReceiptsButtonClickAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="M4p-LY-oPJ"/>
                     </connections>
                 </button>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="曹云霄" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="99R-L2-jAd">
-                    <rect key="frame" x="87" y="47" width="46" height="18"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="99R-L2-jAd">
+                    <rect key="frame" x="87" y="56" width="0.0" height="0.0"/>
                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
@@ -74,8 +75,8 @@
                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="￥1000" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2vq-Mj-jsi">
-                    <rect key="frame" x="336.5" y="47" width="50" height="18"/>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2vq-Mj-jsi">
+                    <rect key="frame" x="336.5" y="56" width="0.0" height="0.0"/>
                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                     <nil key="highlightedColor"/>
@@ -122,9 +123,11 @@
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <connections>
                 <outlet property="customerNameLabel" destination="99R-L2-jAd" id="pUV-Fq-JQD"/>
+                <outlet property="customerTitleLabel" destination="A4D-90-U3c" id="013-Si-t4e"/>
                 <outlet property="orderNumberLabel" destination="Dyu-RA-dDY" id="V8o-b5-YQu"/>
                 <outlet property="orderTimelabel" destination="8zE-O4-90C" id="9o1-2A-cY3"/>
                 <outlet property="orderTotalPriceLabel" destination="2vq-Mj-jsi" id="Cl6-js-GMw"/>
+                <outlet property="orderTotalPriceTitleLabel" destination="aQa-np-djh" id="Tiy-Vd-2Eo"/>
                 <outlet property="rejectNoteLabel" destination="GWd-vp-5Wt" id="yE3-55-reT"/>
                 <outlet property="uploadReceiptsButton" destination="Fje-v9-8h3" id="6ce-we-Qno"/>
             </connections>

Lighting/Class/XXuserController/CardStock/Cells/IntegralCardCollectionViewCell.h

+//
+//  IntegralCardCollectionViewCell.h
+//  Lighting
+//
+//  Created by 曹云霄 on 2017/9/25.
+//  Copyright © 2017年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface IntegralCardCollectionViewCell : UICollectionViewCell
+
+
+
+/**
+ 积分imageView
+ */
+@property (weak, nonatomic) IBOutlet UIImageView *integralCardImageView;
+
+
+/**
+ 更新积分图片
+
+ */
+- (void)updateIntegralCardImageView:(TOJingdongEcardEntity *)model;
+
+@end

Lighting/Class/XXuserController/CardStock/Cells/IntegralCardCollectionViewCell.m

+//
+//  IntegralCardCollectionViewCell.m
+//  Lighting
+//
+//  Created by 曹云霄 on 2017/9/25.
+//  Copyright © 2017年 上海勾芒科技有限公司. All rights reserved.
+//
+
+#import "IntegralCardCollectionViewCell.h"
+
+@implementation IntegralCardCollectionViewCell
+
+- (void)awakeFromNib {
+    [super awakeFromNib];
+    // Initialization code
+}
+
+
+- (void)updateIntegralCardImageView:(TOJingdongEcardEntity *)model
+{
+    self.integralCardImageView.image = [UIImage imageNamed:[NSString stringWithFormat:@"integral%ld",model.denomation]];
+}
+@end

Lighting/Class/XXuserController/CardStock/Cells/IntegralCardCollectionViewCell.xib

+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13196" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13173"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="IntegralCardCollectionViewCell">
+            <rect key="frame" x="0.0" y="0.0" width="354" height="169"/>
+            <autoresizingMask key="autoresizingMask"/>
+            <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                <rect key="frame" x="0.0" y="0.0" width="354" height="169"/>
+                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <subviews>
+                    <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="integral10" translatesAutoresizingMaskIntoConstraints="NO" id="Rok-t5-3VF">
+                        <rect key="frame" x="0.0" y="0.0" width="354" height="169"/>
+                    </imageView>
+                </subviews>
+            </view>
+            <constraints>
+                <constraint firstAttribute="bottom" secondItem="Rok-t5-3VF" secondAttribute="bottom" id="UTG-BC-Vaq"/>
+                <constraint firstItem="Rok-t5-3VF" firstAttribute="top" secondItem="gTV-IL-0wX" secondAttribute="top" id="cLu-p6-cTy"/>
+                <constraint firstAttribute="trailing" secondItem="Rok-t5-3VF" secondAttribute="trailing" id="hZE-8t-GCy"/>
+                <constraint firstItem="Rok-t5-3VF" firstAttribute="leading" secondItem="gTV-IL-0wX" secondAttribute="leading" id="pDo-XX-Ybb"/>
+            </constraints>
+            <size key="customSize" width="354" height="169"/>
+            <connections>
+                <outlet property="integralCardImageView" destination="Rok-t5-3VF" id="c8e-4w-gOp"/>
+            </connections>
+            <point key="canvasLocation" x="-120" y="-17.5"/>
+        </collectionViewCell>
+    </objects>
+    <resources>
+        <image name="integral10" width="290" height="143"/>
+    </resources>
+</document>

Lighting/Resource/Images.xcassets/integral10.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "integral10@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "integral10@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Resource/Images.xcassets/integral20.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "integral20@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "integral20@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Resource/Images.xcassets/integral30.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "integral30@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "integral30@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file

Lighting/Supporting Files/LightingDis-Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundleName</key>
 	<string>欧立方</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.2.0</string>
+	<string>2.2.1</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>

Lighting/Tools/CYConst/CYConstManager.h

@@ -99,7 +99,7 @@ typedef NS_ENUM(NSInteger,COMMENT_PRAISE) {
 /**
  *  服务器开发地址
  */
-#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://gomoredev:8082/opple-web/app%@",URL]
+#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://gomoredev.local:8082/opple-web/app%@",URL]
 
 
 #elif LightingDev

fastlane/report.xml

@@ -5,27 +5,27 @@
     
     
       
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.003835">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.00371">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="1: cocoapods" time="10.972193">
+      <testcase classname="fastlane.lanes" name="1: cocoapods" time="11.607455">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="2: increment_version_number" time="3.570913">
+      <testcase classname="fastlane.lanes" name="2: increment_version_number" time="3.009483">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="3: gym" time="173.748237">
+      <testcase classname="fastlane.lanes" name="3: gym" time="149.23899">
         
       </testcase>
     
       
-      <testcase classname="fastlane.lanes" name="4: pgyer" time="60.242171">
+      <testcase classname="fastlane.lanes" name="4: pgyer" time="70.464818">
         
       </testcase>