Merge branch '00-formal' into dev

src/components/activity/newyear-2019/year-wish/index.js

@@ -4,7 +4,11 @@ import {http, SendMessageToApp, getParam} from '@/utils'
 import CommonContainer from './../common/commonContainer/index'
 import CourseItem from '../../../blessingPreheat/courseItem/index'
 import {withRouter} from "react-router-dom"
+import { connect } from 'react-redux';
 
+@connect(({user}) => ({
+    user
+}))
 class YarnWish extends Component {
     state = {
         list: [],
@@ -113,6 +117,7 @@ class YarnWish extends Component {
 
     // 砍完价去支付
     bargainToOrder = (id) => {
+        console.log(this.props);
         const { history, user } = this.props;
         if(user.hasError) {
             this.toLogin();
@@ -272,7 +277,7 @@ class YarnWish extends Component {
                                                                 item.type === 4 &&
                                                                 <>
                                                                     <a
-                                                                        onClick={() => this.toContinueBargain(item.bargain_code)}
+                                                                        onClick={() => this.toContinueBargain(item.course_id, item.bargain_code)}
                                                                         className="status-btn to-group"
                                                                     >继续砍价</a>
                                                                     <a

src/components/blessingPreheat/courseItem/index.js

@@ -14,13 +14,13 @@ class CourseItem extends Component {
     this.startCountDown(time);
   }
 
-  // componentWillReceiveProps(nextProps) {
-  //   const { time: newTime } = nextProps
-  //   const { time: oldTime } = this.props;
-  //   if(oldTime != newTime) {
-  //     this.startCountDown(newTime);
-  //   }
-  // }
+  componentWillReceiveProps(nextProps) {
+    const { time: newTime } = nextProps
+    const { time: oldTime } = this.props;
+    if(oldTime != newTime) {
+      this.startCountDown(newTime);
+    }
+  }
 
   startCountDown = (time) => {
     if(time) {