修改项说明：修复解除绑定银行卡失败、刷新不及时、提现区分opple奖励和产品返利

7d0e83fc · 曹云霄 · 8f4a4127 · 7d0e83fc · 7d0e83fc · 7d0e83fc
Commit 7d0e83fc authored Dec 26, 2016 by 曹云霄
33 changed files
--- a/Class/AllCustomerViewController.m
+++ b/Class/AllCustomerViewController.m
@@ -275,7 +275,7 @@
            break;
        case 0://start == end
        {
-            [formater setDateFormat:@"yyyy-MM-dd HH:dd:ss"];
+            [formater setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
            self.conditionModel.createTimeBegin = nil;
            self.conditionModel.createTimeEnd = nil;
        }
@@ -298,33 +298,6 @@
    [self.allCustomerTableview.mj_header beginRefreshing];
 }

-
-
-
-#pragma mark -比较两个NSDate的大小
- (int)compareOneDay:(NSDate *)oneDay withAnotherDay:(NSDate *)anotherDay
-{
-    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
-    [dateFormatter setDateFormat:@"yyyy-MM-dd"];
-    NSString *oneDayStr = [dateFormatter stringFromDate:oneDay];
-    NSString *anotherDayStr = [dateFormatter stringFromDate:anotherDay];
-    NSDate *dateA = [dateFormatter dateFromString:oneDayStr];
-    NSDate *dateB = [dateFormatter dateFromString:anotherDayStr];
-    NSComparisonResult result = [dateA compare:dateB];
-    NSLog(@"date1 : %@, date2 : %@", oneDay, anotherDay);
-    if (result == NSOrderedDescending) {
-        //NSLog(@"Date1  is in the future");
-        return 1;
-    }
-    else if (result == NSOrderedAscending){
-        //NSLog(@"Date1 is in the past");
-        return -1;
-    }
-    //NSLog(@"Both dates are the same");
-    return 0;
-    
-}
-
 #pragma mark -Return键检测
 - (BOOL)textFieldShouldReturn:(UITextField *)textField
 {

--- a/Class/BindingBankCARDViewController.m
+++ b/Class/BindingBankCARDViewController.m
@@ -22,7 +22,7 @@
 #pragma mark - lazy
 - (NSArray *)titleArray
 {
-    return @[@"持卡人",@"银行卡号",@"身份证号码"];
+    return @[@"持卡人",@"银行卡号",@"身份证号码",@"手机号码"];
 }

 - (void)viewDidLoad {
@@ -61,47 +61,37 @@
 #pragma mark - 验证银行卡信息是否匹配
 - (void)validationBankCardInformationIsMatching
 {
-//    {
-//        "bankAccount": "6214832132890315",
-//        "accountName": "陈焱焱",
-//        "identityCode": "320921199311166750",
-//        "phoneNumber": "18262621719"
-//    }
    TOCommAuthEntity *entity = [[TOCommAuthEntity alloc] init];
-    entity.bankAccount = @"6214832132890315";
-    entity.accountName = @"陈焱焱";
-    entity.identityCode = @"320921199311166750";
-    entity.phoneNumber = @"18262621719";
-//    BindingTableViewCell *cardholderCell = [self.bindingTableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
-//    entity.accountName = cardholderCell.bindingInputTextField.text;
-//    BindingTableViewCell *bankAccountCell = [self.bindingTableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:1 inSection:0]];
-//    entity.bankAccount = bankAccountCell.bindingInputTextField.text;
-//    BindingTableViewCell *identityCodeCell = [self.bindingTableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:2 inSection:0]];
-//    entity.identityCode = identityCodeCell.bindingInputTextField.text;
-//    BindingTableViewCell *phoneNumberCell = [self.bindingTableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:3 inSection:0]];
-//    entity.phoneNumber = phoneNumberCell.bindingInputTextField.text;
-//    //校验
-//    if ([[self class] isBlankString:entity.phoneNumber]) {
-//        [XBLoadingView showHUDViewWithText:@"手机号不能为空"]; return;
-//    }
-//    if ([[self class] isBlankString:entity.accountName]) {
-//        [XBLoadingView showHUDViewWithText:@"持卡人不能为空"]; return;
-//    }
-//    if ([[self class] isBlankString:entity.identityCode]) {
-//        [XBLoadingView showHUDViewWithText:@"身份证号码不能为空"]; return;
-//    }
-//    if ([[self class] isBlankString:entity.bankAccount]) {
-//        [XBLoadingView showHUDViewWithText:@"银行卡号不能为空"]; return;
-//    }
-//    if (![HENLENSONG isValidateMobile:entity.phoneNumber]) {
-//        [XBLoadingView showHUDViewWithText:@"手机号码格式不正确"]; return;
-//    }
-//    if ([self isPureInt:entity.accountName]) {
-//        [XBLoadingView showHUDViewWithText:@"银行卡号格式不正确"]; return;
-//    }
+    BindingTableViewCell *cardholderCell = [self.bindingTableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0]];
+    entity.accountName = cardholderCell.bindingInputTextField.text;
+    BindingTableViewCell *bankAccountCell = [self.bindingTableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:1 inSection:0]];
+    entity.bankAccount = bankAccountCell.bindingInputTextField.text;
+    BindingTableViewCell *identityCodeCell = [self.bindingTableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:2 inSection:0]];
+    entity.identityCode = identityCodeCell.bindingInputTextField.text;
+    BindingTableViewCell *phoneNumberCell = [self.bindingTableView cellForRowAtIndexPath:[NSIndexPath indexPathForRow:3 inSection:0]];
+    entity.phoneNumber = phoneNumberCell.bindingInputTextField.text;
+    if ([[self class] isBlankString:entity.accountName]) {
+        [XBLoadingView showHUDViewWithText:@"持卡人不能为空"]; return;
+    }
+    if ([[self class] isBlankString:entity.identityCode]) {
+        [XBLoadingView showHUDViewWithText:@"身份证号码不能为空"]; return;
+    }
+    if ([[self class] isBlankString:entity.bankAccount]) {
+        [XBLoadingView showHUDViewWithText:@"银行卡号不能为空"]; return;
+    }
+    if ([[self class] isBlankString:entity.identityCode]) {
+        [XBLoadingView showHUDViewWithText:@"身份证号码不能为空"]; return;
+    }
+    if ([self isPureInt:entity.accountName]) {
+        [XBLoadingView showHUDViewWithText:@"银行卡号格式不正确"]; return;
+    }
+    if (![HENLENSONG isValidateMobile:entity.phoneNumber]) {
+        [XBLoadingView showHUDViewWithText:@"手机号码格式不正确"]; return;
+    }
    NSString *type = [MyBankClass returnBankName:entity.bankAccount];
    WS(weakSelf);
    [XBLoadingView showHUDViewWithDefault];
+    NSLog(@"%@",[[entity toDictionary] JSONString]);
    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(VALIDATION) WithRequestType:ZERO WithParameter:entity WithReturnValueBlock:^(id returnValue) {
        
        [XBLoadingView hideHUDViewWithDefault];

--- a/Class/IntegralDetailsViewController.m
+++ b/Class/IntegralDetailsViewController.m
@@ -26,12 +26,16 @@

 @implementation IntegralDetailsViewController

+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    [self setUpRefreshAction];
+}

 - (void)viewDidLoad {
    [super viewDidLoad];
    
    [self uiConfigAction];
-    [self setUpRefreshAction];
 }

 #pragma mark - UI

