Explorar o código

优惠券列表,生日页,订阅状态 数据处理

iOS-Abel hai 1 ano
pai
achega
6824afde12

+ 5 - 0
Asteria/Fuction/UserCenter/ConponsAndGiftCard/ASCouponsListViewController.m

@@ -46,6 +46,11 @@
             [weakSelf.tableV.mj_footer endRefreshingWithNoMoreData];
         }
         [weakSelf.tableV reloadData];
+        if (weakSelf.vm.couponList.count == 0) {
+            [weakSelf showEmptyV:weakSelf.tableV];
+        } else {
+            [weakSelf hiddenEmpty];
+        }
     }];
 }
 

+ 24 - 29
Asteria/Fuction/UserCenter/Setting/ASSettingViewController.m

@@ -209,12 +209,12 @@
     }
     cell.switchBtn.hidden = !(indexPath.row == 2);
     if (indexPath.row == 2) {
-        [cell.switchBtn setIsOpen:arc4random()%2 == 1 animate:false];
-//        [cell.switchBtn setIsOpen:self.userInfo.is_subscribed animate:false];
-//        @weakify(self);
-//        [cell.switchBtn setClickBack:^{
-//            [weak_self configSubscrib:!weak_self.userInfo.is_subscribed];
-//        }];
+        BOOL isSub = ASUserInfoManager.shared.userInfo.is_subscribed;
+        [cell.switchBtn setIsOpen:isSub animate:false];
+        __weak typeof(self) weakSelf = self;
+        [cell.switchBtn setClickBack:^{
+            [weakSelf configSubscrib:!isSub];
+        }];
     } else {
         cell.switchBtn.clickBack = nil;
     }
@@ -306,28 +306,23 @@
 }
 
 
-//- (void)configSubscrib:(BOOL)is_subscribed {
-//    NSDictionary *param = @{@"is_subscribed":[NSNumber numberWithBool:is_subscribed]};
-//    @weakify(self);
-//    [MBProgressHUD showHUDAddedTo:self.view animated:true];
-//    [PPNetworkHelper POST:SaveSub parameters:param success:^(id responseObject) {
-//        [MBProgressHUD hideHUDForView:weak_self.view animated:true];
-//        if (RequestSuccess) {
-//            weak_self.userInfo.is_subscribed = is_subscribed;
-//            [KWLoginedManager.shareInstance getUserInfo:^(bool flag) {
-//
-//            }];
-//        } else {
-//            NSString *errMsg = [NSString stringWithFormat:@"%@", RequestErrorMsg];
-//            [self.view makeToast:errMsg];
-//        }
-//        [weak_self.tableV reloadData];
-//    } failure:^(NSError *error) {
-//        [MBProgressHUD hideHUDForView:weak_self.view animated:true];
-//        [self.view makeToast:@"请求失败"];
-//        [weak_self.tableV reloadData];
-//    }];
-//
-//}
+- (void)configSubscrib:(BOOL)is_subscribed {
+    NSDictionary *param = @{
+        @"extension_attributes":@{
+            @"is_subscribed":[NSNumber numberWithBool:is_subscribed]
+        }
+    };
+    @weakify(self);
+    [MBProgressHUD showHUDAddedTo:self.view animated:true];
+    [ASNetTools.shared putWithPath:putUserInfo param:param success:^(id _Nonnull json) {
+        ASUserInfoManager.shared.userInfo.is_subscribed = is_subscribed;
+        [weak_self.tableV reloadData];
+    } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
+        [MBProgressHUD hideHUDForView:weak_self.view animated:true];
+        [self.view makeToast:@"请求失败"];
+        [weak_self.tableV reloadData];
+    }];
+
+}
 
 @end

+ 48 - 48
Asteria/Fuction/UserCenter/VipCenter/ASBirthdayTreatViewController.m

@@ -74,54 +74,54 @@
     self.codeDesLB.hidden = !self.isBirthday;
     self.btnV.hidden = !self.isBirthday;
         
