Skip to content

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

发布测试版本2.0.8

parent 8e7a4424
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 @@ ...@@ -138,13 +138,14 @@
{ {
self.postTitleLabel.text = self.topicDetail.title; self.postTitleLabel.text = self.topicDetail.title;
self.contentLabel.text = self.topicDetail.content; 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) { if (self.topicDetail.backEnd) {
self.issuerImageView.image = GuideReplaceImage; self.issuerImageView.image = GuideReplaceImage;
self.issuerNameAndDateLabel.text = [NSString stringWithFormat:@"%@ %@",self.topicDetail.posterRealName,[BaseViewController formateDate:self.topicDetail.postTime]];
}else { }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"]; PostPhotoManagerViewController *photoManager = [[[self class] getLearningCenterStoryboardClass] instantiateViewControllerWithIdentifier:@"PostPhotoManagerViewController"];
......
Class/MyClient/Orderdetails/controller/OrderdetailsViewController.m
View file @ 137766f3
...@@ -236,7 +236,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -236,7 +236,7 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
PromotionWeChatCardModel *weChatModel = [[PromotionWeChatCardModel alloc]initWithDictionary:dict error:nil]; PromotionWeChatCardModel *weChatModel = [[PromotionWeChatCardModel alloc]initWithDictionary:dict error:nil];
[weakSelf getConsumerAllPromotion:weChatModel withBody:weChatModel.body]; [weakSelf getConsumerAllPromotion:weChatModel withBody:weChatModel.body];
}else if ([type isEqualToString:redPackageAction]){ }else if ([type isEqualToString:redPackageAction]){
// 红包 // 现金红包
PromotionalReadPacketModel *readPacketModel = [[PromotionalReadPacketModel alloc]initWithDictionary:dict error:nil]; PromotionalReadPacketModel *readPacketModel = [[PromotionalReadPacketModel alloc]initWithDictionary:dict error:nil];
[weakSelf getConsumerAllPromotion:readPacketModel withBody:readPacketModel.body]; [weakSelf getConsumerAllPromotion:readPacketModel withBody:readPacketModel.body];
} }
...@@ -264,66 +264,54 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -264,66 +264,54 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
NSArray *promotion = RESPONSE(returnValue); NSArray *promotion = RESPONSE(returnValue);
for (NSDictionary *dict in promotion) { for (NSDictionary *dict in promotion) {
TOOrderPromotionEntity *oldPromotion = [[TOOrderPromotionEntity alloc]initWithDictionary:dict error:nil]; TOOrderPromotionEntity *oldPromotion = [[TOOrderPromotionEntity alloc]initWithDictionary:dict error:nil];
// 赠送商品 NSString *type = dict[@"type"];
if (![BaseViewController isBlankString:oldPromotion.goodsName]) { // 折扣金额
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]) { if (![weakSelf.sectionTitle containsObject:PROMOTIONALSTRING]) {
[weakSelf.sectionTitle addObject:PROMOTIONALSTRING]; [weakSelf.sectionTitle addObject:PROMOTIONALSTRING];
} }
PromotionalGoodsModel *goodsModel = [[PromotionalGoodsModel alloc]init]; PromotionalGoodsModel *goodsModel = [[PromotionalGoodsModel alloc]initWithDictionary:[oldPromotion toDictionary] error:nil];
goodsModel.count = [oldPromotion.promotionNumber integerValue]; goodsModel.count = [oldPromotion.promotionNumber integerValue];
Goods *goods = [[Goods alloc]init]; Goods *goods = [[Goods alloc]init];
goods.name = oldPromotion.goodsName; goods.name = oldPromotion.goodsName;
goodsModel.goods = goods; goodsModel.goods = goods;
goodsModel.isSelected = YES; goodsModel.isSelected = YES;
goodsModel.priority = oldPromotion.prority; [weakSelf getConsumerAllPromotion:goodsModel withBody:goodsModel.body];
[weakSelf.promotionInformationArray addObject:goodsModel]; // 京东E卡
}else if ([type isEqualToString:JDECardAction]){
} else if (![BaseViewController isBlankString:[oldPromotion.promotionMoney stringValue]]) { PromotionJDECardModel *jdECardModel = [[PromotionJDECardModel alloc]initWithDictionary:[oldPromotion toDictionary] error:nil];
// 抵扣金额
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];
jdECardModel.total = [oldPromotion.jdecardDenomation integerValue]; jdECardModel.total = [oldPromotion.jdecardDenomation integerValue];
jdECardModel.body = GUIDE; [weakSelf getConsumerAllPromotion:jdECardModel withBody:jdECardModel.body];
jdECardModel.type = JDECardAction; // 转盘抽奖
jdECardModel.priority = oldPromotion.prority; }else if ([type isEqualToString:dzpRedPackage]){
[weakSelf.guidePromotionArray addObject:jdECardModel]; PromotionLuckyDrawModel *guideDrawModel = [[PromotionLuckyDrawModel alloc]initWithDictionary:[oldPromotion toDictionary] error:nil];
[weakSelf getConsumerAllPromotion:guideDrawModel withBody:guideDrawModel.body];
} else if (![BaseViewController isBlankString:[oldPromotion.redPackageCount stringValue]]) { // 微信卡劵
// 导购抽奖数 }else if ([type isEqualToString:WeChatCard]){
PromotionLuckyDrawModel *guideDrawModel = [[PromotionLuckyDrawModel alloc]init]; PromotionWeChatCardModel *weChatModel = [[PromotionWeChatCardModel alloc]initWithDictionary:[oldPromotion toDictionary] error:nil];
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];
weChatModel.total = [oldPromotion.wxcardDenomation integerValue]; weChatModel.total = [oldPromotion.wxcardDenomation integerValue];
weChatModel.priority = oldPromotion.prority;
[weakSelf.promotionInformationArray addObject:weChatModel]; [weakSelf.promotionInformationArray addObject:weChatModel];
self.weChatModel.wxcardNumber = oldPromotion.wxcardNumber; self.weChatModel.wxcardNumber = oldPromotion.wxcardNumber;
self.weChatModel.wxcardDenomation = [oldPromotion.wxcardDenomation integerValue]; 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:@"促销信息"]) { if (self.promotionInformationArray.count && ![self.sectionTitle containsObject:PROMOTIONALSTRING]) {
[self.sectionTitle addObject:@"促销信息"]; [self.sectionTitle addObject:PROMOTIONALSTRING];
} }
} }
}withFailureBlock:^(NSError *error) { }withFailureBlock:^(NSError *error) {
...@@ -782,12 +770,12 @@ NSString *const PROMOTIONALSTRING = @"促销信息"; ...@@ -782,12 +770,12 @@ NSString *const PROMOTIONALSTRING = @"促销信息";
[mutableString appendString:@"抽奖机会、"]; [mutableString appendString:@"抽奖机会、"];
} }
if (isReadPacket) { if (isReadPacket) {
[mutableString appendString:@"京东E卡、"]; [mutableString appendString:@"现金红包、"];
} }
if (isJDEcard || isGuideDraw || isReadPacket) { if (isJDEcard || isGuideDraw || isReadPacket) {
[mutableString appendString:@"已发放到您的账户"]; [mutableString appendString:@"已发放到您的账户"];
[self rebateApplySuccess:mutableString];
} }
[self rebateApplySuccess:mutableString];
} }
#pragma mark - 抽奖界面 HTML #pragma mark - 抽奖界面 HTML
......
Class/RIghtVC/CustomerManagementVC/AllCustomer/controller/AllCustomerViewController.m
View file @ 137766f3
...@@ -85,6 +85,7 @@ ...@@ -85,6 +85,7 @@
[super viewDidLoad]; [super viewDidLoad];
[self uiConfigAction]; [self uiConfigAction];
[self setUpRefreshAction];
} }
#pragma mark -UI #pragma mark -UI
...@@ -104,10 +105,15 @@ ...@@ -104,10 +105,15 @@
self.begindateButton.layer.cornerRadius = 10; self.begindateButton.layer.cornerRadius = 10;
self.enddateButton.layer.masksToBounds = YES; self.enddateButton.layer.masksToBounds = YES;
self.enddateButton.layer.cornerRadius = 10; self.enddateButton.layer.cornerRadius = 10;
}
#pragma mark -设置刷新
- (void)setUpRefreshAction
{
WS(weakSelf); WS(weakSelf);
//下拉刷新 //下拉刷新
MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{ MjRefreshHeaderCustom *headerRefresh = [MjRefreshHeaderCustom headerWithRefreshingBlock:^{
weakSelf.conditionModel.page.page = ONE; weakSelf.conditionModel.page.page = ONE;
[weakSelf.allCustomerTableview.mj_footer resetNoMoreData]; [weakSelf.allCustomerTableview.mj_footer resetNoMoreData];
[weakSelf getshoppersAssociatedCustomer:weakSelf.conditionModel isRemove:YES]; [weakSelf getshoppersAssociatedCustomer:weakSelf.conditionModel isRemove:YES];
......
Class/SearchController/controller/SearchViewController.m
View file @ 137766f3
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
- (void)viewDidLoad { - (void)viewDidLoad {
[super viewDidLoad]; [super viewDidLoad];
// Do any additional setup after loading the view.
[self uiConfigAction]; [self uiConfigAction];
[self getHotSearchdatas]; [self getHotSearchdatas];
......
Lighting.xcodeproj/project.pbxproj
View file @ 137766f3
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
2908870B1CE5A308000B7097 /* DateSelectedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 290887091CE5A308000B7097 /* DateSelectedViewController.m */; }; 2908870B1CE5A308000B7097 /* DateSelectedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 290887091CE5A308000B7097 /* DateSelectedViewController.m */; };
2908870C1CE5A308000B7097 /* DateSelectedViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2908870A1CE5A308000B7097 /* DateSelectedViewController.xib */; }; 2908870C1CE5A308000B7097 /* DateSelectedViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2908870A1CE5A308000B7097 /* DateSelectedViewController.xib */; };
290887131CE5DF16000B7097 /* ShopcarModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 290887121CE5DF16000B7097 /* ShopcarModel.m */; }; 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 */; }; 2912DFE21E012FE80095C576 /* PostPhotoManagerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2912DFE11E012FE80095C576 /* PostPhotoManagerViewController.m */; };
2916A7411D70362000644C8C /* PaymentsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2916A7401D70362000644C8C /* PaymentsViewController.m */; }; 2916A7411D70362000644C8C /* PaymentsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2916A7401D70362000644C8C /* PaymentsViewController.m */; };
2916A7441D70363E00644C8C /* WithdrawalViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2916A7431D70363E00644C8C /* WithdrawalViewController.m */; }; 2916A7441D70363E00644C8C /* WithdrawalViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2916A7431D70363E00644C8C /* WithdrawalViewController.m */; };
...@@ -218,7 +219,6 @@ ...@@ -218,7 +219,6 @@
29A419951E812E5E0064E958 /* MOFSPickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A4198B1E812E5E0064E958 /* MOFSPickerView.m */; }; 29A419951E812E5E0064E958 /* MOFSPickerView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A4198B1E812E5E0064E958 /* MOFSPickerView.m */; };
29A419961E812E5E0064E958 /* MOFSToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A4198D1E812E5E0064E958 /* MOFSToolbar.m */; }; 29A419961E812E5E0064E958 /* MOFSToolbar.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A4198D1E812E5E0064E958 /* MOFSToolbar.m */; };
29A419971E812E5E0064E958 /* PickerAddressModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A4198F1E812E5E0064E958 /* PickerAddressModel.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 */; }; 29A419991E812E760064E958 /* libxml2.2.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 295B62DE1E812188008D4C6F /* libxml2.2.tbd */; };
29A7A6991DED154F00B04272 /* GiftInformationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A7A6981DED154F00B04272 /* GiftInformationView.m */; }; 29A7A6991DED154F00B04272 /* GiftInformationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A7A6981DED154F00B04272 /* GiftInformationView.m */; };
29A7A69F1DED1A9600B04272 /* prizeOrderDetailsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A7A69E1DED1A9600B04272 /* prizeOrderDetailsModel.m */; }; 29A7A69F1DED1A9600B04272 /* prizeOrderDetailsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 29A7A69E1DED1A9600B04272 /* prizeOrderDetailsModel.m */; };
...@@ -360,6 +360,7 @@ ...@@ -360,6 +360,7 @@
2908870A1CE5A308000B7097 /* DateSelectedViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DateSelectedViewController.xib; sourceTree = "<group>"; }; 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>"; }; 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>"; }; 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>"; }; 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>"; }; 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>"; }; 2916A73F1D70362000644C8C /* PaymentsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PaymentsViewController.h; sourceTree = "<group>"; };
...@@ -753,7 +754,6 @@ ...@@ -753,7 +754,6 @@
29A4198D1E812E5E0064E958 /* MOFSToolbar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MOFSToolbar.m; sourceTree = "<group>"; }; 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>"; }; 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>"; }; 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>"; }; 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>"; }; 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>"; }; 29A7A69D1DED1A9600B04272 /* prizeOrderDetailsModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = prizeOrderDetailsModel.h; sourceTree = "<group>"; };
...@@ -2021,7 +2021,7 @@ ...@@ -2021,7 +2021,7 @@
29A4198D1E812E5E0064E958 /* MOFSToolbar.m */, 29A4198D1E812E5E0064E958 /* MOFSToolbar.m */,
29A4198E1E812E5E0064E958 /* PickerAddressModel.h */, 29A4198E1E812E5E0064E958 /* PickerAddressModel.h */,
29A4198F1E812E5E0064E958 /* PickerAddressModel.m */, 29A4198F1E812E5E0064E958 /* PickerAddressModel.m */,
29A419901E812E5E0064E958 /* province_data.xml */, 290E26371E83A1A40036A8B3 /* province_data.xml */,
); );
path = MOFSPickerManager; path = MOFSPickerManager;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -2891,9 +2891,9 @@ ...@@ -2891,9 +2891,9 @@
29698D621CE2C11500D72CE7 /* SettlementViewController.xib in Resources */, 29698D621CE2C11500D72CE7 /* SettlementViewController.xib in Resources */,
294BFDD11D47225A00BFD53F /* OppleMain.storyboard in Resources */, 294BFDD11D47225A00BFD53F /* OppleMain.storyboard in Resources */,
29BFBD911CE44BC200C238FB /* goodsDetailsSectionview.xib in Resources */, 29BFBD911CE44BC200C238FB /* goodsDetailsSectionview.xib in Resources */,
290E26381E83A1A40036A8B3 /* province_data.xml in Resources */,
29C0E73F1DD98335006CCCF9 /* LearningCenter.storyboard in Resources */, 29C0E73F1DD98335006CCCF9 /* LearningCenter.storyboard in Resources */,
29E944531DE413D6007CD26C /* ApplyPrizeViewController.xib in Resources */, 29E944531DE413D6007CD26C /* ApplyPrizeViewController.xib in Resources */,
29A419981E812E5E0064E958 /* province_data.xml in Resources */,
29D260FD1CEED53400A9787D /* goodsDetailsTableViewCell.xib in Resources */, 29D260FD1CEED53400A9787D /* goodsDetailsTableViewCell.xib in Resources */,
29CF0EC81DDC564900A37171 /* GuideIntegral.storyboard in Resources */, 29CF0EC81DDC564900A37171 /* GuideIntegral.storyboard in Resources */,
29807C621CD20C2A00F111B8 /* Images.xcassets in Resources */, 29807C621CD20C2A00F111B8 /* Images.xcassets in Resources */,
......
Lighting/LearningCenter.storyboard
View file @ 137766f3
...@@ -685,14 +685,14 @@ ...@@ -685,14 +685,14 @@
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wup-l7-BBP"> <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Wup-l7-BBP">
<rect key="frame" x="0.0" y="64" width="1024" height="100"/> <rect key="frame" x="0.0" y="64" width="1024" height="100"/>
<subviews> <subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1019" 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="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sSD-4l-Ksh">
<rect key="frame" x="185" y="57" width="29" height="16"/> <rect key="frame" x="185" y="53.5" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" red="1" green="0.80303316346111109" blue="0.31435195738888894" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color key="textColor" red="1" green="0.80303316346111109" blue="0.31435195738888894" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cQA-Kq-2kO"> <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cQA-Kq-2kO">
<rect key="frame" x="884" y="29" width="100" height="35"/> <rect key="frame" x="884" y="40.5" width="100" height="35"/>
<constraints> <constraints>
<constraint firstAttribute="width" constant="100" id="vYJ-pK-0OY"/> <constraint firstAttribute="width" constant="100" id="vYJ-pK-0OY"/>
</constraints> </constraints>
...@@ -701,8 +701,8 @@ ...@@ -701,8 +701,8 @@
<action selector="releaseButtonClickAction:" destination="vh6-zj-WAp" eventType="touchUpInside" id="leE-NB-dYi"/> <action selector="releaseButtonClickAction:" destination="vh6-zj-WAp" eventType="touchUpInside" id="leE-NB-dYi"/>
</connections> </connections>
</button> </button>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="零售交流" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FuU-Is-N7n"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FuU-Is-N7n">
<rect key="frame" x="145" y="29" width="78" height="23"/> <rect key="frame" x="145" y="40.5" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="19"/> <fontDescription key="fontDescription" type="system" pointSize="19"/>
<nil key="textColor"/> <nil key="textColor"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
...@@ -715,7 +715,7 @@ ...@@ -715,7 +715,7 @@
</constraints> </constraints>
</view> </view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="帖子：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e5v-Y5-qWA"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="帖子：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="e5v-Y5-qWA">
<rect key="frame" x="145" y="57" width="40" height="16"/> <rect key="frame" x="145" y="45.5" width="40" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
...@@ -795,44 +795,44 @@ ...@@ -795,44 +795,44 @@
</constraints> </constraints>
</imageView> </imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="comments" translatesAutoresizingMaskIntoConstraints="NO" id="dUd-RK-AJT"> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="comments" translatesAutoresizingMaskIntoConstraints="NO" id="dUd-RK-AJT">
<rect key="frame" x="948" y="18" width="16" height="16"/> <rect key="frame" x="948" y="7.5" width="16" height="16"/>
<constraints> <constraints>
<constraint firstAttribute="height" constant="16" id="SOy-h5-ZJf"/> <constraint firstAttribute="height" constant="16" id="SOy-h5-ZJf"/>
<constraint firstAttribute="width" constant="16" id="Yal-y3-XBn"/> <constraint firstAttribute="width" constant="16" id="Yal-y3-XBn"/>
</constraints> </constraints>
</imageView> </imageView>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="praise" translatesAutoresizingMaskIntoConstraints="NO" id="kDB-jN-eGQ"> <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="praise" translatesAutoresizingMaskIntoConstraints="NO" id="kDB-jN-eGQ">
<rect key="frame" x="872" y="18" width="16" height="16"/> <rect key="frame" x="872" y="7.5" width="16" height="16"/>
<constraints> <constraints>
<constraint firstAttribute="width" constant="16" id="QU6-1C-deq"/> <constraint firstAttribute="width" constant="16" id="QU6-1C-deq"/>
<constraint firstAttribute="height" constant="16" id="W8k-XB-eza"/> <constraint firstAttribute="height" constant="16" id="W8k-XB-eza"/>
</constraints> </constraints>
</imageView> </imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Wx-2q-7tj"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3Wx-2q-7tj">
<rect key="frame" x="976" y="18" width="8" height="15"/> <rect key="frame" x="976" y="7.5" width="8" height="15"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/> <fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.34509803921568627" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.34509803921568627" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ksH-bE-sVV"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="0" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ksH-bE-sVV">
<rect key="frame" x="900" y="18" width="8" height="15"/> <rect key="frame" x="900" y="7.5" width="8" height="15"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/> <fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" red="0.34509803921568627" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/> <color key="textColor" red="0.34509803921568627" green="0.67450980392156867" blue="0.86274509803921573" alpha="1" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="2017年02月22日15:52:03" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7rE-9M-ChU"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="7rE-9M-ChU">
<rect key="frame" x="82" y="40" width="144" height="15"/> <rect key="frame" x="82" y="55" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/> <fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Nt-9M-3An"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2Nt-9M-3An">
<rect key="frame" x="82" y="15" width="43" height="21"/> <rect key="frame" x="82" y="15" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/> <fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="帖子标题" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BCh-Nc-5qE"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BCh-Nc-5qE">
<rect key="frame" x="30" y="65" width="964" height="22"/> <rect key="frame" x="30" y="65" width="964" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/> <fontDescription key="fontDescription" type="system" pointSize="18"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
...@@ -842,8 +842,8 @@ ...@@ -842,8 +842,8 @@
<constraint firstAttribute="height" constant="150" id="mHO-Dp-igl"/> <constraint firstAttribute="height" constant="150" id="mHO-Dp-igl"/>
</constraints> </constraints>
</view> </view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="dasdasd dasdasd dasdasd dasdasd dasdasd dasdasdd dasdasd " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bzO-uU-oYO"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bzO-uU-oYO">
<rect key="frame" x="30" y="92" width="964" height="16"/> <rect key="frame" x="30" y="70" width="964" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/> <fontDescription key="fontDescription" type="system" pointSize="13"/>
<nil key="textColor"/> <nil key="textColor"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
...@@ -1476,8 +1476,8 @@ ...@@ -1476,8 +1476,8 @@
</userDefinedRuntimeAttribute> </userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes> </userDefinedRuntimeAttributes>
</imageView> </imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="欧普问问" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6qe-aA-4Ym"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6qe-aA-4Ym">
<rect key="frame" x="135" y="105" width="69.5" height="20.5"/> <rect key="frame" x="135" y="115.5" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/> <fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/> <nil key="textColor"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
...@@ -2977,14 +2977,14 @@ ...@@ -2977,14 +2977,14 @@
<constraint firstAttribute="height" constant="40" id="lGg-wt-ncu"/> <constraint firstAttribute="height" constant="40" id="lGg-wt-ncu"/>
</constraints> </constraints>
</imageView> </imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="订单" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gWN-DJ-u26"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gWN-DJ-u26">
<rect key="frame" x="75" y="12" width="35" height="21"/> <rect key="frame" x="75" y="12" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/> <fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/> <nil key="textColor"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="你好吗" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Se9-GU-LNv"> <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Se9-GU-LNv">
<rect key="frame" x="75" y="37" width="37" height="15"/> <rect key="frame" x="75" y="52" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" type="system" pointSize="12"/> <fontDescription key="fontDescription" type="system" pointSize="12"/>
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/> <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
......
Lighting/Supporting Files/Info.plist
View file @ 137766f3
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<key>CFBundleName</key> <key>CFBundleName</key>
<string>欧立方</string> <string>欧立方</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>2.0.7</string> <string>2.0.8</string>
<key>CFBundleURLTypes</key> <key>CFBundleURLTypes</key>
<array> <array>
<dict> <dict>
...@@ -70,10 +70,10 @@ ...@@ -70,10 +70,10 @@
</dict> </dict>
<key>NSCameraUsageDescription</key> <key>NSCameraUsageDescription</key>
<string>欧立方需要您的同意,才能访问相机</string> <string>欧立方需要您的同意,才能访问相机</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>欧立方需要您的同意,才能访问相册</string>
<key>NSLocationWhenInUseUsageDescription</key> <key>NSLocationWhenInUseUsageDescription</key>
<string>欧立方需要您的同意,才能访问数据</string> <string>欧立方需要您的同意,才能访问数据</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>欧立方需要您的同意,才能访问相册</string>
<key>UIBackgroundModes</key> <key>UIBackgroundModes</key>
<array> <array>
<string>fetch</string> <string>fetch</string>
......
Tools/CYConst/CYConstManager.h
View file @ 137766f3
...@@ -95,13 +95,13 @@ typedef NS_ENUM(NSInteger,COMMENT_PRAISE) { ...@@ -95,13 +95,13 @@ typedef NS_ENUM(NSInteger,COMMENT_PRAISE) {
/** /**
* 服务器开发地址 * 服务器开发地址
*///http://139.196.195.30:8090 *///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 //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; ...@@ -667,10 +667,15 @@ extern NSString *const CONSUMER;
extern NSString *const deductionAction; extern NSString *const deductionAction;
/** /**
* 红包 * 现金红包
*/ */
extern NSString *const redPackageAction; extern NSString *const redPackageAction;
/**
* 大转盘红包
*/
extern NSString *const dzpRedPackage;
/** /**
* 赠送商品 * 赠送商品
*/ */
......
Tools/CYConst/CYConstManager.m
View file @ 137766f3
...@@ -566,10 +566,15 @@ NSString *const CONSUMER = @"consumer"; ...@@ -566,10 +566,15 @@ NSString *const CONSUMER = @"consumer";
NSString *const deductionAction = @"deductionAction"; NSString *const deductionAction = @"deductionAction";
/** /**
* 红包 * 现金红包
*/ */
NSString *const redPackageAction = @"redPackageAction"; 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; ...@@ -3061,6 +3061,10 @@ extern NSString * const GRADEMETHOD_MANUL;
* *
*/ */
@property (nonatomic, assign) NSInteger prority; @property (nonatomic, assign) NSInteger prority;
@property (nonatomic,copy) NSString *type;
@property (nonatomic,copy) NSString *body;
@end /* interface TOOrderPromotionEntity */ @end /* interface TOOrderPromotionEntity */
/** /**
......
Tools/Location/MOFSPickerManager/province_data.xml 100755 → 100644
View file @ 137766f3
This source diff could not be displayed because it is too large. You can view the blob instead.
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