--- a/Class/LearningCenter/ComprehensiveDiscussion/CommentListTableViewCell.m
+++ b/Class/LearningCenter/ComprehensiveDiscussion/CommentListTableViewCell.m
@@ -24,7 +24,6 @@

 #pragma mark - 选项按钮
 - (IBAction)extensionButtonClickAction:(UIButton *)sender {
-    self.bestView.hidden = NO;
    if (self.bestView.width != 0) {
        [UIView animateWithDuration:0.2 animations:^{
            self.bestView.width = 0;

--- a/Class/LearningCenter/ComprehensiveDiscussion/ForumItemDetailViewController.h
+++ b/Class/LearningCenter/ComprehensiveDiscussion/ForumItemDetailViewController.h
@@ -14,6 +14,10 @@
 */
 typedef void(^DeletePostBlock)(NSString *topicId);

+/**
+ 刷新列表
+ */
+typedef void(^RefreshListBlock)();

 @interface ForumItemDetailViewController : BaseViewController

@@ -47,6 +51,11 @@ typedef void(^DeletePostBlock)(NSString *topicId);
 */
 @property (nonatomic,copy) DeletePostBlock delectBlock;

+/**
+ 刷新列表
+ */
+@property (nonatomic,copy) RefreshListBlock refreshBlock;
+
 /**
 帖子详情数据源
 */

--- a/Class/LearningCenter/ComprehensiveDiscussion/ForumItemDetailViewController.m
+++ b/Class/LearningCenter/ComprehensiveDiscussion/ForumItemDetailViewController.m
@@ -180,7 +180,8 @@
 - (void)tableView:(UITableView *)tableView didEndDisplayingCell:(UITableViewCell *)cell forRowAtIndexPath:(NSIndexPath *)indexPath
 {
    CommentListTableViewCell *commentCell = (CommentListTableViewCell *)cell;
-    commentCell.bestView.hidden = YES;
+    commentCell.bestView.width = ZERO;
+    commentCell.bestView.x = commentCell.optionButton.x;
 }

 #pragma mark - 计算选中图片显示所需高度
@@ -234,6 +235,9 @@
        if ([returnValue[@"code"] isEqualToNumber:@0]) {
            weakSelf.commentInputTextFieldView.text = nil;
            [XBLoadingView showHUDViewWithSuccessText:@"评论成功" completeBlock:^{
+                if (weakSelf.refreshBlock) {
+                    weakSelf.refreshBlock();
+                }
                [weakSelf getPostDetailAction:YES];
            }];
        }else {
@@ -280,7 +284,6 @@
 {
    WS(weakSelf);
    [XBLoadingView showHUDViewWithDefault];
-    NSLog(@"%@",[NSString stringWithFormat:SERVERREQUESTURL(BASEREPLY),self.topicDetail.fid,replyId,isBest?@"true":@"false"]);
    [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(BASEREPLY),self.topicDetail.fid,replyId,isBest?@"true":@"false"] WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
        [XBLoadingView hideHUDViewWithDefault];
        if ([returnValue[@"code"] isEqualToNumber:@0]) {

--- a/Class/LearningCenter/ComprehensiveDiscussion/ForumItemListViewController.m
+++ b/Class/LearningCenter/ComprehensiveDiscussion/ForumItemListViewController.m
@@ -91,7 +91,6 @@
 {
    self.classifyTitleLabel.text = self.category.name;
    [self.classifyImageView sd_setImageWithURL:[NSURL URLWithString:self.category.attachment.fileUrl] placeholderImage:REPLACEIMAGE];
-    self.classifyListCountLabel.text = [NSString stringWithFormat:@"%ld",self.category.topicCount];
 }

 #pragma mark - 获取分类帖子列表
@@ -99,7 +98,6 @@
 {
    [XBLoadingView showHUDViewWithDefault];
    WS(weakSelf);
-    NSLog(@"%@",[[condtion toDictionary] JSONString]);
    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(QUERTFORUMLIST) WithRequestType:ZERO WithParameter:condtion WithReturnValueBlock:^(id returnValue) {
        
        [XBLoadingView hideHUDViewWithDefault];
@@ -112,6 +110,7 @@
            }
            ForumTopicResponse *result = [[ForumTopicResponse alloc] initWithDictionary:returnValue[@"data"] error:nil];
            [weakSelf.datasArray addObjectsFromArray:result.forumTopicEntity];
+            weakSelf.classifyListCountLabel.text = [NSString stringWithFormat:@"帖子: %ld",result.total];
        }else {
            [XBLoadingView showHUDViewWithText:returnValue[@"message"]];
        }
@@ -164,15 +163,15 @@
    ForumItemDetailViewController *postDetail = [[[self class] getLearningCenterStoryboardClass] instantiateViewControllerWithIdentifier:@"ForumItemDetailViewController"];
    postDetail.topicDetail = self.datasArray[indexPath.row];
    WS(weakSelf);
+    [postDetail setRefreshBlock:^{
+        [weakSelf.classificationListTableView.mj_header beginRefreshing];
+    }];
    //删除帖子
    [postDetail setDelectBlock:^(NSString *topicId) {
        for (int i=0; i<weakSelf.datasArray.count; i++) {
            CustomTOForumTopicEntity *entity = self.datasArray[i];
            if ([entity.fid isEqualToString:topicId]) {
-                [weakSelf.classificationListTableView beginUpdates];
-                [weakSelf.datasArray removeObjectAtIndex:i];
-                [weakSelf.classificationListTableView deleteRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:i inSection:ZERO]] withRowAnimation:UITableViewRowAnimationLeft];
-                [weakSelf.classificationListTableView endUpdates];
+                [weakSelf.classificationListTableView.mj_header beginRefreshing];
            }
        }
    }];

--- a/Class/LearningCenter/OnlineLearning/AssessmentViewController.m
+++ b/Class/LearningCenter/OnlineLearning/AssessmentViewController.m
@@ -221,11 +221,10 @@
    studyResult.details = (NSArray<TOStudyResultDetailEntity>*)submitAnswerArray;
    studyResult.grade = [NSNumber numberWithInteger:allScore];
    //判断考核是否合格
-    if (self.taskDetails.passGrade < allScore) {
-        studyResult.examResult = @"1";
-    }
+    studyResult.examResult = (self.taskDetails.passGrade < allScore)?@"1":@"0";
    [XBLoadingView showHUDViewWithDefault];
    WS(weakSelf);
+    NSLog(@"%@",[[studyResult toDictionary] JSONString])
    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(SUBMITANSWER) WithRequestType:ZERO WithParameter:studyResult WithReturnValueBlock:^(id returnValue) {
        
        [XBLoadingView hideHUDViewWithDefault];
@@ -259,12 +258,12 @@
    }else {
        WS(weakSelf);
        [XBLoadingView showHUDViewWithDefault];
-        [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(GETINTEGRAL),@"studyScore"] WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
+        [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(GETINTEGRAL),INSPECTIONTHROUGH] WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
            [XBLoadingView hideHUDViewWithDefault];
            if ([returnValue[@"code"] isEqualToNumber:@0]) {
                AssessmentQualifiedViewController *qualified = [[[weakSelf class] getLearningCenterStoryboardClass] instantiateViewControllerWithIdentifier:@"AssessmentQualifiedViewController"];
                qualified.delegate = self;
-                qualified.intrgral = [NSString stringWithFormat:@"+%@",returnValue[@"data"][@"optionValue"]];
+                qualified.intrgral = [NSString stringWithFormat:@"+%@",returnValue[@"data"]];
                qualified.allScore = [NSString stringWithFormat:@"%ld",allScore];
                qualified.preferredContentSize = CGSizeMake(300, 300);
                qualified.modalPresentationStyle = UIModalPresentationFormSheet;

--- a/Class/LearningCenter/OnlineLearning/OnlineLearningDetailViewController.m
+++ b/Class/LearningCenter/OnlineLearning/OnlineLearningDetailViewController.m
@@ -47,6 +47,13 @@
    if ([self.navigationController respondsToSelector:@selector(interactivePopGestureRecognizer)]) {
        self.navigationController.interactivePopGestureRecognizer.enabled = YES;
    }
+    //记录播放时间
+    VideoHelperViewController *videoVc = [self.childViewControllers firstObject];
+    if (videoVc.learningItem) {
+        double currentTime = [videoVc getCurrentPlayingTime];
+        double totalTime = videoVc.playerItem.duration.value/videoVc.playerItem.duration.timescale;
+        [self switchVideoRecordPlayTime:videoVc.learningItem.attachment withPlayTime:currentTime withPlayPercent:currentTime/totalTime];
+    }
 }

 - (void)viewDidLoad {
@@ -54,9 +61,10 @@
    
    [self addChildViewController];
    [self getStudyItemDetailAction];
+    [self listeningHomeButton];
 }

-#pragma mark - 
+#pragma mark - 添加子控制器
 - (void)addChildViewController
 {
    //播放窗口
@@ -68,6 +76,7 @@
    VideoListViewController *playList = [[[self class] getLearningCenterStoryboardClass] instantiateViewControllerWithIdentifier:@"VideoListViewController"];
    playList.studyItemTitle = self.studyTypeEntity.name;
    playList.delegate = self;
+    videoWindow.progressDelegate = playList;
    [self addChildViewController:playList];
    [self.view addSubview:playList.view];
    //播放简介
@@ -97,6 +106,33 @@
    playDetail.view.frame = CGRectMake(0, ScreenHeight/2+NavigationHeight, ScreenWidth*2/3, ScreenHeight/2-NavigationHeight);
 }

+#pragma mark - 监听Home键
+- (void)listeningHomeButton
+{
+    //监听是否触发home键挂起程序.
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationWillResignActive:)name:UIApplicationWillResignActiveNotification object:nil];
+    //监听是否重新进入程序程序.
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidBecomeActive:)name:UIApplicationDidBecomeActiveNotification object:nil];
+}
+
+#pragma mark - 进入后台
+- (void)applicationWillResignActive:(NSNotification *)notification
+{
+    printf("触发home按下\n");
+    //记录播放时间
+    VideoHelperViewController *videoVc = [self.childViewControllers firstObject];
+    if (videoVc.learningItem) {
+        double currentTime = [videoVc getCurrentPlayingTime];
+        double totalTime = videoVc.playerItem.duration.value/videoVc.playerItem.duration.timescale;
+        [self switchVideoRecordPlayTime:videoVc.learningItem.attachment withPlayTime:currentTime withPlayPercent:currentTime/totalTime];
+    }
+}
+
+#pragma mark - 进入前台
+- (void)applicationDidBecomeActive:(NSNotification *)notification
+{
+    printf("重新进来后响应\n");
+}

 #pragma mark - 获取学习项详情
 - (void)getStudyItemDetailAction
@@ -135,9 +171,15 @@
    VideoHelperViewController *videoVc = [self.childViewControllers firstObject];
    RsStudyTask *studyEntity = self.studyResult.studyEntity[indexPath.section];
    CustomStudyEntity *studyList = studyEntity.studyTasks[indexPath.row];
+    videoVc.indexPath = indexPath;
    if ([studyList.attachment.fileUrl rangeOfString:@".mp4"].location != NSNotFound) {
+        //判断是否是第一次播放
+        if (videoVc.learningItem) {
+            double currentTime = [videoVc getCurrentPlayingTime];
+            double totalTime = videoVc.playerItem.duration.value/videoVc.playerItem.duration.timescale;
+            [self switchVideoRecordPlayTime:videoVc.learningItem.attachment withPlayTime:currentTime withPlayPercent:currentTime/totalTime];
+        }
        videoVc.learningItem = studyList;
-        videoVc.videoTitleLabel.text = studyList.title;
    }else if ([studyList.attachment.fileUrl rangeOfString:@".ppt"].location != NSNotFound) {
        
        [videoVc resetPlayer];
@@ -152,6 +194,32 @@
    }
 }

+#pragma mark - 切换视频播放记录播放时间
+- (void)switchVideoRecordPlayTime:(TOAttachmentEntity *)attachment withPlayTime:(double)playTime withPlayPercent:(double)percent
+{
+    TOAttachmentPlayEntity *playTimeEntity = [[TOAttachmentPlayEntity alloc] init];
+    playTimeEntity.fid = attachment.entityId;
+    playTimeEntity.attachmentId = attachment.fid;
+    playTimeEntity.employeeId = [Shoppersmanager manager].Shoppers.employee.fid;
+    playTimeEntity.playTime = [NSString stringWithFormat:@"%.0lf",playTime];
+    playTimeEntity.playPercent = [NSString stringWithFormat:@"%.2lf",percent];
+    NSLog(@"%@",[playTimeEntity toDictionary]);
+    [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(ATTACHMENTPLAYTIME) WithRequestType:ZERO WithParameter:playTimeEntity WithReturnValueBlock:^(id returnValue) {
+        
+        if ([returnValue[@"code"] isEqualToNumber:@0]) {
+            NSLog(@"记录播放时间成功")
+            attachment.playTime = playTimeEntity.playTime;
+            attachment.playPercent = playTimeEntity.playPercent;
+        }else {
+            [XBLoadingView showHUDViewWithText:returnValue[@"message"]];
+        }
+        
+    } WithFailureBlock:^(NSError *error) {
+        [XBLoadingView showHUDViewWithText:error.localizedDescription];
+    }];
+}
+
+
 #pragma mark - 视频播放完成
 - (void)videoPlayFinish:(CustomStudyEntity *)studyEntity
 {
@@ -177,7 +245,6 @@
 {
    dispatch_group_t group = dispatch_group_create();
    dispatch_group_enter(group);
-    
    [XBLoadingView showHUDViewWithDefault];
    // 任务一，学习项完成
    [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(FINISHSTUDY),studuEntity.fid,[Shoppersmanager manager].Shoppers.employee.fid] WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
@@ -194,12 +261,12 @@
    }];
    // 任务二，获得学习积分
    dispatch_group_enter(group);
-    [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(GETINTEGRAL),@"finishStudyScore"] WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
+    [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(GETINTEGRAL),STUDYFINISH] WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
        
        dispatch_group_leave(group);
        if ([returnValue[@"code"] isEqualToNumber:@0]) {
            if (getIntegral) {
-                getIntegral(returnValue[@"data"][@"optionValue"]);
+                getIntegral(returnValue[@"data"]);
            }
        }else {
            [XBLoadingView showHUDViewWithText:returnValue[@"message"]];
@@ -211,7 +278,6 @@
    }];
    // 全部任务完成
    dispatch_group_notify(group, dispatch_get_main_queue(), ^{
-        
        [XBLoadingView hideHUDViewWithDefault];
    });
 }
@@ -249,8 +315,7 @@
        [XBLoadingView showHUDViewWithText:@"学习内容为空"];return;
    }
    VideoListViewController *studyListVC = self.childViewControllers[1];
-    studyListVC.datasArray = result.studyEntity;
-    
+    studyListVC.datasArray = [NSMutableArray arrayWithArray:result.studyEntity];
    VideoDetailViewController *studyDetailsVC = self.childViewControllers[2];
    studyDetailsVC.datasArray = result.studyEntity;
    studyDetailsVC.indexPath = [NSIndexPath indexPathForRow:0 inSection:0];

--- a/Class/LearningCenter/OnlineLearning/PPTListItemTableViewCell.h
+++ b/Class/LearningCenter/OnlineLearning/PPTListItemTableViewCell.h
@@ -21,6 +21,10 @@
 */
 @property (weak, nonatomic) IBOutlet UILabel *studyItemTitleLabel;

+/**
+ 考核状态
+ */
+@property (weak, nonatomic) IBOutlet UIImageView *examResultImageView;

 /**
 学习时间

--- a/Class/LearningCenter/OnlineLearning/PPTListItemTableViewCell.m
+++ b/Class/LearningCenter/OnlineLearning/PPTListItemTableViewCell.m
@@ -20,6 +20,11 @@
 {
    _model = model;
    self.studyItemTitleLabel.text = _model.title;
-    
+    //考核状态
+    if ([BaseViewController isBlankString:_model.examResult] || [_model.examResult isEqualToString:@"0"]) {
+        self.examResultImageView.hidden = YES;
+    }else {
+        self.examResultImageView.hidden = NO;
+    }
 }
 @end
--- a/Class/LearningCenter/OnlineLearning/VideoHelperViewController.h
+++ b/Class/LearningCenter/OnlineLearning/VideoHelperViewController.h
@@ -11,11 +11,38 @@
 #import <MediaPlayer/MediaPlayer.h>
 #import "VIMediaCache.h"

+
+/**
+ 视频播放
+ */
 @protocol VideoPlayerDelegate <NSObject>

 @optional
+
+/**
+ 视频播放完成
+
+ @param studyEntity 学习任务entity
+ */
 - (void)videoPlayFinish:(CustomStudyEntity *)studyEntity;

+
+@end
+
+
+/**
+ 视频播放进度
+ */
+@protocol VideoPlayProgressDelegate <NSObject>
+
+/**
+ 播放进度
+ 
+ @param proportion 进度
+ @param indexPath  index
+ */
+- (void)videoPlayProportion:(NSInteger)proportion withIndexPath:(NSIndexPath *)indexPath;
+
 @end

 @interface VideoHelperViewController : BaseViewController
@@ -30,6 +57,7 @@
 @property (nonatomic,strong) id avplayerServer;
 @property (nonatomic,strong) VIResourceLoaderManager *resourceLoaderManager;
 @property (nonatomic,weak) id<VideoPlayerDelegate> delegate;
+@property (nonatomic,weak) id<VideoPlayProgressDelegate> progressDelegate;

 /**
 视频导航栏
@@ -66,6 +94,11 @@
 */
 @property (weak, nonatomic) IBOutlet UILabel *playItemTotalTimeLabel;

+/**
+ 播放项下标
+ */
+@property (nonatomic,strong) NSIndexPath *indexPath;
+
 /**
 播放路径
 */
@@ -81,5 +114,12 @@
 */
 - (void)resetPlayer;

+/**
+ 当前播放时间
+
+ @return 秒数
+ */
+- (double)getCurrentPlayingTime;
+

 @end
--- a/Class/LearningCenter/OnlineLearning/VideoHelperViewController.m
+++ b/Class/LearningCenter/OnlineLearning/VideoHelperViewController.m
@@ -63,6 +63,7 @@
    }
 }

+
 #pragma mark - SetUp AVPlayer
 - (void)setUpAVPlayer
 {
@@ -78,6 +79,7 @@
    self.playerLayer = [AVPlayerLayer playerLayerWithPlayer:self.customPlayer];
    self.playerLayer.frame = CGRectMake(0, 0, ScreenWidth*2/3, ScreenHeight/2);
    [self.view.layer insertSublayer:self.playerLayer atIndex:0];
+    self.videoTitleLabel.text = self.learningItem.title;
 }

 #pragma mark - AVPlayer KVO
