Merge remote-tracking branch 'origin/user_action' into send_coupon

zxl

3 天以前 be6df55226b155a1567ce3bac9c6d25df6c68b98

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

@@ -103,7 +103,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 {