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

zxl

3 天以前 be6df55226b155a1567ce3bac9c6d25df6c68b98

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

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

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