3 次代碼提交 67c01dd719 ... e0cd644cb1

作者 SHA1 備註 提交日期
  wangwei e0cd644cb1 提交图片素材 5 年之前
  wangwei 395dd7ea88 下拉小西的渐变色 5 年之前
  wangwei 0974370866 下拉代码 5 年之前
共有 20 個文件被更改,包括 144 次插入32 次删除
  1. 23 0
      CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ assess_alertImg.imageset/Contents.json
  2. 二進制
      CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ assess_alertImg.imageset/icon_check_ assess_alertImg.png
  3. 二進制
      CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ assess_alertImg.imageset/icon_check_ assess_alertImg@2x.png
  4. 二進制
      CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ assess_alertImg.imageset/icon_check_ assess_alertImg@3x.png
  5. 23 0
      CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ home_banner.imageset/Contents.json
  6. 二進制
      CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ home_banner.imageset/icon_check_ home_banner.png
  7. 二進制
      CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ home_banner.imageset/icon_check_ home_banner@2x.png
  8. 二進制
      CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ home_banner.imageset/icon_check_ home_banner@3x.png
  9. 23 0
      CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ home_quality.imageset/Contents.json
  10. 二進制
      CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ home_quality.imageset/icon_check_ home_quality.png
  11. 二進制
      CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ home_quality.imageset/icon_check_ home_quality@2x.png
  12. 二進制
      CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ home_quality.imageset/icon_check_ home_quality@3x.png
  13. 3 2
      CAISHEN/SellPhone2/Home/AssessPage/Controller/KXAssessComputerViewController.m
  14. 2 1
      CAISHEN/SellPhone2/Home/AssessPage/Controller/KXAssessPadViewController.m
  15. 2 1
      CAISHEN/SellPhone2/Home/AssessPage/Controller/KXAssessPhoneViewController.m
  16. 17 7
      CAISHEN/SellPhone2/Home/AssessPage/Controller/KXAssessViewController.m
  17. 2 1
      CAISHEN/SellPhone2/Home/AssessPage/View/WWAssessAlertView/KXAssessAlertView.h
  18. 21 4
      CAISHEN/SellPhone2/Home/AssessPage/View/WWAssessAlertView/KXAssessAlertView.m
  19. 27 15
      CAISHEN/SellPhone2/Home/HomePage/Controller/KXSPHomeViewController.m
  20. 1 1
      CAISHEN/SellPhone2/Home/HomePage/View/WWGradientColor/UIImage+WWGradientColor.m

+ 23 - 0
CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ assess_alertImg.imageset/Contents.json

1
+{
2
+  "images" : [
3
+    {
4
+      "idiom" : "universal",
5
+      "filename" : "icon_check_ assess_alertImg.png",
6
+      "scale" : "1x"
7
+    },
8
+    {
9
+      "idiom" : "universal",
10
+      "filename" : "icon_check_ assess_alertImg@2x.png",
11
+      "scale" : "2x"
12
+    },
13
+    {
14
+      "idiom" : "universal",
15
+      "filename" : "icon_check_ assess_alertImg@3x.png",
16
+      "scale" : "3x"
17
+    }
18
+  ],
19
+  "info" : {
20
+    "version" : 1,
21
+    "author" : "xcode"
22
+  }
23
+}

二進制
CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ assess_alertImg.imageset/icon_check_ assess_alertImg.png


二進制
CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ assess_alertImg.imageset/icon_check_ assess_alertImg@2x.png


二進制
CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ assess_alertImg.imageset/icon_check_ assess_alertImg@3x.png


+ 23 - 0
CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ home_banner.imageset/Contents.json

1
+{
2
+  "images" : [
3
+    {
4
+      "idiom" : "universal",
5
+      "filename" : "icon_check_ home_banner.png",
6
+      "scale" : "1x"
7
+    },
8
+    {
9
+      "idiom" : "universal",
10
+      "filename" : "icon_check_ home_banner@2x.png",
11
+      "scale" : "2x"
12
+    },
13
+    {
14
+      "idiom" : "universal",
15
+      "filename" : "icon_check_ home_banner@3x.png",
16
+      "scale" : "3x"
17
+    }
18
+  ],
19
+  "info" : {
20
+    "version" : 1,
21
+    "author" : "xcode"
22
+  }
23
+}

二進制
CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ home_banner.imageset/icon_check_ home_banner.png


