2 次代碼提交 7c7289e658 ... 174d52b191

作者 SHA1 備註 提交日期
  jikaipeng 174d52b191 解决冲突 5 年之前
  jikaipeng bfe3fa62cc 修改bug 5 年之前
共有 20 個文件被更改,包括 195 次插入47 次删除
  1. 17 5
      KuDianProject.xcodeproj/project.pbxproj
  2. 1 1
      KuDianProject.xcodeproj/xcuserdata/kaipeng.xcuserdatad/xcschemes/xcschememanagement.plist
  3. 二進制
      KuDianProject.xcworkspace/xcuserdata/kaipeng.xcuserdatad/UserInterfaceState.xcuserstate
  4. 5 0
      KuDianProject.xcworkspace/xcuserdata/kaipeng.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
  5. 0 6
      KuDianProject/Info.plist
  6. 8 0
      KuDianProject/KuDianProject.entitlements
  7. 1 1
      KuDianProject/LiveData/Controller/KDPLiveDataViewController.m
  8. 1 1
      KuDianProject/LiveData/Controller/KDPLiveLeftViewController.m
  9. 6 2
      KuDianProject/LiveData/Controller/KDPLiveRightViewController.m
  10. 1 1
      KuDianProject/LiveData/Controller/KDPOrderDetailViewController.m
  11. 11 0
      KuDianProject/Login/controller/KDPPhoneLoginViewController.m
  12. 1 17
      KuDianProject/Login/controller/KDPWebViewViewController.m
  13. 1 1
      KuDianProject/Search/Controller/KDPSearchResultViewController.m
  14. 2 2
      KuDianProject/Search/Controller/KDPSearchViewController.m
  15. 5 5
      KuDianProject/SupplyGood/Controller/KDPScreenViewController.m
  16. 2 2
      KuDianProject/SupplyGood/Controller/KDPSupplyContentViewController.m
  17. 2 1
      KuDianProject/SupplyGood/Controller/KDPSupplyGoodViewController.m
  18. 1 1
      KuDianProject/SupplyGood/Controller/KDPSupplyListViewController.m
  19. 1 1
      KuDianProject/SupplyGood/View/KDPSupplyCommentViewCell.m
  20. 129 0
      Pods/Pods.xcodeproj/xcuserdata/kaipeng.xcuserdatad/xcschemes/xcschememanagement.plist

+ 17 - 5
KuDianProject.xcodeproj/project.pbxproj

