Merge branch 'dev'

src/components/order/index.js

@@ -89,6 +89,7 @@ class Order extends Component {
   }
   // 提交订单
   submitOrder = () => {
+    const {total} = this.state;
     if (this.state.orderList.length === 0) {
       Toast.info('没有要提交的订单！');
       return;
@@ -98,9 +99,12 @@ class Order extends Component {
     }
     if(this.props.location.state && this.props.location.state.group === 1) {
       http.post(`${API['base-api']}/pdd/m`, {course_id: getParam("id")}).then(res => {
-        console.log(res.data.data);
         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}`);
+            return;
+          }
           this.props.history.replace(`/payorder?oid=${res.data.data.oid}`);
         }else {
           Toast.info(res.data.msg, 2);
@@ -113,12 +117,15 @@ class Order extends Component {
         url += '&type=1'
       }
       http.get(url).then(res => {
-        console.log(res);
         if(res.data.errno !== 0) {
           Toast.info(res.data.msg, 2);
           return;
         }
         sessionStorage.removeItem('orderUseCacheObj');
+        if (res.data.data.is_free === 1) {
+          this.props.history.replace(`/purchased`);
+          return;
+        }
         this.props.history.replace(`/payorder?oid=${res.data.data.order_id}`);
       });
     }