bug

src/components/detail/bargain/index.js

@@ -184,6 +184,7 @@ class Bargain extends Component {
 
     render() {
         const { list, outList, barInfo } = this.state;
+        console.log(barInfo)
         const {user} = this.props
         const uid = user && user.data && user.data.uid
         return (
@@ -192,7 +193,7 @@ class Bargain extends Component {
                 {/*bargain_status 砍价状态 0-砍价中，1砍价结束，待支付，2砍价过期（没有砍价记录没有砍价信息），3已购买*/}
                 {
                     (barInfo.bargain_status === 2 || !uid) &&
-                    <BargainIntro limitPeople={barInfo.limitPeople} iWantBargain={this.iWantBargain}/>
+                    <BargainIntro limitPeople={barInfo.limit_people} iWantBargain={this.iWantBargain}/>
                 }
                 {
                     (barInfo.bargain_status === 0 || barInfo.bargain_status === 1) &&
@@ -239,11 +240,11 @@ class Bargain extends Component {
 
 
                 {/*更多好友砍价*/}
-                <Ranking 
-                    list={list} 
-                    icon={this.state.kanjiaIcon} 
+                <Ranking
+                    list={list}
+                    icon={this.state.kanjiaIcon}
                     limitPeople={barInfo.limitPeople}
-                    isShowMore={this.state.isShowMore} 
+                    isShowMore={this.state.isShowMore}
                     boxHide={this.boxHide}
                 />
 

src/components/detail/group/togroup.js

@@ -61,7 +61,7 @@ class ToGroup extends Component {
                 wx.showMenuItems({
                     menuList: ['menuItem:share:appMessage' , 'menuItem:share:timeline'] // 要显示的菜单项，所有menu项见附录3
                   });
-                wx.updateAppMessageShareData({ 
+                wx.updateAppMessageShareData({
                     ...shareData,
                     success: function () {
                       // 设置成功
@@ -152,10 +152,10 @@ class ToGroup extends Component {
             <div className='to-group-box'>
                 <HeaderBar title='拼团' cart={false} toHref={() => this.toCourseDetail(course_id)}></HeaderBar>
                 {
-                    !is_success && 
-                    <VList 
-                        img={this.state.data.image_name} 
-                        id={this.state.data.course_id} 
+                    !is_success &&
+                    <VList
+                        img={this.state.data.image_name}
+                        id={this.state.data.course_id}
                         info={Info}
                         toDetail={this.toCourseDetail}
                     />
@@ -187,10 +187,10 @@ class ToGroup extends Component {
                             </div>
                             </div>
                             return (
-                                <VList 
-                                    img={item.image_name} 
-                                    key={item.uid} 
-                                    id={item.course_id} 
+                                <VList
+                                    img={item.image_name}
+                                    key={item.uid}
+                                    id={item.course_id}
                                     info={weekInfo}
                                     toDetail={this.toCourseDetail}
                                 />
@@ -261,7 +261,7 @@ function GorupContent(props) {
 
     if (is_success === 1) {
         tip = <p className='success'>拼团成功</p>
-        btn = <Link to={`/play`} className='tostudy'>去学习</Link>
+        btn = <Link to={`/detail?id=${data.course_id}`} className='tostudy'>去学习</Link>
     }
     return (
         <div className='gorup-content'>
@@ -269,7 +269,7 @@ function GorupContent(props) {
                 share ? (
                     <div className='groupSuccessMbc' onClick={props.invitedFriends}>
                         <div className='tipContent'>
-                            
+
                             {`还差${number}人，分享到3个群，成团率高达98%`}
                         </div>
                         <div className='tipArrow'>

src/components/myOrders/index.js

@@ -112,7 +112,7 @@ class MyOrders extends Component {
                                                                 <p className='order-content text-overflow-2'>{item.description}</p>
                                                                 <p className='order-des'>
                                                                 <span
-                                                                    className='order-newprice'>¥{item.pay_amount}</span>
+                                                                    className='order-newprice'>¥{item.amount}</span>
                                                                     <span
                                                                         className='order-price'>¥{item.price0}</span>
                                                                 </p>

src/components/study/freeCourses/free-courses.scss

@@ -3,6 +3,13 @@
     display: flex;
     flex-wrap: wrap;
     justify-content: space-between;
+    .course-base-item{
+        margin-top: 0;
+        margin-bottom: 15px;
+        img{
+            border-radius: 3px;
+        }
+    }
 
     .top {
         position: absolute;