Skip to content

M
mr-julyedu
Commit ad8e6188 by xuzhenghua
Options

Merge branch 'add-server' of gitlab.julyedu.com:baiguangyao/mr-julyedu into pre

parents fa7e1134 b6d72214
Showing with 61 additions and 63 deletions
src/components/Index/index.scss
......@@ -8,6 +8,8 @@
height: 44px;
background-color: $bg_fff;
padding: 10px 15px;
position: fixed;
z-index: 52;
.logo {
width: 78px;
......@@ -37,7 +39,7 @@
}
.index-swiper {
//margin-top: 7px;
margin-top: 44px;
height: 168px;
.swiper-container {
......
src/components/detail/index.js
......@@ -507,13 +507,13 @@ class Detail extends Component {
is_vip 1是属于vip赠的 0是不在vip范围内的
*/}
{
course_info.is_baoming === 1 && course_info.is_pay == 1 && course_info.contact_type == 1 &&
course_info.is_baoming === 1 && course_info.is_pay == 1 && course_info.contact_type == 1 && course_info.course_qq &&
<div className='group'>
上课QQ群：{course_info.course_qq}，加群请备注您的学号：{course_info.uid}
</div>
}
{
course_info.is_baoming === 1 && course_info.is_pay == 1 && course_info.contact_type == 2 &&
course_info.is_baoming === 1 && course_info.is_pay == 1 && course_info.contact_type == 2 && course_info.course_qq &&
<div className='group'>
请添加班主任微信：{course_info.course_qq}，添加时备注学号：{course_info.uid}
</div>
......@@ -522,14 +522,14 @@ class Detail extends Component {
{/*vip课程显示*/}
{
course_info.vip_range && course_info.is_vip == 1 && course_info.is_pay == 0 && course_info.contact_type == 1 &&
course_info.vip_range && course_info.is_vip == 1 && course_info.is_pay == 0 && course_info.contact_type == 1 && course_info.course_qq &&
<div className="vip">
<p>已开通年会员：{course_info.vip_range}</p>
<p>上课QQ群：{course_info.course_qq}，加群请备注您的学号：{course_info.uid}</p>
</div>
}
{
course_info.vip_range && course_info.is_vip == 1 && course_info.is_pay == 0 && course_info.contact_type == 2 &&
course_info.vip_range && course_info.is_vip == 1 && course_info.is_pay == 0 && course_info.contact_type == 2 && course_info.course_qq &&
<div className="vip">
<p>已开通年会员：{course_info.vip_range}</p>
<p>请添加班主任微信：{course_info.course_qq}，添加时备注学号：{course_info.uid}</p>
......
src/components/order/index.js
......@@ -76,16 +76,16 @@ function OrderList(props) {
}}}>
{/* <Link to='coupons' query={{id: course_id}} state={{from: '/order'}}> */}
<Flex justify='between'>
<span
style={{
color: '#333',
fontSize: '15px'
<span
style={{
color: '#333',
fontSize: '15px'
}}
>优惠券</span>
<span
style={{
fontSize: '14px',
color: '#999999'
<span
style={{
fontSize: '14px',
color: '#999999'
}}
>
{!coupon_desc ? (coupon_num === 0 ? '无' : `${coupon_num}张可用`) : (coupon_desc)}
......@@ -415,48 +415,48 @@ class Order extends Component {
<Flex>
<Flex.Item>
<HeaderBar title='课程报名' arrow={true} />
{
!this.state.perfect &&
<Link to={{
pathname: '/orderinfo',
state: {type: this.props.location.state ? this.props.location.state.type : null, id: getParam('id')}
}}
className="order-information">
<i className="iconfont iconiconfront-6 order-addsize" />
<div className="order-infotext">完善报名信息</div>
<i className="iconfont iconiconfront-70 order-next" />
</Link>
}
{
this.state.perfect &&
<div className="order-information2">
<WingBlank>
<Link to={{
pathname: '/orderinfo',
state: {
...this.state.perfect,
...this.props.location.state,
id: getParam('id')
}
}
} >
<Flex align='center' justify='between' style={{ height: '80px' }}>
<i className="iconfont iconiconfront-20 user-icon"></i>
{/*{*/}
{/*!this.state.perfect &&*/}
{/*<Link to={{*/}
{/*pathname: '/orderinfo',*/}
{/*state: {type: this.props.location.state ? this.props.location.state.type : null, id: getParam('id')}*/}
{/*}}*/}
{/*className="order-information">*/}
{/*<i className="iconfont iconiconfront-6 order-addsize" />*/}
{/*<div className="order-infotext">完善报名信息</div>*/}
{/*<i className="iconfont iconiconfront-70 order-next" />*/}
{/*</Link>*/}
{/*}*/}
{/*{*/}
{/*this.state.perfect &&*/}
{/*<div className="order-information2">*/}
{/*<WingBlank>*/}
{/*<Link to={{*/}
{/*pathname: '/orderinfo',*/}
{/*state: {*/}
{/*...this.state.perfect,*/}
{/*...this.props.location.state,*/}
{/*id: getParam('id')*/}
{/*}*/}
{/*}*/}
{/*} >*/}
{/*<Flex align='center' justify='between' style={{ height: '80px' }}>*/}
{/*<i className="iconfont iconiconfront-20 user-icon"></i>*/}
<Flex direction='column' justify='between' align='start' className="order-cell">
<div className="name">{`姓名：${perfect.real_name}`}</div>
<div>{`电话：${perfect.cellphone}`}</div>
</Flex>
{/*<Flex direction='column' justify='between' align='start' className="order-cell">*/}
{/*<div className="name">{`姓名：${perfect.real_name}`}</div>*/}
{/*<div>{`电话：${perfect.cellphone}`}</div>*/}
{/*</Flex>*/}
<Flex align='start' className="order-cell">
<div>{`QQ：${perfect.qq}`}</div>
</Flex>
{/*<Flex align='start' className="order-cell">*/}
{/*<div>{`QQ：${perfect.qq}`}</div>*/}
{/*</Flex>*/}
</Flex>
</Link>
</WingBlank>
</div>
}
{/*</Flex>*/}
{/*</Link>*/}
{/*</WingBlank>*/}
{/*</div>*/}
{/*}*/}
<div className="order-list">
<OrderList
list={orderList}
......
src/components/passport/accountLogin/index.js
......@@ -74,15 +74,11 @@ const formikConfig = {
const {props, props: {history}} = formikBag
props.accountLogin({
username, password
})/*.then(res => {
if (!res.hasError) {
let {from} = props.location.state || {from: {pathname: '/', search: ''}}
console.log(from, 'account');
history.replace({pathname: from.pathname, search: from.search || ''})
} else {
}).then(res => {
if (res.hasError) {
Toast.info(res.msg, 2, null, false)
}
})*/
})
}
}
......
src/components/purchased/index.js
......@@ -70,11 +70,11 @@ class Purchased extends Component {
<div className='des'>助教微信：{item.assist_weixin}</div>
}
{
!item.is_aist && item.contact_type == 1 &&
!item.is_aist && item.contact_type == 1 && item.course_qq &&
<div className='des'>QQ群：{item.course_qq}</div>
}
{
!item.is_aist && item.contact_type == 2 &&
!item.is_aist && item.contact_type == 2 && item.course_qq &&
<div className='des'>班主任微信：{item.course_qq}</div>
}
</div>
......
src/components/study/myCourses/index.js
......@@ -127,11 +127,11 @@ class MyCourses extends Component {
<div className='contact'>助教微信：{item.assist_weixin}</div>
}
{
!item.is_aist && item.contact_type == 1 &&
!item.is_aist && item.contact_type == 1 && item.course_qq &&
<div className='contact'>QQ群：{item.course_qq}</div>
}
{
!item.is_aist && item.contact_type == 2 &&
!item.is_aist && item.contact_type == 2 && item.course_qq &&
<div className='contact'>班主任微信：{item.course_qq}</div>
}
......
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