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

zxl

2025-06-04 ba5acc3cdefd33a4845b578015e2aae8b43f80d3

 pages/promotion/bargain/list.vue

@@ -16,6 +16,7 @@
</template>

<script>
import '@/uview-components/uview-ui'
import { getBargainList } from "@/api/promotions";
import goodsTemplate from '@/components/m-goods-list/promotion'
export default {