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

zxl

4 天以前 c9928dd4f6d25e2339ea1400f59ec58674a927a7

 pages/tabbar/home/template/tpl_goods.vue

@@ -84,7 +84,7 @@
  </div>
</template>
<script>
import '@/uview-components/uview-ui'
import '@/components/uview-components/uview-ui'
import { getGoodsList } from "@/api/goods.js";
export default {
  title: "商品分类以及商品",