提交

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));