Merge branch 'dev_fix_sub' into user_action

peng

2 天以前 9653f4faa20699a2d9a03391f4a6175ff8ce59c3

 pages/promotion/point/pointList.vue

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

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