瀏覽代碼

筛选逻辑修改

Abel 1 年之前
父節點
當前提交
b383a665bc

+ 0 - 5
Asteria/Fuction/Home/ASProductListViewController.m

@@ -79,11 +79,6 @@
     self.timer = nil;
 }
 
-- (void)configFilter {
-    if (_type && ![_type isEqualToString:@""]) {
-        [self.menuFilterV configTypeId:self.type];
-    }
-}
 
 
 - (void)timerAction {

+ 0 - 1
Asteria/Fuction/Home/Views/productList/KWProductMenuFilterView.h

@@ -27,7 +27,6 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy, nullable) void(^resultFilterDic)(NSDictionary<NSString *,NSMutableArray<KWProductListFilterSubModel *> *> * _Nonnull arr);
 
 
-- (void)configTypeId:(NSString *)typeId;
 
 - (void)showAnimate:(NSMutableDictionary<NSString *,NSMutableArray<KWProductListFilterSubModel *> *> *)arr;
 

+ 11 - 1
Asteria/Fuction/Home/Views/productList/KWProductMenuFilterView.m

@@ -161,8 +161,17 @@
 
 - (void)clearBtAction {
     [self.vm.selectDic removeAllObjects];
+    for (KWProductListFilterModel *m in self.vm.sourceArr) {
+        if ([m.attribute_id isEqualToString:@"price"]) {
+            for (KWProductListFilterSubModel *subM in m.attribute_data) {
+                subM.inputMin = @"";
+                subM.inputMax = @"";
+            }
+        }
+    }
     [ASHomeAlertWindow alertMsg:@"All Selection Properties Have Been Cleared"];
     [self.collectV reloadData];
+    [self doneBtAction];
 }
 
 - (void)showAnimate:(NSMutableDictionary<NSString *,NSMutableArray<KWProductListFilterSubModel *> *> *)arr {
@@ -285,6 +294,7 @@
             [tempSubs removeObject:subM];
         }
         [self.collectV reloadData];
+        [self doneBtAction];
         return;
     }
     NSMutableArray *tempSubs = [NSMutableArray array];
@@ -296,6 +306,7 @@
     self.vm.selectDic[mainM.attribute_id] = tempSubs;
     
     [self.collectV reloadData];
+    [self doneBtAction];
 }
 
 - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
@@ -385,5 +396,4 @@
 }
 
 
-
 @end