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

zxl

4 天以前 c9928dd4f6d25e2339ea1400f59ec58674a927a7

 pages/tabbar/category/category.vue

@@ -36,10 +36,12 @@
        </view>
      </scroll-view>
    </view>
   <custom-tabbar bgColor="#ffffff" selected="shop"></custom-tabbar>
  </view>
</template>

<script>
import '@/components/uview-components/uview-ui';
import { getCategoryList } from "@/api/goods.js";
export default {
  data() {