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

zxl

4 天以前 c9928dd4f6d25e2339ea1400f59ec58674a927a7

 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: {