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

zxl

4 天以前 c9928dd4f6d25e2339ea1400f59ec58674a927a7

 components/m-goods-list/promotion.vue

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

<script>
   import '@/uview-components/uview-ui'
   import '@/components/uview-components/uview-ui'
   import commonTpl from '@/components/m-goods-list/common'
   export default {
      data() {