Merge branch 'dev'

src/components/order/index.js

@@ -101,8 +101,8 @@ class Order extends Component {
       http.post(`${API['base-api']}/pdd/m`, {course_id: getParam("id"),ischeck:this.state.useBalance}).then(res => {
         if(res.data.errno === 200) {
           sessionStorage.removeItem('orderUseCacheObj');
-          if (res.data.data.is_free === 1) {
-            this.props.history.push(`/togroup?id=${res.data.data.order_id}`);
+          if (res.data.data.pay_jump === 1) {
+            this.props.history.push(`/togroup?id=${res.data.data.pdd_order_id}`);
             return;
           }
           this.props.history.replace(`/payorder?oid=${res.data.data.oid}`);