Merge remote-tracking branch 'origin/dev' into dev

zxl

2025-06-24 1c0caaa395331920cf58cfd53924c9beb4a2b0d0

 pages/commodity-square/commoditySquare.vue

@@ -109,6 +109,8 @@
            this.getGoodsParam.categoryId = ''
            this.goodsList1 = []
            this.goodsList2 = []
            this.listHeight1 = 0;
            this.listHeight2 = 0;
            await this.getgoodsData();
         },
         confirm() {},
@@ -214,6 +216,8 @@
            this.getGoodsParam.pageNumber = 1
            this.goodsList1 = [];
            this.goodsList2 = [];
            this.listHeight1 = 0;
            this.listHeight2 = 0;
            await this.getgoodsData();
            console.log(this.maxPages)
         }