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

zxl

4 天以前 c9928dd4f6d25e2339ea1400f59ec58674a927a7

 pages/product/product/promotion/-promotion-assemble-list.vue

@@ -24,14 +24,11 @@
</template>

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

import * as API_Promotions from "@/api/promotions";
import configs from '@/config/config'
export default {
  components: {UImage,UButton,UEmpty},
  data() {
    return {
      configs,