登录密码改为明文

redstar/Assets.xcassets/Img/00.imageset/Contents.json

-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "img_05.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file

redstar/Assets.xcassets/Img/01.imageset/Contents.json

-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "img_01.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file

redstar/Assets.xcassets/Img/02.imageset/Contents.json

-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "img_02.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file

redstar/Assets.xcassets/Img/03.imageset/Contents.json

-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "img_03.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file

redstar/Assets.xcassets/Img/04.imageset/Contents.json

-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "filename" : "img_04.png",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file

redstar/Assets.xcassets/Img/Contents.json

-{
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file

redstar/Classes/Macro/Url.h

@@ -10,10 +10,10 @@
 #define Url_h
 
 // url 测试环境
-//#define kRedStarURL  @"http://218.244.151.129:7580/"
+#define kRedStarURL  @"http://218.244.151.129:7580/"
 
 // 正式环境
- #define kRedStarURL  @"http://219.235.234.225:7580/"
+// #define kRedStarURL  @"http://219.235.234.225:7580/"
 
 // 最新正式环境
 // #define kRedStarURL  @"http://219.235.234.212:7580/"

redstar/Classes/Module/Function/Picture/PictureCategory/ViewController/PicCategoryViewController.m

@@ -42,7 +42,7 @@
 {
     UILabel *customLab = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 40, 30)];
     [customLab setTextColor:[UIColor whiteColor]];
-    [customLab setText:@"口碑标准"];
+    [customLab setText:@"图说口碑"];
     customLab.font = [UIFont boldSystemFontOfSize:19];
     self.navigationItem.titleView = customLab;
     

redstar/Classes/Module/Function/Picture/PictureList/Cell/PictureTableCell.m

@@ -221,7 +221,7 @@
         NSLayoutConstraint *titleImageTop = [NSLayoutConstraint constraintWithItem:_dateLabel attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.titleImageView attribute:NSLayoutAttributeBottom multiplier:1.0 constant:7];
         [self.contentView addConstraint:titleImageTop];
         
-        NSLayoutConstraint *titleImageLeft = [NSLayoutConstraint constraintWithItem:_dateLabel attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:self.titleImageView attribute:NSLayoutAttributeRight multiplier:1.0 constant:10];
+        NSLayoutConstraint *titleImageLeft = [NSLayoutConstraint constraintWithItem:_dateLabel attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:self.titleImageView attribute:NSLayoutAttributeRight multiplier:1.0 constant:5];
         [self.contentView addConstraint:titleImageLeft];
         
         NSLayoutConstraint *titleRight = [NSLayoutConstraint constraintWithItem:_dateLabel attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:self.thumbBtn attribute:NSLayoutAttributeLeft multiplier:1.0 constant:0];
@@ -244,7 +244,7 @@
         [_thumbBtn setImage:[UIImage imageNamed:@"commend_after"] forState:UIControlStateSelected];
         _thumbBtn.translatesAutoresizingMaskIntoConstraints = NO;
         [_thumbBtn setTitleColor:kNavigationBarColor forState:UIControlStateNormal];
-        _thumbBtn.titleLabel.font = [UIFont systemFontOfSize:16.0];
+        _thumbBtn.titleLabel.font = [UIFont systemFontOfSize:15.0];
         [self.contentView addSubview:_thumbBtn];
         
         NSLayoutConstraint *titleImageTop = [NSLayoutConstraint constraintWithItem:_thumbBtn attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.titleImageView attribute:NSLayoutAttributeBottom multiplier:1.0 constant:8];
@@ -253,7 +253,7 @@
         NSLayoutConstraint *titleImageWidth = [NSLayoutConstraint constraintWithItem:_thumbBtn attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:self.commentBtn attribute:NSLayoutAttributeWidth multiplier:1.0 constant:0];
         [self.contentView addConstraint:titleImageWidth];
         
-        NSLayoutConstraint *titleRight = [NSLayoutConstraint constraintWithItem:_thumbBtn attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:self.commentBtn attribute:NSLayoutAttributeLeft multiplier:1.0 constant:-15];
+        NSLayoutConstraint *titleRight = [NSLayoutConstraint constraintWithItem:_thumbBtn attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:self.commentBtn attribute:NSLayoutAttributeLeft multiplier:1.0 constant:-3];
         [self.contentView addConstraint:titleRight];
         
         NSLayoutConstraint *titleImageHeight = [NSLayoutConstraint constraintWithItem:_thumbBtn attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:20];
