Merge branch 'master' into WXCard

# Conflicts:
#	Class/CustomerOrderViewController.m
#	Class/OrderdetailsViewController.h
#	Class/OrderdetailsViewController.m

Class/CustomerOrderViewController.m

@@ -220,7 +220,7 @@
     OrderdetailsViewController *orderdetails = [storyboard instantiateViewControllerWithIdentifier:@"orderdetails"];
     TOOrderEntity *model = (TOOrderEntity *)[[self.datasArray objectAtIndex_opple:indexPath.row] order];
     orderdetails.orderCode = model.orderNumber;
-    orderdetails.consumerId = model.consumerId;
+    orderdetails.consumerID = model.consumerId;
     if ([model.orderState isEqualToString:@"006"] || [model.orderState isEqualToString:@"002"] || [model.orderState isEqualToString:@"003"]) {
         orderdetails.isShowPrintButton = YES;
         orderdetails.isShowPayButton = NO;

Class/LuckyDrawDetailsViewController.m

@@ -182,7 +182,7 @@
     }
     UsedDrawTableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"UsedDrawTableViewCell" forIndexPath:indexPath];
     cell.orderNumber.text = drawEntity.draw.orderNumber;
-    cell.drawTimeLabel.text = drawEntity.draw.createDate;
+    cell.drawTimeLabel.text = drawEntity.draw.drawDate;
     cell.trophyLabel.text = drawEntity.draw.awardDescription;
     if (self.drawValue == 0) {
         cell.drawTimeLabel.hidden = YES;

Class/OrderdetailsViewController.h

@@ -65,10 +65,10 @@
  */
 @property (nonatomic,assign) BOOL isUserInteractionEnabled;
 
-/**
+/*
  用户ID
  */
-@property (nonatomic,copy) NSString *consumerId;
+@property (nonatomic,copy) NSString *consumerID;
 
 
 

Class/OrderdetailsViewController.m

@@ -328,7 +328,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
             [weakSelf ErrorMBProgressView:error.localizedDescription];
         }];
     }
-    // 查询客户订单抽奖状态
+    /// 查询客户订单抽奖状态
     __block RsAwardDraw *resultModel = nil;
     dispatch_group_enter(group);
     RsLotteryRequest *queryDrawState = [[RsLotteryRequest alloc]init];
@@ -336,7 +336,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
     if (!self.isShowPayButton) {
        queryDrawState.orderNumberEquals = self.orderCode;
     }
-    queryDrawState.winnerIdEquals = self.consumerId?self.consumerId:[Customermanager manager].model.fid;
+    queryDrawState.winnerIdEquals = self.consumerID?self.consumerID:[Customermanager manager].model.fid;
     queryDrawState.stateEquals = self.isShowPayButton?ACCOMPLISHED:USED;
     DataPage *page = [[DataPage alloc]init];
     page.page = ZERO;
@@ -722,7 +722,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
         weakSelf.orderDetailsTableview.tableFooterView = nil;
         __block BOOL isJDEcard = NO;//促销中是否有京东E卡；
         __block BOOL isGuideDraw = NO;//促销中是否有导购抽奖机会
-        // 刷新数据成功
+        /// 刷新数据成功
         [weakSelf getOrderDetailsData:^{
             // 先判断促销中有无京东E卡，有则认为发放成功
             for (id object in weakSelf.promotionInformationArray) {

Lighting/Info.plist

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