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

zxl

17 小时以前 4c85457a83afeebb0bb4977d0525222493d29de2

 pages/subComponents/m-goods-list/promotion.vue

@@ -45,7 +45,7 @@

<script>
   import '@/components/uview-components/uview-ui'
   import commonTpl from '@/pages/subComponents/m-goods-list/common.vue'
   import commonTpl from '@/pages/product/m-goods-list/common.vue'
   export default {
      data() {
         return {