Commit d2f86890 by FE

del notice and year-wish

parent 7521d0ee
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -4,7 +4,11 @@ import {http, SendMessageToApp, getParam} from '@/utils' ...@@ -4,7 +4,11 @@ import {http, SendMessageToApp, getParam} from '@/utils'
import CommonContainer from './../common/commonContainer/index' import CommonContainer from './../common/commonContainer/index'
import CourseItem from '../../../blessingPreheat/courseItem/index' import CourseItem from '../../../blessingPreheat/courseItem/index'
import {withRouter} from "react-router-dom" import {withRouter} from "react-router-dom"
import { connect } from 'react-redux';
@connect(({user}) => ({
user
}))
class YarnWish extends Component { class YarnWish extends Component {
state = { state = {
list: [], list: [],
...@@ -113,6 +117,7 @@ class YarnWish extends Component { ...@@ -113,6 +117,7 @@ class YarnWish extends Component {
// 砍完价去支付 // 砍完价去支付
bargainToOrder = (id) => { bargainToOrder = (id) => {
console.log(this.props);
const { history, user } = this.props; const { history, user } = this.props;
if(user.hasError) { if(user.hasError) {
this.toLogin(); this.toLogin();
...@@ -272,7 +277,7 @@ class YarnWish extends Component { ...@@ -272,7 +277,7 @@ class YarnWish extends Component {
item.type === 4 && item.type === 4 &&
<> <>
<a <a
onClick={() => this.toContinueBargain(item.bargain_code)} onClick={() => this.toContinueBargain(item.course_id, item.bargain_code)}
className="status-btn to-group" className="status-btn to-group"
>继续砍价</a> >继续砍价</a>
<a <a
......
...@@ -14,13 +14,13 @@ class CourseItem extends Component { ...@@ -14,13 +14,13 @@ class CourseItem extends Component {
this.startCountDown(time); this.startCountDown(time);
} }
// componentWillReceiveProps(nextProps) { componentWillReceiveProps(nextProps) {
// const { time: newTime } = nextProps const { time: newTime } = nextProps
// const { time: oldTime } = this.props; const { time: oldTime } = this.props;
// if(oldTime != newTime) { if(oldTime != newTime) {
// this.startCountDown(newTime); this.startCountDown(newTime);
// } }
// } }
startCountDown = (time) => { startCountDown = (time) => {
if(time) { if(time) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment