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

zxl

2025-06-24 e50f021ddf73b80f5a1273b8b01e7dd4344a4cdc

 pages/promotion/bargain/log.vue

@@ -31,12 +31,10 @@
</template>

<script>
import UImage from '@/uview-components/uview-ui/components/u-image/u-image.vue';
import UEmpty from '@/uview-components/uview-ui/components/u-empty/u-empty.vue';
import '@/components/uview-components/uview-ui';

import { getMineBargainLog } from "@/api/promotions";
export default {
  components: {UImage, UEmpty},
  data() {
    return {
      params: {