Merge branch 'dev_fix_sub' into user_action

peng

3 天以前 58c78011ca0567a597d8c1e51696e317a3086604

 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 {