Commit 9f093788 authored by 曹云霄's avatar 曹云霄

修改项说明:

parent 47a783ae
......@@ -139,7 +139,7 @@
WS(weakSelf);
TOJingdongEcardEntity *model = self.datasArray[indexPath.row];
if ([[self class] isBlankString:model.orderReceiptUrl]) {
[self promptCustomerTitle:@"不能查看未激活卡劵,请先上传小票激活卡劵" finish:^{
[self promptCustomerTitle:@"我知道了" withMessage:@"不能查看未激活卡劵,请先上传小票激活卡劵" finish:^{
CardDetailsViewController *cardDetails = [[[weakSelf class] getMainStoryboardClass] instantiateViewControllerWithIdentifier:@"CardDetailsViewController"];
[weakSelf.navigationController pushViewController:cardDetails animated:YES];
}];
......
......@@ -25,7 +25,16 @@
#pragma mark - 获取积分数据
- (void)getIntegralDataAction
{
WS(weakSelf);
[[NetworkRequestClassManager Manager] NetworkWithDictionaryRequestWithURL:SERVERREQUESTURL(INTEGRALQUERY) WithCallClass:weakSelf WithRequestType:ONE WithParameter:nil WithReturnValueBlock:^(id returnValue) {
NSSLog(@"%@",returnValue);
} WithErrorCodeBlock:^(id errorCodeValue) {
} WithFailureBlock:^(NSError *error) {
}];
}
#pragma mark - 添加积分明细、导购头像
......@@ -40,18 +49,6 @@
[self.guideHeaderView sd_setImageWithURL:[NSURL URLWithString:headerurl] placeholderImage:ReplaceImage];
}
#pragma mark - 礼品兑换
- (IBAction)exchangeButtonClick:(UIButton *)sender {
}
......
......@@ -22,6 +22,10 @@
#import "QRViewController.h"
#import "ExperienceCentreViewController.h"
#import "RebateViewController.h"
#import "GuideIntegralViewController.h"
#import "LearningCenterMainViewController.h"
#import "AnnouncementViewController.h"
@interface CustomTabbarController ()<TabbarButtonClickdelegate,ChangpasswordDelegate,CancelButtondelegate,UITextFieldDelegate>
......@@ -55,7 +59,7 @@
{
if (_identifierArray == nil) {
_identifierArray = [NSArray arrayWithObjects:@"SearchViewController",@"ShoppingViewController",@"ClientViewController",@"RebateViewController",@"SceneLibraryViewController",@"ProductLibraryViewController",@"AllCustomerViewController",@"CustomerOrderViewController",@"AboutViewController", nil];
_identifierArray = [NSArray arrayWithObjects:@"SearchViewController",@"ShoppingViewController",@"ClientViewController",@"RebateViewController",@"GuideIntegralViewController",@"AnnouncementViewController",@"SceneLibraryViewController",@"ProductLibraryViewController",@"AllCustomerViewController",@"CustomerOrderViewController",@"LearningCenterMainViewController",@"AboutViewController", nil];
}
return _identifierArray;
}
......@@ -121,7 +125,7 @@
- (void)addViewcontroller
{
NSMutableArray *controllerArray = [NSMutableArray array];
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil];
for (int i=0; i<self.identifierArray.count; i++) {
BaseViewController *control = [storyboard instantiateViewControllerWithIdentifier:self.identifierArray[i]];
UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:control];
......@@ -331,7 +335,7 @@
}else
{
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil];
ExperienceCentreViewController *ExperienceCenter = [storyboard instantiateViewControllerWithIdentifier:@"ExperienceCentre"];
ExperienceCenter.modalPresentationStyle = UIModalPresentationOverFullScreen;
UIPopoverPresentationController *popover = ExperienceCenter.popoverPresentationController;
......
This diff is collapsed.
......@@ -66,6 +66,10 @@
提示框
*/
- (void)promptCustomerTitle:(NSString *)title withMessage:(NSString *)message finish:(void (^)())complete;
/**
判断相机权限
*/
+ (BOOL)determineCameraPermissions;
/**
......@@ -94,13 +98,6 @@
*/
- (void)RemovePromptinformationView;
/**
* 提示框
*
*/
- (void)promptCustomerTitle:(NSString *)title finish:(void(^)())complete;
/**
* 查询订单状态图片
*/
......
......@@ -88,7 +88,7 @@
[weakSelf dismissViewControllerAnimated:YES completion:nil];
[Shoppersmanager manager].currentCustomer = NO;
[Customermanager manager].model = nil;
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil];
LoginViewController *loginVC = [storyboard instantiateViewControllerWithIdentifier:@"Login"];
[[NSUserDefaults standardUserDefaults] removeObjectForKey:USERNAME];
[[NSUserDefaults standardUserDefaults] removeObjectForKey:PASSWORD];
......@@ -230,9 +230,30 @@
}
#pragma mark -获得我的storyboard对象
- (UIStoryboard *)getStoryboardWithName
+ (UIStoryboard *)getMainStoryboardClass
{
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"StoryboardwithCYX" bundle:nil];
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"OppleMain" bundle:nil];
return storyboard;
}
#pragma mark - 获得公告storyboard对象
+ (UIStoryboard *)getAnnouncementStoryboardClass
{
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Announcement" bundle:nil];
return storyboard;
}
#pragma mark - 获得学习中心storyboard对象
+ (UIStoryboard *)getLearningCenterStoryboardClass
{
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"LearningCenter" bundle:nil];
return storyboard;
}
#pragma mark -获得积分storyboard对象
+ (UIStoryboard *)getGuideIntegralStoryboardClass
{
UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"GuideIntegral" bundle:nil];
return storyboard;
}
......
......@@ -282,6 +282,11 @@ extern NSString *const LOTTERYED;
* 使用微信卡劵
*/
extern NSString *const USEWECHATCARD;
/**
* 查询积分
*/
extern NSString *const INTEGRALQUERY;
/*****************************************接口地址*****************************************/
......
......@@ -276,6 +276,11 @@ NSString *const LOTTERYED = @"/lottery/query";
* 使用微信卡劵
*/
NSString *const USEWECHATCARD = @"http://wxcard.opple.com/api/Pay?voucherNo=%@&orderNum=%@&orderTotal=%@";
/**
* 查询积分
*/
NSString *const INTEGRALQUERY = @"/score/details?employee=%@";
/*****************************************接口地址*****************************************/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment