Skip to content

O
Opple-iOS
Commit 137766f3 authored by 曹云霄's avatar 曹云霄
Browse files
Options

发布测试版本2.0.8

parent 8e7a4424
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2468 additions and 2153 deletions
Class/LearningCenter/ComprehensiveDiscussion/Controllers/ForumItemDetailViewController.m
View file @ 137766f3
......@@ -138,13 +138,14 @@
{
self.postTitleLabel.text = self.topicDetail.title;
self.contentLabel.text = self.topicDetail.content;
self.issuerNameAndDateLabel.text = [NSString stringWithFormat:@"%@: %@ %@",self.topicDetail.posterPosition,self.topicDetail.posterRealName,[BaseViewController formateDate:self.topicDetail.postTime]];
NSString *headerurl = [Shoppersmanager manager].shoppers.employee.picture;
[self.issuerImageView sd_setImageWithURL:[NSURL URLWithString:headerurl] placeholderImage:CoustomerReplaceImage];
//系统管理员
if (self.topicDetail.backEnd) {
self.issuerImageView.image = GuideReplaceImage;
self.issuerNameAndDateLabel.text = [NSString stringWithFormat:@"%@ %@",self.topicDetail.posterRealName,[BaseViewController formateDate:self.topicDetail.postTime]];
}else {
[self.issuerImageView sd_setImageWithURL:[NSURL URLWithString:self.topicDetail.posterPicture] placeholderImage:TCImage(@"user")];
//普通用户
[self.issuerImageView sd_setImageWithURL:[NSURL URLWithString:self.topicDetail.posterPicture] placeholderImage:CoustomerReplaceImage];
self.issuerNameAndDateLabel.text = [NSString stringWithFormat:@"%@: %@ %@",self.topicDetail.posterPosition,self.topicDetail.posterRealName,[BaseViewController formateDate:self.topicDetail.postTime]];
}
//图片
PostPhotoManagerViewController *photoManager = [[[self class] getLearningCenterStoryboardClass] instantiateViewControllerWithIdentifier:@"PostPhotoManagerViewController"];
......
Class/MyClient/Orderdetails/controller/OrderdetailsViewController.m
View file @ 137766f3
......@@ -236,7 +236,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
PromotionWeChatCardModel *weChatModel = [[PromotionWeChatCardModel alloc]initWithDictionary:dict error:nil];
[weakSelf getConsumerAllPromotion:weChatModel withBody:weChatModel.body];
}else if ([type isEqualToString:redPackageAction]){
// 红包
// 现金红包
PromotionalReadPacketModel *readPacketModel = [[PromotionalReadPacketModel alloc]initWithDictionary:dict error:nil];
[weakSelf getConsumerAllPromotion:readPacketModel withBody:readPacketModel.body];
}
......@@ -264,66 +264,54 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
NSArray *promotion = RESPONSE(returnValue);
for (NSDictionary *dict in promotion) {
TOOrderPromotionEntity *oldPromotion = [[TOOrderPromotionEntity alloc]initWithDictionary:dict error:nil];
// 赠送商品
if (![BaseViewController isBlankString:oldPromotion.goodsName]) {
NSString *type = dict[@"type"];
// 折扣金额
if ([type isEqualToString:deductionAction]) {
if (![weakSelf.sectionTitle containsObject:PROMOTIONALSTRING]) {
[weakSelf.sectionTitle addObject:PROMOTIONALSTRING];
}
PromotionalDeductionModel *deductionModel = [[PromotionalDeductionModel alloc]initWithDictionary:[oldPromotion toDictionary] error:nil];
deductionModel.total = [oldPromotion.promotionMoney integerValue];
deductionModel.isSelected = YES;
[weakSelf getConsumerAllPromotion:deductionModel withBody:deductionModel.body];
// 赠送商品
}else if ([type isEqualToString:goodsAction]){
if (![weakSelf.sectionTitle containsObject:PROMOTIONALSTRING]) {
[weakSelf.sectionTitle addObject:PROMOTIONALSTRING];
}
PromotionalGoodsModel *goodsModel = [[PromotionalGoodsModel alloc]init];
PromotionalGoodsModel *goodsModel = [[PromotionalGoodsModel alloc]initWithDictionary:[oldPromotion toDictionary] error:nil];
goodsModel.count = [oldPromotion.promotionNumber integerValue];
Goods *goods = [[Goods alloc]init];
goods.name = oldPromotion.goodsName;
goodsModel.goods = goods;
goodsModel.isSelected = YES;
goodsModel.priority = oldPromotion.prority;
[weakSelf.promotionInformationArray addObject:goodsModel];
} else if (![BaseViewController isBlankString:[oldPromotion.promotionMoney stringValue]]) {
// 抵扣金额
if (![weakSelf.sectionTitle containsObject:PROMOTIONALSTRING]) {
[weakSelf.sectionTitle addObject:PROMOTIONALSTRING];
}
PromotionalDeductionModel *deductionModel = [[PromotionalDeductionModel alloc]init];
deductionModel.total = [oldPromotion.promotionMoney integerValue];
deductionModel.isSelected = YES;
deductionModel.type = @"deductionAction";
deductionModel.priority = oldPromotion.prority;
[weakSelf.promotionInformationArray addObject:deductionModel];
} else if (![BaseViewController isBlankString:[oldPromotion.jdecardDenomation stringValue]]) {
// 京东E卡
PromotionJDECardModel *jdECardModel = [[PromotionJDECardModel alloc]init];
[weakSelf getConsumerAllPromotion:goodsModel withBody:goodsModel.body];
// 京东E卡
}else if ([type isEqualToString:JDECardAction]){
PromotionJDECardModel *jdECardModel = [[PromotionJDECardModel alloc]initWithDictionary:[oldPromotion toDictionary] error:nil];
jdECardModel.total = [oldPromotion.jdecardDenomation integerValue];
jdECardModel.body = GUIDE;
jdECardModel.type = JDECardAction;
jdECardModel.priority = oldPromotion.prority;
[weakSelf.guidePromotionArray addObject:jdECardModel];
} else if (![BaseViewController isBlankString:[oldPromotion.redPackageCount stringValue]]) {
// 导购抽奖数
PromotionLuckyDrawModel *guideDrawModel = [[PromotionLuckyDrawModel alloc]init];
guideDrawModel.body = GUIDE;
guideDrawModel.priority = oldPromotion.prority;
[weakSelf.guidePromotionArray addObject:guideDrawModel];
} else if (![BaseViewController isBlankString:[oldPromotion.discountRate stringValue]]) {
// 抽奖折扣
PromotionLuckyDrawModel *drawResultModel = [[PromotionLuckyDrawModel alloc]init];
drawResultModel.descriptionString = [oldPromotion.discountRate stringValue];
drawResultModel.body = CONSUMER;
drawResultModel.priority = oldPromotion.prority;
[weakSelf.promotionInformationArray addObject:drawResultModel];
} else if (![BaseViewController isBlankString:oldPromotion.wxcardNumber]) {
// 微信卡劵
PromotionWeChatCardModel *weChatModel = [[PromotionWeChatCardModel alloc]init];
[weakSelf getConsumerAllPromotion:jdECardModel withBody:jdECardModel.body];
// 转盘抽奖
}else if ([type isEqualToString:dzpRedPackage]){
PromotionLuckyDrawModel *guideDrawModel = [[PromotionLuckyDrawModel alloc]initWithDictionary:[oldPromotion toDictionary] error:nil];
[weakSelf getConsumerAllPromotion:guideDrawModel withBody:guideDrawModel.body];
// 微信卡劵
}else if ([type isEqualToString:WeChatCard]){
PromotionWeChatCardModel *weChatModel = [[PromotionWeChatCardModel alloc]initWithDictionary:[oldPromotion toDictionary] error:nil];
weChatModel.total = [oldPromotion.wxcardDenomation integerValue];
weChatModel.priority = oldPromotion.prority;
[weakSelf.promotionInformationArray addObject:weChatModel];
self.weChatModel.wxcardNumber = oldPromotion.wxcardNumber;
self.weChatModel.wxcardDenomation = [oldPromotion.wxcardDenomation integerValue];
[weakSelf getConsumerAllPromotion:weChatModel withBody:weChatModel.body];
// 现金红包
}else if ([type isEqualToString:redPackageAction]){
PromotionalReadPacketModel *readPacketModel = [[PromotionalReadPacketModel alloc]initWithDictionary:[oldPromotion toDictionary] error:nil];
readPacketModel.total = [oldPromotion.redPackageNumber integerValue];
[weakSelf getConsumerAllPromotion:readPacketModel withBody:readPacketModel.body];
}
}
if (self.promotionInformationArray.count && ![self.sectionTitle containsObject:@"促销信息"]) {
[self.sectionTitle addObject:@"促销信息"];
if (self.promotionInformationArray.count && ![self.sectionTitle containsObject:PROMOTIONALSTRING]) {
[self.sectionTitle addObject:PROMOTIONALSTRING];
}
}
}withFailureBlock:^(NSError *error) {
......@@ -782,12 +770,12 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
[mutableString appendString:@"抽奖机会、"];
}
if (isReadPacket) {
[mutableString appendString:@"京东E卡、"];
[mutableString appendString:@"现金红包、"];
}
if (isJDEcard || isGuideDraw || isReadPacket) {
[mutableString appendString:@"已发放到您的账户"];
[self rebateApplySuccess:mutableString];
}
[self rebateApplySuccess:mutableString];
}
#pragma mark - 抽奖界面 HTML
......
Class/RIghtVC/CustomerManagementVC/AllCustomer/controller/AllCustomerViewController.m
View file @ 137766f3
......@@ -85,6 +85,7 @@
[super viewDidLoad];
[self uiConfigAction];
[self setUpRefreshAction];
}
#pragma mark -UI
......@@ -104,10 +105,15 @@
self.begindateButton.layer.cornerRadius = 10;
self.enddateButton.layer.masksToBounds = YES;
self.enddateButton.layer.cornerRadius = 10;
}
#pragma mark -设置刷新
- (void)setUpRefreshAction
{
WS(weakSelf);
//下拉刷新
MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
weakSelf.conditionModel.page.page = ONE;
[weakSelf.allCustomerTableview.mj_footer resetNoMoreData];
[weakSelf getshoppersAssociatedCustomer:weakSelf.conditionModel isRemove:YES];
......
Class/SearchController/controller/SearchViewController.m
View file @ 137766f3
......@@ -45,7 +45,6 @@
- (void)viewDidLoad {
[super viewDidLoad];
// Do any additional setup after loading the view.
[self uiConfigAction];
[self getHotSearchdatas];
......
Lighting.xcodeproj/project.pbxproj
View file @ 137766f3
......@@ -25,6 +25,7 @@
2908870B1CE5A308000B7097 /* DateSelectedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 290887091CE5A308000B7097 /* DateSelectedViewController.m */; };
2908870C1CE5A308000B7097 /* DateSelectedViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2908870A1CE5A308000B7097 /* DateSelectedViewController.xib */; };
290887131CE5DF16000B7097 /* ShopcarModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 290887121CE5DF16000B7097 /* ShopcarModel.m */; };
290E26381E83A1A40036A8B3 /* province_data.xml in Resources */ = {isa = PBXBuildFile; fileRef = 290E26371E83A1A40036A8B3 /* province_data.xml */; };
2912DFE21E012FE80095C576 /* PostPhotoManagerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2912DFE11E012FE80095C576 /* PostPhotoManagerViewController.m */; };
2916A7411D70362000644C8C /* PaymentsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2916A7401D70362000644C8C /* PaymentsViewController.m */; };
2916A7441D70363E00644C8C /* WithdrawalViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2916A7431D70363E00644C8C /* WithdrawalViewController.m */; };
......@@ -218,7 +219,6 @@
29A419951E812E5E0064E958 /* MOFSPickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A4198B1E812E5E0064E958 /* MOFSPickerView.m */; };
29A419961E812E5E0064E958 /* MOFSToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A4198D1E812E5E0064E958 /* MOFSToolbar.m */; };
29A419971E812E5E0064E958 /* PickerAddressModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A4198F1E812E5E0064E958 /* PickerAddressModel.m */; };
29A419981E812E5E0064E958 /* province_data.xml in Resources */ = {isa = PBXBuildFile; fileRef = 29A419901E812E5E0064E958 /* province_data.xml */; };
29A419991E812E760064E958 /* libxml2.2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 295B62DE1E812188008D4C6F /* libxml2.2.tbd */; };
29A7A6991DED154F00B04272 /* GiftInformationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A7A6981DED154F00B04272 /* GiftInformationView.m */; };
29A7A69F1DED1A9600B04272 /* prizeOrderDetailsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A7A69E1DED1A9600B04272 /* prizeOrderDetailsModel.m */; };
......@@ -360,6 +360,7 @@
2908870A1CE5A308000B7097 /* DateSelectedViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DateSelectedViewController.xib; sourceTree = "<group>"; };
290887111CE5DF16000B7097 /* ShopcarModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ShopcarModel.h; sourceTree = "<group>"; };
290887121CE5DF16000B7097 /* ShopcarModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ShopcarModel.m; sourceTree = "<group>"; };
290E26371E83A1A40036A8B3 /* province_data.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = province_data.xml; sourceTree = "<group>"; };
2912DFE01E012FE80095C576 /* PostPhotoManagerViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PostPhotoManagerViewController.h; sourceTree = "<group>"; };
2912DFE11E012FE80095C576 /* PostPhotoManagerViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PostPhotoManagerViewController.m; sourceTree = "<group>"; };
2916A73F1D70362000644C8C /* PaymentsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PaymentsViewController.h; sourceTree = "<group>"; };
......@@ -753,7 +754,6 @@
29A4198D1E812E5E0064E958 /* MOFSToolbar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MOFSToolbar.m; sourceTree = "<group>"; };
29A4198E1E812E5E0064E958 /* PickerAddressModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PickerAddressModel.h; sourceTree = "<group>"; };
29A4198F1E812E5E0064E958 /* PickerAddressModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PickerAddressModel.m; sourceTree = "<group>"; };
29A419901E812E5E0064E958 /* province_data.xml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = province_data.xml; sourceTree = "<group>"; };
29A7A6971DED154F00B04272 /* GiftInformationView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GiftInformationView.h; sourceTree = "<group>"; };
29A7A6981DED154F00B04272 /* GiftInformationView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GiftInformationView.m; sourceTree = "<group>"; };
29A7A69D1DED1A9600B04272 /* prizeOrderDetailsModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = prizeOrderDetailsModel.h; sourceTree = "<group>"; };
......@@ -2021,7 +2021,7 @@
29A4198D1E812E5E0064E958 /* MOFSToolbar.m */,
29A4198E1E812E5E0064E958 /* PickerAddressModel.h */,
29A4198F1E812E5E0064E958 /* PickerAddressModel.m */,
29A419901E812E5E0064E958 /* province_data.xml */,
290E26371E83A1A40036A8B3 /* province_data.xml */,
);
path = MOFSPickerManager;
sourceTree = "<group>";
......@@ -2891,9 +2891,9 @@
29698D621CE2C11500D72CE7 /* SettlementViewController.xib in Resources */,
294BFDD11D47225A00BFD53F /* OppleMain.storyboard in Resources */,
29BFBD911CE44BC200C238FB /* goodsDetailsSectionview.xib in Resources */,
290E26381E83A1A40036A8B3 /* province_data.xml in Resources */,
29C0E73F1DD98335006CCCF9 /* LearningCenter.storyboard in Resources */,
29E944531DE413D6007CD26C /* ApplyPrizeViewController.xib in Resources */,
29A419981E812E5E0064E958 /* province_data.xml in Resources */,
29D260FD1CEED53400A9787D /* goodsDetailsTableViewCell.xib in Resources */,
29CF0EC81DDC564900A37171 /* GuideIntegral.storyboard in Resources */,
29807C621CD20C2A00F111B8 /* Images.xcassets in Resources */,
......
Lighting/LearningCenter.storyboard
View file @ 137766f3
This diff is collapsed.
Lighting/Supporting Files/Info.plist
View file @ 137766f3
......@@ -15,7 +15,7 @@
<key>CFBundleName</key>
<string>欧立方</string>
<key>CFBundleShortVersionString</key>
<string>2.0.7</string>
<string>2.0.8</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
......@@ -70,10 +70,10 @@
</dict>
<key>NSCameraUsageDescription</key>
<string>欧立方需要您的同意,才能访问相机</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>欧立方需要您的同意,才能访问相册</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>欧立方需要您的同意,才能访问数据</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>欧立方需要您的同意,才能访问相册</string>
<key>UIBackgroundModes</key>
<array>
<string>fetch</string>
......
Tools/CYConst/CYConstManager.h
View file @ 137766f3
......@@ -95,13 +95,13 @@ typedef NS_ENUM(NSInteger,COMMENT_PRAISE) {
/**
* 服务器开发地址
*///http://139.196.195.30:8090
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
//#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://139.196.195.30:8090/opple-web/app%@",URL]
//192.168.199.197：8080
/**
* 服务器测试地址
*/
//#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
#define SERVERREQUESTURL(URL) [NSString stringWithFormat:@"http://dg-dev.opple.com/opple-web/app%@",URL]
//**
// * 服务器正式地址
......@@ -667,10 +667,15 @@ extern NSString *const CONSUMER;
extern NSString *const deductionAction;
/**
* 红包
* 现金红包
*/
extern NSString *const redPackageAction;
/**
* 大转盘红包
*/
extern NSString *const dzpRedPackage;
/**
* 赠送商品
*/
......
Tools/CYConst/CYConstManager.m
View file @ 137766f3
......@@ -566,10 +566,15 @@ NSString *const CONSUMER = @"consumer";
NSString *const deductionAction = @"deductionAction";
/**
* 红包
* 现金红包
*/
NSString *const redPackageAction = @"redPackageAction";
/**
* 大转盘红包
*/
NSString *const dzpRedPackage = @"dzpRedPackage";
/**
* 赠送商品
*/
......
Tools/Jastor/opple_objc_json_client.h
View file @ 137766f3
......@@ -3061,6 +3061,10 @@ extern NSString * const GRADEMETHOD_MANUL;
*
*/
@property (nonatomic, assign) NSInteger prority;
@property (nonatomic,copy) NSString *type;
@property (nonatomic,copy) NSString *body;
@end /* interface TOOrderPromotionEntity */
/**
......
Tools/Location/MOFSPickerManager/province_data.xml 100755 → 100644
View file @ 137766f3
This diff is collapsed.
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