@@ -224,6 +224,7 @@
224 224
 		7662960D22D8233600B2C0DB /* KDPMainNavViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = KDPMainNavViewController.m; sourceTree = "<group>"; };
225 225
 		7662960F22D8267800B2C0DB /* KDPBaseLabel.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = KDPBaseLabel.h; path = KuDianProject/MainTab/KDPBaseLabel.h; sourceTree = SOURCE_ROOT; };
226 226
 		7662961022D8267800B2C0DB /* KDPBaseLabel.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = KDPBaseLabel.m; path = KuDianProject/MainTab/KDPBaseLabel.m; sourceTree = SOURCE_ROOT; };
227
+		7662961B22D87B3600B2C0DB /* KuDianProject.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = KuDianProject.entitlements; sourceTree = "<group>"; };
227 228
 		76D6EE6F22D4A7A100E7AC1C /* KDPTabBarVC.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KDPTabBarVC.m; sourceTree = "<group>"; };
228 229
 		76D6EE7022D4A7A100E7AC1C /* KDPTabBarVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KDPTabBarVC.h; sourceTree = "<group>"; };
229 230
 		76D6EE7222D4A7D600E7AC1C /* KDPSupplyContentViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KDPSupplyContentViewController.h; sourceTree = "<group>"; };
@@ -889,6 +890,7 @@
889 890
 		C5D561F922CD97840035A714 /* KuDianProject */ = {
890 891
 			isa = PBXGroup;
891 892
 			children = (
893
+				7662961B22D87B3600B2C0DB /* KuDianProject.entitlements */,
892 894
 				C5AAE2F222D8596B0080DFBE /* ALBC */,
893 895
 				C5D5624022CD9E710035A714 /* MainTab */,
894 896
 				C5D5623F22CD9D350035A714 /* Public */,
@@ -1191,6 +1193,11 @@
1191 1193
 				TargetAttributes = {
1192 1194
 					C5D561F622CD97840035A714 = {
1193 1195
 						CreatedOnToolsVersion = 10.1;
1196
+						SystemCapabilities = {
1197
+							com.apple.Push = {
1198
+								enabled = 1;
1199
+							};
1200
+						};
1194 1201
 					};
1195 1202
 					C5D5620E22CD97860035A714 = {
1196 1203
 						CreatedOnToolsVersion = 10.1;
@@ -1587,8 +1594,11 @@
1587 1594
 			buildSettings = {
1588 1595
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1589 1596
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
1597
+				CODE_SIGN_ENTITLEMENTS = KuDianProject/KuDianProject.entitlements;
1598
+				CODE_SIGN_IDENTITY = "iPhone Developer";
1590 1599
 				CODE_SIGN_STYLE = Manual;
1591
-				DEVELOPMENT_TEAM = WV23VEMQV8;
1600
+				DEVELOPMENT_TEAM = "";
1601
+				ENABLE_BITCODE = NO;
1592 1602
 				FRAMEWORK_SEARCH_PATHS = (
1593 1603
 					"$(inherited)",
1594 1604
 					"$(PROJECT_DIR)/KuDianProject/ALBC",
@@ -1669,7 +1679,7 @@
1669 1679
 				);
1670 1680
 				PRODUCT_BUNDLE_IDENTIFIER = com.KuDianProject.eight;
1671 1681
 				PRODUCT_NAME = "$(TARGET_NAME)";
1672
-				PROVISIONING_PROFILE_SPECIFIER = dev;
1682
+				PROVISIONING_PROFILE_SPECIFIER = "";
1673 1683
 				TARGETED_DEVICE_FAMILY = 1;
1674 1684
 			};
1675 1685
 			name = Debug;
@@ -1680,9 +1690,11 @@
1680 1690
 			buildSettings = {
1681 1691
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1682 1692
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
1683
-				CODE_SIGN_IDENTITY = "iPhone Distribution";
1693
+				CODE_SIGN_ENTITLEMENTS = KuDianProject/KuDianProject.entitlements;
1694
+				CODE_SIGN_IDENTITY = "iPhone Developer";
1684 1695
 				CODE_SIGN_STYLE = Manual;
1685
-				DEVELOPMENT_TEAM = WV23VEMQV8;
1696
+				DEVELOPMENT_TEAM = "";
1697
+				ENABLE_BITCODE = NO;
1686 1698
 				FRAMEWORK_SEARCH_PATHS = (
1687 1699
 					"$(inherited)",
1688 1700
 					"$(PROJECT_DIR)/KuDianProject/ALBC",
@@ -1763,7 +1775,7 @@
1763 1775
 				);
1764 1776
 				PRODUCT_BUNDLE_IDENTIFIER = com.KuDianProject.eight;
1765 1777
 				PRODUCT_NAME = "$(TARGET_NAME)";
1766
-				PROVISIONING_PROFILE_SPECIFIER = dis;
1778
+				PROVISIONING_PROFILE_SPECIFIER = "";
1767 1779
 				TARGETED_DEVICE_FAMILY = 1;
1768 1780
 			};
1769 1781
 			name = Release;

+ 1 - 1
KuDianProject.xcodeproj/xcuserdata/kaipeng.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
7 7
 		<key>KuDianProject.xcscheme_^#shared#^_</key>
8 8
 		<dict>
9 9
 			<key>orderHint</key>
10
-			<integer>35</integer>
10
+			<integer>0</integer>
11 11
 		</dict>
12 12
 	</dict>
13 13
 </dict>

二進制
KuDianProject.xcworkspace/xcuserdata/kaipeng.xcuserdatad/UserInterfaceState.xcuserstate


+ 5 - 0
KuDianProject.xcworkspace/xcuserdata/kaipeng.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -0,0 +1,5 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<Bucket
3
+   type = "0"
4
+   version = "2.0">
5
+</Bucket>

+ 0 - 6
KuDianProject/Info.plist

@@ -30,14 +30,12 @@
30 30
 	</array>
31 31
 	<key>LSRequiresIPhoneOS</key>
32 32
 	<true/>
33
-
34 33
 	<key>MiSDKAppID</key>
35 34
 	<string>2882303761518060278</string>
36 35
 	<key>MiSDKAppKey</key>
37 36
 	<string>5351806025278</string>
38 37
 	<key>MiSDKRun</key>
39 38
 	<string>${MiSDKRun}</string>
40
-
41 39
 	<key>NSAppTransportSecurity</key>
42 40
 	<dict>
43 41
 		<key>NSAllowsArbitraryLoads</key>
@@ -48,10 +46,6 @@
48 46
 			<string></string>
49 47
 		</dict>
50 48
 	</dict>
51
-
52
-	<key>UILaunchStoryboardName</key>
53
-	<string>LaunchScreen</string>
54
-
55 49
 	<key>UIMainStoryboardFile</key>
56 50
 	<string>Main</string>
57 51
 	<key>UIRequiredDeviceCapabilities</key>

+ 8 - 0
KuDianProject/KuDianProject.entitlements

@@ -0,0 +1,8 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3
+<plist version="1.0">
4
+<dict>
5
+	<key>aps-environment</key>
6
+	<string>development</string>
7
+</dict>
8
+</plist>

+ 1 - 1
KuDianProject/LiveData/Controller/KDPLiveDataViewController.m

@@ -63,7 +63,7 @@
63 63
         config.shadowLineAnimationType = XLPageShadowLineAnimationTypePan;
64 64
         config.separatorLineBottomMargin = 5;
65 65
         _pageVC = [[XLPageViewController alloc] initWithConfig:config];
66
-        _pageVC.view.bounds = CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT-KDTabBarHeight);
66
+        _pageVC.view.bounds = CGRectMake(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT-KDTabBarHeight+1);
67 67
         _pageVC.delegate = self;
68 68
         _pageVC.dataSource = self;
69 69
     }

+ 1 - 1
KuDianProject/LiveData/Controller/KDPLiveLeftViewController.m

@@ -91,7 +91,7 @@
91 91
             self.page = 1;
92 92
             [self requestData];
93 93
         }];
