test

src/components/Index/index.js

@@ -330,12 +330,14 @@ function ScrollBox(props) {
                                     <div className="item-content">
                                         <h2 className="item-title">{item.live_title}</h2>
                                         <p className="item-teacher">讲师：{item.live_teacher_name}</p>
+
+                                        {/*公开课需预约、付费课不需要预约*/}
                                         {
-                                            item.is_prepare && item.live_status === 0 &&
+                                            ( item.is_prepare || item.is_free === 0) && item.live_status === 0 &&
                                             <p className="item-time">时间：{item.live_start_time}</p>
                                         }
                                         {
-                                            !item.is_prepare && item.live_status === 0 &&
+                                            !item.is_prepare && item.live_status === 0 && item.is_free === 1 &&
                                             <button className='item-btn'>预约</button>
                                         }
                                         {

src/components/Index/index.scss

@@ -504,7 +504,7 @@
         text-align: center;
         height: 47px;
 
-        button {
+        button,a {
           width: 60px;
           height: 27px;
           background-color: $bg_active;
@@ -517,6 +517,11 @@
           margin-left: -30px;
           bottom: 10px;
         }
+        a{
+          width: 90px;
+          line-height: 27px;
+          margin-left: -45px;
+        }
 
         span {
           width: 220px;

src/components/Index/liveRoom.js

@@ -2,6 +2,8 @@ import React, {Component} from 'react'
 import './index.scss'
 import {http, browser, validateTel} from '@/utils'
 import {Toast} from 'antd-mobile'
+import { Link } from "react-router-dom"
+
 
 class LiveRoom extends Component {
     constructor(props) {
@@ -214,10 +216,14 @@ class LiveRoom extends Component {
                             </div>
                             <div className='course-subscribe'>
                                 {
-                                    !roomMess.is_prepare && roomMess.course_id !== 0 &&
+                                    !roomMess.is_prepare && roomMess.is_free === 1 &&
                                     <button onClick={this.toSubscribeFun}>预约</button>
                                 }
                                 {
+                                    roomMess.is_free === 0 &&
+                                    <Link to={`/detail?id=${roomMess.course_id}`}>查看课程</Link>
+                                }
+                                {
                                     roomMess.is_prepare &&
                                     <span>直播尚未开始，敬请期待...</span>
                                 }

src/components/detail/group/togroup.js

@@ -207,6 +207,7 @@ 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) {
         ary.push(num);
@@ -252,11 +253,11 @@ function GorupContent(props) {
         })
 
         if(flag) {
-            tip = <p className='tip'>{`拼团省￥${pdd_price}元`}</p>
+            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'>{`拼团省￥${pdd_price}元`}</p>
+            tip = <p className='tip'>{`拼团省￥${data.price1-pdd_price}元`}</p>
             btn = <Link to={`/order?id=${data.course_id}`} className='group-btn'>一键参团</Link>
         }
     }