修复bug

redstar.xcodeproj/project.pbxproj

@@ -75,6 +75,7 @@
 		849B2F711C0CA22F005D809F /* AnnoContentTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 849B2F701C0CA22F005D809F /* AnnoContentTableViewCell.m */; };
 		849B2F741C0CA60E005D809F /* AnnounceDetailFootView.m in Sources */ = {isa = PBXBuildFile; fileRef = 849B2F731C0CA60E005D809F /* AnnounceDetailFootView.m */; };
 		849B2F771C0CABE6005D809F /* AnnounceDetailModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 849B2F761C0CABE6005D809F /* AnnounceDetailModel.m */; };
+		84A2270E1C229409002766DC /* RankPickView.m in Sources */ = {isa = PBXBuildFile; fileRef = 84A2270D1C229409002766DC /* RankPickView.m */; };
 		84A673881C0B50B4000F828E /* OnLineCompleteViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 84A673871C0B50B4000F828E /* OnLineCompleteViewController.m */; };
 		84A6738E1C0BE2D0000F828E /* OnLineCompleteCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 84A6738D1C0BE2D0000F828E /* OnLineCompleteCell.m */; };
 		84A673911C0C2681000F828E /* FunctionViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 84A673901C0C2681000F828E /* FunctionViewController.m */; };
@@ -309,6 +310,8 @@
 		849B2F731C0CA60E005D809F /* AnnounceDetailFootView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AnnounceDetailFootView.m; sourceTree = "<group>"; };
 		849B2F751C0CABE6005D809F /* AnnounceDetailModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnnounceDetailModel.h; sourceTree = "<group>"; };
 		849B2F761C0CABE6005D809F /* AnnounceDetailModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AnnounceDetailModel.m; sourceTree = "<group>"; };
+		84A2270C1C229409002766DC /* RankPickView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RankPickView.h; sourceTree = "<group>"; };
+		84A2270D1C229409002766DC /* RankPickView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RankPickView.m; sourceTree = "<group>"; };
 		84A673861C0B50B4000F828E /* OnLineCompleteViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OnLineCompleteViewController.h; sourceTree = "<group>"; };
 		84A673871C0B50B4000F828E /* OnLineCompleteViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OnLineCompleteViewController.m; sourceTree = "<group>"; };
 		84A6738C1C0BE2D0000F828E /* OnLineCompleteCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OnLineCompleteCell.h; sourceTree = "<group>"; };
@@ -711,6 +714,8 @@
 			children = (
 				846206B31C06AF700015C456 /* RankListHeaderView.h */,
 				846206B41C06AF700015C456 /* RankListHeaderView.m */,
+				84A2270C1C229409002766DC /* RankPickView.h */,
+				84A2270D1C229409002766DC /* RankPickView.m */,
 			);
 			path = View;
 			sourceTree = "<group>";
@@ -2272,6 +2277,7 @@
 				84CC34E21C09583D002F10E2 /* LookOnLineTableViewCell.m in Sources */,
 				8480BEB21C143A4100E2F18F /* StateTableView.m in Sources */,
 				849B2F711C0CA22F005D809F /* AnnoContentTableViewCell.m in Sources */,
+				84A2270E1C229409002766DC /* RankPickView.m in Sources */,
 				84D3E6021C04DA85001FF1DD /* InspectUpLoadFootView.m in Sources */,
 				84A673881C0B50B4000F828E /* OnLineCompleteViewController.m in Sources */,
 				8474C5991BE78BBC007DCF19 /* QuestionDetailCell.m in Sources */,

redstar/Classes/Macro/Url.h

@@ -31,7 +31,6 @@
 
 // 口碑排名列表
 #define kRankingListURL @"redstar-server/rest/praise/ranking"
-
 // 提交评论
 #define kAddCommentURL @"redstar-server/rest/comment/submit"
 
@@ -105,4 +104,12 @@
 // 口碑取消点赞
 #define kPicturePraiseCancelLikeURL @"redstar-server/rest/legendpraise/cancel_like/"
 
+
+/**
+ *  口碑排名（新）
+ */
+
+// 获取口碑列表
+#define kQueryShortPraiseURL @"redstar-server/rest/praise/query_short?userUuid="
+
 #endif /* Url_h */

redstar/Classes/Module/Function/OnLine/AddOnLine/Cell/OnLineTableViewCell.m

