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

src/components/bargainMiddlePage/bargain-middle-page.scss

@@ -307,15 +307,19 @@
     .bargain {
       width: 165px;
       height: 30px;
-      background: $bg_077FD0;
+      background: $bg_FADD29;
       border-radius: 2px;
       border: none;
-      color: $white;
+      color: $color_FF4000;
       -webkit-appearance: none;
       display: inline-block;
       text-align: center;
       line-height: 30px;
     }
+    .button--study {
+      color: $white;
+      background: $bg_077FD0;
+    }
 
     .btns {
       display: flex;

src/components/bargainMiddlePage/index.js

@@ -11,6 +11,7 @@ import Overlay from '../detail/overlay'
 import { compose } from "redux"
 import { connect } from "react-redux";
 import {getCourses} from './../detail/actions';
+import classnames from 'classnames';
 
 @connect(state => ({
     user: state.user
@@ -544,9 +545,9 @@ function CourseBottom(props) {
     let Buttons
     if (props.item.bargain_status === 2) {
         // Buttons = <Link to={`/detail?id=${props.item.course_id}`} className={'bargain'}>我要砍价</Link>
-        Buttons = <a href="javascript:;" onClick={() => props.toDetail(props.item.course_id)} className={'bargain'}>我要砍价</a>
+        Buttons = <a href="javascript:;" onClick={() => props.toDetail(props.item.course_id)} className={'bargain bargian-study'}>我要砍价</a>
     } else if (props.item.bargain_status === 3) {
-        Buttons = <Link to={`/play/video?id=${props.item.v_course_id}`} className={'bargain'}>去学习</Link>
+        Buttons = <Link to={`/play/video?id=${props.item.v_course_id}`} className={classnames('bargain', 'button--study')}>去学习</Link>
     } else {
         Buttons = (
             <div className="btns">

src/components/detail/group/index.js

@@ -39,7 +39,13 @@ class Group extends Component {
     toPay = (pdd_order_id) => {
         const {courseInfo, history} = this.props;
         if (courseInfo.group_status === 3) {
-            history.push(`/order?id=${getParam('id')}`, {group: 1});
+            history.push(
+                `/order?id=${getParam('id')}`, 
+                {
+                    group: 1,
+                    pdd_order_id
+                }
+            );
         } else {
             this.setState({
                 isShowMore: false,

src/components/order/index.js

@@ -121,8 +121,17 @@ class Order extends Component {
     if (!this.state.perfect) {
       Toast.info('请完善报名信息！');
     }
-    if(this.props.location.state && this.props.location.state.group === 1) {
-      http.post(`${API['base-api']}/pdd/m`, {course_id: getParam("id"),ischeck:this.state.useBalance}).then(res => {
+    const { location: { state ={} } } = this.props;
+    if(state.group === 1) {
+      let params = state.pdd_order_id? {
+        course_id: getParam("id"),
+        ischeck: this.state.useBalance,
+        pdd_order_id: state.pdd_order_id
+      } : {
+        course_id: getParam("id"),
+        ischeck: this.state.useBalance,
+      }
+      http.post(`${API['base-api']}/pdd/m`, params).then(res => {
         console.log(res);
         if(res.data.errno === 200) {
           sessionStorage.removeItem('orderUseCacheObj');