Merge branch 'bug' into pre

src/components/detail/group/togroup.js

 import React, { Component } from 'react'
 import './togroup.scss'
 import { HeaderBar, VList } from '../../../common'
-
-import {getParam, http, browser, wxShare} from "@/utils";
+import { getParam, http, browser, wxShare } from "@/utils";
 import { connect } from "react-redux"
 import { Link } from "react-router-dom"
 import { WingBlank, WhiteSpace, Flex, Toast, Modal } from 'antd-mobile'
-import {getCourses} from './../../detail/actions';
 
-@connect()
+
+@connect(state => ({user: state.user}))
 class ToGroup extends Component {
     constructor(props) {
         super(props)
@@ -19,7 +18,6 @@ class ToGroup extends Component {
             groupon_member: [],
             person_num: 0, // 共多少人成团
             is_success: false, // 是否拼团成功
-            userInfo: {},
             number: 0, // 差几人成团
             isBuy: false,
             modal: false,
@@ -28,7 +26,7 @@ class ToGroup extends Component {
 
     invitedFriends = () => {
         const {pdd_price, number, data} = this.state;
-        if(browser.isWeixin) {
+        if (browser.isWeixin) {
             let share = this.state.share;
             this.setState({
                 share: !share,
@@ -40,21 +38,14 @@ class ToGroup extends Component {
                 imgUrl: data.image_name,
             });
 
-        }else{
+        } else {
             Toast.info('请在微信中使用分享功能！', 2);
         }
     }
 
     componentDidMount() {
-        Promise.all([http.get(`${API['base-api']}/pdd/goupon_pay_page/${getParam('id')}`), http.get(`${API.home}/m/user_info`)]).then(resultList => {
-            console.log(resultList);
-            let res = resultList[0],
-            userInfo = resultList[1];
-            if(res.data.errno !== 0) {
-                Toast.info(res.data.msg, 2);
-                return;
-            }
-            if(userInfo.data.code !== 200) {
+        http.get(`${API['base-api']}/pdd/info/${getParam('id')}`).then(res => {
+            if (res.data.errno !== 0) {
                 Toast.info(res.data.msg, 2);
                 return;
             }
@@ -65,13 +56,12 @@ class ToGroup extends Component {
                 is_success: res.data.data.is_success,
                 person_num: res.data.data.person_num,
                 course_list: res.data.data.course_list,
-                userInfo,
                 number: res.data.data.number,
                 countdown: '',
                 isBuy: res.data.data.is_buy
             });
 
-            if(res.data.data.is_success === 0) {
+            if (res.data.data.is_success === 0) {
                 let date = res.data.data.end_time * 1000,
                     hours = 0,
                     minutes = 0,
@@ -80,7 +70,7 @@ class ToGroup extends Component {
                     date -= 1000
                     hours = `${parseInt(date / (60 * 60 * 1000))}`.padStart(2, 0);
                     minutes = `${parseInt((date - hours * 3600000) / 60000)}`.padStart(2, 0);
-                    seconds = `${parseInt((date - hours * 3600000 - minutes * 60000 ) / 1000)}`.padStart(2, 0);
+                    seconds = `${parseInt((date - hours * 3600000 - minutes * 60000) / 1000)}`.padStart(2, 0);
                     this.setState({
                         countdown: `${hours}:${minutes}:${seconds}`
                     });
@@ -90,33 +80,36 @@ class ToGroup extends Component {
     }
 
     toCourseDetail = (id) => {
-        const { dispatch, history } = this.props;
-        // dispatch(getCourses(id, () => {
+        const {history} = this.props;
         history.push(`/detail?id=${id}`, {href: '/classify'});
         return false;
-        // }));
     }
 
     handleToGroup = () => {
-        const { isBuy = false, data={} } = this.state;
-        const { history } = this.props;
-        if(!isBuy){
+        const {isBuy = false, data = {}} = this.state;
+        const {user, history, location} = this.props;
+        if (user.hasError) {
+            history.push('/passport', {from: location})
+            return
+        }
+
+
+        if (!isBuy) {
             history.push(
                 `/order?id=${data.course_id}`,
                 {
                     group: 1
                 }
             )
-        }else {
+        } else {
             this.setState({
                 modal: true
             })
         }
-        console.log(this.state);
     }
 
     render() {
-        const { data: { course_id, course_title, simpledescription, price0, price1 }, pdd_price, is_success, person_num, groupon_member, course_list } = this.state;
+        const {data: {course_id, course_title, simpledescription, price0, price1}, pdd_price, is_success, person_num, groupon_member, course_list} = this.state;
         const Info = (
             <div className="info">
                 <p className='title' onClick={() => this.toCourseDetail(course_id)}>
@@ -168,13 +161,15 @@ class ToGroup extends Component {
                     data={this.state}
                     invitedFriends={this.invitedFriends}
                     handleToGroup={this.handleToGroup}
+                    userInfo={this.props.user}
                 />
 
                 <WhiteSpace></WhiteSpace>
                 <div className="group-course">
                     <div className="top-title">
                         <span>本周特惠</span>
-                        <Link to={`/preferential`} className='more'>更多<i className='iconfont iconiconfront-70'></i></Link>
+                        <Link to={`/preferential`} className='more'>更多<i
+                            className='iconfont iconiconfront-70'></i></Link>
                     </div>
                     {
                         (course_list && course_list.length > 0) && (course_list[0].course && course_list[0].course.length > 0) && course_list[0].course.slice(0, 4).map(item => {
@@ -213,10 +208,10 @@ class ToGroup extends Component {
 
 function GorupContent(props) {
     let tip, btn, dec, groupTip, shareTip, groupSuccessMbc;
-    const { pdd_price, data, groupon_member, is_success, person_num, userInfo, share, number, countdown } = props.data;
-
-    let ary=[],num = number;
-    while(num != 0) {
+    const {pdd_price, data, groupon_member, is_success, person_num, share, number, countdown} = props.data;
+    const {userInfo} = props
+    let ary = [], num = number;
+    while (num != 0) {
         ary.push(num);
         num--;
     }
@@ -226,7 +221,7 @@ function GorupContent(props) {
                 groupon_member.map(item => {
                     return (
                         <div className='imgContainer' key={Math.random()}>
-                            <img className='imgname' src={item.avatar} alt='' />
+                            <img className='imgname' src={item.avatar} alt=''/>
                             {
                                 item.user_type === 1 ? (
                                     <div className='leaderFlag'>
@@ -250,21 +245,19 @@ function GorupContent(props) {
     </div>);
 
     if (groupon_member && groupon_member.length > 0) {
-        let uid = '';
         let flag = false;
-        groupon_member.map(item=>{
-            if(item.uid == userInfo.data.data.uid) {
-                // uid = `${item.uid}`;
+        !userInfo.hasError && groupon_member.map(item => {
+            if (item.uid == userInfo.data.uid) {
                 flag = true
             }
         })
 
-        if(flag) {
-            tip = <p className='tip'>{`拼团省￥${data.price1-pdd_price}元`}</p>
+        if (flag) {
+            tip = <p className='tip'>{`拼团省￥${data.price1 - pdd_price}元`}</p>
             btn = <span className='group-btn' onClick={props.invitedFriends}>邀请好友参团 {countdown} 后结束</span>
             dec = <p className='dec'>分享到3个群后，成团率高达98%</p>
         } else {
-            tip = <p className='tip'>{`拼团省￥${data.price1-pdd_price}元`}</p>
+            tip = <p className='tip'>{`拼团省￥${data.price1 - pdd_price}元`}</p>
             // btn = <Link to={{
             //     pathname: '/order',
             //     search: `?id=${data.course_id}`,