二進制
CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ home_banner.imageset/icon_check_ home_banner@2x.png


二進制
CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ home_banner.imageset/icon_check_ home_banner@3x.png


+ 23 - 0
CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ home_quality.imageset/Contents.json

1
+{
2
+  "images" : [
3
+    {
4
+      "idiom" : "universal",
5
+      "filename" : "icon_check_ home_quality.png",
6
+      "scale" : "1x"
7
+    },
8
+    {
9
+      "idiom" : "universal",
10
+      "filename" : "icon_check_ home_quality@2x.png",
11
+      "scale" : "2x"
12
+    },
13
+    {
14
+      "idiom" : "universal",
15
+      "filename" : "icon_check_ home_quality@3x.png",
16
+      "scale" : "3x"
17
+    }
18
+  ],
19
+  "info" : {
20
+    "version" : 1,
21
+    "author" : "xcode"
22
+  }
23
+}

二進制
CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ home_quality.imageset/icon_check_ home_quality.png


二進制
CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ home_quality.imageset/icon_check_ home_quality@2x.png


二進制
CAISHEN/Images.xcassets/SellPhoneNew/icon_check_ home_quality.imageset/icon_check_ home_quality@3x.png


+ 3 - 2
CAISHEN/SellPhone2/Home/AssessPage/Controller/KXAssessComputerViewController.m

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

+ 2 - 1
CAISHEN/SellPhone2/Home/AssessPage/Controller/KXAssessPadViewController.m

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

+ 2 - 1
CAISHEN/SellPhone2/Home/AssessPage/Controller/KXAssessPhoneViewController.m

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

+ 17 - 7
CAISHEN/SellPhone2/Home/AssessPage/Controller/KXAssessViewController.m

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

+ 2 - 1
CAISHEN/SellPhone2/Home/AssessPage/View/WWAssessAlertView/KXAssessAlertView.h

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

+ 21 - 4
CAISHEN/SellPhone2/Home/AssessPage/View/WWAssessAlertView/KXAssessAlertView.m

42
         self.contentView.layer.cornerRadius = 10.0;
42
         self.contentView.layer.cornerRadius = 10.0;
43
         
43
         
44
         //图片
44
         //图片
45
-        self.imgView = [[UIImageView alloc] initWithFrame:CGRectMake(50*SCREEN_MUTI, -30*SCREEN_MUTI, 200*SCREEN_MUTI, 100*SCREEN_MUTI)];
45
+        self.imgView = [[UIImageView alloc] initWithFrame:CGRectMake(30*SCREEN_MUTI, -40*SCREEN_MUTI, 240*SCREEN_MUTI, 130*SCREEN_MUTI)];
46
         self.imgView.image = [UIImage imageNamed:imageName];
46
         self.imgView.image = [UIImage imageNamed:imageName];
47
         [self.contentView addSubview:self.imgView];
47
         [self.contentView addSubview:self.imgView];
48
         
48
         
62
         self.priceLabel.textAlignment = NSTextAlignmentCenter;
62
         self.priceLabel.textAlignment = NSTextAlignmentCenter;
63
         [self.contentView addSubview:self.priceLabel];
63
         [self.contentView addSubview:self.priceLabel];
64
         
64
         
65
-        //按钮
66
-        self.assessBtn = [[UIButton alloc] initWithFrame:CGRectMake(50*SCREEN_MUTI, 200*SCREEN_MUTI, 200*SCREEN_MUTI, 40*SCREEN_MUTI)];
65
+        //取消
66
+        self.cancleBtn = [[UIButton alloc] initWithFrame:CGRectMake(20*SCREEN_MUTI, 200*SCREEN_MUTI, 110*SCREEN_MUTI, 30*SCREEN_MUTI)];
67
+        [self.cancleBtn setTitle:@"取消" forState:UIControlStateNormal];
68
+        [self.cancleBtn setTitleColor:[UIColor newPhoneBaseColor] forState:UIControlStateNormal];
69
+        self.cancleBtn.layer.masksToBounds = YES;
70
+        self.cancleBtn.layer.cornerRadius = 15*SCREEN_MUTI;
71
+        self.cancleBtn.layer.borderWidth = 1.0;
72
+        self.cancleBtn.layer.borderColor = [UIColor newPhoneBaseColor].CGColor;
73
+        
74
+//        UIColor *rigktColor = WWColor(219, 141, 255, 1);
75
+//        UIColor *leftColor = WWColor(173, 99, 255, 1);
76
+//        UIImage *bgImg = [UIImage gradientColorImageFromColors:@[leftColor, rigktColor] gradientType:GradientTypeLeftToRight imgSize:self.assessBtn.frame.size];
77
+//        [self.assessBtn setBackgroundColor:[UIColor colorWithPatternImage:bgImg]];
78
+        
79
+        [self.cancleBtn addTarget:self action:@selector(dismiss) forControlEvents:UIControlEventTouchUpInside];
80
+        [self.contentView addSubview:self.cancleBtn];
81
+        
82
+        //下单按钮
83
+        self.assessBtn = [[UIButton alloc] initWithFrame:CGRectMake(170*SCREEN_MUTI, 200*SCREEN_MUTI, 110*SCREEN_MUTI, 30*SCREEN_MUTI)];
67
         [self.assessBtn setTitle:btnTitle forState:UIControlStateNormal];
