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

peng

2025-07-02 be80b22a4a0fcd33e1b17ebdb86eba91cc7de4d2

 pages/tabbar/category/category.vue

@@ -36,10 +36,12 @@
        </view>
      </scroll-view>
    </view>
   <custom-tabbar bgColor="#ffffff" selected="shop"></custom-tabbar>
  </view>
</template>

<script>
import '@/components/uview-components/uview-ui';
import { getCategoryList } from "@/api/goods.js";
export default {
  data() {