94
-        _tableView.mj_footer = [MJRefreshBackFooter footerWithRefreshingBlock:^{
94
+        _tableView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
95 95
             self.page ++;
96 96
             [self requestData];
97 97
         }];

+ 6 - 2
KuDianProject/LiveData/Controller/KDPLiveRightViewController.m

@@ -31,7 +31,6 @@
31 31
     // Do any additional setup after loading the view.
32 32
     self.navBar.hidden = YES;
33 33
     self.type = @"today";
34
-    
35 34
     UIView *backView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 115)];
36 35
     [backView setGradientBackgroundWithColors:@[[UIColor colorWithHex:0xFF235F],[UIColor colorWithHex:0xFF7676]] locations:@[@0,@1] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
37 36
     [self.view addSubview:backView];
@@ -85,12 +84,17 @@
85 84
         _tableView.rowHeight = 105;
86 85
         _tableView.delegate = self;
87 86
         _tableView.dataSource = self;
87
+        if (@available(iOS 11.0, *)) {
88
+            _tableView.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
89
+        } else {
90
+            // Fallback on earlier versions
91
+        }
88 92
         _tableView.tableFooterView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH-20, 0.1f)];
89 93
         _tableView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
90 94
             self.page = 1;
91 95
             [self requestTotalData];
92 96
         }];
93
-        _tableView.mj_footer = [MJRefreshBackFooter footerWithRefreshingBlock:^{
97
+        _tableView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
94 98
             self.page ++;
95 99
             [self requestTotalData];
96 100
         }];

+ 1 - 1
KuDianProject/LiveData/Controller/KDPOrderDetailViewController.m

@@ -76,7 +76,7 @@
76 76
             self.page = 1;
77 77
             [self requestDetailDataWithPage:self.page];
78 78
         }];
