CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ assess_alertImg.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_ assess_alertImg.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_ assess_alertImg@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_ assess_alertImg@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ home_banner.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_ home_banner.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_ home_banner@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_ home_banner@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ home_quality.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_ home_quality.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_ home_quality@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icon_check_ home_quality@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

CAISHEN/SellPhone2/Home/AssessPage/Controller/KXAssessComputerViewController.m

@@ -112,6 +112,7 @@ static NSString *cellID = @"cellID";
     // Do any additional setup after loading the view.
     
     [self.view addSubview:self.tableView];
+    self.view.backgroundColor = [UIColor groupTableViewBackgroundColor];
     self.computerModel = [[KXAssessViewModel alloc] init];
 }
 
@@ -250,7 +251,7 @@ static NSString *cellID = @"cellID";
     
     self.computerModel.price = [NSString stringWithFormat:@"%d", nowPrice];
     
-    KXAssessAlertView *alertView = [[KXAssessAlertView alloc] initWithImage:@"sellBottom" andText:@"经过评估，您的手机收受价格为" andPrice:self.computerModel.price delegate:self btnTitle:@"立即下单"];
+    KXAssessAlertView *alertView = [[KXAssessAlertView alloc] initWithImage:@"icon_check_ assess_alertImg" andText:@"经过评估，您的手机收受价格为" andPrice:self.computerModel.price delegate:self btnTitle:@"立即下单"];
     [alertView show];
 }
 
@@ -269,7 +270,7 @@ static NSString *cellID = @"cellID";
     
     [KXHTTP post:urlString params:paramsDict success:^(id json) {
         NSLog(@"%@", json);
-//        [self.navigationController popViewControllerAnimated:YES];
+        [self.navigationController popViewControllerAnimated:YES];
     } failure:^(NSError *error) {
         [MBProgressHUD showTip:@"网络错误"];
     }];

CAISHEN/SellPhone2/Home/AssessPage/Controller/KXAssessPadViewController.m

@@ -109,6 +109,7 @@ static NSString *cellID = @"cellID";
     // Do any additional setup after loading the view.
     
     [self.view addSubview:self.tableView];
+    self.view.backgroundColor = [UIColor groupTableViewBackgroundColor];
     self.padModel = [[KXAssessViewModel alloc] init];
 }
 
@@ -261,7 +262,7 @@ static NSString *cellID = @"cellID";
     
     self.padModel.price = [NSString stringWithFormat:@"%d", nowPrice];
     
-    KXAssessAlertView *alertView = [[KXAssessAlertView alloc] initWithImage:@"sellBottom" andText:@"经过评估，您的手机收受价格为" andPrice:self.padModel.price delegate:self btnTitle:@"立即下单"];
+    KXAssessAlertView *alertView = [[KXAssessAlertView alloc] initWithImage:@"icon_check_ assess_alertImg" andText:@"经过评估，您的手机收受价格为" andPrice:self.padModel.price delegate:self btnTitle:@"立即下单"];
     [alertView show];
 }
 

CAISHEN/SellPhone2/Home/AssessPage/Controller/KXAssessPhoneViewController.m

@@ -108,6 +108,7 @@ static NSString *cellID = @"cellID";
     // Do any additional setup after loading the view.
 
     [self.view addSubview:self.tableView];
+    self.view.backgroundColor = [UIColor groupTableViewBackgroundColor];
     self.phoneModel = [[KXAssessViewModel alloc] init];
 }
 
@@ -256,7 +257,7 @@ static NSString *cellID = @"cellID";
     
     self.phoneModel.price = [NSString stringWithFormat:@"%d", nowPrice];
     
-    KXAssessAlertView *alertView = [[KXAssessAlertView alloc] initWithImage:@"sellBottom" andText:@"经过评估，您的手机收受价格为" andPrice:self.phoneModel.price delegate:self btnTitle:@"立即下单"];
+    KXAssessAlertView *alertView = [[KXAssessAlertView alloc] initWithImage:@"icon_check_ assess_alertImg" andText:@"经过评估，您的手机收受价格为" andPrice:self.phoneModel.price delegate:self btnTitle:@"立即下单"];
     [alertView show];
 }
 

CAISHEN/SellPhone2/Home/AssessPage/Controller/KXAssessViewController.m

@@ -12,6 +12,8 @@
 #import "KXAssessComputerViewController.h"   //电脑评估
 #import "KXAssessPadViewController.h"        //平板评估
 
+#import "UIImage+WWGradientColor.h"  //渐变色
+
 @interface KXAssessViewController ()
 
 @property (nonatomic, strong)UISegmentedControl *segment;  //多段选择器
