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

zxl

4 天以前 c9928dd4f6d25e2339ea1400f59ec58674a927a7

 pages/cart/coupon/couponCenter.vue

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

<script>
   import UEmpty from '@/uview-components/uview-ui/components/u-empty/u-empty.vue';
   import '@/components/uview-components/uview-ui';
   import {
      receiveCoupons
   } from "@/api/members.js";
@@ -54,7 +54,6 @@
      getAllCoupons
   } from "@/api/promotions.js";
   export default {
      components: {UEmpty},
      data() {
         return {
            loadStatus: "more", //下拉状态