修改项说明：debug

Class/CardViewController.m

@@ -10,6 +10,7 @@
 #import "CardCollectionViewCell.h"
 #import "CardDetailsViewController.h"
 #import "CardAmplificationViewController.h"
+#import "LuckyDrawViewController.h"
 
 @interface CardViewController ()<UICollectionViewDelegate,UICollectionViewDataSource,DZNEmptyDataSetSource,DZNEmptyDataSetDelegate>
 
@@ -135,9 +136,14 @@
 
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
 {
-    TOJingdongEcardEntity *model = self.datasArray[indexPath.section];
+    WS(weakSelf);
+    TOJingdongEcardEntity *model = self.datasArray[indexPath.row];
     if ([[self class] isBlankString:model.orderReceiptUrl]) {
-        [self SHOWPrompttext:@"不能查看未激活卡劵,请先上传小票激活卡劵"];
+        [self promptCustomerTitle:@"不能查看未激活卡劵,请先上传小票激活卡劵" finish:^{
+            CardDetailsViewController *cardDetails = [[weakSelf getStoryboardWithName] instantiateViewControllerWithIdentifier:@"CardDetailsViewController"];
+            [weakSelf.navigationController pushViewController:cardDetails animated:YES];
+        }];
+        
     }else{
         CardAmplificationViewController *cardVC = [[CardAmplificationViewController alloc]init];
         self.settingsPopoverController = [[WYPopoverController alloc] initWithContentViewController:cardVC];

Class/LuckyDrawDetailsViewController.m

@@ -219,8 +219,7 @@
                 if ([BaseViewController isBlankString:json[@"awardId"]]) {
                     [weakSelf SHOWPrompttext:@"未中奖"];
                 }else {
-                    NSString *string = [NSString stringWithFormat:@"恭喜获得%ld元红包",[json[@"number"] integerValue]];
-                    [weakSelf SHOWPrompttext:string];
+                    [weakSelf SHOWPrompttext:[NSString stringWithFormat:@"恭喜你获得了 %@",json[@"description"]]];
                 }
             }
         }

Class/OrderdetailsViewController.m

@@ -326,19 +326,25 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
         }
         /// 默认弹出支付框
         if (weakSelf.isShowPayButton && [weakSelf.orderDetails.order.orderState isEqualToString:NOTPAY]) {
-            for (id object in weakSelf.luckyDrawAndJDECardArray) {
-                if ([object isKindOfClass:[LuckyDrawModel class]] && !resultModel) {
-                    [weakSelf queryConsumerLuckyDrawChance:object];
-                }else {
-                    [weakSelf payButtonClickAction];
-                }
-                /// 区分导购抽奖和消费者抽奖
-                if ([object isKindOfClass:[LuckyDrawModel class]]) {
-                    LuckyDrawModel *model = object;
-                    if ([model.body isEqualToString:CONSUMER]) {
-                        break;
+            
+            if (weakSelf.luckyDrawAndJDECardArray.count) {
+                for (id object in weakSelf.luckyDrawAndJDECardArray) {
+                    if ([object isKindOfClass:[LuckyDrawModel class]] && !resultModel) {
+                        [weakSelf queryConsumerLuckyDrawChance:object];
+                    }else {
+                        [weakSelf payButtonClickAction];
+                    }
+                    /// 区分导购抽奖和消费者抽奖
+                    if ([object isKindOfClass:[LuckyDrawModel class]]) {
+                        LuckyDrawModel *model = object;
+                        if ([model.body isEqualToString:CONSUMER]) {
+                            break;
+                        }
                     }
                 }
+            }else {
+                /// 无促销的情况
+                [weakSelf payButtonClickAction];
             }
         }
         if (finish) {
@@ -472,8 +478,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
                         if ([BaseViewController isBlankString:weakSelf.customerDrawModel.awardId]) {
                             [weakSelf SHOWPrompttext:@"未中奖"];
                         }else {
-                            NSString *string = [NSString stringWithFormat:@"恭喜获得%ld折优惠,会在支付时直接扣除!",[weakSelf.customerDrawModel.number integerValue]/10];
-                            [weakSelf SHOWPrompttext:string];
+                            [weakSelf SHOWPrompttext:[NSString stringWithFormat:@"恭喜你获得了 %@",weakSelf.customerDrawModel.descriptionString]];
                         }
                     }
                 }

Lighting/Info.plist

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

Tools/NetworkRequestClassManager.m

@@ -48,7 +48,7 @@ static NetworkRequestClassManager *manager = nil;
     AFHTTPSessionManager *manager = [AFHTTPSessionManager manager];
     manager.responseSerializer = [AFJSONResponseSerializer serializer];
     manager.requestSerializer = [AFJSONRequestSerializer serializer];
-    manager.requestSerializer.timeoutInterval = 120.0f;
+    manager.requestSerializer.timeoutInterval = 10.0f;
     [manager.requestSerializer setValue:@"application/json;charset=utf-8" forHTTPHeaderField: @"Content-Type"];
     return manager;
 }

Tools/PrefixHeader.pch

@@ -120,20 +120,16 @@
  */
 //#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
 
-///**
-// *  服务器开发地址
-// */
-//#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://192.168.199.188:8081/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]
 
 ///**
 // *  服务器正式地址
 // */
-//#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL]
+#define SERVERREQUESTURL(URL)  [NSString stringWithFormat:@"http://dg.opple.com/opple-web/app%@",URL]
 
 /**
  *  搜索框输入通知