@@ -269,16 +269,16 @@
         [_commentBtn setImage:[UIImage imageNamed:@"comment"] forState:UIControlStateNormal];
         _commentBtn.translatesAutoresizingMaskIntoConstraints = NO;
         [_commentBtn setTitleColor:kNavigationBarColor forState:UIControlStateNormal];
-        _commentBtn.titleLabel.font = [UIFont systemFontOfSize:16.0];
+        _commentBtn.titleLabel.font = [UIFont systemFontOfSize:15.0];
         [self.contentView addSubview:_commentBtn];
         
         NSLayoutConstraint *titleImageTop = [NSLayoutConstraint constraintWithItem:_commentBtn attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.titleImageView attribute:NSLayoutAttributeBottom multiplier:1.0 constant:8];
         [self.contentView addConstraint:titleImageTop];
         
-        NSLayoutConstraint *titleImageWidth = [NSLayoutConstraint constraintWithItem:_commentBtn attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:70];
+        NSLayoutConstraint *titleImageWidth = [NSLayoutConstraint constraintWithItem:_commentBtn attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:60];
         [self.contentView addConstraint:titleImageWidth];
         
-        NSLayoutConstraint *titleRight = [NSLayoutConstraint constraintWithItem:_commentBtn attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeRight multiplier:1.0 constant:-15];
+        NSLayoutConstraint *titleRight = [NSLayoutConstraint constraintWithItem:_commentBtn attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeRight multiplier:1.0 constant:-8];
         [self.contentView addConstraint:titleRight];
         
         NSLayoutConstraint *titleImageHeight = [NSLayoutConstraint constraintWithItem:_commentBtn attribute:NSLayoutAttributeHeight relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:20];

redstar/Classes/Module/Function/Question/AddQuestion/ViewController/AddQuestionViewController.m

@@ -22,7 +22,7 @@
 
 #define kPhotoTag 3339922
 
-#define CATEGORYLIST @"服务", @"环境企划", @"环境物业", nil
+#define CATEGORYLIST @"服务", @"环境企划", @"环境物业",@"价格",@"质量",@"商户信用分类",@"审批比价采购",@"送货跟单",@"指标",@"其他", nil
 #define QUESTIONLIST @"15分钟退单", @"便民服务", @"基础管理",@"轻松购系统",@"全员服务",@"人员信息",@"营运物流及服务硬件", nil
 
 
@@ -47,13 +47,19 @@
 @property (nonatomic, assign) int rowNumber;
 
 @property (nonatomic, strong) NSMutableDictionary *saveDict;
+
+@property (nonatomic, strong) NSMutableArray *categoryArray;
+@property (nonatomic, strong) NSMutableDictionary *questionDict;
+
 @end
 
 @implementation AddQuestionViewController
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-    
+
+    [self createNewDict];
+
     self.view.backgroundColor = kFootViewBackGroundColor;
     
     UILabel *customLab = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 40, 30)];
@@ -87,6 +93,13 @@
 
 }
 
+//
+- (void)createNewDict
+{
+    self.categoryArray = [NSMutableArray arrayWithObjects:@"服务", @"环境企划", @"环境物业",@"价格",@"质量",@"商户信用分类",@"审批比价采购",@"送货跟单",@"指标",@"其他", nil];
+    self.questionDict = [NSMutableDictionary dictionary];
+}
+
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.

redstar/Classes/Module/Function/Question/QuestionList/Cell/QuestionListTableCell.m

@@ -218,11 +218,11 @@
         [self.contentView addConstraint:stateTop];
         
         // 左边
-        NSLayoutConstraint *stateWidth = [NSLayoutConstraint constraintWithItem:_thumbBtn attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:80];
+        NSLayoutConstraint *stateWidth = [NSLayoutConstraint constraintWithItem:_thumbBtn attribute:NSLayoutAttributeWidth relatedBy:NSLayoutRelationEqual toItem:nil attribute:NSLayoutAttributeNotAnAttribute multiplier:1.0 constant:65];
         [self.contentView addConstraint:stateWidth];
         
         // 右边
