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

zxl

4 天以前 c9928dd4f6d25e2339ea1400f59ec58674a927a7

 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 {