-//    KWLoginedUserModel *info = [KWLoginedManager.shareInstance getCurrentLoginedUser];
-//    NSDate *date = [NSDate dateWithString:info.dob format:@"yyyy-MM-dd hh:mm:ss"];
-    NSDate *date = [NSDate new];
-
-        self.dayLb.text = [NSString stringWithFormat:@"%ld" ,date.day];
-        
-        NSString *monStr = @"JANUARY";
-        NSInteger mon = date.month;
-        switch (mon) {
-            case 1:
-                monStr = @"JANUARY";
-                break;
-            case 2:
-                monStr = @"FEBRUARY";
-                break;
-            case 3:
-                monStr = @"MARCH";
-                break;
-            case 4:
-                monStr = @"APRIL";
-                break;
-            case 5:
-                monStr = @"MAY";
-                break;
-            case 6:
-                monStr = @"JUNE";
-                break;
-            case 7:
-                monStr = @"JULY";
-                break;
-            case 8:
-                monStr = @"AUGUST";
-                break;
-            case 9:
-                monStr = @"SEPTEMBER";
-                break;
-            case 10:
-                monStr = @"OCTOBER";
-                break;
-            case 11:
-                monStr = @"NOVEMBER";
-                break;
-            default:
-                monStr = @"DECEMBER";
-                break;
-        }
-        self.monthLb.text = monStr;
-        self.yearLb.text = [NSString stringWithFormat:@"%ld" ,date.year];// @"2000";
+    
+    NSString *time = ASUserInfoManager.shared.birthDay;
+    NSDate *date = [NSDate dateWithString:time format:@"MM dd, yyyy"];
+    
+    self.dayLb.text = [NSString stringWithFormat:@"%ld" ,date.day];
+    
+    NSString *monStr = @"JANUARY";
+    NSInteger mon = date.month;
+    switch (mon) {
+        case 1:
+            monStr = @"JANUARY";
+            break;
+        case 2:
+            monStr = @"FEBRUARY";
+            break;
+        case 3:
+            monStr = @"MARCH";
+            break;
+        case 4:
+            monStr = @"APRIL";
+            break;
+        case 5:
+            monStr = @"MAY";
+            break;
+        case 6:
+            monStr = @"JUNE";
+            break;
+        case 7:
+            monStr = @"JULY";
+            break;
+        case 8:
+            monStr = @"AUGUST";
+            break;
+        case 9:
+            monStr = @"SEPTEMBER";
+            break;
+        case 10:
+            monStr = @"OCTOBER";
+            break;
+        case 11:
+            monStr = @"NOVEMBER";
+            break;
+        default:
+            monStr = @"DECEMBER";
+            break;
+    }
+    self.monthLb.text = monStr;
+    self.yearLb.text = [NSString stringWithFormat:@"%ld" ,date.year];// @"2000";
     
     NSString *birthStr = @"Our Gift To You?\n$30 To Spend On Your\nFavorite Hair.";
     NSString *defualtStr = [NSString stringWithFormat: @"hello,%@ %@\nThanks for giving us the opportunity to celebratingyour birthday with you in the future.You’re going to receive our special birthday treat.\nLook forward to your special day to come.", @"USER", @"NAME"];//info.lastname, info.firstname];

+ 5 - 0
Asteria/NetTools/ASNetApis.h

@@ -26,6 +26,8 @@
 #define vipInfoUrl BaseRequestrUrl(@"vip/index")
 #define userBirthUrl BaseRequestrUrl(@"vip/birthday")
 
+// MARK: - 修改用户信息
+#define putUserInfo BaseRequestrUrl(@"customers/me")
 
 //MARK: - 个人中心
 #define getSignStateUrl BaseRequestrUrl(@"sign/index")
@@ -35,6 +37,9 @@
 #define getUserCouponUrl BaseRequestrUrl(@"coupon/index")
 #define getUserGiftCardUrl BaseRequestrUrl(@"gift/index")
 
+// vip 优惠券
+#define getVipCouponUrl BaseRequestrUrl(@"vip/coupon")
+
 // MARK: 积分
 #define getPointsDetailUrl BaseRequestrUrl(@"points/index")