-        NSLayoutConstraint *stateRight = [NSLayoutConstraint constraintWithItem:_thumbBtn attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeRight multiplier:1.0 constant:-20];
+        NSLayoutConstraint *stateRight = [NSLayoutConstraint constraintWithItem:_thumbBtn attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeRight multiplier:1.0 constant:-15];
         [self.contentView addConstraint:stateRight];
         
         // 高度

redstar/Classes/Module/Function/Standar/SOPCategarys/ViewController/SOPViewController.m

@@ -278,6 +278,7 @@
         }
         //下载附件
         aUrl = [aUrl stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
+        NSLog(@"aaaurl === %@", aUrl);
         NSURL *url = [[NSURL alloc] initWithString:aUrl];
         NSURLRequest *request = [NSURLRequest requestWithURL:url];
         

redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/ViewController/InspectNotUploadViewController.h

@@ -16,4 +16,6 @@
 @property (nonatomic, strong) NSString *uuid; // 口碑巡检uuid
 @property (nonatomic, strong) NSString *praiseUuid;
 @property (nonatomic, strong) NSString *questionUuid;
+@property (nonatomic, copy) NSString *catesgory;
+
 @end

redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/ViewController/InspectNotUploadViewController.m

@@ -49,7 +49,7 @@
     UILabel *customLab = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 100, 30)];
     [customLab setTextColor:[UIColor whiteColor]];
     customLab.textAlignment = NSTextAlignmentCenter;
-    [customLab setText:[NSString stringWithFormat:@"检查点--%@(%@/%d)", self.taskModel.category, self.taskModel.lineNo, self.questionCount]];
+    [customLab setText:[NSString stringWithFormat:@"检查点--%@(%@/%d)", self.catesgory, self.taskModel.lineNo, self.questionCount]];
     customLab.font = [UIFont boldSystemFontOfSize:19];
     self.navigationItem.titleView = customLab;
     

redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/ViewController/InspectUploadedViewController.h

@@ -12,4 +12,5 @@
 @interface InspectUploadedViewController : UIViewController
 @property (nonatomic, assign) int questionCount;
 @property (nonatomic, strong) TaskModel *taskModel;
+@property (nonatomic, copy) NSString *catesgory;
 @end

redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectDetail/ViewController/InspectUploadedViewController.m

@@ -30,7 +30,7 @@
     UILabel *customLab = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, 100, 30)];
     [customLab setTextColor:[UIColor whiteColor]];
     customLab.textAlignment = NSTextAlignmentCenter;
-    [customLab setText:[NSString stringWithFormat:@"检查点--%@(%@/%d)", self.taskModel.category, self.taskModel.lineNo, self.questionCount]];
+    [customLab setText:[NSString stringWithFormat:@"检查点--%@(%@/%d)", self.catesgory, self.taskModel.lineNo, self.questionCount]];
     customLab.font = [UIFont boldSystemFontOfSize:19];
     self.navigationItem.titleView = customLab;
     

redstar/Classes/Module/Function/WordOfMouth/Inspect/InspectTask/ViewController/InspectTaskViewController.m

@@ -262,6 +262,7 @@
                     InspectUploadedViewController *inspectVC = [[InspectUploadedViewController alloc] init];
                     inspectVC.questionCount = taskGroup.questionCount;
                     inspectVC.taskModel = task;
+                    inspectVC.catesgory = taskGroup.category;
                     [self.navigationController pushViewController:inspectVC animated:YES];
                 } else {
                     InspectNotUploadViewController *inspectNotVC = [[InspectNotUploadViewController alloc] init];
@@ -270,6 +271,7 @@
                     inspectNotVC.store_uuid = _taskDetail.store_uuid;
                     inspectNotVC.praiseUuid = _taskDetail.uuid;
                     inspectNotVC.questionUuid = task.uuid;
+                    inspectNotVC.catesgory = taskGroup.category;
                     [self.navigationController pushViewController:inspectNotVC animated:YES];
                 }
             } else {
@@ -280,6 +282,7 @@
             InspectUploadedViewController *inspectVC = [[InspectUploadedViewController alloc] init];
             inspectVC.questionCount = taskGroup.questionCount;
             inspectVC.taskModel = task;
+            inspectVC.catesgory = taskGroup.category;
             [self.navigationController pushViewController:inspectVC animated:YES];
         }
     }

