图片加载失败

icon添加

Asteria.xcodeproj/project.pbxproj

@@ -3350,6 +3350,7 @@
 				APPLICATION_EXTENSION_API_ONLY = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Asteria/Asteria.entitlements;
 				CODE_SIGN_STYLE = Automatic;
@@ -3388,6 +3389,7 @@
 				APPLICATION_EXTENSION_API_ONLY = NO;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Asteria/Asteria.entitlements;
 				CODE_SIGN_STYLE = Automatic;

Asteria/ASUI/SimpleBase/ASBaseViewController.h

@@ -13,6 +13,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface ASBaseViewController : UIViewController
 
+@property (nonatomic, copy) btnClickBlock nav_logoBlock;
+
 @property (nonatomic, strong) UIView *statusBgV;
 @property (nonatomic, strong) UIView *customNavBar;
 @property (nonatomic, copy) NSString *titleStr;

Asteria/ASUI/SimpleBase/ASBaseViewController.m

@@ -375,6 +375,9 @@
     if (!_leftImgV) {
         UIImageView *v = [UIImageView baseImgV];
         v.image = [UIImage imageNamed:@"nav_icon"];
+        v.userInteractionEnabled = true;
+        UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(logo_navAction)];
+        [v addGestureRecognizer:tap];
         _leftImgV = v;
     }
     return _leftImgV;
@@ -455,4 +458,11 @@
     }
 }
 
+// MARK: - actions
+- (void)logo_navAction {
+    if (self.nav_logoBlock) {
+        self.nav_logoBlock();
+    }
+}
+
 @end

Asteria/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,6 +1,97 @@
 {
   "images" : [
     {
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "38x38"
+    },
+    {
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "38x38"
+    },
+    {
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "64x64"
+    },
+    {
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "3x",
+      "size" : "64x64"
+    },
+    {
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "68x68"
+    },
+    {
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "universal",
+      "platform" : "ios",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "filename" : "App Store-1024.png",
       "idiom" : "universal",
       "platform" : "ios",
       "size" : "1024x1024"

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

@@ -29,6 +29,7 @@
         }
         GKPhotoBrowser *photoBrowser = [GKPhotoBrowser photoBrowserWithPhotos:photos currentIndex:type];
         photoBrowser.showStyle = GKPhotoBrowserShowStyleNone;
+        photoBrowser.failureText = @"Net Error";
         [photoBrowser showFromVC:[Current_normalTool topViewController]];
         
     };

Asteria/Fuction/Goods/V/ASGoodsDetailsTableView.m

@@ -133,6 +133,7 @@
                 [photos addObject:photo];
             }
             GKPhotoBrowser *photoBrowser = [GKPhotoBrowser photoBrowserWithPhotos:photos currentIndex:type];
+            photoBrowser.failureText = @"Net Error";
             photoBrowser.showStyle = GKPhotoBrowserShowStyleNone;
             [photoBrowser showFromVC:[Current_normalTool topViewController]];
             

Asteria/Fuction/Goods/V/Banner/WKM_goodsBanner.m

@@ -181,6 +181,7 @@ UICollectionViewDelegate>
     }
     GKPhotoBrowser *photoBrowser = [GKPhotoBrowser photoBrowserWithPhotos:photos currentIndex:index];
     photoBrowser.showStyle = GKPhotoBrowserShowStyleNone;
+    photoBrowser.failureText = @"Net Error";
     [photoBrowser showFromVC:[Current_normalTool topViewController]];
 }
 @end

Asteria/Fuction/UserCenter/Address/ASAddressViewModel.h

@@ -24,7 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)getCountryList:(void(^)(void))success;
 - (void)getProvinceList:(NSString *)country_id  success:(void(^)(void))success;
 
-- (void)deleteAnAddress:(ASAddressModel *)addressModel complate:(void(^)(BOOL))complate;
+- (void)deleteAnAddress:(ASAddressModel *)addressModel complate:(void(^)(BOOL,NSString *))complate;
 
 - (NSArray *)provinceNameList;
 - (NSArray *)countryNameList;

Asteria/Fuction/UserCenter/Address/ASAddressViewModel.m

@@ -10,11 +10,21 @@
 @implementation ASAddressViewModel
 
 - (void)upAddress:(ASAddressModel *)addressModel complate:(void(^)(BOOL,NSString *))complate {
-    complate(true, @"");
+    [ASNetTools.shared formData_postWithPath:saveAddress param:addressModel.params success:^(id _Nonnull json) {
+        [ASUserInfoManager.shared getInfo];
+        complate(true, @"");
+    } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
+        complate(false, msg);
+    }];
 }
 
