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

zxl

4 天以前 be6df55226b155a1567ce3bac9c6d25df6c68b98

 pages/promotion/point/pointList.vue

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

<script>
import '@/uview-components/uview-ui'
import '@/components/uview-components/uview-ui'
import { getPointsCategory, getPointsGoods } from "@/api/promotions.js";
import userPoint from "./user";
export default {