提交

QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.h

@@ -10,7 +10,7 @@
 NS_ASSUME_NONNULL_BEGIN
 
 @interface QXGuildViewController : QXBaseViewController
-
+@property (nonatomic,strong)NSString*joinGuild;
 @end
 
 NS_ASSUME_NONNULL_END

QXLive/Mine(音域)/Controller/公会中心/QXGuildViewController.m

@@ -44,7 +44,12 @@ static void *WKWebBrowserContext = &WKWebBrowserContext;
 }
 - (void)loadData {
     NSInteger safeTop = kSafeAreaTop;
-    NSURL* url=[NSURL URLWithString:[NSString stringWithFormat:@"%@web/index.html#/pages/union/index?id=%@&h=%ld",H5ServerUrl,[QXGlobal shareGlobal].loginModel.token,safeTop]];
+    NSString *urlString = [NSString stringWithFormat:@"%@web/index.html#/pages/union/index?id=%@&h=%ld",H5ServerUrl,[QXGlobal shareGlobal].loginModel.token,safeTop];
+    
+    if ([self.joinGuild isExist]) {
+        urlString =  [urlString stringByAppendingFormat:@"&guild_id=%@",self.joinGuild];
+    }
+    NSURL* url=[NSURL URLWithString:urlString];
     NSURLRequest *request =[NSURLRequest requestWithURL:url];
     [self.contentWebView loadRequest:request];
 }

QXLive/Mine(音域)/Controller/礼物墙/QXGiftWallSubViewController.h

@@ -9,7 +9,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface QXGiftWallSubViewController : QXBaseViewController<JXCategoryListContentViewDelegate>
+@interface QXGiftWallSubViewController : UIViewController<JXCategoryListContentViewDelegate>
 /// 是否为已点亮
 @property(nonatomic,assign)BOOL isLight;
 /// 数据源

QXLive/Mine(音域)/Controller/礼物墙/QXGiftWallSubViewController.m

@@ -19,9 +19,9 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
+    [self initSubViews];
 }
 - (void)initSubViews{
-    self.bgImageHidden = YES;
     UICollectionViewFlowLayout *layout = [[UICollectionViewFlowLayout alloc] init];
     int itemWidth = (SCREEN_WIDTH-16*2-12*2)/3;
     layout.itemSize = CGSizeMake(itemWidth, ScaleWidth(143));

QXLive/Mine(音域)/Model/QXUserModel.h

@@ -127,7 +127,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong)NSString *total_price;
 
 /// 公会
-@property (nonatomic,strong)NSString *guild;
+@property (nonatomic,strong)NSString *guild_name;
 
 /// 是否使用靓号  0未使用   1 已使用
 @property (nonatomic,strong)NSString *is_use_code;
@@ -200,7 +200,12 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic,strong)NSString *gift_num;
 
 /// 公会
-@property (nonatomic,strong)NSString *guild;
+@property (nonatomic,strong)NSString *guild_id;
+@property (nonatomic,strong)NSString *guild_name;
+
+/// 公会
+@property (nonatomic,strong)NSString *me_guild_id;
+@property (nonatomic,strong)NSString *me_guild_name;
 
 /// 是否已关注 0 未关注   1 已关注
 @property (nonatomic,strong)NSString *is_follow;

QXLive/Mine(音域)/View/QXMineServiceCell.m

@@ -190,7 +190,7 @@
         
         
         QXServiceModel *md4 = [[QXServiceModel alloc] init];
-        md4.title = @"家族";
+        md4.title = @"我的家族";
         md4.icon = @"service_my_family";
         md4.type = QXMineServiceTypeFamily;
         
@@ -243,8 +243,8 @@
         _moreArray = [NSMutableArray arrayWithArray:@[
             md1,
             md2,
-            md3,
-            md4,
+//            md3,
+//            md4,
 //            md5,
 //            md6,
             md7

QXLive/Mine(音域)/View/个人主页/QXUserHomeHeaderView.m

@@ -490,8 +490,8 @@
             [self.playBtn setBackgroundImage:[UIImage imageNamed:@"expansion_call"] forState:(UIControlStateNormal)];
         }
     }
-    if ([model.guild isExist]) {
-        self.guildLabel.text = model.guild;
+    if ([model.guild_name isExist]) {
+        self.guildLabel.text = model.guild_name;
     }else{
         self.guildLabel.text = @"无";
     }

QXLive/Mine(音域)/View/亲密关系/QXIntimateMoreListCell.m

@@ -103,7 +103,7 @@
         self.rightNameLabel.text = model.nickname1;
         self.rightSexImageView.image = [UIImage imageNamed:model.sex2.intValue == 1?@"user_sex_boy":@"user_sex_girl"];
     }
-    if ([self.userId isEqualToString:QXGlobal.shareGlobal.loginModel.user_id]) {
+    if (![self.userId isEqualToString:QXGlobal.shareGlobal.loginModel.user_id]) {
         self.topBtn.hidden = YES;
         self.deleteBtn.hidden = YES;
     }else{

QXLive/Mine(音域)/View/家族/QXFamilyMemberCell.m

@@ -47,7 +47,7 @@
     [self.priceBtn setTitle:model.market_value forState:(UIControlStateNormal)];
     self.onlineLabel.text = model.is_online==1?@"当前在线":@"当前离线";
     self.continueBtn.hidden = model.is_show_sign.intValue==1?NO:YES;
-    self.continueBtn.hidden = NO;
+//    self.continueBtn.hidden = NO;
 }
 - (IBAction)continueAction:(id)sender {