-- (void)deleteAnAddress:(ASAddressModel *)addressModel complate:(void(^)(BOOL))complate {
-    complate(true);
+- (void)deleteAnAddress:(ASAddressModel *)addressModel complate:(void(^)(BOOL,NSString *))complate {
+    [ASNetTools.shared getWithPath:delAddress param:@{@"id":addressModel.Id} success:^(id _Nonnull json) {
+        [ASUserInfoManager.shared getInfo];
+        complate(true, @"");
+    } faild:^(NSString * _Nonnull code, NSString * _Nonnull msg) {
+        complate(false, msg);
+    }];
 }
 
 - (void)getCountryList:(void(^)(void))success  {

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

@@ -365,9 +365,9 @@
 -(void)deleteBtAction {
     [MBProgressHUD showHUDAddedTo:self.view animated:true];
     @weakify(self);
-    [self.vm deleteAnAddress:self.m complate:^(BOOL flag) {
+    [self.vm deleteAnAddress:self.m complate:^(BOOL flag, NSString *msg) {
         [MBProgressHUD hideHUDForView:weak_self.view animated:true];
-        NSString *str = flag ? @"Successed" : @"Faild";
+        NSString *str = flag ? @"Successed" : [NSString stringWithFormat:@"Faild, %@", msg];
         [weak_self.view makeToast:[NSString  stringWithFormat:@"Delete %@", str]];
         if (flag) {
             

Asteria/Fuction/UserCenter/UserCenterHome/ASUserCenterViewController.m

@@ -86,6 +86,10 @@
         
     }];
     
+    self.nav_logoBlock = ^{
+        [Fuction_Tool popToHomeVc];
+    };
+    
     [self.view addSubview:self.tableV];
     [self.tableV mas_makeConstraints:^(MASConstraintMaker *make) {
         make.top.equalTo(self.customNavBar.mas_bottom);

Asteria/Fuction/UserManager/info/ASUserModel.h

@@ -45,6 +45,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 + (ASAddressModel *)defualtData;
 
+- (NSDictionary *)params;
+
 @end
 
 @interface ASUserModel : NSObject

Asteria/Fuction/UserManager/info/ASUserModel.m

@@ -74,6 +74,37 @@
     return m;
 }
 
+- (NSDictionary *)params {
+    NSMutableDictionary *dic = [NSMutableDictionary dictionary];
+    dic[@"id"] = self.Id;
+    dic[@"firstname"] = self.firstname;
+    dic[@"lastname"] = self.lastname;
+    NSString *stre = [self.street componentsJoinedByString:@","];
+    dic[@"street[]"] = stre;
+    dic[@"postcode"] = self.postcode;
+    dic[@"city"] = self.city;
+    dic[@"country_id"] = self.country_id;
+    dic[@"region_id"] = self.region_id;
+    dic[@"region"] = self.region.region;
+    dic[@"telephone"] = self.telephone;
+    dic[@"default_billing"] = @"0";
+    dic[@"default_shipping"] = @"0";
+    if (self.addressType == 3) {
+        dic[@"default_billing"] = @"1";
+        dic[@"default_shipping"] = @"1";
+    }
+    if (self.addressType == 2) {
+        dic[@"default_billing"] = @"0";
+        dic[@"default_shipping"] = @"1";
+    }
+    if (self.addressType == 1) {
+        dic[@"default_billing"] = @"1";
+        dic[@"default_shipping"] = @"0";
+    }
+    
+    return dic;
+}
+
 @end
 
 @implementation ASAddressReginModel

Asteria/NetTools/ASNetApis.h

@@ -59,6 +59,8 @@
 #define userinfoUrl BaseRequestrUrl(@"customers/me")
 #define vipInfoUrl BaseRequestrUrl(@"vip/index")
 #define userBirthUrl BaseRequestrUrl(@"vip/birthday")
+#define saveAddress BaseRequestrUrl(@"app/customer/address/saveAddress")
+#define delAddress BaseRequestrUrl(@"app/customer/address/delete")
 //三方登录
 #define userThirdLoginUrl BaseRequestrUrl(@"callback")
 //验证用户是否绑定过邮箱

Asteria/Product/Tool/Fuction_Tool.h

@@ -14,6 +14,7 @@ NS_ASSUME_NONNULL_BEGIN
 +(void)push_BaseWebUrl:(NSString *)url webTitle:(NSString *)title;
 +(void)push_JSBaseWebUrl:(NSString *)url webTitle:(NSString *)title;
 +(void)pop_toLoginVC;
++ (void)popToHomeVc;
 
 
 +(void)tool_shareImgStr:(NSString *)imgStr sharetitle:(NSString *)title shareUrl:(NSString *)urlStr currentVC:(UIViewController *)vc;

Asteria/Product/Tool/Fuction_Tool.m

@@ -8,6 +8,15 @@
 #import "Fuction_Tool.h"
 
 @implementation Fuction_Tool
+
++ (void)popToHomeVc {
+    [[Current_normalTool currentNav] popToRootViewControllerAnimated:false];
+    UITabBarController *tabvc = (UITabBarController *)[UIApplication sharedApplication].delegate.window.rootViewController;
+    if ([tabvc isKindOfClass:[UITabBarController self]]) {
+        tabvc.selectedIndex = 0;
+    }
+}
+
 +(void)push_BaseWebUrl:(NSString *)url webTitle:(NSString *)title{
     XXX_BaseWebC *vc = [[XXX_BaseWebC alloc] init];
     [vc xxx_dsWebLoadUrl:url];