@@ -97,10 +97,13 @@
 {
     if (!_storeBtn) {
         _storeBtn = [[UIButton alloc] init];
+        _storeBtn.tag = 323228;
         [_storeBtn setTitleColor:kOnLineCellTitleColor forState:UIControlStateNormal];
         _storeBtn.translatesAutoresizingMaskIntoConstraints = NO;
+        [_storeBtn setTitle:@"商场得分" forState:UIControlStateNormal];
+        _storeBtn.selected = YES;
         [_storeBtn setImage:[UIImage imageNamed:@"select_box"] forState:UIControlStateNormal];
-        [_storeBtn setImage:[UIImage imageNamed:@"on_select_box"] forState:UIControlStateSelected];
+        [_storeBtn setImage:[UIImage imageNamed:@"no_select_box"] forState:UIControlStateSelected];
         _storeBtn.titleLabel.font = [UIFont systemFontOfSize:15.0f];
         _storeBtn.imageEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 20);
         _storeBtn.titleEdgeInsets = UIEdgeInsetsMake(0, 5, 0, 0);
@@ -132,10 +135,12 @@
 {
     if (!_averageBtn) {
         _averageBtn = [[UIButton alloc] init];
+        _averageBtn.tag = 323229;
         [_averageBtn setTitleColor:kOnLineCellTitleColor forState:UIControlStateNormal];
         _averageBtn.translatesAutoresizingMaskIntoConstraints = NO;
+        [_averageBtn setTitle:@"区域平均分" forState:UIControlStateNormal];
         [_averageBtn setImage:[UIImage imageNamed:@"select_box"] forState:UIControlStateNormal];
-        [_averageBtn setImage:[UIImage imageNamed:@"on_select_box"] forState:UIControlStateSelected];
+        [_averageBtn setImage:[UIImage imageNamed:@"no_select_box"] forState:UIControlStateSelected];
         _averageBtn.titleLabel.font = [UIFont systemFontOfSize:15.0f];
         _averageBtn.imageEdgeInsets = UIEdgeInsetsMake(0, 0, 0, 20);
         _averageBtn.titleEdgeInsets = UIEdgeInsetsMake(0, 5, 0, 0);

redstar/Classes/Module/Function/WordOfMouth/Ranking/RankingList/View/RankListHeaderView.m

@@ -150,7 +150,7 @@
 {
     [super layoutSubviews];
     _bgView.frame = self.bounds;
-    _bgButton.frame = CGRectMake(30, 0, 0.3 * kScreenWidth, self.bounds.size.height);
+    _bgButton.frame = CGRectMake(30, 0, 0.35 * kScreenWidth, self.bounds.size.height);
     _arrowImageView.frame = CGRectMake(20, (self.frame.size.height - 11) / 2, 9, 10);
     _scoreLabel.frame = CGRectMake(0.4 * kScreenWidth, 0, 0.25 * kScreenWidth, 50);
     if (_section < 3) {

redstar/Classes/Module/Function/WordOfMouth/Ranking/RankingList/View/RankPickView.h

+//
+//  RankPickView.h
+//  redstar
+//
+//  Created by admin on 15/12/17.
+//  Copyright © 2015年 ZWF. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface RankPickView : UIView
+@property (nonatomic, strong) UIPickerView *pickerView;
+@property (nonatomic, strong) UIButton *okButton;
+@end

redstar/Classes/Module/Function/WordOfMouth/Ranking/RankingList/View/RankPickView.m

+//
+//  RankPickView.m
+//  redstar
+//
+//  Created by admin on 15/12/17.
+//  Copyright © 2015年 ZWF. All rights reserved.
+//
+
+#import "RankPickView.h"
+
+@implementation RankPickView
+
+- (instancetype)init
+{
+    self = [super init];
+    if (self) {
+        [self setup];
+    }
+    return self;
+}
+
+- (void)setup{
+    self.pickerView = [[UIPickerView alloc] init];
+    _pickerView.frame = CGRectMake(0, 30, kScreenWidth, 120);
+    [self addSubview:_pickerView];
+    
+    self.okButton = [[UIButton alloc] init];
+    _okButton.frame = CGRectMake(kScreenWidth - 60, 0, 60, 30);
+    [_okButton setTitle:@"完成" forState:UIControlStateNormal];
+    [_okButton setTitleColor:kLightBlack forState:UIControlStateNormal];
+    _okButton.titleLabel.font = [UIFont systemFontOfSize:16.0];
+    [self addSubview:_okButton];
+    
+}
+
+@end

redstar/Classes/Module/Function/WordOfMouth/Ranking/RankingList/ViewController/RankingListViewController.h

@@ -11,11 +11,5 @@
 
 
 @interface RankingListViewController : UIViewController
-//@property (nonatomic, strong) UILabel *pointLabel1; // 月度排名
-//@property (nonatomic, strong) UILabel *pointLabel2; // 参与商场数量
-//@property (nonatomic, strong) DateButton *dateButton; // 年月日
-//@property (nonatomic, strong) UILabel *shoppingCountLabel; // 商场数
-
-//@property (nonatomic, strong) UIView *lineView; // 分割线
 
 @end

redstar/Classes/Tools/HttpClient/HttpClient.h

@@ -113,5 +113,10 @@ typedef void (^completionBlock) (id response, NSError *error);
 
 // 口碑取消点赞
 - (void)cancelLikePicturePraiseWithCompletion:(completionBlock)completion;
+/**
+ *  口碑排名（新）
+ */
 
+// 获取口碑列表
+- (void)queryShortPraiseWithCompletion:(completionBlock)completion;
 @end

redstar/Classes/Tools/HttpClient/HttpClient.m

@@ -397,4 +397,14 @@
     }];
 }
 
+// 获取口碑列表
+- (void)queryShortPraiseWithCompletion:(completionBlock)completion
+{
+    [self getParameters:nil completion:^(id response, NSError *error) {
+        if (completion) {
+            completion (response, error);
+        }
+    }];
+}
+
 @end