Merge branch 'deposit-coupons' into 11-11

src/components/coupons/myCoupons/index.js

@@ -109,19 +109,13 @@ class UseCoupon extends PureComponent {
 
   getMyCoupons = () => {
     Promise.all([
-      http.get(`${API.home}/m/coupon/all`),
-      http.get(`${API.home}/m/coupon/expansion`)
+      http.get(`${API.home}/m/coupon/expansion`),
+      http.get(`${API.home}/m/coupon/all`)
     ]).then((coupons) => {
       let myCoupons = []
-      const [allCoupons, expansionCoupons] = coupons
+      const [expansionCoupons, allCoupons] = coupons
       const {data: all} = allCoupons
       const {data: expansion} = expansionCoupons
-      if (all.code == 200) {
-        Array.isArray(all.data) && (myCoupons = myCoupons.concat(all.data))
-      } else {
-        Toast.info(all.msg)
-      }
-
       if (expansion.code == 200) {
         Array.isArray(expansion.data)
         && (expansion.data = expansion.data.map(item => (item.ctype = 4, item)))
@@ -129,6 +123,11 @@ class UseCoupon extends PureComponent {
       } else {
         Toast.info(expansion.msg)
       }
+      if (all.code == 200) {
+        Array.isArray(all.data) && (myCoupons = myCoupons.concat(all.data))
+      } else {
+        Toast.info(all.msg)
+      }
 
       this.setState({
         couponList: myCoupons
@@ -138,12 +137,21 @@ class UseCoupon extends PureComponent {
 
   getAllCoupons = () => {
     Promise.all([
-      http.post(`${API.home}/m/coupon/select`, {course_id: this.state.courseId}),
-      http.get(`${API.home}/m/coupon/expansion`)
+      http.get(`${API.home}/m/coupon/expansion`),
+      http.post(`${API.home}/m/coupon/select`, {course_id: this.state.courseId})
     ]).then((coupons) => {
-      const [selectCoupons, expansionCoupons] = coupons
+      const [expansionCoupons, selectCoupons] = coupons
       const {data: select} = selectCoupons
       const {data: expansion} = expansionCoupons
+      if (expansion.code == 200) {
+        Array.isArray(expansion.data)
+        && (expansion.data = expansion.data.map(item => (item.ctype = 4, item)))
+        && (this.setState({
+          valid_coupons: this.state.valid_coupons.concat(expansion.data)
+        }))
+      } else {
+        Toast.info(expansion.msg)
+      }
       if (select.code === 200) {
         const inuse_coupon = select.data['inuse_coupon']
         this.setState({
@@ -157,15 +165,6 @@ class UseCoupon extends PureComponent {
       } else {
         Toast.info(data.msg)
       }
-      if (expansion.code == 200) {
-        Array.isArray(expansion.data)
-        && (expansion.data = expansion.data.map(item => (item.ctype = 4, item)))
-        && (this.setState({
-          valid_coupons: this.state.valid_coupons.concat(expansion.data)
-        }))
-      } else {
-        Toast.info(expansion.msg)
-      }
 
 
     })