fix：bug修改

Asteria/Fuction/Goods/Revies/V/ReviewsTableHearV.m

@@ -168,15 +168,21 @@
         _tipsLab.numberOfLines          = 0;
         _tipsLab.userInteractionEnabled = YES;
         _tipsLab.frame = CGRectMake(20,  CGRectGetMaxY(self.writeBtn.frame), KScreenWidth - 40, 45);
-        NSString *string = @"Only Registered Users Can Write Reviews. Please，Log In Or Register";
+        NSString *string = @"Only Registered Users Can Write Reviews. Please，Log In Or Register ";
         NSMutableAttributedString *attrStr = [[NSMutableAttributedString alloc] initWithString:string];
-        NSMutableArray *arr_text = [[NSMutableArray alloc]initWithObjects:@"Log In Or Register" ,nil];
+        NSMutableArray *arr_text = [[NSMutableArray alloc]initWithObjects:@"Log In", @"Register ", nil];
         attrStr = [self textArr:arr_text AttributedString:attrStr Connet:string];
-        NSMutableArray * arr_range = [[NSMutableArray alloc]initWithObjects:@"48", nil];//点击的文字开始位置设置
+        NSMutableArray * arr_range = [[NSMutableArray alloc]initWithObjects:@"48", @"58", nil];//点击的文字开始位置设置
         [_tipsLab setAttributesText:attrStr actionText:arr_text actionRange:arr_range];//d添加到UILabel上面
         _tipsLab.YJLAttributesBlock = ^(NSString * _Nonnull clicktext) {//点击事件的d返回
-            if([clicktext isEqualToString:@"Log In Or Register"]){
+            if([clicktext isEqualToString:@"Log In"]){
                 [Fuction_Tool pop_toLoginVC];
+            } else if ([clicktext isEqualToString:@"Register "]) {
+                AS_SignUpC *signUpVC = [[AS_SignUpC alloc] init];
+                signUpVC.isPresent = YES;
+                QMUINavigationController *uikitNavController = [[QMUINavigationController alloc] initWithRootViewController:signUpVC];
+                uikitNavController.modalPresentationStyle = UIModalPresentationFullScreen;
+                [[Current_normalTool topViewController] presentViewController:uikitNavController animated:YES completion:nil];
             }
         };
         _tipsLab.font = [UIFont fontWithName:Rob_Regular size:12];

Asteria/Fuction/Login/VC/AS_SignUpC.h

@@ -11,6 +11,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface AS_SignUpC : UCMBaseC
 
+@property (nonatomic, assign) BOOL isPresent;
+
 @end
 
 NS_ASSUME_NONNULL_END

Asteria/Fuction/Login/VC/AS_SignUpC.m

@@ -82,7 +82,12 @@
 }
 
 -(void)handle_popEvent:(UIButton *)btn{
-    [self.navigationController popViewControllerAnimated:YES];
+    if (self.isPresent) {
+        [self.navigationController dismissViewControllerAnimated:YES completion:nil];
+    } else {
+        [self.navigationController popViewControllerAnimated:YES];
+    }
+    
 }
 
 

Asteria/Fuction/UserCenter/Address/edit/ASEditAddressViewController.m

@@ -246,7 +246,8 @@
     
     NSMutableArray *btArr = [[NSMutableArray alloc]init];
     if(self.isCartEdit){
-        [btArr addObjectsFromArray:@[self.saveBt]];
+//        [btArr addObjectsFromArray:@[self.saveBt]];
+        [btArr addObjectsFromArray:@[self.billTypeBt, self.shipTypeBt, self.saveBt]];
     }else{
         [btArr addObjectsFromArray:@[self.billTypeBt, self.shipTypeBt, self.saveBt, self.deletBt]];
     }

Asteria/Fuction/UserCenter/Orders/Controller/ASOrderDetailsViewController.m

@@ -31,19 +31,19 @@
 
 @implementation ASOrderDetailsViewController
 
-- (void)viewWillAppear:(BOOL)animated {
-    [super viewWillAppear:animated];
+- (void)viewDidDisappear:(BOOL)animated {
+    [super viewDidDisappear:animated];
+    self.navigationController.interactivePopGestureRecognizer.enabled = YES;
+}
+
+- (void)viewDidAppear:(BOOL)animated {
+    [super viewDidAppear:animated];
     if (self.isPay) {
         //支付成功页面禁止侧滑返回
         self.navigationController.interactivePopGestureRecognizer.enabled = NO;
     }
 }
 
-- (void)viewWillDisappear:(BOOL)animated {
-    [super viewWillDisappear:animated];
-    self.navigationController.interactivePopGestureRecognizer.enabled = YES;
-}
-
 - (void)viewDidLoad {
     [super viewDidLoad];
     
@@ -60,7 +60,7 @@
     
     [self loadSubV];
     
-    [self requestOrderDetailsData];
+//    [self requestOrderDetailsData];
 }
 
 - (void)requestOrderDetailsData {
@@ -169,6 +169,12 @@
             K_STRONG_SELF;
             if (type == 1) {
                 [Fuction_Tool popToHomeVc];
+            } else if (type == 2) {
+                UIViewController *vc = [CTMediator.sharedInstance getWebViewVc:@{
+                    @"title":@"Faq",
+                    @"url":HelpFaqsWebUrl,
+                }];
+                [weakSelf.navigationController pushViewController:vc animated:true];
             }
         };
         _paySuccessView.frame = CGRectMake(0, 0, KScreenWidth, [_paySuccessView getViewHeight]);

Asteria/Fuction/UserCenter/Orders/Controller/ASPayFailedViewController.m

@@ -35,6 +35,18 @@
         K_STRONG_SELF;
         if (type == 1) {
             [self.navigationController popViewControllerAnimated:true];
+        } else if (type == 2) {
+            UIViewController *vc = [CTMediator.sharedInstance getWebViewVc:@{
+                @"title":@"Faq",
+                @"url":HelpFaqsWebUrl,
+            }];
+            [weakSelf.navigationController pushViewController:vc animated:true];
+        } else if (type == 3) {
+            UIViewController *vc = [CTMediator.sharedInstance getWebViewVc:@{
+                @"title":@"Contact Us",
+                @"url":ContactUsWebUrl,
+            }];
+            [weakSelf.navigationController pushViewController:vc animated:true];
         }
     };
     

Asteria/NetTools/ASNetApis.h

@@ -16,7 +16,9 @@
 
 #define BaseWebUrl(url) ([NSString stringWithFormat:@"%@%@",@"rest/V1/",url])
 
-#define PointRuleWebUrl @"https://m.bilisar.com/pointsrule"
+#define PointRuleWebUrl     @"https://m.bilisar.com/pointsrule"
+#define HelpFaqsWebUrl      @"https://m.bilisar.com/help-faqs"
+#define ContactUsWebUrl     @"https://m.bilisar.com/contact_us"
 
 // MARK: - host
 #if (DEBUG)