Merge branch 'master' of gitlab.julyedu.com:baiguangyao/mr-julyedu

src/components/coupons/index.js

@@ -23,12 +23,12 @@ class UseCoupon extends PureComponent {
     }
 
     componentDidMount() {
+
         const {history, location} = this.props
-        if (!this.state.courseId) {
-            location.state && location.state.from ? history.replace(location.state.from) : history.goBack()
-        }
+
         const {state} = this.props.location
 
+
         if (state && state.from) {
             if (state.from === '/my') {
                 this.getMyCoupons();
@@ -36,6 +36,9 @@ class UseCoupon extends PureComponent {
                     showUseButton: true
                 })
             } else {
+                if (!this.state.courseId) {
+                    location.state && location.state.from ? history.replace(location.state.from) : history.goBack()
+                }
                 this.getAllCoupons();
             }
         }