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

xiangpei

2025-07-09 a1c289e7dfc5d9a3b8dc7ca9b05857f276c05f8d

 pages/promotion/bargain/list.vue

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

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