fix ui

Dolphins/Classes/Goods/Controller/ZJGoodsViewController.m

@@ -441,7 +441,7 @@
 //恢复按钮点击
 - (void)huiFuButtonClick{
     NSLog(@"恢复购买");
-    [ZTPurchaseManager restorePurchasesWithSuccess:^{
+    [ZTPurchaseManager restorePurchases:self.view success:^{
         [self.navigationController popViewControllerAnimated:YES];
     }];
 }

Dolphins/Classes/Goods/Controller/ZTPurchaseManager.swift

@@ -128,8 +128,8 @@ class ZTPurchaseManager: NSObject {
     }
     
     // 恢复购买
-    @objc class func restorePurchases(success: @escaping(()->Void)) {
-        let hud = MBProgressHUD.showAdded(to: UIApplication.shared.delegate!.window!!, animated: true)
+    @objc class func restorePurchases(_ inView: UIView ,success: @escaping(()->Void)) {
+        let hud = MBProgressHUD.showAdded(to: inView, animated: true)
         SwiftyStoreKit.restorePurchases(atomically: true) { results in
             hud.hide(animated: true);
             if results.restoreFailedPurchases.count > 0 {

Dolphins/Classes/Guard/Controller/ZJElectricalRemindVC.m

@@ -137,6 +137,7 @@
     
     cell.phoneLab.text = model.name;
     [cell.headerImv sd_setImageWithURL:[NSURL URLWithString:model.headImage]];
+    cell.headerImv.layer.cornerRadius = 42*scale_w/2;
     
     cell.settingBtn.tag = 0x64+indexPath.row;
     if (model.status == 0) {

Dolphins/Classes/LocationAttention/ZJLocationAttentionVC.swift

@@ -80,7 +80,7 @@ class ZJLocationAttentionVC: BaseViewController {
         maskBgView.isHidden = self.locationRemindDataSource.count != 0
         
         if currentFriendModel != nil {
-            headView.phoneLabel.text = "  "+currentFriendModel.phoneNo
+            headView.phoneLabel.text = currentFriendModel.nickname.count > 0 ? "    "+currentFriendModel.nickname : "  "+currentFriendModel.phoneNo
             headView.desLab.text = "选择好友"
             headView.desLab.font = UIFont.systemFont(ofSize: 13)
             headView.desLab.textColor = UIColor.init(red: 102.0/255, green: 102.0/255, blue: 102.0/255, alpha: 1.0);
@@ -115,7 +115,7 @@ class ZJLocationAttentionVC: BaseViewController {
         var dataSource:Array<String> = [];
         for count in 0 ..< headerFriendsDataSource!.count {
             let model = headerFriendsDataSource?[count]
-            dataSource.append(model!.phoneNo)
+            dataSource.append( model!.nickname.count > 0 ? "  "+model!.nickname : "  "+model!.phoneNo)
         }
         
         friendSelectView = ZJLocationRemindFriendSelectView(boundView: self.headView, dataSource: dataSource, delegate: self)
@@ -422,8 +422,8 @@ extension ZJLocationAttentionVC: UITableViewDelegate, UITableViewDataSource {
 extension ZJLocationAttentionVC: ZJLocationRemindFriendSelectDelegate {
     func clickedListView(at indexPath: IndexPath) {
         print(indexPath)
-        let selectModel = headerFriendsDataSource?[indexPath.row]
-        headView.phoneLabel.text = "  "+selectModel!.phoneNo
+        let selectModel = headerFriendsDataSource![indexPath.row]
+        headView.phoneLabel.text = selectModel.nickname.count > 0 ? "    "+selectModel.nickname : "  "+selectModel.phoneNo
         self.headView.button.transform = CGAffineTransform.identity
         
         currentFriendModel = headerFriendsDataSource![indexPath.row]

Dolphins/Classes/Map/Controller/ZJBaseMapViewController.m

@@ -64,7 +64,8 @@
     [self.view addSubview: _cardView];
     [_cardView mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.right.equalTo(self.view);
-        make.top.equalTo(@(kStatusBarHeight));
+//        make.top.equalTo(@(kStatusBarHeight));
+        make.top.equalTo(@(10));
         make.height.equalTo(@130);
     }];
     [self.cardView setHidden:true];

Dolphins/Classes/Tools/GoodsManager/ZJGoodsMagager.h

@@ -6,6 +6,7 @@
 //  Copyright © 2020 Company. All rights reserved.
 //
 
+
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN

Dolphins/Classes/Tools/GoodsManager/ZJGoodsMagager.m

@@ -104,7 +104,7 @@ static ZJGoodsMagager * manager;
             NSDictionary * switchDic = [[self.data Read] objectForKey:@"switch"];
             
             if ([[switchDic objectForKey:@"isLadderPay"] isEqual:@1]) {
-                [self getUrl:0];
+                [self getUrl_new:0];
             }else{
                 [self getUrl:[self.products firstObject]];
             }