redstar/Classes/Module/Function/WordOfMouth/Ranking/RankingList/Cell/RankingListCell.m

@@ -69,13 +69,14 @@
         _shopNameButton = [[UILabel alloc] init];
         _shopNameButton.translatesAutoresizingMaskIntoConstraints = NO;
         _shopNameButton.textColor = kShopNameTextColor;
-        _shopNameButton.font = [UIFont systemFontOfSize:17.0];
+        _shopNameButton.font = [UIFont systemFontOfSize:16.0];
+        _shopNameButton.numberOfLines = 0;
         [self.contentView addSubview:_shopNameButton];
         
-        NSLayoutConstraint *shoppingTop = [NSLayoutConstraint constraintWithItem:_shopNameButton attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeTop multiplier:1.0 constant:1];
+        NSLayoutConstraint *shoppingTop = [NSLayoutConstraint constraintWithItem:_shopNameButton attribute:NSLayoutAttributeTop relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeTop multiplier:1.0 constant:0];
         [self.contentView addConstraint:shoppingTop];
         
-        NSLayoutConstraint *shoppingLeft = [NSLayoutConstraint constraintWithItem:_shopNameButton attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeLeft multiplier:1.0 constant:25];
+        NSLayoutConstraint *shoppingLeft = [NSLayoutConstraint constraintWithItem:_shopNameButton attribute:NSLayoutAttributeLeft relatedBy:NSLayoutRelationEqual toItem:self.contentView attribute:NSLayoutAttributeLeft multiplier:1.0 constant:20];
         [self.contentView addConstraint:shoppingLeft];
         
         NSLayoutConstraint *shoppingRight = [NSLayoutConstraint constraintWithItem:_shopNameButton attribute:NSLayoutAttributeRight relatedBy:NSLayoutRelationEqual toItem:self.scoreLabel attribute:NSLayoutAttributeLeft multiplier:1.0 constant:0];

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

@@ -7,7 +7,7 @@
 //
 
 #import "RankingListViewController.h"
-#import "RankingListCell.h"
+//#import "RankingListCell.h"
 #import "RankDetailViewController.h"
 
 #import "HttpClient.h"

redstar/Classes/Tools/HttpClient/HttpClient.m

@@ -92,10 +92,10 @@
     url = [url stringByAddingPercentEscapesUsingEncoding: NSUTF8StringEncoding];
 
     // password
-    NSString *passwordMD5 = [CommonFunc md5:password];
+    //NSString *passwordMD5 = [CommonFunc md5:password];
     // 参数
     NSDictionary *parameters = @{@"authenticode":@"211534962",
-                                 @"password":passwordMD5
+                                 @"password":password
                                  };
     [_manager POST:url parameters:parameters success:^(NSURLSessionDataTask *task, id responseObject) {
         if (completion) {

redstar/Classes/Tools/ZanButton/ZanButton.m

@@ -17,17 +17,17 @@
     [super layoutSubviews];
     
     // 1.imageView
-    CGFloat imageX = 5;
-    CGFloat imageY = 0;
-    CGFloat imageW = 17;
+    CGFloat imageX = 2;
+    CGFloat imageY = 1;
+    CGFloat imageW = 16.5;
     CGFloat imageH = 18;
     self.imageView.frame = CGRectMake(imageX, imageY, imageW, imageH);
     
     
     // 2.title
-    CGFloat titleX = imageW + imageX + 4;
-    CGFloat titleY = 1;
-    CGFloat titleW = self.bounds.size.width - (imageW + imageX + 4);
+    CGFloat titleX = imageW + imageX + 2;
+    CGFloat titleY = 0;
+    CGFloat titleW = self.bounds.size.width - titleX;
     CGFloat titleH = self.bounds.size.height - titleY;
     self.titleLabel.frame = CGRectMake(titleX , titleY, titleW, titleH);