79
-        _tableview.mj_footer = [MJRefreshBackFooter footerWithRefreshingBlock:^{
79
+        _tableview.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
80 80
             self.page ++;
81 81
             [self requestDetailDataWithPage:self.page];
82 82
         }];

+ 11 - 0
KuDianProject/Login/controller/KDPPhoneLoginViewController.m

@@ -212,6 +212,17 @@ static int count = 0;
212 212
     [self.sendCodeBtn setTitle:title forState:UIControlStateNormal];
213 213
 }
214 214
 
215
+-(void)viewWillAppear:(BOOL)animated
216
+{
217
+    [super viewWillAppear:animated];
218
+    [UIApplication sharedApplication].statusBarStyle=UIStatusBarStyleDefault;
219
+}
220
+-(void)viewWillDisappear:(BOOL)animated
221
+{
222
+    [super viewWillDisappear:animated];
223
+    [UIApplication sharedApplication].statusBarStyle=UIStatusBarStyleLightContent;
224
+}
225
+
215 226
 - (void)updateTime {
216 227
     count --;
217 228
     [self changeCode];

+ 1 - 17
KuDianProject/Login/controller/KDPWebViewViewController.m

@@ -28,16 +28,12 @@
28 28
 }
29 29
 
30 30
 - (void)setContentView{
31
-    self.navBar.backgroundColor = [UIColor whiteColor];
32
-    self.navBar.navTitleLabel.textColor = [UIColor colorWithHex:0x333333];
33
-//    self.backButton = [UIButton buttonWithType:UIButtonTypeSystem];
31
+    self.backButton = [UIButton buttonWithType:UIButtonTypeSystem];
34 32
 //    [self.backButton setImage:[UIImage imageNamed:@"return_black"] forState:UIControlStateNormal];
35 33
 //    self.backButton.frame = CGRectMake(0, 0, 40, 40);
36 34
 //    [self.backButton addTarget:self action:@selector(backAction:) forControlEvents:UIControlEventTouchUpInside];
37 35
 //    [self.navBar addSubview:self.backButton];
38
-    
39 36
     [self.navBar addleftReturnButton:self selector:@selector(backAction:)];
40
-    
41 37
     WKWebViewConfiguration *config = [[WKWebViewConfiguration alloc] init];
42 38
     config.allowsInlineMediaPlayback = NO;
43 39
     self.webView = [[WKWebView alloc] initWithFrame:CGRectMake(0, KDNavBarHeight, SCREEN_WIDTH, SCREEN_HEIGHT-KDNavBarHeight) configuration:config];
@@ -121,18 +117,6 @@
121 117
     self.navBar.navTitleLabel.text = webView.title;
122 118
 }
123 119
 