@@ -93,6 +95,7 @@

 #pragma mark -KVO回调
 -(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context{
+    WS(weakSelf);
    if ([keyPath isEqualToString:@"status"]) {//播放状态
        NSInteger status = [[change objectForKey:NSKeyValueChangeNewKey] integerValue];
        switch (status) {
@@ -103,10 +106,25 @@
                [XBLoadingView showHUDViewWithText:@"播放失败"];
                break;
            case AVPlayerStatusReadyToPlay://正在播放
+            {
+                self.playButton.selected = NO;
                [XBLoadingView hideHUDViewWithDefaultWithView:self.view];
                self.playItemTotalTimeLabel.text = [NSString stringWithFormat:@"/ %@",[self convertTime:CMTimeGetSeconds(self.playerItem.duration)]];
-                self.playButton.selected = NO;
+                NSString *timeString = [self timeFormatted:[self.learningItem.attachment.playTime integerValue]];
+                if (![[self class] isBlankString:timeString]) {
+                    [self.customPlayer pause];
+                    self.playButton.selected = YES;
+                    [self promptBoxWithMessage:[NSString stringWithFormat:@"上次播放时间:%@,是否继续播放",timeString] cancelBlock:^{
+                        [weakSelf.customPlayer play];
+                        weakSelf.playButton.selected = NO;
+                        
+                    } sureBlock:^{
+                        [weakSelf.customPlayer seekToTime:CMTimeMake([weakSelf.learningItem.attachment.playTime integerValue], ONE) toleranceBefore:kCMTimeZero toleranceAfter:kCMTimeZero];
+                        weakSelf.playButton.selected = NO;
+                    }];
+                }
                break;
+            }
            default:
                break;
        }
@@ -147,19 +165,27 @@
        //更新播放时间
        CMTime ctime = weakSelf.customPlayer.currentTime;
        weakSelf.playingTimeLabel.text = [weakSelf convertTime:ctime.value/ctime.timescale];
+        //更新播放百分比
+        if ([weakSelf.progressDelegate respondsToSelector:@selector(videoPlayProportion:withIndexPath:)]) {
+            [weakSelf.progressDelegate videoPlayProportion:[weakSelf getCurrentPlayingTime]/CMTimeGetSeconds(weakSelf.playerItem.duration)*100 withIndexPath:weakSelf.indexPath];
+        }
    }];
 }

 #pragma mark - 隐藏(显示)状态栏、工具栏
 - (void)hideOrShowNavigationBarAndToolBar
 {
-    WS(weakSelf);
    [UIView animateWithDuration:0.4 animations:^{
-        weakSelf.videoNavigationView.alpha = weakSelf.toolNaviViewIsHide?1:0;
-        weakSelf.videoToolView.alpha = weakSelf.toolNaviViewIsHide?1:0;
+        self.videoNavigationView.alpha = self.toolNaviViewIsHide?1:0;
+        self.videoToolView.alpha = self.toolNaviViewIsHide?1:0;
        
    }completion:^(BOOL finished) {
-        weakSelf.toolNaviViewIsHide = !weakSelf.toolNaviViewIsHide;
+        self.toolNaviViewIsHide = !self.toolNaviViewIsHide;
+        if (!self.toolNaviViewIsHide) {
+            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(5 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+                [self hideOrShowNavigationBarAndToolBar];
+            });
+        }
    }];
 }

@@ -180,7 +206,6 @@
 #pragma mark - 播放完成
 - (void)playFinish
 {
-    [self.customPlayer seekToTime:kCMTimeZero];
    self.playButton.selected = YES;
    if ([self.delegate respondsToSelector:@selector(videoPlayFinish:)]) {
        [self.delegate videoPlayFinish:self.learningItem];
@@ -311,7 +336,6 @@
        [audioInputParams setTrackID:[track trackID]];
        [allAudioParams addObject:audioInputParams];
    }
-    
    AVMutableAudioMix *audioMix = [AVMutableAudioMix audioMix];
    [audioMix setInputParameters:allAudioParams];
    [self.playerItem setAudioMix:audioMix];

--- a/Class/LearningCenter/OnlineLearning/VideoListItemTableViewCell.h
+++ b/Class/LearningCenter/OnlineLearning/VideoListItemTableViewCell.h
@@ -41,4 +41,10 @@
 */
 @property (nonatomic,strong) PNCircleChart *studyProgressView;

+/**
+ 考核状态
+ */
+@property (weak, nonatomic) IBOutlet UIImageView *examResultImageView;
+
+
 @end
--- a/Class/LearningCenter/OnlineLearning/VideoListItemTableViewCell.m
+++ b/Class/LearningCenter/OnlineLearning/VideoListItemTableViewCell.m
@@ -27,7 +27,13 @@
    _model = model;
    self.studyItemTitleLabel.text = _model.title;
    self.studyItemTimeLabel.text = _model.videoLength;
-    [self.studyProgressView updateChartByCurrent:@50];
+    [self.studyProgressView updateChartByCurrent:[NSNumber numberWithInteger:[_model.attachment.playPercent floatValue]*100]];
+    //考核状态
+    if ([BaseViewController isBlankString:_model.examResult] || [_model.examResult isEqualToString:@"0"]) {
+        self.examResultImageView.hidden = YES;
+    }else {
+        self.examResultImageView.hidden = NO;
+    }
 }

 @end
--- a/Class/LearningCenter/OnlineLearning/VideoListViewController.h
+++ b/Class/LearningCenter/OnlineLearning/VideoListViewController.h
@@ -7,6 +7,7 @@
 //

 #import "BaseViewController.h"
+#import "VideoHelperViewController.h"


 /**
@@ -18,7 +19,7 @@

 @end

-@interface VideoListViewController : BaseViewController
+@interface VideoListViewController : BaseViewController<VideoPlayProgressDelegate>

 @property (nonatomic,weak) id<SelectStudyItemDelegate> delegate;

@@ -40,5 +41,5 @@
 /**
 学习列表数据源
 */
-@property (nonatomic,strong) NSArray *datasArray;
+@property (nonatomic,strong) NSMutableArray *datasArray;
 @end
--- a/Class/LearningCenter/OnlineLearning/VideoListViewController.m
+++ b/Class/LearningCenter/OnlineLearning/VideoListViewController.m
@@ -27,7 +27,7 @@
 }

 #pragma mark - 数据源
- (void)setDatasArray:(NSArray *)datasArray
+- (void)setDatasArray:(NSMutableArray *)datasArray
 {
    _datasArray = datasArray;
    [self.studyListTableView reloadData];
@@ -104,4 +104,15 @@
 }


+#pragma mark - 视频播放百分比
+- (void)videoPlayProportion:(NSInteger)proportion withIndexPath:(NSIndexPath *)indexPath
+{
+    VideoListItemTableViewCell *videoPlayCell = [self.studyListTableView cellForRowAtIndexPath:indexPath];
+    RsStudyTask *studyEntity = self.datasArray[indexPath.section];
+    CustomStudyEntity *studyList = studyEntity.studyTasks[indexPath.row];
+    studyList.attachment.playPercent = [NSString stringWithFormat:@"%ld",proportion];
+    [videoPlayCell.studyProgressView updateChartByCurrent:@(proportion)];
+}
+
+
 @end
--- a/Class/LearningCenter/SkillsAssessment/AnswerViewController.h
+++ b/Class/LearningCenter/SkillsAssessment/AnswerViewController.h
@@ -10,8 +10,17 @@



+/**
+ 取消、完成代理
+ */
 @protocol DismissDelegate <NSObject>
+
+
 @optional
+
+/**
+ 取消
+ */
 - (void)dismissController;

 /**

--- a/Class/LearningCenter/SkillsAssessment/AnswerViewController.m
+++ b/Class/LearningCenter/SkillsAssessment/AnswerViewController.m
@@ -264,13 +264,13 @@
    }else {
        WS(weakSelf);
        [XBLoadingView showHUDViewWithDefault];
-        NSString *url = [NSString stringWithFormat:SERVERREQUESTURL(GETINTEGRAL),@"passLevelScore"];
+        NSString *url = [NSString stringWithFormat:SERVERREQUESTURL(GETINTEGRAL),RECRUITTHROUGH];
        [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:url WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
            [XBLoadingView hideHUDViewWithDefault];
            if ([returnValue[@"code"] isEqualToNumber:@0]) {
                finish.state = ONE;
                finish.score = [NSString stringWithFormat:@"%ld",allScore];
-                finish.integral = [NSString stringWithFormat:@"+%@",returnValue[@"data"][@"optionValue"]];
+                finish.integral = [NSString stringWithFormat:@"+%@",returnValue[@"data"]];
                [weakSelf showPopoverView:finish];
                
            }else {
@@ -290,6 +290,13 @@
    [self.popover dismissPopoverAnimated:YES];
 }

+#pragma mark - 取消闯关
+- (IBAction)exitButtonClickAction:(UIButton *)sender {
+    if ([self.delegate respondsToSelector:@selector(dismissController)]) {
+        [self.delegate dismissController];
+    }
+}
+
 #pragma mark - 弹出框
 - (void)showPopoverView:(BaseViewController *)controller
 {

--- a/Class/LearningCenter/SkillsAssessment/EmigratedFinishViewController.h
+++ b/Class/LearningCenter/SkillsAssessment/EmigratedFinishViewController.h
@@ -11,6 +11,7 @@

 @protocol CompeteDelegate <NSObject>

+@optional
 - (void)finish;

 @end

--- a/Class/LearningCenter/SkillsAssessment/EmigratedMainViewController.m
+++ b/Class/LearningCenter/SkillsAssessment/EmigratedMainViewController.m
@@ -96,7 +96,14 @@
 - (void)selectApplicableAction:(UITapGestureRecognizer *)sender
 {
    TOPassLevelEntity *entity = self.emigratedResponse.passLevelEntity[sender.view.tag];
-    if ([[self class] compareDateString:entity.endDate]) {
+    //判断闯关任务是否过期
+    NSDateFormatter* dateFormat = [[NSDateFormatter alloc] init];
+    dateFormat.locale = [[NSLocale alloc] initWithLocaleIdentifier:@"en_US"];
+    [dateFormat setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
+    NSDate *date = [dateFormat dateFromString:entity.endDate];
+    NSDate *date2 = [date dateByAddingTimeInterval:8 * 60 * 60];//手动增加8小时
+    int result = [self compareOneDay:[NSDate date] withAnotherDay:date2];
+    if (result == ONE) {
        [XBLoadingView showHUDViewWithText:@"已过期"];return;
    }
    AnswerViewController *answer = [[[self class] getLearningCenterStoryboardClass] instantiateViewControllerWithIdentifier:@"AnswerViewController"];
@@ -106,7 +113,7 @@
    [self showPopoverView:answer];
 }

-#pragma mark ------- <DismissDelegate>
+#pragma mark - <DismissDelegate>
 #pragma mark - 做题完成
 - (void)dismissController
 {

--- a/Class/RebateDetailsViewController.h
+++ b/Class/RebateDetailsViewController.h
@@ -20,4 +20,14 @@
 */
 @property (nonatomic,copy) void(^showApplyDetails)(TOApplyBillEntity *model);

+/**
+ 提现卡号
+ */
+@property (nonatomic,copy) NSString *bankCardNumber;
+
+/**
+ 提现类型
+ */
+@property (nonatomic,copy) NSString *billType;
+
 @end
--- a/Class/RebateDetailsViewController.m
+++ b/Class/RebateDetailsViewController.m
@@ -41,21 +41,21 @@
    if ([self.inputRebateTextField.text floatValue] > self.rebateAmount) {
        [XBLoadingView showHUDViewWithText:@"当前账户余额不足"];return;
    }
-    if ([self.inputRebateTextField.text floatValue] <= 0) {
-        [XBLoadingView showHUDViewWithText:@"格式不正确"];return;
+    if ([self.inputRebateTextField.text floatValue] <= 10) {
+        [XBLoadingView showHUDViewWithText:@"提现金额不能小于10"];return;
    }
    if ([self includeChinese:self.inputRebateTextField.text]) {
        [XBLoadingView showHUDViewWithText:@"格式不正确"];return;
    }
-    UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:nil message:[NSString stringWithFormat:@"请确认提现金额:%@元",self.inputRebateTextField.text] preferredStyle:UIAlertControllerStyleAlert];
-    [alertVC addAction:[UIAlertAction actionWithTitle:@"确认" style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+    [self promptBoxWithMessage:[NSString stringWithFormat:@"请确认提现金额:%@元",self.inputRebateTextField.text] cancelBlock:^{
        
+    } sureBlock:^{
        [XBLoadingView showHUDViewWithDefault];
        ApplyRequest *withdrawal = [[ApplyRequest alloc] init];
-        withdrawal.amount = [NSNumber numberWithFloat:[self.inputRebateTextField.text floatValue]];
-        withdrawal.billType = nil;
-        withdrawal.bankCardNumber = @"";
-        
+        withdrawal.amount = [NSNumber numberWithFloat:[weakSelf.inputRebateTextField.text floatValue]];
+        withdrawal.billType = weakSelf.billType;
+        withdrawal.bankCardNumber = weakSelf.bankCardNumber;
+        NSLog(@"%@",[[withdrawal toDictionary] JSONString]);
        [[NetworkRequestClassManager Manager] NetworkRequestWithURL:SERVERREQUESTURL(WITHDRAWAL) WithRequestType:ZERO WithParameter:withdrawal WithReturnValueBlock:^(id returnValue) {
            [XBLoadingView hideHUDViewWithDefault];
            if ([returnValue[@"code"] isEqualToNumber:@0]) {
@@ -70,12 +70,7 @@
            [XBLoadingView hideHUDViewWithDefault];
            [XBLoadingView showHUDViewWithText:error.localizedDescription];
        }];
-        
-        
-    }]];
-    [alertVC addAction:[UIAlertAction actionWithTitle:@"取消" style:UIAlertActionStyleCancel handler:^(UIAlertAction * _Nonnull action) {
-    }]];
-    [self presentViewController:alertVC animated:YES completion:nil];
+    }];
 }

 #pragma mark - 提现申请成功

