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

src/components/bargainMiddlePage/index.js

-import React, { Component } from 'react'
+import React, {Component} from 'react'
 import './bargain-middle-page.scss'
-import { HeaderBar, VList } from '@common'
-import { Course } from '@common'
+import {HeaderBar, VList} from '@common'
+import {Course} from '@common'
 import {api, getParam, http, browser, wxShare} from "@/utils"
-import { Toast } from "antd-mobile"
-import { Link, withRouter } from "react-router-dom"
+import {Toast} from "antd-mobile"
+import {Link, withRouter} from "react-router-dom"
 import Ranking from './ranking'
-import { differenceInSeconds, differenceInMinutes, differenceInHours, differenceInDays } from "date-fns"
+import {differenceInSeconds, differenceInMinutes, differenceInHours, differenceInDays} from "date-fns"
 import Overlay from '../detail/overlay'
-import { compose } from "redux"
-import { connect } from "react-redux";
+import {compose} from "redux"
+import {connect} from "react-redux";
 import {getCourses} from './../detail/actions';
 import classnames from 'classnames';
 
@@ -54,6 +54,17 @@ class BargainMiddlePage extends Component {
         this.getBargainInfo()
     }
 
+    componentDidUpdate(prevProps) {
+        let {user} = this.props
+        let {user: prevUser} = prevProps
+        if(!user.hasError && user.hasError !== prevUser.hasError){
+            this.getBargainRankList(getParam('id'), 1)
+            this.getBargainCourse()
+            this.getBargainInfo()
+        }
+    }
+
+
     // 获取砍价信息
     getBargainInfo = () => {
 
@@ -130,6 +141,7 @@ class BargainMiddlePage extends Component {
                     list: res.data.data.list,
                     outList: newList
                 })
+            } else if (res.data.code == 4030 || res.data.code == 4040) {
             } else {
                 Toast.info(res.data.msg, 2)
             }
@@ -157,7 +169,7 @@ class BargainMiddlePage extends Component {
         // })
     }
     // 我要砍价列表的去支付
-    toCartBottom=(id)=>{
+    toCartBottom = (id) => {
         http.get(`${API['base-api']}/m/cart/addtopreorder/[${id}]`).then((res) => {
             if (res.data.errno === 0) {
                 this.props.history.push(`/order?id=[${getParam('id')}]`, {bargain: 1});
@@ -262,8 +274,18 @@ class BargainMiddlePage extends Component {
                 this.getBargainInfo()
 
 
-            } else if(res.data.code == 4030 || res.data.code == 4040){
-                this.props.history.push('/passport')
+            } else if (res.data.code == 4030 || res.data.code == 4040) {
+                if (browser.isWeixin) {
+                    let redirectURI = window.location.href
+                    if (redirectURI.includes('code=') && redirectURI.includes('state=STATE')) {
+                        let index = redirectURI.lastIndexOf('code=');
+                        redirectURI = redirectURI.substr(0, index - 1);
+                    }
+                    window.location.assign(`https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx23dac6775ac82877&redirect_uri=${encodeURIComponent(redirectURI)}&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect`)
+                } else {
+                    this.props.history.push('/passport')
+                }
+
             } else {
                 Toast.info(res.data.msg, 2)
             }
@@ -307,10 +329,10 @@ class BargainMiddlePage extends Component {
     }
 
     toCourseDetail = (id) => {
-        const { dispatch, history } = this.props;
+        const {dispatch, history} = this.props;
         // dispatch(getCourses(id, () => {
-            history.push(`/detail?id=${id}`);
-            return false;
+        history.push(`/detail?id=${id}`);
+        return false;
         // }));
     }
 
@@ -357,10 +379,10 @@ class BargainMiddlePage extends Component {
                             <VList
                                 img={this.state.course.course_img}
                                 info={
-                                <CourseDes
-                                    isOriginator={this.state.isOriginator}
-                                    data={this.state.data}
-                                    toCart={this.toCart}/>
+                                    <CourseDes
+                                        isOriginator={this.state.isOriginator}
+                                        data={this.state.data}
+                                        toCart={this.toCart}/>
                                 }
                             />
                         </ul>
@@ -459,11 +481,11 @@ class BargainMiddlePage extends Component {
                                     title={item.course_title}
                                     toDetail={this.toCourseDetail}
                                     bottom={
-                                    <CourseBottom
-                                        item={item}
-                                        toCartBottom={this.toCartBottom.bind(this,item.course_id)}
-                                        toDetail={this.toCourseDetail}
-                                    />
+                                        <CourseBottom
+                                            item={item}
+                                            toCartBottom={this.toCartBottom.bind(this, item.course_id)}
+                                            toDetail={this.toCourseDetail}
+                                        />
                                     }
                                 />
                             })
@@ -569,7 +591,8 @@ function CourseBottom(props) {
         // Buttons = <Link to={`/detail?id=${props.item.course_id}`} className={'bargain'}>我要砍价</Link>
         Buttons = <a 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={classnames('bargain', 'button--study')}>去学习</Link>
+        Buttons = <Link to={`/play/video?id=${props.item.v_course_id}`}
+                        className={classnames('bargain', 'button--study')}>去学习</Link>
     } else {
         Buttons = (
             <div className="btns">