@@ -36,14 +38,13 @@
 - (void)createrNaviBar {
     [self addLeftBarButtonItemWithImageName:@"main_back" title:@"" target:self selector:@selector(popAction)];
     self.name = @"评估中心";
+        self.navigationController.navigationBar.shadowImage = [UIImage new];
+    [self.navigationController.navigationBar setBackgroundImage:[UIImage new] forBarMetrics:UIBarMetricsDefault];
     
-    for (UIView *views in self.navigationController.navigationBar.subviews) {
-        for (UIView *view in views.subviews) {
-            if ([view isKindOfClass:[UIImageView class]]) {
-                view.hidden = YES;
-            }
-        }
-    }
+    UIColor *topColor = WWColor(219, 141, 255, 1);
+    UIColor *bottomColor = WWColor(233, 202, 248, 1);
+    UIImage *bgImg = [UIImage gradientColorImageFromColors:@[topColor, bottomColor] gradientType:GradientTypeTopToBottom imgSize:CGSizeMake(SCREEN_WIDTH, NavHeight)];
+    self.navigationController.navigationBar.barTintColor = [UIColor colorWithPatternImage:bgImg];
 }
 
 - (void)popAction {
@@ -95,6 +96,15 @@
 #pragma mark - 创建主界面
 - (void)createrMainUI {
     self.view.backgroundColor = [UIColor groupTableViewBackgroundColor];
+    
+    UIView *topView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 40)];
+    
+    UIColor *topColor = WWColor(233, 202, 248, 1);
+    UIColor *bottomColor = [UIColor groupTableViewBackgroundColor];
+    UIImage *bgImg = [UIImage gradientColorImageFromColors:@[topColor, bottomColor] gradientType:GradientTypeTopToBottom imgSize:CGSizeMake(SCREEN_WIDTH, 44)];
+    topView.backgroundColor = [UIColor colorWithPatternImage:bgImg];
+    [self.view addSubview:topView];
+    
     [self.view addSubview:self.segment];
     [self onClickSegment];
 }

CAISHEN/SellPhone2/Home/AssessPage/View/WWAssessAlertView/KXAssessAlertView.h

@@ -26,7 +26,8 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong)UIImageView *imgView;  //图片
 @property (nonatomic, strong)UILabel *textLabel;   //文字信息
 @property (nonatomic, strong)UILabel *priceLabel;   //价格
-@property (nonatomic, strong)UIButton *assessBtn;   //按钮
+@property (nonatomic, strong)UIButton *cancleBtn;   //取消按钮
+@property (nonatomic, strong)UIButton *assessBtn;   //下单按钮
 
 @property (nonatomic,weak) id<KXAssessAlertViewDelegate> delegate;
 

CAISHEN/SellPhone2/Home/AssessPage/View/WWAssessAlertView/KXAssessAlertView.m

@@ -42,7 +42,7 @@
         self.contentView.layer.cornerRadius = 10.0;
         
         //图片
-        self.imgView = [[UIImageView alloc] initWithFrame:CGRectMake(50*SCREEN_MUTI, -30*SCREEN_MUTI, 200*SCREEN_MUTI, 100*SCREEN_MUTI)];
+        self.imgView = [[UIImageView alloc] initWithFrame:CGRectMake(30*SCREEN_MUTI, -40*SCREEN_MUTI, 240*SCREEN_MUTI, 130*SCREEN_MUTI)];
         self.imgView.image = [UIImage imageNamed:imageName];
         [self.contentView addSubview:self.imgView];
         
@@ -62,12 +62,29 @@
         self.priceLabel.textAlignment = NSTextAlignmentCenter;
         [self.contentView addSubview:self.priceLabel];
         
-        //按钮
-        self.assessBtn = [[UIButton alloc] initWithFrame:CGRectMake(50*SCREEN_MUTI, 200*SCREEN_MUTI, 200*SCREEN_MUTI, 40*SCREEN_MUTI)];
+        //取消
+        self.cancleBtn = [[UIButton alloc] initWithFrame:CGRectMake(20*SCREEN_MUTI, 200*SCREEN_MUTI, 110*SCREEN_MUTI, 30*SCREEN_MUTI)];
+        [self.cancleBtn setTitle:@"取消" forState:UIControlStateNormal];
+        [self.cancleBtn setTitleColor:[UIColor newPhoneBaseColor] forState:UIControlStateNormal];
+        self.cancleBtn.layer.masksToBounds = YES;
+        self.cancleBtn.layer.cornerRadius = 15*SCREEN_MUTI;
+        self.cancleBtn.layer.borderWidth = 1.0;
+        self.cancleBtn.layer.borderColor = [UIColor newPhoneBaseColor].CGColor;
+        
+//        UIColor *rigktColor = WWColor(219, 141, 255, 1);
+//        UIColor *leftColor = WWColor(173, 99, 255, 1);
+//        UIImage *bgImg = [UIImage gradientColorImageFromColors:@[leftColor, rigktColor] gradientType:GradientTypeLeftToRight imgSize:self.assessBtn.frame.size];
+//        [self.assessBtn setBackgroundColor:[UIColor colorWithPatternImage:bgImg]];
+        
+        [self.cancleBtn addTarget:self action:@selector(dismiss) forControlEvents:UIControlEventTouchUpInside];
+        [self.contentView addSubview:self.cancleBtn];
+        
+        //下单按钮
+        self.assessBtn = [[UIButton alloc] initWithFrame:CGRectMake(170*SCREEN_MUTI, 200*SCREEN_MUTI, 110*SCREEN_MUTI, 30*SCREEN_MUTI)];
         [self.assessBtn setTitle:btnTitle forState:UIControlStateNormal];
         [self.assessBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
         self.assessBtn.layer.masksToBounds = YES;
-        self.assessBtn.layer.cornerRadius = 20*SCREEN_MUTI;
+        self.assessBtn.layer.cornerRadius = 15*SCREEN_MUTI;
         
         UIColor *rigktColor = WWColor(219, 141, 255, 1);
         UIColor *leftColor = WWColor(173, 99, 255, 1);

CAISHEN/SellPhone2/Home/HomePage/Controller/KXSPHomeViewController.m

@@ -42,7 +42,7 @@ static NSString *cellID = @"cellID";
 
 - (UIView *)headerView {
     if (!_headerView) {
-        _headerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 200)];
+        _headerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 180)];
         
         UIColor *topColor = WWColor(219, 141, 255, 1);
         UIColor *bottomColor = WWColor(233, 202, 248, 1);