--- a/Class/RebateViewController.m
+++ b/Class/RebateViewController.m
@@ -81,11 +81,6 @@

 /*******************************/

-/**
- *  账户数据
- */
-@property (nonatomic,strong) EarningsResponse *model;
-
 /**
 *  我的卡劵包
 */
@@ -102,9 +97,13 @@
 @property (nonatomic,strong) EarningsResponse *resultEntity;


+@end

+//欧普奖励
+NSString *const commission = @"commission";
+//红包
+NSString *const redPackage = @"redPackage";

-@end

 @implementation RebateViewController

@@ -139,7 +138,7 @@
    // 我的抽奖
    LuckyDrawDetailsViewController *draw = [[[self class] getMainStoryboardClass]instantiateViewControllerWithIdentifier:@"LuckyDrawDetailsViewController"];
    [self addChildViewController:draw];
-    draw.drawValue = 0;
+    draw.drawValue = ZERO;
    [self.drawBackgroundView addSubview:draw.view];
 }

@@ -193,25 +192,30 @@
    self.oppleRewardAmountLabel.attributedText = oppleReward;
    self.currentAmountLabel.text = [NSString stringWithFormat:@"%.2f",[response.redPackageAccountTotal floatValue] + [response.accountTotal floatValue]];
    self.productRebateAmountLabel.text = [NSString stringWithFormat:@"%.2f",[response.accountTotal floatValue]];
-     self.productRebateYesterdayAmountLabel.text = [NSString stringWithFormat:@"冻结金额：%.2f",[response.yesterdayEarnings floatValue]];
+     self.productRebateYesterdayAmountLabel.text = [NSString stringWithFormat:@"昨日收益：%.2f",[response.yesterdayEarnings floatValue]];
     self.productRebateHistoryAmountLabel.text = [NSString stringWithFormat:@"历史收益：%.2f",[response.historyEarning floatValue]];
-    self.productRebateFreezeAmountLabel.text = [NSString stringWithFormat:@"昨日收益：%.2f",[response.applytotal floatValue]];
+    self.productRebateFreezeAmountLabel.text = [NSString stringWithFormat:@"冻结金额：%.2f",[response.applytotal floatValue]];
    self.oppleRewardYesterdayAmountLabel.text = [NSString stringWithFormat:@"昨日收益：%.2f",[response.redPackageYesterdayEarnings floatValue]];
    self.oppleRewardHistoryAmountLabel.text = [NSString stringWithFormat:@"历史收益：%.2f",[response.redPackageHistoryEarning floatValue]];
    self.oppleRewardFreezeAmountLabel.text = [NSString stringWithFormat:@"冻结金额：%.2f",[response.redPackageApplytotal floatValue]];
    self.oppleRewardAmountLabel.text = [NSString stringWithFormat:@"%.2f",[response.redPackageAccountTotal floatValue]];
-    
-//    self.productRebateButton.enabled = response.isUsable;
-//    self.oppleRewardButton.enabled = response.isUsable;
 }


 #pragma mark - 提现<tag == 100 产品返利><tag == 101 欧普奖励>
 - (IBAction)withdrawalButtonClickAction:(UIButton *)sender {

+    if (!self.resultEntity.bankCards.count) {
+        [self showUnboundedAlertView];
+    }
+//    if (!self.resultEntity.isUsable) {
+//        [self promptCustomerTitle:@"我知道了" withMessage:@"只能在周二和周五发起提现申请!" finish:nil];
+//        return;
+//    }
    WS(weakSelf);
    RebateDetailsViewController *rebateDetails = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"RebateDetailsViewController"];