84
         [self.assessBtn setTitle:btnTitle forState:UIControlStateNormal];
68
         [self.assessBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
85
         [self.assessBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
69
         self.assessBtn.layer.masksToBounds = YES;
86
         self.assessBtn.layer.masksToBounds = YES;
70
-        self.assessBtn.layer.cornerRadius = 20*SCREEN_MUTI;
87
+        self.assessBtn.layer.cornerRadius = 15*SCREEN_MUTI;
71
         
88
         
72
         UIColor *rigktColor = WWColor(219, 141, 255, 1);
89
         UIColor *rigktColor = WWColor(219, 141, 255, 1);
73
         UIColor *leftColor = WWColor(173, 99, 255, 1);
90
         UIColor *leftColor = WWColor(173, 99, 255, 1);

+ 27 - 15
CAISHEN/SellPhone2/Home/HomePage/Controller/KXSPHomeViewController.m

42
 
42
 
43
 - (UIView *)headerView {
43
 - (UIView *)headerView {
44
     if (!_headerView) {
44
     if (!_headerView) {
45
-        _headerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 200)];
45
+        _headerView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 180)];
46
         
46
         
47
         UIColor *topColor = WWColor(219, 141, 255, 1);
47
         UIColor *topColor = WWColor(219, 141, 255, 1);
48
         UIColor *bottomColor = WWColor(233, 202, 248, 1);
48
         UIColor *bottomColor = WWColor(233, 202, 248, 1);
50
         [_headerView setBackgroundColor:[UIColor colorWithPatternImage:bgImg]];
50
         [_headerView setBackgroundColor:[UIColor colorWithPatternImage:bgImg]];
51
         
51
         
52
         //图片
52
         //图片
53
-        UIImageView *topImg = [[UIImageView alloc] initWithFrame:CGRectMake(13, 15, SCREEN_WIDTH-26, 170)];
54
-        topImg.image = [UIImage imageNamed:@"sellBanner"];
53
+        UIImageView *topImg = [[UIImageView alloc] initWithFrame:CGRectMake(13, 15, SCREEN_WIDTH-26, 150)];
54
+        topImg.image = [UIImage imageNamed:@"icon_check_ home_banner"];
55
         topImg.layer.masksToBounds = YES;
55
         topImg.layer.masksToBounds = YES;
56
         topImg.layer.cornerRadius = 10.0;
56
         topImg.layer.cornerRadius = 10.0;
57
         [_headerView addSubview:topImg];
57
         [_headerView addSubview:topImg];
78
         
78
         
79
         //质检标准(图片)
79
         //质检标准(图片)
80
         UIImageView *bottomImg = [[UIImageView alloc] initWithFrame:CGRectMake(13, 250, SCREEN_WIDTH-26, 120)];
80
         UIImageView *bottomImg = [[UIImageView alloc] initWithFrame:CGRectMake(13, 250, SCREEN_WIDTH-26, 120)];
81
-        bottomImg.image = [UIImage imageNamed:@"sellBanner"];
81
+        bottomImg.image = [UIImage imageNamed:@"icon_check_ home_quality"];
82
         bottomImg.layer.masksToBounds = YES;
82
         bottomImg.layer.masksToBounds = YES;
83
         bottomImg.layer.cornerRadius = 10.0;
83
         bottomImg.layer.cornerRadius = 10.0;
84
         bottomImg.userInteractionEnabled = YES;
84
         bottomImg.userInteractionEnabled = YES;
119
 - (void)viewDidLoad {
119
 - (void)viewDidLoad {
120
     [super viewDidLoad];
120
     [super viewDidLoad];
121
     // Do any additional setup after loading the view.
121
     // Do any additional setup after loading the view.
122
-    
123
     [self createNaviBar];
122
     [self createNaviBar];
124
     [self.view addSubview:self.tableView];
123
     [self.view addSubview:self.tableView];
125
 }
124
 }
126
 
125
 
126
+- (void)viewWillAppear:(BOOL)animated {
127
+    [super viewWillAppear:animated];
128
+    
129
+    self.navigationController.navigationBar.barTintColor = WWColor(219, 141, 255, 1);
130
+}
131
+
127
 #pragma mark - 创建导航栏
132
 #pragma mark - 创建导航栏
128
 - (void)createNaviBar {
133
 - (void)createNaviBar {
129
     NSString *appName = [NSString getAppName];
134
     NSString *appName = [NSString getAppName];
130
     self.name = appName;
135
     self.name = appName;
131
     
136
     
132
-//    for (UIView *views in self.navigationController.navigationBar.subviews) {
133
-//        for (UIView *view in views.subviews) {
134
-//            if ([view isKindOfClass:[UIImageView class]]) {
135
-//                view.hidden = YES;
136
-//            }
137
-//        }
138
-//    }
139
-    
140
-    self.navigationController.navigationBar.barTintColor = WWColor(219, 141, 255, 1);
137
+    for (UIView *views in self.navigationController.navigationBar.subviews) {
138
+        for (UIView *view in views.subviews) {
139
+            if ([view isKindOfClass:[UIImageView class]]) {
140
+                view.hidden = YES;
141
+            }
142
+        }
143
+    }
141
 }
144
 }
142
 
145
 
143
 #pragma mark - tableView dataSource
146
 #pragma mark - tableView dataSource
158
     cell.indexPath = indexPath;
161
     cell.indexPath = indexPath;
159
     if (indexPath.row == 0) {
162
     if (indexPath.row == 0) {
160
         UIColor *topColor = WWColor(233, 202, 248, 1);
163
         UIColor *topColor = WWColor(233, 202, 248, 1);
161
-        UIColor *bottomColor = WWColor(245, 245, 245, 1);
164
+        UIColor *bottomColor = [UIColor groupTableViewBackgroundColor];
162
         UIImage *bgImg = [UIImage gradientColorImageFromColors:@[topColor, bottomColor] gradientType:GradientTypeTopToBottom imgSize:CGSizeMake(SCREEN_WIDTH, 190)];
165
         UIImage *bgImg = [UIImage gradientColorImageFromColors:@[topColor, bottomColor] gradientType:GradientTypeTopToBottom imgSize:CGSizeMake(SCREEN_WIDTH, 190)];
163
         [cell.contentView setBackgroundColor:[UIColor colorWithPatternImage:bgImg]];
166
         [cell.contentView setBackgroundColor:[UIColor colorWithPatternImage:bgImg]];
164
     }
167
     }
167
     return cell;
170
     return cell;
168
 }
171
 }
169
 
172
 
173
+- (void)scrollViewDidScroll:(UIScrollView *)scrollView {
174
+    if (scrollView == self.tableView) {
175
+        CGFloat offY = scrollView.contentOffset.y;
176
+        if (offY < 0) {
177
+            scrollView.contentOffset = CGPointZero;   
178
+        }
179
+    }
180
+}
181
+
170
 #pragma mark - 点击最底部质检标准图片
182
 #pragma mark - 点击最底部质检标准图片
171
 - (void)onClickBottomImage {
183
 - (void)onClickBottomImage {
172
     KXSPWebViewController *web = [[KXSPWebViewController alloc] init];
184
     KXSPWebViewController *web = [[KXSPWebViewController alloc] init];

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

21
         
21
         
22
     }
22
     }
23
     
23
     
24
-    UIGraphicsBeginImageContextWithOptions(imgSize, YES, 1);
24
+    UIGraphicsBeginImageContextWithOptions(imgSize, YES, [UIScreen mainScreen].scale);
25
     
25
     
26
     CGContextRef context = UIGraphicsGetCurrentContext();
26
     CGContextRef context = UIGraphicsGetCurrentContext();
27
     
27