Merge branch 'dev_st'

# Conflicts: # keyBoard.xcodeproj/project.pbxproj 解决冲突
2025-11-10 16:12:38 +08:00
parent 2c8142c0d2 9f4110b24a
commit 8069b08fab
25 changed files with 630 additions and 32 deletions
--- a/keyBoard/Class/Shop/VC/KBShopItemVC.m
+++ b/keyBoard/Class/Shop/VC/KBShopItemVC.m
@@ -27,7 +27,7 @@
    }];

    // 刷新组件（演示：2 秒后结束）
-    __weak typeof(self) weakSelf = self;
+    KBWeakSelf
    if (self.isNeedHeader) {
        self.collectionView.mj_header = [MJRefreshNormalHeader headerWithRefreshingBlock:^{
            dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(2 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{