-    rebateDetails.rebateAmount = [self.model.accountTotal floatValue]-[self.model.applytotal floatValue];
+    rebateDetails.rebateAmount = (sender.tag == 100)?[self.resultEntity.accountTotal floatValue]:[self.resultEntity.redPackageAccountTotal floatValue];
+    rebateDetails.billType = (sender.tag == 100)?commission:redPackage;
    [rebateDetails setShowApplyDetails:^(TOApplyBillEntity *entity) {
        WithdrawalTableViewController *detailVC = [[[self class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"WithdrawalTableViewController"];
        detailVC.model = entity;
@@ -272,7 +276,7 @@
    [XBLoadingView showHUDViewWithDefault];
    WS(weakSelf);
     TOBankCardEntity *entity = self.resultEntity.bankCards[0];
-    [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(UNBINDING),entity.bankAccount] WithRequestType:ZERO WithParameter:nil WithReturnValueBlock:^(id returnValue) {
+    [[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:[NSString stringWithFormat:SERVERREQUESTURL(UNBINDING),entity.bankAccount] WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
        
        [XBLoadingView hideHUDViewWithDefault];
        if ([returnValue[@"code"] isEqualToNumber:@0]) {

--- a/Class/RightViewController.m
+++ b/Class/RightViewController.m
@@ -59,7 +59,7 @@
 {
    if (_dataArray == nil) {
        _dataArray = [NSMutableArray arrayWithObjects:@"体验中心",@"场景库",@"产品库",@"客户管理",@"学习中心",@"关于", nil];
-        if (![[Shoppersmanager manager].Shoppers.employee.userKey isEqualToString:@"学习人员"]) {
+        if ([[Shoppersmanager manager].Shoppers.employee.userKey rangeOfString:@"学习人员"].location == NSNotFound) {
            [_dataArray removeObject:@"学习中心"];
        }
    }

--- a/Lighting/LearningCenter.storyboard
+++ b/Lighting/LearningCenter.storyboard
@@ -232,7 +232,7 @@
                                        <rect key="frame" x="0.0" y="28" width="1024" height="90"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gz9-gD-P6A" id="4lI-td-FE0">
-                                            <frame key="frameInset" width="830" height="89.5"/>
+                                            <frame key="frameInset" width="830" height="89"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="00登录-谭" translatesAutoresizingMaskIntoConstraints="NO" id="tIu-Ox-DXo">
@@ -391,7 +391,7 @@
                                            </userDefinedRuntimeAttribute>
                                        </userDefinedRuntimeAttributes>
                                    </imageView>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="帖子：1122" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sSD-4l-Ksh">
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="帖子：0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sSD-4l-Ksh">
                                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                        <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                        <nil key="highlightedColor"/>
@@ -428,7 +428,7 @@
                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="172" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="mCC-Hw-JZs">
                                <color key="backgroundColor" red="0.92941176470588238" green="0.93333333333333335" blue="0.93725490196078431" alpha="1" colorSpace="calibratedRGB"/>
                                <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="ForumItemTableViewCell" rowHeight="253" id="KPa-ue-ynj" customClass="ForumItemTableViewCell">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="ForumItemTableViewCell" rowHeight="253" id="KPa-ue-ynj" customClass="ForumItemTableViewCell">
                                        <rect key="frame" x="0.0" y="28" width="1024" height="253"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KPa-ue-ynj" id="fqg-6x-xYw">
@@ -601,7 +601,7 @@
                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                <prototypes>
                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="AssessmentHeaderView" id="UfB-K3-NdF" customClass="AssessmentHeaderView">
-                                        <rect key="frame" x="0.0" y="55.5" width="460" height="44"/>
+                                        <rect key="frame" x="0.0" y="56" width="460" height="44"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="UfB-K3-NdF" id="WGo-Wa-YTq">
                                            <frame key="frameInset" width="460" height="44"/>
@@ -626,7 +626,7 @@
                                        </connections>
                                    </tableViewCell>
                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="AssessmentTableViewCell" rowHeight="52" id="gIe-bF-XsX" customClass="AssessmentTableViewCell">
-                                        <rect key="frame" x="0.0" y="99.5" width="460" height="52"/>
+                                        <rect key="frame" x="0.0" y="100" width="460" height="52"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gIe-bF-XsX" id="Va8-wn-DBM">
                                            <frame key="frameInset" width="460" height="52"/>
@@ -670,7 +670,7 @@
                                        </connections>
                                    </tableViewCell>
                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="AssessmentShortAnswerTableViewCell" rowHeight="112" id="smV-qr-KgP" customClass="AssessmentShortAnswerTableViewCell">
-                                        <rect key="frame" x="0.0" y="151.5" width="460" height="112"/>
+                                        <rect key="frame" x="0.0" y="152" width="460" height="112"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="smV-qr-KgP" id="A2f-ek-60T">
                                            <frame key="frameInset" width="460" height="112"/>
@@ -712,12 +712,25 @@
                                    <action selector="nextButtonClickAction:" destination="Lkd-51-36Y" eventType="touchUpInside" id="ywj-pf-O5c"/>
                                </connections>
                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EmK-nj-ESP">
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="45" id="MbH-mD-iSm"/>
+                                    <constraint firstAttribute="height" constant="45" id="ofC-MN-zCz"/>
+                                </constraints>
+                                <state key="normal" backgroundImage="cancel"/>
+                                <connections>
+                                    <action selector="dismissButtonClickAction:" destination="CQf-WE-NWn" eventType="touchUpInside" id="rra-S5-XzR"/>
+                                    <action selector="exitButtonClickAction:" destination="Lkd-51-36Y" eventType="touchUpInside" id="Mk2-bU-F5d"/>
+                                </connections>
+                            </button>
                        </subviews>
                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                        <constraints>
                            <constraint firstItem="V2g-cZ-x9s" firstAttribute="top" secondItem="WUh-87-00D" secondAttribute="bottom" id="4IP-YK-BBD"/>
                            <constraint firstItem="WUh-87-00D" firstAttribute="top" secondItem="gE8-Ry-qGe" secondAttribute="top" id="6J3-yr-FYs"/>
                            <constraint firstItem="WUh-87-00D" firstAttribute="leading" secondItem="gE8-Ry-qGe" secondAttribute="leading" id="7C3-iY-erJ"/>
+                            <constraint firstAttribute="trailing" secondItem="EmK-nj-ESP" secondAttribute="trailing" id="EBV-36-Y3D"/>
+                            <constraint firstItem="EmK-nj-ESP" firstAttribute="top" secondItem="gE8-Ry-qGe" secondAttribute="top" id="H4D-C9-9li"/>
                            <constraint firstItem="2N8-Zu-eSH" firstAttribute="centerX" secondItem="gE8-Ry-qGe" secondAttribute="centerX" id="NtH-k3-Cvq"/>
                            <constraint firstAttribute="trailing" secondItem="WUh-87-00D" secondAttribute="trailing" id="NwF-Xm-cSz"/>
                            <constraint firstItem="V2g-cZ-x9s" firstAttribute="top" secondItem="2N8-Zu-eSH" secondAttribute="bottom" constant="20" id="R1P-ex-EEf"/>
@@ -792,7 +805,7 @@
                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="HEy-wy-TuV">
                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="HeadlineTableViewCell" id="RwU-Te-fXY" customClass="HeadlineTableViewCell">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="HeadlineTableViewCell" id="RwU-Te-fXY" customClass="HeadlineTableViewCell">
                                        <rect key="frame" x="0.0" y="28" width="1024" height="44"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="RwU-Te-fXY" id="GcB-7X-Q0o">
@@ -827,7 +840,7 @@
                                            <outlet property="titleTextField" destination="QwA-Ps-okZ" id="tdx-q3-9uv"/>
                                        </connections>
                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="ContentTableViewCell" rowHeight="170" id="bcJ-bt-ka6" customClass="ContentTableViewCell">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="ContentTableViewCell" rowHeight="170" id="bcJ-bt-ka6" customClass="ContentTableViewCell">
                                        <rect key="frame" x="0.0" y="72" width="1024" height="170"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="bcJ-bt-ka6" id="uXN-gY-mO0">
@@ -1264,7 +1277,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
                                        <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="Qnm-0r-wEL" id="VAA-bT-OlF">
-                                            <frame key="frameInset" width="1024" height="99.5"/>
+                                            <frame key="frameInset" width="1024" height="99"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="课时简介" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="agZ-rF-DnB">
@@ -1294,7 +1307,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
                                        <rect key="frame" x="0.0" y="128" width="1024" height="130"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WzB-nZ-wsW" id="Zzv-Yi-ZxT">
-                                            <frame key="frameInset" width="1024" height="129.5"/>
+                                            <frame key="frameInset" width="1024" height="129"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="授课讲师" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kxK-dX-OAf">
@@ -1347,7 +1360,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
                                        <rect key="frame" x="0.0" y="258" width="1024" height="100"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="oia-jO-L9n" id="AMF-ag-ZWN">
-                                            <frame key="frameInset" width="1024" height="99.5"/>
+                                            <frame key="frameInset" width="1024" height="99"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="针对人员" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NfI-IM-h1i">
@@ -1537,8 +1550,8 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
                        <subviews>
                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="n7q-60-s3U">
                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
-                                <view key="tableHeaderView" contentMode="scaleToFill" misplaced="YES" id="p9i-EO-Sx0">
-                                    <rect key="frame" x="0.0" y="0.0" width="0.0" height="60"/>
+                                <view key="tableHeaderView" contentMode="scaleToFill" id="p9i-EO-Sx0">
+                                    <rect key="frame" x="0.0" y="0.0" width="500" height="60"/>
                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                    <subviews>
                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DNW-by-H8X">
@@ -1554,11 +1567,11 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
                                    </constraints>
                                </view>
                                <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="VideoListItemTableViewCell" rowHeight="50" id="YXo-b3-NKo" customClass="VideoListItemTableViewCell">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="VideoListItemTableViewCell" rowHeight="50" id="YXo-b3-NKo" customClass="VideoListItemTableViewCell">
                                        <rect key="frame" x="0.0" y="88" width="500" height="50"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="YXo-b3-NKo" id="Zsh-Nm-SGv">
-                                            <frame key="frameInset" width="500" height="49.5"/>
+                                            <frame key="frameInset" width="500" height="49"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="FNL-Q4-kdY">
@@ -1586,13 +1599,21 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
                                                        <constraint firstAttribute="height" constant="30" id="xS0-wu-MRb"/>
                                                    </constraints>
                                                </view>
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="通过" translatesAutoresizingMaskIntoConstraints="NO" id="cny-PA-JpH">
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="20" id="qlN-ce-UR9"/>
+                                                        <constraint firstAttribute="width" constant="50" id="uLt-h5-EDk"/>
+                                                    </constraints>
+                                                </imageView>
                                            </subviews>
                                            <constraints>
                                                <constraint firstItem="Ast-eO-9V0" firstAttribute="centerY" secondItem="FNL-Q4-kdY" secondAttribute="centerY" id="4D8-Yl-tb5"/>
                                                <constraint firstItem="BVg-HN-E2s" firstAttribute="centerY" secondItem="Ast-eO-9V0" secondAttribute="centerY" id="9w5-mB-anf"/>
                                                <constraint firstItem="FNL-Q4-kdY" firstAttribute="centerY" secondItem="Zsh-Nm-SGv" secondAttribute="centerY" id="DoL-1X-1DZ"/>
+                                                <constraint firstItem="BVg-HN-E2s" firstAttribute="leading" secondItem="cny-PA-JpH" secondAttribute="trailing" constant="10" id="FeY-kV-5zF"/>
                                                <constraint firstItem="FNL-Q4-kdY" firstAttribute="leading" secondItem="Zsh-Nm-SGv" secondAttribute="leading" constant="12" id="IKT-GZ-UfU"/>
                                                <constraint firstItem="0QA-OC-BkN" firstAttribute="centerY" secondItem="FNL-Q4-kdY" secondAttribute="centerY" id="KVJ-bY-0gc"/>
+                                                <constraint firstItem="cny-PA-JpH" firstAttribute="centerY" secondItem="BVg-HN-E2s" secondAttribute="centerY" id="Odt-ir-59j"/>
                                                <constraint firstItem="0QA-OC-BkN" firstAttribute="leading" secondItem="FNL-Q4-kdY" secondAttribute="trailing" constant="20" id="Qc4-J9-Joq"/>
                                                <constraint firstAttribute="trailing" secondItem="Ast-eO-9V0" secondAttribute="trailing" constant="15" id="Xih-52-5hy"/>
                                                <constraint firstItem="Ast-eO-9V0" firstAttribute="leading" secondItem="BVg-HN-E2s" secondAttribute="trailing" constant="10" id="i3G-EM-h4h"/>
@@ -1600,17 +1621,18 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
                                            </constraints>
                                        </tableViewCellContentView>
                                        <connections>
+                                            <outlet property="examResultImageView" destination="cny-PA-JpH" id="R7t-ol-rAq"/>
                                            <outlet property="playButton" destination="FNL-Q4-kdY" id="Abd-Au-JQk"/>
                                            <outlet property="seekbarView" destination="BVg-HN-E2s" id="Ngx-Ju-zff"/>
                                            <outlet property="studyItemTimeLabel" destination="Ast-eO-9V0" id="q9C-EN-fp3"/>
                                            <outlet property="studyItemTitleLabel" destination="0QA-OC-BkN" id="1d5-ex-vvU"/>
                                        </connections>
                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="PPTListItemTableViewCell" rowHeight="50" id="OSF-93-RuO" customClass="PPTListItemTableViewCell">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PPTListItemTableViewCell" rowHeight="50" id="OSF-93-RuO" customClass="PPTListItemTableViewCell">
                                        <rect key="frame" x="0.0" y="138" width="500" height="50"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="OSF-93-RuO" id="IQr-pV-6ZO">
-                                            <frame key="frameInset" width="500" height="49.5"/>
+                                            <frame key="frameInset" width="500" height="49"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="j7R-oP-wMP">
@@ -1631,28 +1653,37 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
                                                    <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                    <nil key="highlightedColor"/>
                                                </label>
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="通过" translatesAutoresizingMaskIntoConstraints="NO" id="Gwb-yp-kzF">
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="50" id="3pT-7N-uob"/>
+                                                        <constraint firstAttribute="height" constant="20" id="sFf-Ng-aIU"/>
+                                                    </constraints>
+                                                </imageView>
                                            </subviews>
                                            <constraints>
+                                                <constraint firstItem="Gwb-yp-kzF" firstAttribute="centerY" secondItem="t1Q-41-RAj" secondAttribute="centerY" id="Lvf-ms-adf"/>
                                                <constraint firstItem="t1Q-41-RAj" firstAttribute="leading" secondItem="6O1-Dg-ELo" secondAttribute="trailing" constant="20" id="P2g-cX-AOe"/>
                                                <constraint firstItem="t1Q-41-RAj" firstAttribute="centerY" secondItem="IQr-pV-6ZO" secondAttribute="centerY" id="Rip-Vc-um3"/>
                                                <constraint firstItem="6O1-Dg-ELo" firstAttribute="leading" secondItem="j7R-oP-wMP" secondAttribute="trailing" constant="22" id="bNv-py-RlR"/>
                                                <constraint firstItem="j7R-oP-wMP" firstAttribute="leading" secondItem="IQr-pV-6ZO" secondAttribute="leading" constant="12" id="cjG-Ve-HKc"/>
+                                                <constraint firstItem="t1Q-41-RAj" firstAttribute="leading" secondItem="Gwb-yp-kzF" secondAttribute="trailing" constant="50" id="gss-Qt-GwH"/>
                                                <constraint firstAttribute="trailing" secondItem="t1Q-41-RAj" secondAttribute="trailing" constant="15" id="hWI-F3-sQG"/>
                                                <constraint firstItem="6O1-Dg-ELo" firstAttribute="centerY" secondItem="j7R-oP-wMP" secondAttribute="centerY" id="uNk-Xg-kfU"/>
                                                <constraint firstItem="j7R-oP-wMP" firstAttribute="centerY" secondItem="IQr-pV-6ZO" secondAttribute="centerY" id="w2Y-l9-mb5"/>
                                            </constraints>
                                        </tableViewCellContentView>
                                        <connections>
+                                            <outlet property="examResultImageView" destination="Gwb-yp-kzF" id="Ftr-TR-W7i"/>
                                            <outlet property="pptButton" destination="j7R-oP-wMP" id="m7u-ia-zmb"/>
                                            <outlet property="studyItemLabel" destination="t1Q-41-RAj" id="jCw-CL-C3l"/>
                                            <outlet property="studyItemTitleLabel" destination="6O1-Dg-ELo" id="MDq-lB-rxF"/>
                                        </connections>
                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="VideoListSectionHeaderView" rowHeight="60" id="w6E-t4-Q38" customClass="VideoListSectionHeaderView">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="VideoListSectionHeaderView" rowHeight="60" id="w6E-t4-Q38" customClass="VideoListSectionHeaderView">
                                        <rect key="frame" x="0.0" y="188" width="500" height="60"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="w6E-t4-Q38" id="Xwb-Tx-Kw3">
-                                            <frame key="frameInset" width="500" height="59.5"/>
+                                            <frame key="frameInset" width="500" height="59"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2016第一期销售培训" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nNT-PL-RIn">
@@ -1752,7 +1783,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                <prototypes>
                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="AssessmentHeaderView" rowHeight="60" id="2M5-To-MLj" customClass="AssessmentHeaderView">
-                                        <rect key="frame" x="0.0" y="55.5" width="1024" height="60"/>
+                                        <rect key="frame" x="0.0" y="56" width="1024" height="60"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="2M5-To-MLj" id="ypf-GL-4CP">
                                            <frame key="frameInset" width="1024" height="60"/>
@@ -1777,7 +1808,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
                                        </connections>
                                    </tableViewCell>
                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="AssessmentTableViewCell" rowHeight="50" id="BjI-a1-CRm" customClass="AssessmentTableViewCell">
-                                        <rect key="frame" x="0.0" y="115.5" width="1024" height="50"/>
+                                        <rect key="frame" x="0.0" y="116" width="1024" height="50"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="BjI-a1-CRm" id="bq8-ly-DcD">
                                            <frame key="frameInset" width="1024" height="50"/>
@@ -2031,7 +2062,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="118" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="TVZ-eo-sh6">
                                <color key="backgroundColor" red="0.96078431372549022" green="0.97647058823529409" blue="0.98039215686274506" alpha="1" colorSpace="calibratedRGB"/>
                                <view key="tableHeaderView" contentMode="scaleToFill" id="sYW-Jc-Fde">
-                                    <rect key="frame" x="0.0" y="0.0" width="1048" height="0.0"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="1024" height="0.0"/>
                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                    <subviews>
                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="00登录-谭" translatesAutoresizingMaskIntoConstraints="NO" id="v3R-bc-vx5">
@@ -2088,7 +2119,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
                                        <rect key="frame" x="0.0" y="28" width="1024" height="84"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="sX2-jy-tQ2" id="iVT-bi-RKr">
-                                            <frame key="frameInset" width="1024" height="83.5"/>
+                                            <frame key="frameInset" width="1024" height="83"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="crown" translatesAutoresizingMaskIntoConstraints="NO" id="pyu-Y7-w8M">
@@ -2354,6 +2385,7 @@ timingFunction 设置动画速度曲线,默认值上面已经给出.下面说它
        <image name="startEvaluation" width="203" height="43"/>
        <image name="stop" width="24" height="30"/>
        <image name="study" width="118" height="91"/>
+        <image name="通过" width="35" height="17"/>
        <image name="闯关说明" width="306" height="90"/>
    </resources>
    <simulatedMetricsContainer key="defaultSimulatedMetrics">

--- a/Lighting/OppleMain.storyboard
+++ b/Lighting/OppleMain.storyboard
@@ -16,7 +16,7 @@
                        <viewControllerLayoutGuide type="bottom" id="f67-Xu-Sz9"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="4VL-r5-nPN">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="laV-XF-HtJ">
@@ -192,11 +192,11 @@
                                    <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="hkO-uH-vEN">
                                        <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="information" rowHeight="100" id="NV8-I4-ig4" customClass="InformationTableViewCell">
-                                                <rect key="frame" x="0.0" y="28" width="984" height="100"/>
+                                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="information" rowHeight="100" id="NV8-I4-ig4" customClass="InformationTableViewCell">
+                                                <rect key="frame" x="0.0" y="28" width="728" height="100"/>
                                                <autoresizingMask key="autoresizingMask"/>
                                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="NV8-I4-ig4" id="E0m-wU-1b5">
-                                                    <frame key="frameInset" width="984" height="99"/>
+                                                    <frame key="frameInset" width="728" height="99"/>
                                                    <autoresizingMask key="autoresizingMask"/>
                                                    <subviews>
                                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" translatesAutoresizingMaskIntoConstraints="NO" id="F66-vh-va3">
@@ -371,7 +371,7 @@
                        <viewControllerLayoutGuide type="bottom" id="QKC-Cc-6mX"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="ifQ-Lu-e3W">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hWi-cZ-Zfb">
@@ -552,17 +552,17 @@
                        <viewControllerLayoutGuide type="bottom" id="66p-Lg-9F1"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="Ebq-bU-Wvd">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="1" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="Zna-07-otf">
                                <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                                <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="firstcell" rowHeight="84" id="XgA-9w-ut9" customClass="OrderInformationTableViewCell">
-                                        <rect key="frame" x="0.0" y="56" width="1024" height="84"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="firstcell" rowHeight="84" id="XgA-9w-ut9" customClass="OrderInformationTableViewCell">
+                                        <rect key="frame" x="0.0" y="56" width="768" height="84"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="XgA-9w-ut9" id="BWi-jv-OOH">
-                                            <frame key="frameInset" width="1024" height="83"/>
+                                            <frame key="frameInset" width="768" height="83"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单编号：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KGm-XJ-NyV">
@@ -633,11 +633,11 @@
                                            <outlet property="orderTime" destination="9E7-7Q-pDg" id="QXm-nI-FOa"/>
                                        </connections>
                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="110" id="rIO-yd-hh7" customClass="PersonInformationTableViewCell">
-                                        <rect key="frame" x="0.0" y="140" width="1024" height="110"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="110" id="rIO-yd-hh7" customClass="PersonInformationTableViewCell">
+                                        <rect key="frame" x="0.0" y="140" width="768" height="110"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="rIO-yd-hh7" id="mn8-g0-Zqo">
-                                            <frame key="frameInset" width="1024" height="109"/>
+                                            <frame key="frameInset" width="768" height="109"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" translatesAutoresizingMaskIntoConstraints="NO" id="Zdg-s0-xfD">
@@ -716,11 +716,11 @@
                                            <outlet property="customerPhoneNumber" destination="A8m-f4-VJE" id="2iI-No-miD"/>
                                        </connections>
                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="thirdcell" rowHeight="84" id="PfN-24-v5t" customClass="GoodsInformationTableViewCell">
-                                        <rect key="frame" x="0.0" y="250" width="1024" height="84"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="thirdcell" rowHeight="84" id="PfN-24-v5t" customClass="GoodsInformationTableViewCell">
+                                        <rect key="frame" x="0.0" y="250" width="768" height="84"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PfN-24-v5t" id="2Je-94-WVY">
-                                            <frame key="frameInset" width="1024" height="83"/>
+                                            <frame key="frameInset" width="768" height="83"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="收货人：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tiK-JC-Jy4">
@@ -775,11 +775,11 @@
                                            <outlet property="detailsAddress" destination="Dse-ts-588" id="bZr-mK-aIR"/>
                                        </connections>
                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fourthcell" rowHeight="80" id="47T-H0-tG7" customClass="CommodityListTableViewCell">
-                                        <rect key="frame" x="0.0" y="334" width="1024" height="80"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="fourthcell" rowHeight="80" id="47T-H0-tG7" customClass="CommodityListTableViewCell">
+                                        <rect key="frame" x="0.0" y="334" width="768" height="80"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="47T-H0-tG7" id="zXR-bC-Wdh">
-                                            <frame key="frameInset" width="1024" height="79"/>
+                                            <frame key="frameInset" width="768" height="79"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" translatesAutoresizingMaskIntoConstraints="NO" id="6MS-gq-TMk">
@@ -853,11 +853,11 @@
                                            <outlet property="totalPrice" destination="lQS-PG-Dws" id="NuP-hS-GiX"/>
                                        </connections>
                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="sixthcell" rowHeight="50" id="PNT-Fy-4Hi" customClass="AllpriceTableViewCell">
-                                        <rect key="frame" x="0.0" y="414" width="1024" height="50"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="sixthcell" rowHeight="50" id="PNT-Fy-4Hi" customClass="AllpriceTableViewCell">
+                                        <rect key="frame" x="0.0" y="414" width="768" height="50"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="PNT-Fy-4Hi" id="PxE-0c-Zdt">
-                                            <frame key="frameInset" width="1024" height="49"/>
+                                            <frame key="frameInset" width="768" height="49"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总计：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ywx-T1-GlW">
@@ -897,11 +897,11 @@
                                            <outlet property="goodsAllPrice" destination="bp3-LQ-5yj" id="cax-p0-eqs"/>
                                        </connections>
                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="OrderDetailsSectionHeaderView" rowHeight="60" id="93R-pm-DiM" customClass="OrderDetailsSectionHeaderView">
-                                        <rect key="frame" x="0.0" y="464" width="1024" height="60"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="OrderDetailsSectionHeaderView" rowHeight="60" id="93R-pm-DiM" customClass="OrderDetailsSectionHeaderView">
+                                        <rect key="frame" x="0.0" y="464" width="768" height="60"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="93R-pm-DiM" id="ps4-EA-igT">
-                                            <frame key="frameInset" width="1024" height="59"/>
+                                            <frame key="frameInset" width="768" height="59"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7rk-Gz-d7W">
@@ -932,11 +932,11 @@
                                            <outlet property="sectionHeaderTitleLabel" destination="dqd-EF-bfU" id="g3v-Kz-sbJ"/>
                                        </connections>
                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" accessoryType="checkmark" indentationWidth="10" reuseIdentifier="PromotionalTableViewCell" rowHeight="44" id="R0y-9Q-NEJ" customClass="PromotionalTableViewCell">
-                                        <rect key="frame" x="0.0" y="524" width="1024" height="44"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" accessoryType="checkmark" indentationWidth="10" reuseIdentifier="PromotionalTableViewCell" rowHeight="44" id="R0y-9Q-NEJ" customClass="PromotionalTableViewCell">
+                                        <rect key="frame" x="0.0" y="524" width="768" height="44"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="R0y-9Q-NEJ" id="tLA-TB-cwT">
-                                            <frame key="frameInset" width="824" height="43"/>
+                                            <frame key="frameInset" width="696" height="43"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="折扣金额" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iOu-WG-fyV">
@@ -983,7 +983,7 @@
                        <viewControllerLayoutGuide type="bottom" id="x9t-l9-W9K"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="BW8-jR-i6f">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dXn-DO-sRi">
@@ -1071,7 +1071,7 @@
                        <viewControllerLayoutGuide type="bottom" id="ZZ5-AI-ghH"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="sKB-LA-6KH">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="qOs-Li-Zuf">
@@ -1177,17 +1177,17 @@
                        <viewControllerLayoutGuide type="bottom" id="PhE-Wq-YtT"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="Urq-Pg-ChG">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="192" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="7fl-ag-O5b">
                                <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="182" id="Sye-2R-IQf" customClass="ProductDetailsTableViewCell">
-                                        <rect key="frame" x="0.0" y="56" width="1024" height="182"/>
+                                        <rect key="frame" x="0.0" y="56" width="768" height="182"/>
                                        <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="181"/>
+                                            <frame key="frameInset" width="768" height="181"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2bG-Ip-ptr" userLabel="View1">
@@ -1498,7 +1498,7 @@
                        <viewControllerLayoutGuide type="bottom" id="I9J-F9-SpT"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="iVt-Ys-8K0">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="NewJDECard" translatesAutoresizingMaskIntoConstraints="NO" id="vNC-g1-zfP">
@@ -1532,17 +1532,17 @@
                        <viewControllerLayoutGuide type="bottom" id="Y54-Yh-ikm"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="wOO-u2-DSn">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="ebs-7R-KfJ">
                                <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="ClientDetails" rowHeight="100" id="EPc-Ii-VaY" customClass="ClientDetailsTableViewCell">
-                                        <rect key="frame" x="0.0" y="28" width="1024" height="100"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="ClientDetails" rowHeight="100" id="EPc-Ii-VaY" customClass="ClientDetailsTableViewCell">
+                                        <rect key="frame" x="0.0" y="28" width="768" 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="768" height="99"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" translatesAutoresizingMaskIntoConstraints="NO" id="S6q-gC-tBB">
@@ -1683,17 +1683,17 @@
                        <viewControllerLayoutGuide type="bottom" id="bTu-UF-1qb"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="3yE-WJ-h4m">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="NWY-ut-vAy">
                                <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="ordercell" rowHeight="200" id="0Oq-z4-T96" customClass="OrderTableViewCell">
-                                        <rect key="frame" x="0.0" y="28" width="1024" height="200"/>
+                                        <rect key="frame" x="0.0" y="28" width="768" 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="768" height="199"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="下单时间：" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wXj-VY-jlJ">
@@ -1909,7 +1909,7 @@
                        <viewControllerLayoutGuide type="bottom" id="GiM-WR-kg5"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="Akw-YQ-k7f">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="aboutus" translatesAutoresizingMaskIntoConstraints="NO" id="cZd-bI-b5a"/>
@@ -1958,7 +1958,7 @@
                        <viewControllerLayoutGuide type="bottom" id="Zo0-vW-iUF"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="cxt-gf-RU0">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gHb-xr-WYA">
@@ -2033,10 +2033,10 @@
                                <color key="backgroundColor" red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                <prototypes>
                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Shopping" rowHeight="80" id="ZT1-XJ-ObI" customClass="ShoppingTableViewCell">
-                                        <rect key="frame" x="0.0" y="28" width="984" height="80"/>
+                                        <rect key="frame" x="0.0" y="28" width="1000" height="80"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ZT1-XJ-ObI" id="GWp-Jl-7br">
-                                            <frame key="frameInset" width="984" height="79"/>
+                                            <frame key="frameInset" width="1000" height="79"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PkJ-eJ-ksY">
@@ -2328,17 +2328,17 @@
                        <viewControllerLayoutGuide type="bottom" id="XUO-em-Ffm"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="fHP-ek-Exb">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="56" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="lD6-5a-1OW">
                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="110" id="LsY-i0-h5H" customClass="PersonInformationTableViewCell">
-                                        <rect key="frame" x="0.0" y="28" width="1024" height="110"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="secondcell" rowHeight="110" id="LsY-i0-h5H" customClass="PersonInformationTableViewCell">
+                                        <rect key="frame" x="0.0" y="28" width="768" height="110"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="LsY-i0-h5H" id="dPG-p9-V2i">
-                                            <frame key="frameInset" width="1024" height="109"/>
+                                            <frame key="frameInset" width="768" height="109"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" translatesAutoresizingMaskIntoConstraints="NO" id="qWT-p0-Gta">
@@ -2417,11 +2417,11 @@
                                            <outlet property="customerPhoneNumber" destination="hP2-rt-HWE" id="AjL-uh-E3H"/>
                                        </connections>
                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="consigneecell" rowHeight="56" id="gfQ-UE-mXV" customClass="GenerateOrdersTableViewCell">
-                                        <rect key="frame" x="0.0" y="138" width="1024" height="56"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="consigneecell" rowHeight="56" id="gfQ-UE-mXV" customClass="GenerateOrdersTableViewCell">
+                                        <rect key="frame" x="0.0" y="138" width="768" height="56"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="gfQ-UE-mXV" id="za6-HU-VEw">
-                                            <frame key="frameInset" width="1024" height="55"/>
+                                            <frame key="frameInset" width="768" height="55"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="手机号码：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X0Z-8j-BdI">
@@ -2491,11 +2491,11 @@
                                            <outlet property="isSelectedButton" destination="fs3-Vh-g5G" id="avL-eW-lce"/>
                                        </connections>
                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="Modifycell" rowHeight="70" id="Kk4-Fh-HhL" customClass="GenerateOrdersModifyTableViewCell">
-                                        <rect key="frame" x="0.0" y="194" width="1024" height="70"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="Modifycell" rowHeight="70" id="Kk4-Fh-HhL" customClass="GenerateOrdersModifyTableViewCell">
+                                        <rect key="frame" x="0.0" y="194" width="768" height="70"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Kk4-Fh-HhL" id="oRX-7p-HkY">
-                                            <frame key="frameInset" width="1024" height="69"/>
+                                            <frame key="frameInset" width="768" height="69"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="m0f-EW-LM5">
@@ -2540,11 +2540,11 @@
                                            <outlet property="changeButton" destination="m0f-EW-LM5" id="CVd-sS-vsr"/>
                                        </connections>
                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="fourthcell" rowHeight="80" id="G7o-xS-1mB" customClass="CommodityListTableViewCell">
-                                        <rect key="frame" x="0.0" y="264" width="1024" height="80"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="fourthcell" rowHeight="80" id="G7o-xS-1mB" customClass="CommodityListTableViewCell">
+                                        <rect key="frame" x="0.0" y="264" width="768" height="80"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="G7o-xS-1mB" id="l3e-TL-GCT">
-                                            <frame key="frameInset" width="1024" height="79"/>
+                                            <frame key="frameInset" width="768" height="79"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="05产品库-详情_03" translatesAutoresizingMaskIntoConstraints="NO" id="Un4-g0-sG6">
@@ -2618,11 +2618,11 @@
                                            <outlet property="totalPrice" destination="sGz-dS-QOx" id="Mdz-z9-NlR"/>
                                        </connections>
                                    </tableViewCell>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="sixthcell" rowHeight="50" id="6K9-mc-7RW" customClass="AllpriceTableViewCell">
-                                        <rect key="frame" x="0.0" y="344" width="1024" height="50"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="sixthcell" rowHeight="50" id="6K9-mc-7RW" customClass="AllpriceTableViewCell">
+                                        <rect key="frame" x="0.0" y="344" width="768" height="50"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="6K9-mc-7RW" id="Vc7-f6-wGb">
-                                            <frame key="frameInset" width="1024" height="49"/>
+                                            <frame key="frameInset" width="768" height="49"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="总数量：" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ULe-0J-pCd">
@@ -2736,7 +2736,7 @@
                        <viewControllerLayoutGuide type="bottom" id="3vt-iG-ma2"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="wYZ-O8-XUy">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2uI-t4-q00">
@@ -3083,7 +3083,7 @@
                        <viewControllerLayoutGuide type="bottom" id="t2l-5O-cDd"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="eTY-fF-sRG">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="1s4-ZY-Qaj">
@@ -3235,7 +3235,7 @@
                        <viewControllerLayoutGuide type="bottom" id="iQ5-VA-iTl"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="mzj-1G-3Kl">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <button opaque="NO" tag="100" contentMode="scaleToFill" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HGx-bG-vPP">
@@ -3357,7 +3357,7 @@
                        <viewControllerLayoutGuide type="bottom" id="Ht4-YI-Wce"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="cE1-jz-HGm">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0j7-eQ-laL">
@@ -3440,17 +3440,17 @@
                        <viewControllerLayoutGuide type="bottom" id="9Je-Wn-9YB"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="jlE-rS-RQD">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="70" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="LIf-UD-q9P">
                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                <prototypes>
                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="NotDrawTableViewCell" rowHeight="70" id="X3v-Ll-1MC" customClass="NotDrawTableViewCell">
-                                        <rect key="frame" x="0.0" y="28" width="1024" height="70"/>
+                                        <rect key="frame" x="0.0" y="28" width="768" height="70"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="X3v-Ll-1MC" id="900-Pd-b1F">
-                                            <frame key="frameInset" width="1024" height="69"/>
+                                            <frame key="frameInset" width="768" height="69"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单编号:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TMg-8t-PNg">
@@ -3490,10 +3490,10 @@
                                        </connections>
                                    </tableViewCell>
                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="UsedDrawTableViewCell" id="7NE-I0-E9m" customClass="UsedDrawTableViewCell">
-                                        <rect key="frame" x="0.0" y="98" width="1024" height="70"/>
+                                        <rect key="frame" x="0.0" y="98" width="768" height="70"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="7NE-I0-E9m" id="6dy-h1-Du5">
-                                            <frame key="frameInset" width="1024" height="69"/>
+                                            <frame key="frameInset" width="768" height="69"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单编号:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mCP-hd-n1N">
@@ -3571,7 +3571,7 @@
                        <viewControllerLayoutGuide type="bottom" id="NrQ-Lr-hCd"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="vA5-eX-gaL">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="CYw-Xm-hU7">
@@ -3704,7 +3704,7 @@
                        <viewControllerLayoutGuide type="bottom" id="Bt8-ru-WmV"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="bYD-ng-1xs">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="ghu-hI-3hq">
@@ -3837,17 +3837,17 @@
                        <viewControllerLayoutGuide type="bottom" id="cmp-ml-wZV"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="mY7-8j-LRp">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="60" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="X5N-SY-GaL">
                                <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="PaymentsTableViewCell" rowHeight="70" id="ycT-hi-XMt" customClass="PaymentsTableViewCell">
-                                        <rect key="frame" x="0.0" y="28" width="1024" height="70"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PaymentsTableViewCell" rowHeight="70" id="ycT-hi-XMt" customClass="PaymentsTableViewCell">
+                                        <rect key="frame" x="0.0" y="28" width="768" height="70"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ycT-hi-XMt" id="kgy-QA-YB7">
-                                            <frame key="frameInset" width="1024" height="69"/>
+                                            <frame key="frameInset" width="768" height="69"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="撒大声地" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="IgV-UM-cUZ">
@@ -3909,17 +3909,17 @@
            <objects>
                <tableViewController storyboardIdentifier="PaymentsDetailsTableViewController" id="RgV-wv-buQ" customClass="PaymentsDetailsTableViewController" sceneMemberID="viewController">
                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="fkj-DI-MhA">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                        <sections>
                            <tableViewSection id="8uW-dt-76b">
                                <cells>
                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="126" id="hkV-sz-e6I">
-                                        <rect key="frame" x="0.0" y="0.0" width="1024" height="126"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="768" height="126"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hkV-sz-e6I" id="376-dL-SGZ">
-                                            <frame key="frameInset" width="1024" height="125"/>
+                                            <frame key="frameInset" width="768" height="125"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="交易成功" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bj2-3f-d1N">
@@ -3942,10 +3942,10 @@
                                        </tableViewCellContentView>
                                    </tableViewCell>
                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="150" id="omi-89-fSM">
-                                        <rect key="frame" x="0.0" y="126" width="1024" height="150"/>
+                                        <rect key="frame" x="0.0" y="126" width="768" height="150"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="omi-89-fSM" id="kHX-8W-6YZ">
-                                            <frame key="frameInset" width="1024" height="149"/>
+                                            <frame key="frameInset" width="768" height="149"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="类型" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WvF-Vp-w7I">
@@ -4038,17 +4038,17 @@
                        <viewControllerLayoutGuide type="bottom" id="3Cg-XS-OH1"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="CAQ-JA-gBL">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="60" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Se4-SZ-Wqk">
                                <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"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="WithdrawalTableViewCell" rowHeight="70" id="jHf-PW-bB3" customClass="WithdrawalTableViewCell">
+                                        <rect key="frame" x="0.0" y="28" width="768" 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"/>
+                                            <frame key="frameInset" width="768" height="69"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="进度:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ssz-VZ-85R">
@@ -4117,17 +4117,17 @@
            <objects>
                <tableViewController storyboardIdentifier="WithdrawalTableViewController" id="dN6-Zv-JVd" customClass="WithdrawalTableViewController" sceneMemberID="viewController">
                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="plain" separatorStyle="default" rowHeight="140" sectionHeaderHeight="28" sectionFooterHeight="28" id="PLm-Ih-xG1">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                        <sections>
                            <tableViewSection id="GZ6-yR-ZkF">
                                <cells>
                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="216" id="1Gh-Ht-hTc">
-                                        <rect key="frame" x="0.0" y="0.0" width="1024" height="216"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="768" height="216"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1Gh-Ht-hTc" id="uun-nY-hTG">
-                                            <frame key="frameInset" width="1024" height="215"/>
+                                            <frame key="frameInset" width="768" height="215"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="progress" translatesAutoresizingMaskIntoConstraints="NO" id="mQZ-vP-Ej3">
@@ -4146,7 +4146,7 @@
                                                    <nil key="highlightedColor"/>
                                                </label>
                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="s3d-4S-Hli">
-                                                    <frame key="frameInset" minX="13.43%" minY="170" width="16.46%" height="21"/>
+                                                    <frame key="frameInset" minX="13.41%" minY="170" width="16.47%" height="21"/>
                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                    <color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -4158,7 +4158,7 @@
                                                    <nil key="highlightedColor"/>
                                                </label>
                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Wy-5J-W1w">
-                                                    <frame key="frameInset" minX="44.78%" minY="170" width="16.41%" height="21"/>
+                                                    <frame key="frameInset" minX="44.79%" minY="170" width="16.41%" height="21"/>
                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                    <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                    <color key="textColor" red="0.66666666666666663" green="0.66666666666666663" blue="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -4180,10 +4180,10 @@
                                        </tableViewCellContentView>
                                    </tableViewCell>
                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" rowHeight="100" id="odb-Qv-xvv">
-                                        <rect key="frame" x="0.0" y="216" width="1024" height="100"/>
+                                        <rect key="frame" x="0.0" y="216" width="768" height="100"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="odb-Qv-xvv" id="vVJ-L8-CP8">
-                                            <frame key="frameInset" width="1024" height="99"/>
+                                            <frame key="frameInset" width="768" height="99"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="金额" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cQu-pj-zGP">
@@ -4265,7 +4265,7 @@
                        <viewControllerLayoutGuide type="bottom" id="Eqp-nf-Jia"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="I14-ig-cOR">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="F8n-z2-Oh6">
@@ -4346,15 +4346,15 @@
            <objects>
                <tableViewController storyboardIdentifier="RebateSuccessTableViewController" id="Adi-1A-ucl" customClass="RebateSuccessTableViewController" sceneMemberID="viewController">
                    <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" scrollEnabled="NO" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="68" sectionHeaderHeight="28" sectionFooterHeight="28" id="MeE-u7-NaE">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                        <prototypes>
                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PromptHeaderTableViewCell" rowHeight="150" id="a4X-wI-TKY" customClass="PromptHeaderTableViewCell">
-                                <rect key="frame" x="0.0" y="28" width="1024" height="150"/>
+                                <rect key="frame" x="0.0" y="28" width="768" height="150"/>
                                <autoresizingMask key="autoresizingMask"/>
                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="a4X-wI-TKY" id="F9G-Lu-fOF">
-                                    <frame key="frameInset" width="1024" height="150"/>
+                                    <frame key="frameInset" width="768" height="150"/>
                                    <autoresizingMask key="autoresizingMask"/>
                                    <subviews>
                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gKU-uU-ts6">
@@ -4390,10 +4390,10 @@
                                </connections>
                            </tableViewCell>
                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="PromptTableViewCell" rowHeight="68" id="C2r-ss-hDa" customClass="PromptTableViewCell">
-                                <rect key="frame" x="0.0" y="178" width="1024" height="68"/>
+                                <rect key="frame" x="0.0" y="178" width="768" height="68"/>
                                <autoresizingMask key="autoresizingMask"/>
                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="C2r-ss-hDa" id="L9q-Fk-oOX">
-                                    <frame key="frameInset" width="1024" height="68"/>
+                                    <frame key="frameInset" width="768" height="68"/>
                                    <autoresizingMask key="autoresizingMask"/>
                                    <subviews>
                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="文本" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xc6-ok-ben">
@@ -4568,7 +4568,7 @@
                        <viewControllerLayoutGuide type="bottom" id="8vm-uL-RLa"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="kdd-9E-MpA">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kfl-gU-ffA">
@@ -4651,11 +4651,11 @@
                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="116" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Zqw-SR-cRg">
                                <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="1024" height="125"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="allcustomercell" rowHeight="125" id="OYf-pc-4my" customClass="AllCutomerTableViewCell">
+                                        <rect key="frame" x="0.0" y="28" width="768" 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="1024" height="125"/>
+                                            <frame key="frameInset" width="768" height="125"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Dcm-cA-leg">
@@ -4801,7 +4801,7 @@
                        <viewControllerLayoutGuide type="bottom" id="n4Y-BV-qSe"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="szp-KJ-fw4">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9KS-IR-Val">
@@ -4840,11 +4840,11 @@
                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" rowHeight="263" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="SiR-rm-chD">
                                <color key="backgroundColor" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="customerordercell" rowHeight="260" id="YwA-DX-QXj" customClass="CustomerOrderTableViewCell">
-                                        <rect key="frame" x="0.0" y="28" width="984" height="260"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="customerordercell" rowHeight="260" id="YwA-DX-QXj" customClass="CustomerOrderTableViewCell">
+                                        <rect key="frame" x="0.0" y="28" width="728" height="260"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="YwA-DX-QXj" id="jSd-hf-XkG">
-                                            <frame key="frameInset" width="984" height="260"/>
+                                            <frame key="frameInset" width="728" height="260"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mff-AO-i22">
@@ -5124,7 +5124,7 @@
                        <viewControllerLayoutGuide type="bottom" id="AhW-0w-RUn"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="v3k-z6-eR6">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="fmC-jg-sSJ">
@@ -5294,7 +5294,7 @@
                        <viewControllerLayoutGuide type="bottom" id="ysi-kp-yFu"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="xNf-Ng-NUx">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="n1A-v4-tFR">
@@ -5450,7 +5450,7 @@
                                    <constraint firstAttribute="width" constant="130" id="n1r-bf-QmM"/>
                                </constraints>
                                <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="ProductScreeningTableViewCell" rowHeight="100" id="lHY-Zb-Idx" customClass="ProductScreeningTableViewCell">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="ProductScreeningTableViewCell" rowHeight="100" id="lHY-Zb-Idx" customClass="ProductScreeningTableViewCell">
                                        <rect key="frame" x="0.0" y="28" width="130" height="100"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="lHY-Zb-Idx" id="sA6-Zz-dlh">
@@ -5458,7 +5458,7 @@
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="登录" translatesAutoresizingMaskIntoConstraints="NO" id="rGw-q9-ctQ">
-                                                    <frame key="frameInset" minX="-2.5" minY="-3" maxX="3.5" maxY="1.5"/>
+                                                    <frame key="frameInset" minX="-3" minY="-3.5" maxX="4" maxY="1.5"/>
                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                </imageView>
                                            </subviews>
@@ -5531,7 +5531,7 @@
                        <viewControllerLayoutGuide type="bottom" id="iGh-DT-f1t"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="gkF-Yq-Az3">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3aN-RP-MSb">
@@ -5689,7 +5689,7 @@
                                                </collectionViewFlowLayout>
                                                <cells>
                                                    <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="ScreeningCollectioncell" id="0Ez-VX-wtD" customClass="ScreeningCollectionViewCell">
-                                                        <rect key="frame" x="0.0" y="53" width="159" height="104"/>
+                                                        <rect key="frame" x="95" y="0.0" width="159" height="104"/>
                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                        <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                                            <rect key="frame" x="0.0" y="0.0" width="159" height="104"/>
@@ -5711,7 +5711,7 @@
                                                        </connections>
                                                    </collectionViewCell>
                                                    <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="ProductCollectionViewCell" id="KUD-2T-2PZ" customClass="ProductScreeningCollectionViewCell">
-                                                        <rect key="frame" x="169" y="0.0" width="236" height="210"/>
+                                                        <rect key="frame" x="56" y="114" width="236" height="210"/>
                                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                        <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
                                                            <rect key="frame" x="0.0" y="0.0" width="236" height="210"/>
@@ -5851,7 +5851,7 @@
                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="Jxr-8v-HeG">
                                <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="none" indentationWidth="10" reuseIdentifier="RightControlTableViewCell" rowHeight="60" id="0wm-zc-Jqc" customClass="RightControlTableViewCell">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="RightControlTableViewCell" rowHeight="60" id="0wm-zc-Jqc" customClass="RightControlTableViewCell">
                                        <rect key="frame" x="0.0" y="56" width="200" height="60"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0wm-zc-Jqc" id="p9s-UH-PIl">
@@ -5910,7 +5910,7 @@
                        <viewControllerLayoutGuide type="bottom" id="87R-0L-1sH"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="TGk-BQ-3Ep">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fd8-5S-hPm">
@@ -6093,10 +6093,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="Shopping" rowHeight="80" id="g2L-9g-KsS" customClass="ShoppingTableViewCell">
-                                                <rect key="frame" x="0.0" y="28" width="754" height="80"/>
+                                                <rect key="frame" x="0.0" y="28" width="498" height="80"/>
                                                <autoresizingMask key="autoresizingMask"/>
                                                <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="g2L-9g-KsS" id="XPi-Zc-aGh">
-                                                    <frame key="frameInset" width="754" height="79"/>
+                                                    <frame key="frameInset" width="498" height="79"/>
                                                    <autoresizingMask key="autoresizingMask"/>
                                                    <subviews>
                                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="34f-aR-0gw">
@@ -6292,7 +6292,7 @@
                        <viewControllerLayoutGuide type="bottom" id="eps-xk-Zam"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="bjW-i6-kRZ">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="00登录-谭" translatesAutoresizingMaskIntoConstraints="NO" id="aHb-br-tuo"/>
@@ -6454,17 +6454,17 @@
                        <viewControllerLayoutGuide type="bottom" id="Hws-3z-nNZ"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="Ccw-aQ-xHz">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="I31-IQ-4Pp">
                                <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="PromotionChooseTableViewCell" id="5vC-JB-WSk" customClass="PromotionChooseTableViewCell">
-                                        <rect key="frame" x="0.0" y="92" width="1024" height="44"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PromotionChooseTableViewCell" id="5vC-JB-WSk" customClass="PromotionChooseTableViewCell">
+                                        <rect key="frame" x="0.0" y="92" width="768" height="44"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5vC-JB-WSk" id="XVj-PN-Pxx">
-                                            <frame key="frameInset" width="1024" height="43"/>
+                                            <frame key="frameInset" width="768" height="43"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                        </tableViewCellContentView>
                                    </tableViewCell>
@@ -6530,7 +6530,7 @@
                        <viewControllerLayoutGuide type="bottom" id="NRT-ED-9bt"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="e5r-tF-3ue">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请绑定持卡人本人的银行卡" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="trb-s6-Gi5">
@@ -6544,11 +6544,11 @@
                                    <constraint firstAttribute="height" constant="176" id="9I6-vg-76r"/>
                                </constraints>
                                <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="BindingTableViewCell" id="oPa-eM-dSd" customClass="BindingTableViewCell">
-                                        <rect key="frame" x="0.0" y="28" width="1024" height="44"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="BindingTableViewCell" id="oPa-eM-dSd" customClass="BindingTableViewCell">
+                                        <rect key="frame" x="0.0" y="28" width="768" height="44"/>
                                        <autoresizingMask key="autoresizingMask"/>
                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="oPa-eM-dSd" id="GU3-wN-YE4">
-                                            <frame key="frameInset" width="1024" height="43"/>
+                                            <frame key="frameInset" width="768" height="43"/>
                                            <autoresizingMask key="autoresizingMask"/>
                                            <subviews>
                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="身份证号码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D2u-XX-tUW">
@@ -6634,7 +6634,7 @@
                        <viewControllerLayoutGuide type="bottom" id="xLC-Jj-pLB"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="Gx5-Xc-uTM">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请绑定持卡人本人的银行卡" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="si8-r3-ZpD">
@@ -6792,7 +6792,7 @@
                        <viewControllerLayoutGuide type="bottom" id="X6w-oc-dFJ"/>
                    </layoutGuides>
                    <view key="view" contentMode="scaleToFill" id="yRJ-cn-SlI">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="1024"/>
                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                        <subviews>
                            <button opaque="NO" tag="100" contentMode="scaleToFill" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wLR-8w-dmO">
@@ -6920,7 +6920,7 @@
    </resources>
    <simulatedMetricsContainer key="defaultSimulatedMetrics">
        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation" orientation="landscapeRight"/>
+        <simulatedOrientationMetrics key="orientation"/>
        <simulatedScreenMetrics key="destination"/>
    </simulatedMetricsContainer>
 </document>
--- a/Tools/BaseViewController.h
+++ b/Tools/BaseViewController.h
@@ -165,9 +165,16 @@

 @return 是否比当前时间大
 */
-+ (BOOL)compareDateString:(NSString *)dateString;
+- (int)compareOneDay:(NSDate *)oneDay withAnotherDay:(NSDate *)anotherDay;


+/**
+ 转换秒钟
+ 
+ @param totalSeconds 秒数
+ 
+ */
+- (NSString *)timeFormatted:(NSInteger)totalSeconds;




--- a/Tools/BaseViewController.m
+++ b/Tools/BaseViewController.m
@@ -566,22 +566,44 @@
 }


+#pragma mark -比较两个NSDate的大小
+- (int)compareOneDay:(NSDate *)oneDay withAnotherDay:(NSDate *)anotherDay
+{
+    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+    [dateFormatter setDateFormat:@"yyyy-MM-dd"];
+    NSString *oneDayStr = [dateFormatter stringFromDate:oneDay];
+    NSString *anotherDayStr = [dateFormatter stringFromDate:anotherDay];
+    NSDate *dateA = [dateFormatter dateFromString:oneDayStr];
+    NSDate *dateB = [dateFormatter dateFromString:anotherDayStr];
+    NSComparisonResult result = [dateA compare:dateB];
+    if (result == NSOrderedDescending) {
+        return 1;
+    }
+    else if (result == NSOrderedAscending){
+        return -1;
+    }
+    return 0;
+}
+
 /**
- 比较时间大小
+ 转换秒钟

- @param dateString 时间字符串
+ @param totalSeconds 秒数

- @return 是否比当前时间大
 */
-+ (BOOL)compareDateString:(NSString *)dateString
-{
-    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
-    [dateFormatter setDateFormat:@"yyyy-MM-dd 23:59:59"];
-    NSDate *endDate = [dateFormatter dateFromString:dateString];
-    if ([endDate compare:[NSDate date]] == NSOrderedAscending) {
-        return YES;
+- (NSString *)timeFormatted:(NSInteger)totalSeconds
+{
+    NSInteger seconds = totalSeconds % 60;
+    NSInteger minutes = (totalSeconds / 60) % 60;
+    NSInteger hours = totalSeconds / 3600;
+    if (!hours && !minutes && seconds) {
+        return [NSString stringWithFormat:@"%02ld秒", seconds];
+    }else if (!hours && minutes){
+        return [NSString stringWithFormat:@"%02ld分:%02ld秒",minutes,seconds];
+    }else if (hours && minutes) {
+        return [NSString stringWithFormat:@"%02ld时:%02ld分:%02ld秒",hours, minutes, seconds];
    }
-    return NO;
+    return nil;
 }



--- a/Tools/CYConstManager.h
+++ b/Tools/CYConstManager.h
@@ -426,7 +426,12 @@ extern NSString *const UNBINDING;
 /**
 *  学习完成
 */
-extern NSString *const FINISHSTUDY ;
+extern NSString *const FINISHSTUDY;
+
+/**
+ *  附件播放时间
+ */
+extern NSString *const ATTACHMENTPLAYTIME;
 /*****************************************接口地址*****************************************/


@@ -580,4 +585,18 @@ extern NSString *const PROMPTDRAWINFORMATION;
 */
 extern NSString *const NOTREADANNOUNCEMENT;

+/**
+ *  学习完成
+ */
+extern NSString *const STUDYFINISH;
+
+/**
+ *  考核通过
+ */
+extern NSString *const INSPECTIONTHROUGH;
+
+/**
+ *  闯关通过
+ */
+extern NSString *const RECRUITTHROUGH;

--- a/Tools/CYConstManager.m
+++ b/Tools/CYConstManager.m
@@ -348,9 +348,9 @@ NSString *const THROUGHLIST = @"/passLevel/query";
 NSString *const SUBMITANSWER = @"/study/submitStudyResult";

 /**
- *  获取相应分数对应的积分
+ *  获取对应的积分
 */
-NSString *const GETINTEGRAL = @"/option/get/%@";
+NSString *const GETINTEGRAL = @"/score/getScoreRule/%@";

 /**
 *  获取闯关详情
@@ -421,6 +421,11 @@ NSString *const UNBINDING = @"/applybill/unbind/%@";
 *  学习完成
 */
 NSString *const FINISHSTUDY = @"/study/finishStudy/%@/%@";
+
+/**
+ *  附件播放时间
+ */
+NSString *const ATTACHMENTPLAYTIME = @"/attachment/play";
 /*****************************************接口地址*****************************************/


@@ -579,4 +584,17 @@ NSString *const PROMPTDRAWINFORMATION = @"PROMPTDRAWINFORMATION";
 */
 NSString *const NOTREADANNOUNCEMENT = @"NOTREADANNOUNCEMENT";

+/**
+ *  学习完成
+ */
+NSString *const STUDYFINISH = @"5";

+/**
+ *  考核通过
+ */
+NSString *const INSPECTIONTHROUGH = @"6";
+
+/**
+ *  闯关通过
+ */
+NSString *const RECRUITTHROUGH = @"7";
--- a/Tools/opple_objc_json_client.h
+++ b/Tools/opple_objc_json_client.h
@@ -180,6 +180,7 @@ extern NSString * const GRADEMETHOD_MANUL;
 @class TOShopcartEntity;
 @class TOStudyEmployeeEntity;
 @class TOStudyResultEntity;
+@class TOAttachmentPlayEntity;
 @class TOStudyTopicEntity;
 @class TOStudyTypeEntity;
 @class Action;
@@ -268,6 +269,7 @@ extern NSString * const GRADEMETHOD_MANUL;
 @protocol RsCommissionRequest @end
 @protocol DataPage @end
 @protocol PageRows @end
+@protocol TOAttachmentPlayEntity @end
 @protocol RsResponse @end
 @protocol FunctionInfo @end
 @protocol LoginResult @end
@@ -789,6 +791,23 @@ extern NSString * const GRADEMETHOD_MANUL;
 @end /* interface ForumTopicCondition */


+@interface TOAttachmentPlayEntity : JSONModel
+
+@property (nonatomic,copy) NSString *fid;
+@property (nonatomic,copy) NSString *employeeId;
+@property (nonatomic,copy) NSString *attachmentId;
+@property (nonatomic,copy) NSString *playTime;
+@property (nonatomic,copy) NSString *playPercent;
+//{
+//"id": "string",
+//"employeeId": "string",
+//"attachmentId": "string",
+//"playTime": "string",
+//"playPercent": "string"
+//}
+
+@end
+

 /**
 *  @author Administrator
@@ -1688,6 +1707,12 @@ extern NSString * const GRADEMETHOD_MANUL;
 *
 */
 @property (nonatomic, copy) NSString *playTime;
+/**
+ * 播放百分比
+ *
+ *
+ */
+@property (nonatomic, copy) NSString *playPercent;
 @end /* interface TOAttachmentEntity */


@@ -3608,7 +3633,7 @@ extern NSString * const GRADEMETHOD_MANUL;
 *
 *
 */
-@property (nonatomic, assign) NSInteger examResult;
+@property (nonatomic, copy) NSString *examResult;
 /**
 * 学习内容
 *

--- a/Tools/opple_objc_json_client.m
+++ b/Tools/opple_objc_json_client.m
@@ -1373,6 +1373,18 @@ NSString * const SORTDIRECTION_DESC = @"desc";
 }


+@end
+
+
+@implementation TOAttachmentPlayEntity
+
+(JSONKeyMapper*)keyMapper
+{
+    return [[JSONKeyMapper alloc] initWithDictionary:@{
+                                                       @"id": @"fid",
+                                                       }];
+}
+
 @end

 NSString * const STUDYTASKSTATE_INITIAL = @"initial";