124
--(void)viewWillAppear:(BOOL)animated
125
-{
126
-    [super viewWillAppear:animated];
127
-    [UIApplication sharedApplication].statusBarStyle=UIStatusBarStyleDefault;
128
-    self.navBar.navTitleLabel.textColor = [UIColor whiteColor];
129
-}
130
--(void)viewWillDisappear:(BOOL)animated
131
-{
132
-    [super viewWillDisappear:animated];
133
-    [UIApplication sharedApplication].statusBarStyle=UIStatusBarStyleLightContent;
134
-}
135
-
136 120
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context{
137 121
     if ([keyPath isEqualToString:NSStringFromSelector(@selector(estimatedProgress))] && object == self.webView ) {
138 122
         [self.processView setAlpha:1.0];

+ 1 - 1
KuDianProject/Search/Controller/KDPSearchResultViewController.m

@@ -169,7 +169,6 @@
169 169
             reusAbleView.changeBlock = ^(BOOL isPrice) {
170 170
                 KDPScreenViewController *screenVC = [[KDPScreenViewController alloc] initWithPrice:isPrice];
171 171
                 screenVC.params = weakSelf.params;
172
-                screenVC.view.frame = CGRectMake(91, 0, SCREEN_WIDTH-91, SCREEN_HEIGHT);
173 172
                 screenVC.resetBlock = ^(BOOL isPrice) {
174 173
                     if (isPrice == YES) {
175 174
                         [weakReusAbleView changeScreeWithStyle:KDPSupplyContentButtonStylePrice Color:[UIColor colorWithHex:0x333333] text:@"价格筛选"];
@@ -211,6 +210,7 @@
211 210
                     [weakSelf.collectionView.mj_header beginRefreshing];
212 211
                 };
213 212
                 CWLateralSlideConfiguration *conf = [CWLateralSlideConfiguration configurationWithDistance:0 maskAlpha:0.7 scaleY:1 direction:CWDrawerTransitionFromRight backImage:nil];
213
+                conf.distance=SCREEN_WIDTH/3*2;
214 214
                 [weakSelf cw_showDrawerViewController:screenVC animationType:0 configuration:conf];
215 215
             };
216 216
             return reusAbleView;

+ 2 - 2
KuDianProject/Search/Controller/KDPSearchViewController.m

@@ -120,18 +120,18 @@
120 120
 
121 121
 - (void)requestSearchData:(NSString *)keyWord{
122 122
     NSString *searchUrl = [NSString stringWithFormat:@"%@api/goods/searchAdvice",KDURL];
123
-    [self.searchArray removeAllObjects];
124 123
     [KDPNetworkRequestHTTP postURL:searchUrl params:@{@"keyword":keyWord} success:^(id  _Nonnull json) {
125 124
         NSArray *data = json[@"data"];
125
+        [self.searchArray removeAllObjects];
126 126
         [self.searchArray addObjectsFromArray:data];
127 127
         if (self.searchArray.count) {
128 128
             self.historyView.hidden = YES;
129 129
             self.tableview.hidden = NO;
130
-            [self.tableview reloadData];
131 130
         } else{
132 131
             self.historyView.hidden = NO;
133 132
             self.tableview.hidden = YES;
134 133
         }
134
+        [self.tableview reloadData];
135 135
     } failure:^(NSError * _Nonnull error) {
136 136
         
137 137
     }];

+ 5 - 5
KuDianProject/SupplyGood/Controller/KDPScreenViewController.m

@@ -42,7 +42,7 @@
42 42
 }
43 43
 
44 44
 - (void)setContentView{
45
-    self.tipLabel = [[UILabel alloc] initWithFrame:CGRectMake(13 + 91, KDStatusHeight + 16, SCREEN_WIDTH-91-13, 20)];
45
+    self.tipLabel = [[UILabel alloc] initWithFrame:CGRectMake(13 + SCREEN_WIDTH/3, KDStatusHeight + 16, SCREEN_WIDTH-91-13, 20)];
46 46
     self.tipLabel.textColor = [UIColor colorWithHexString:@"0x333333"];
47 47
     self.tipLabel.font = [UIFont fontWithName:@"PingFang-SC-Medium" size: 14];
48 48
     NSString *tipText = _isPrice ? @"价格区间(元)":@"利润区间";
@@ -50,13 +50,13 @@
50 50
     [self.view addSubview:self.tipLabel];
51 51
     
52 52
     // 初始化tagView
53
-    CGFloat btnWidth = (self.view.width - 91 - kBtnMargin * 2 - 20)/2;
53
+    CGFloat btnWidth = (self.view.width - SCREEN_WIDTH/3 - kBtnMargin * 2 - 20)/2;
54 54
     CGFloat height = 45;
55 55
     NSArray *btnDataArray = _isPrice ? @[@"最低价",@"最高价",@"10元以下",@"10-50元",@"50-100元",@"100元以上"] : @[@"最低利润",@"",@"20%以上",@"30%以上",@"40%以上",@"50%以上"];
56 56
     for (NSInteger i = 0; i < 6; i++) {
57 57
         NSInteger row = i / 2;
58 58
         NSInteger line = i % 2;
59
-        KDPScreenBtnView *btnView = [[KDPScreenBtnView alloc] initWithFrame:CGRectMake(kBtnMargin +91 + (btnWidth+20)*line,self.tipLabel.bottom + 25 + row *(17+height) , btnWidth, height)];
59
+        KDPScreenBtnView *btnView = [[KDPScreenBtnView alloc] initWithFrame:CGRectMake(kBtnMargin +SCREEN_WIDTH/3 + (btnWidth+20)*line,self.tipLabel.bottom + 25 + row *(17+height) , btnWidth, height)];
60 60
         btnView.delegate = self;
61 61
         btnView.tag = kBaseBtnViewTag + i;
62 62
         btnView.textColor = [UIColor colorWithHexString:@"#333333"];
@@ -80,7 +80,7 @@
80 80
     // 重置按钮和确定按钮
81 81
     
82 82
     UIButton *resetBtn = [UIButton buttonWithType:UIButtonTypeCustom];
83
-    resetBtn.frame = CGRectMake(91 + 14, self.tipLabel.bottom + 235, (SCREEN_WIDTH-91-28)/2, 41);
83
+    resetBtn.frame = CGRectMake(SCREEN_WIDTH/3 + 14, self.tipLabel.bottom + 235, (SCREEN_WIDTH-SCREEN_WIDTH/3-28)/2, 41);
84 84
 //    [resetBtn setGradientBackgroundWithColors:@[[UIColor colorWithRGB:0xFFC300],[UIColor colorWithRGB:0xFF9A01]] locations:@[@0,@1] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(0, 1)];
85 85
     resetBtn.backgroundColor = [UIColor colorWithHex:0xFF7693];
86 86
     [resetBtn addCornerRadiusByRoundingCorners:UIRectCornerTopLeft | UIRectCornerBottomLeft cornerRadii:CGSizeMake(20, 20)];
@@ -92,7 +92,7 @@
92 92
     [self.view addSubview:resetBtn];
93 93
     
94 94
     UIButton *confirmBtn = [UIButton buttonWithType:UIButtonTypeCustom];
95
-    confirmBtn.frame = CGRectMake(resetBtn.right, self.tipLabel.bottom + 235, (SCREEN_WIDTH-91-28)/2, 41);
95
+    confirmBtn.frame = CGRectMake(resetBtn.right, self.tipLabel.bottom + 235, (SCREEN_WIDTH-SCREEN_WIDTH/3-28)/2, 41);
96 96
 //    [confirmBtn setGradientBackgroundWithColors:@[[UIColor colorWithRGB:0xFF8300],[UIColor colorWithRGB:0xFF5200]] locations:@[@0,@1] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(0, 1)];
97 97
     confirmBtn.backgroundColor = [UIColor colorWithHex:0xFF6B8A];
98 98
     [confirmBtn addCornerRadiusByRoundingCorners:UIRectCornerTopRight | UIRectCornerBottomRight cornerRadii:CGSizeMake(20, 20)];

+ 2 - 2
KuDianProject/SupplyGood/Controller/KDPSupplyContentViewController.m

@@ -111,7 +111,7 @@
111 111
             self.page = 1;
112 112
             [self requestGoodlistData];
113 113
         }];
114
-        _collectionView.mj_footer = [MJRefreshBackFooter footerWithRefreshingBlock:^{
114
+        _collectionView.mj_footer = [MJRefreshBackNormalFooter footerWithRefreshingBlock:^{
115 115
             self.page ++;
116 116
             [self requestGoodlistData];
117 117
         }];
@@ -248,7 +248,6 @@
248 248
                 weakSelf.shouldHiddenScreen = NO;
249 249
                 KDPScreenViewController *screenVC = [[KDPScreenViewController alloc] initWithPrice:isPrice];
250 250
                 screenVC.params = weakSelf.mutabParams;
251
-                screenVC.view.frame = CGRectMake(91, 0, SCREEN_WIDTH-91, SCREEN_HEIGHT);
252 251
                 screenVC.resetBlock = ^(BOOL isPrice) {
253 252
                     if (isPrice == YES) {
254 253
                         [weakReusAbleView changeScreeWithStyle:KDPSupplyContentButtonStylePrice Color:[UIColor colorWithHex:0x333333] text:@"价格筛选"];
@@ -290,6 +289,7 @@
290 289
                     [weakSelf.collectionView.mj_header beginRefreshing];
291 290
                 };
292 291
                 CWLateralSlideConfiguration *conf = [CWLateralSlideConfiguration configurationWithDistance:0 maskAlpha:0.7 scaleY:1 direction:CWDrawerTransitionFromRight backImage:nil];
292
+                conf.distance=SCREEN_WIDTH/3*2;
293 293
                 [weakSelf cw_showDrawerViewController:screenVC animationType:0 configuration:conf];
294 294
             };
295 295
             return reusAbleView;

+ 2 - 1
KuDianProject/SupplyGood/Controller/KDPSupplyGoodViewController.m

@@ -91,7 +91,8 @@
91 91
 
92 92
 - (void)setUpTopView{
93 93
     self.navBar.hidden = YES;
94
-    UIView *topBackView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, 163)];
94
+    NSInteger height = KDNavBarHeight == 64 ? 130 : 163;
95
+    UIView *topBackView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH, height)];
95 96
     [topBackView setGradientBackgroundWithColors:@[[UIColor colorWithRGB:0xFF235F],[UIColor colorWithRGB:0xFF7676]] locations:@[@0,@1] startPoint:CGPointMake(0, 0) endPoint:CGPointMake(1, 0)];
96 97
     [self.view addSubview:topBackView];
97 98
     

+ 1 - 1
KuDianProject/SupplyGood/Controller/KDPSupplyListViewController.m

@@ -140,7 +140,6 @@
140 140
         reusAbleView.changeBlock = ^(BOOL isPrice) {
141 141
             KDPScreenViewController *screenVC = [[KDPScreenViewController alloc] initWithPrice:isPrice];
142 142
             screenVC.params = weakSelf.params;
143
-            screenVC.view.frame = CGRectMake(91, 0, SCREEN_WIDTH-91, SCREEN_HEIGHT);
144 143
             screenVC.resetBlock = ^(BOOL isPrice) {
145 144
                 if (isPrice == YES) {
146 145
                     [weakReusAbleView changeScreeWithStyle:KDPSupplyContentButtonStylePrice Color:[UIColor colorWithHex:0x333333] text:@"价格筛选"];
@@ -182,6 +181,7 @@
182 181
                 [weakSelf.collectionView.mj_header beginRefreshing];
183 182
             };
184 183
             CWLateralSlideConfiguration *conf = [CWLateralSlideConfiguration configurationWithDistance:0 maskAlpha:0.7 scaleY:1 direction:CWDrawerTransitionFromRight backImage:nil];
184
+            conf.distance=SCREEN_WIDTH/3*2;
185 185
             [weakSelf cw_showDrawerViewController:screenVC animationType:0 configuration:conf];
186 186
         };
187 187
         return reusAbleView;

+ 1 - 1
KuDianProject/SupplyGood/View/KDPSupplyCommentViewCell.m

@@ -105,7 +105,7 @@
105 105
 - (void)setSubViewsConstraints{
106 106
     [_commentImageView mas_makeConstraints:^(MASConstraintMaker *make) {
107 107
         make.top.equalTo(self.contentView.mas_top).offset(30);
108
-        make.size.equalTo(CGSizeMake(20, 35));
108
+        make.size.equalTo(CGSizeMake(40, 40));
109 109
         make.centerX.equalTo(self.contentView);
110 110
     }];
111 111
     [_commentLabel mas_makeConstraints:^(MASConstraintMaker *make) {

+ 129 - 0
Pods/Pods.xcodeproj/xcuserdata/kaipeng.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,129 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3
+<plist version="1.0">
4
+<dict>
5
+	<key>SchemeUserState</key>
6
+	<dict>
7
+		<key>AFNetworking.xcscheme_^#shared#^_</key>
8
+		<dict>
9
+			<key>orderHint</key>
10
+			<integer>1</integer>
11
+		</dict>
12
+		<key>Bugly.xcscheme_^#shared#^_</key>
13
+		<dict>
14
+			<key>orderHint</key>
15
+			<integer>2</integer>
16
+		</dict>
17
+		<key>CWLateralSlide.xcscheme_^#shared#^_</key>
18
+		<dict>
19
+			<key>orderHint</key>
20
+			<integer>3</integer>
21
+		</dict>
22
+		<key>DZNEmptyDataSet.xcscheme_^#shared#^_</key>
23
+		<dict>
24
+			<key>orderHint</key>
25
+			<integer>4</integer>
26
+		</dict>
27
+		<key>FORScrollViewEmptyAssistant-FORScrollViewEmptyAssistant.xcscheme_^#shared#^_</key>
28
+		<dict>
29
+			<key>orderHint</key>
30
+			<integer>6</integer>
31
+		</dict>
32
+		<key>FORScrollViewEmptyAssistant.xcscheme_^#shared#^_</key>
33
+		<dict>
34
+			<key>orderHint</key>
35
+			<integer>5</integer>
36
+		</dict>
37
+		<key>IQKeyboardManager.xcscheme_^#shared#^_</key>
38
+		<dict>
39
+			<key>orderHint</key>
40
+			<integer>7</integer>
41
+		</dict>
42
+		<key>MBProgressHUD.xcscheme_^#shared#^_</key>
43
+		<dict>
44
+			<key>orderHint</key>
45
+			<integer>9</integer>
46
+		</dict>
47
+		<key>MJExtension.xcscheme_^#shared#^_</key>
48
+		<dict>
49
+			<key>orderHint</key>
50
+			<integer>11</integer>
51
+		</dict>
52
+		<key>MJRefresh.xcscheme_^#shared#^_</key>
53
+		<dict>
54
+			<key>orderHint</key>
55
+			<integer>12</integer>
56
+		</dict>
57
+		<key>Masonry.xcscheme_^#shared#^_</key>
58
+		<dict>
59
+			<key>orderHint</key>
60
+			<integer>8</integer>
61
+		</dict>
62
+		<key>MiPushSDK.xcscheme_^#shared#^_</key>
63
+		<dict>
64
+			<key>orderHint</key>
65
+			<integer>10</integer>
66
+		</dict>
67
+		<key>PYSearch.xcscheme_^#shared#^_</key>
68
+		<dict>
69
+			<key>orderHint</key>
70
+			<integer>14</integer>
71
+		</dict>
72
+		<key>Pods-KuDianProject.xcscheme_^#shared#^_</key>
73
+		<dict>
74
+			<key>orderHint</key>
75
+			<integer>13</integer>
76
+		</dict>
77
+		<key>SDCycleScrollView.xcscheme_^#shared#^_</key>
78
+		<dict>
79
+			<key>orderHint</key>
80
+			<integer>15</integer>
81
+		</dict>
82
+		<key>SDWebImage.xcscheme_^#shared#^_</key>
83
+		<dict>
84
+			<key>orderHint</key>
85
+			<integer>16</integer>
86
+		</dict>
87
+		<key>SVProgressHUD.xcscheme_^#shared#^_</key>
88
+		<dict>
89
+			<key>orderHint</key>
90
+			<integer>17</integer>
91
+		</dict>
92
+		<key>UMengAnalytics.xcscheme_^#shared#^_</key>
93
+		<dict>
94
+			<key>orderHint</key>
95
+			<integer>18</integer>
96
+		</dict>
97
+		<key>YYCache.xcscheme_^#shared#^_</key>
98
+		<dict>
99
+			<key>orderHint</key>
100
+			<integer>19</integer>
101
+		</dict>
102
+		<key>YYCategories.xcscheme_^#shared#^_</key>
103
+		<dict>
104
+			<key>orderHint</key>
105
+			<integer>20</integer>
106
+		</dict>
107
+		<key>YYImage.xcscheme_^#shared#^_</key>
108
+		<dict>
109
+			<key>orderHint</key>
110
+			<integer>21</integer>
111
+		</dict>
112
+		<key>YYModel.xcscheme_^#shared#^_</key>
113
+		<dict>
114
+			<key>orderHint</key>
115
+			<integer>22</integer>
116
+		</dict>
117
+		<key>YYText.xcscheme_^#shared#^_</key>
118
+		<dict>
119
+			<key>orderHint</key>
120
+			<integer>23</integer>
121
+		</dict>
122
+		<key>YYWebImage.xcscheme_^#shared#^_</key>
123
+		<dict>
124
+			<key>orderHint</key>
125
+			<integer>24</integer>
126
+		</dict>
127
+	</dict>
128
+</dict>
129
+</plist>