caoyunxiao

Lighting/Class/ProductLibraryViewController.m

@@ -482,10 +482,18 @@
     DataPage *page = [[DataPage alloc]init];
     page.page = 0;
     condition.page = page;
-    condition.styleEquals = styleCode;
-    condition.categoryEquals = categoriesCode;
-    condition.spaceEquals = spaceCode;
-    condition.materialEqueals = materialCode;
+    if (styleCode.length != 0) {
+       condition.styleEquals = styleCode;
+    }
+    if (categoriesCode.length != 0) {
+       condition.categoryEquals = categoriesCode;
+    }
+    if (spaceCode.length!= 0) {
+        condition.spaceEquals = spaceCode;
+    }
+    if (materialCode.length!= 0) {
+        condition.materialEqueals = materialCode;
+    }
 
     if (![priceTitle isEqualToString:@"全部"]) {
      
@@ -497,7 +505,7 @@
 
     
     __weak typeof (self) Weakself = self;
-//    NSLog(@"%@",[condition toDictionary]);
+    NSLog(@"%@",[condition toDictionary]);
     [self getGoodsListdatas:condition returnResponse:^(GoodsResponse *response) {
         
         Weakself.screenSecondView.totalNumber = response.total;

Lighting/Class/screeningSecondView.m

@@ -32,7 +32,7 @@
     self.defaultDatasArray = [NSMutableArray array];
     for (int i=0; i<5; i++) {
         
-        NSDictionary *defaultDict = @{@"typecode":@" ",@"typename":@"全部"};
+        NSDictionary *defaultDict = @{@"typecode":@"",@"typename":@"全部"};
         [self.defaultDatasArray addObject:defaultDict];
     }
     [self uiConfigAction];

Lighting/Tools/NetworkRequestClassManager.m

@@ -74,10 +74,8 @@ static NetworkRequestClassManager *manager = nil;
     
     if (requestType == 0) {
         
-        NSLog(@"%@",[jastorobject toDictionary]);
         
-        //       toDictionary    转字典
-        [manager POST:requestURLString parameters:[jastorobject toJSONString] progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
+        [manager POST:requestURLString parameters:[jastorobject toDictionary] progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
             
             successBlock(responseObject);
             
@@ -89,7 +87,7 @@ static NetworkRequestClassManager *manager = nil;
         
     }else if (requestType == 1){
         
-        [manager GET:requestURLString parameters:[jastorobject toJSONString] progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
+        [manager GET:requestURLString parameters:[jastorobject toDictionary] progress:nil success:^(NSURLSessionDataTask * _Nonnull task, id  _Nullable responseObject) {
             
             successBlock(responseObject);