@@ -50,8 +50,8 @@ static NSString *cellID = @"cellID";
         [_headerView setBackgroundColor:[UIColor colorWithPatternImage:bgImg]];
         
         //图片
-        UIImageView *topImg = [[UIImageView alloc] initWithFrame:CGRectMake(13, 15, SCREEN_WIDTH-26, 170)];
-        topImg.image = [UIImage imageNamed:@"sellBanner"];
+        UIImageView *topImg = [[UIImageView alloc] initWithFrame:CGRectMake(13, 15, SCREEN_WIDTH-26, 150)];
+        topImg.image = [UIImage imageNamed:@"icon_check_ home_banner"];
         topImg.layer.masksToBounds = YES;
         topImg.layer.cornerRadius = 10.0;
         [_headerView addSubview:topImg];
@@ -78,7 +78,7 @@ static NSString *cellID = @"cellID";
         
         //质检标准(图片)
         UIImageView *bottomImg = [[UIImageView alloc] initWithFrame:CGRectMake(13, 250, SCREEN_WIDTH-26, 120)];
-        bottomImg.image = [UIImage imageNamed:@"sellBanner"];
+        bottomImg.image = [UIImage imageNamed:@"icon_check_ home_quality"];
         bottomImg.layer.masksToBounds = YES;
         bottomImg.layer.cornerRadius = 10.0;
         bottomImg.userInteractionEnabled = YES;
@@ -119,25 +119,28 @@ static NSString *cellID = @"cellID";
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
-    
     [self createNaviBar];
     [self.view addSubview:self.tableView];
 }
 
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    
+    self.navigationController.navigationBar.barTintColor = WWColor(219, 141, 255, 1);
+}
+
 #pragma mark - 创建导航栏
 - (void)createNaviBar {
     NSString *appName = [NSString getAppName];
     self.name = appName;
     
-//    for (UIView *views in self.navigationController.navigationBar.subviews) {
-//        for (UIView *view in views.subviews) {
-//            if ([view isKindOfClass:[UIImageView class]]) {
-//                view.hidden = YES;
-//            }
-//        }
-//    }
-    
-    self.navigationController.navigationBar.barTintColor = WWColor(219, 141, 255, 1);
+    for (UIView *views in self.navigationController.navigationBar.subviews) {
+        for (UIView *view in views.subviews) {
+            if ([view isKindOfClass:[UIImageView class]]) {
+                view.hidden = YES;
+            }
+        }
+    }
 }
 
 #pragma mark - tableView dataSource
@@ -158,7 +161,7 @@ static NSString *cellID = @"cellID";
     cell.indexPath = indexPath;
     if (indexPath.row == 0) {
         UIColor *topColor = WWColor(233, 202, 248, 1);
-        UIColor *bottomColor = WWColor(245, 245, 245, 1);
+        UIColor *bottomColor = [UIColor groupTableViewBackgroundColor];
         UIImage *bgImg = [UIImage gradientColorImageFromColors:@[topColor, bottomColor] gradientType:GradientTypeTopToBottom imgSize:CGSizeMake(SCREEN_WIDTH, 190)];
         [cell.contentView setBackgroundColor:[UIColor colorWithPatternImage:bgImg]];
     }
@@ -167,6 +170,15 @@ static NSString *cellID = @"cellID";
     return cell;
 }
 
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
+    if (scrollView == self.tableView) {
+        CGFloat offY = scrollView.contentOffset.y;
+        if (offY < 0) {
+            scrollView.contentOffset = CGPointZero;   
+        }
+    }
+}
+
 #pragma mark - 点击最底部质检标准图片
 - (void)onClickBottomImage {
     KXSPWebViewController *web = [[KXSPWebViewController alloc] init];

CAISHEN/SellPhone2/Home/HomePage/View/WWGradientColor/UIImage+WWGradientColor.m

@@ -21,7 +21,7 @@
         
     }
     
-    UIGraphicsBeginImageContextWithOptions(imgSize, YES, 1);
+    UIGraphicsBeginImageContextWithOptions(imgSize, YES, [UIScreen mainScreen].scale);
     
     CGContextRef context = UIGraphicsGetCurrentContext();