Skip to content

M
mr-julyedu
Commit 3ab39396 by wangshuo
Options

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

parents 7a741779 4a8bbd37
Showing with 1446 additions and 274 deletions
src/assets/css/variable.scss
...@@ -9,6 +9,7 @@ $redprice: #ff3131; ...@@ -9,6 +9,7 @@ $redprice: #ff3131;
$color_333: #333; $color_333: #333;
$color_555: #555; $color_555: #555;
$color_666: #666; $color_666: #666;
$color_888: #888;
$color_999: #999; $color_999: #999;
$color_606: #606060; $color_606: #606060;
$color_bbb: #BBB; $color_bbb: #BBB;
...@@ -19,7 +20,6 @@ $color_FF4000: #FF4000; ...@@ -19,7 +20,6 @@ $color_FF4000: #FF4000;
$color_FF0000: #FF0000; $color_FF0000: #FF0000;
/* /*
* @ 文字大小 * @ 文字大小
*/ */
...@@ -73,6 +73,7 @@ $bg_E02E24: #E02E24; ...@@ -73,6 +73,7 @@ $bg_E02E24: #E02E24;
$bg_007FD0: #007FD0; $bg_007FD0: #007FD0;
$bg_FF0000: #FF0000; $bg_FF0000: #FF0000;
$bg_FFF4CE: #FFF4CE; $bg_FFF4CE: #FFF4CE;
$bg_FAFAFA: #FAFAFA;
/* /*
...@@ -91,8 +92,6 @@ $border_f31: #f31; ...@@ -91,8 +92,6 @@ $border_f31: #f31;
$border_ccc: #ccc; $border_ccc: #ccc;
/* /*
* @ 标签颜色 * @ 标签颜色
*/ */
......
src/common/VList/index.js
...@@ -4,7 +4,7 @@ import {Link} from 'react-router-dom' ...@@ -4,7 +4,7 @@ import {Link} from 'react-router-dom'
const VList = (props) => { const VList = (props) => {
return ( return (
<li className='v-list-item' onClick={e=>props.handleClick(props.id)}> <li className='v-list-item'>
<div className="content"> <div className="content">
<div className="cover"> <div className="cover">
{props.status} {props.status}
......
src/components/Index/index.js
...@@ -7,7 +7,7 @@ import createStyle from './createStyle' ...@@ -7,7 +7,7 @@ import createStyle from './createStyle'
import LazyLoad from 'react-lazy-load' import LazyLoad from 'react-lazy-load'
import {http, api} from '@/utils' import {http, api} from '@/utils'
import LiveRoom from './liveRoom' import LiveRoom from './liveRoom'
import {Link} from "react-router-dom"; import {Link} from "react-router-dom"
import {Toast} from 'antd-mobile' import {Toast} from 'antd-mobile'
...@@ -22,7 +22,7 @@ class Index extends Component { ...@@ -22,7 +22,7 @@ class Index extends Component {
modules: [], modules: [],
isShow: false, isShow: false,
islive: false, islive: false,
roomId: '', roomMess: '',
tabdata: [ tabdata: [
{ {
'src': require('./image/freeclass_icon.png'), 'src': require('./image/freeclass_icon.png'),
...@@ -71,12 +71,17 @@ class Index extends Component { ...@@ -71,12 +71,17 @@ class Index extends Component {
// 点击近期直播课程弹出预约提示框 // 点击近期直播课程弹出预约提示框
liveCourse = (roomId) => { liveCourse = (item) => {
this.setState(status => ({ if (item.live_status === 0) {
isShow: true, this.setState({
islive: true, isShow: true,
roomId islive: true,
})) roomMess: item
})
} else {
window.location.href = `http://www-test.julyedu.com/live/m_room/${item.room_id}`
}
} }
// 自组件传给父组件的isshow // 自组件传给父组件的isshow
colseBox = (val) => { colseBox = (val) => {
...@@ -148,7 +153,7 @@ class Index extends Component { ...@@ -148,7 +153,7 @@ class Index extends Component {
{/* 直播间预约 */} {/* 直播间预约 */}
{ {
this.state.islive && this.state.islive &&
<LiveRoom isShow={this.state.isShow} colseBox={this.colseBox} roomId={this.state.roomId}></LiveRoom> <LiveRoom isShow={this.state.isShow} colseBox={this.colseBox} roomMess={this.state.roomMess}></LiveRoom>
} }
</div> </div>
...@@ -238,13 +243,26 @@ function ScrollBox(props) { ...@@ -238,13 +243,26 @@ function ScrollBox(props) {
{ {
props.livesList && props.livesList.length > 0 && props.livesList.map((item, index) => { props.livesList && props.livesList.length > 0 && props.livesList.map((item, index) => {
return ( return (
<li key={index} className='scroll-item' onClick={e => props.liveCourse(item.room_id)}> <li key={index} className='scroll-item'
onClick={e => props.liveCourse(item)}>
<div className='item-box'> <div className='item-box'>
{
item.live_status === 0 &&
<span className='no-start'>即将开始</span>
}
{
item.live_status === 1 &&
<span className='start'>正在直播</span>
}
<img className="item-img" src={item.live_img} alt=""/> <img className="item-img" src={item.live_img} alt=""/>
<div className="item-content"> <div className="item-content">
<h2 className="item-title">{item.live_title}</h2> <h2 className="item-title">{item.live_title}</h2>
<p className="item-teacher">讲师：{item.live_teacher_name}</p> <p className="item-teacher">讲师：{item.live_teacher_name}</p>
<p className="item-time">时间：{item.live_start_time}</p> <p className="item-time">时间：{item.live_start_time}</p>
{
item.live_status === 1 &&
<span>已预约</span>
}
</div> </div>
</div> </div>
</li> </li>
......
src/components/Index/index.scss
...@@ -131,6 +131,7 @@ ...@@ -131,6 +131,7 @@
} }
} }
} }
/* /*
近期直播 近期直播
*/ */
...@@ -172,6 +173,24 @@ ...@@ -172,6 +173,24 @@
height: 100%; height: 100%;
padding: 10px; padding: 10px;
display: flex; display: flex;
position: relative;
.no-start, .start {
display: inline-block;
position: absolute;
top: 15px;
padding: 3px 8px;
color: $white;
font-size: 12px;
text-align: center;
border-radius: 0 20px 20px 0;
}
.no-start{
background-color: $red;
}
.start{
background-color: $bg_active;
}
.item-img { .item-img {
width: 100px; width: 100px;
...@@ -536,11 +555,11 @@ ...@@ -536,11 +555,11 @@
} }
.follow { .follow {
margin-top: 15px; margin-top: 20px;
} }
.nofollow { .nofollow {
margin-top: 20px; margin-top: 15px;
} }
.tips { .tips {
...@@ -668,6 +687,7 @@ ...@@ -668,6 +687,7 @@
// // background-image: none; // // background-image: none;
// //} // //}
} }
.borderTop { .borderTop {
width: 100%; width: 100%;
height: 8px; height: 8px;
......
src/components/classify/courselist.js
...@@ -70,10 +70,6 @@ class Classify extends Component { ...@@ -70,10 +70,6 @@ class Classify extends Component {
}) })
} }
// 点击课程
handleClick = (courseId) => {
console.log(courseId)
}
// 点击横向滚动tab查询 // 点击横向滚动tab查询
ontabclick = (tab) => { ontabclick = (tab) => {
...@@ -161,7 +157,7 @@ class Classify extends Component { ...@@ -161,7 +157,7 @@ class Classify extends Component {
</div> </div>
) )
return ( return (
<VList handleClick={this.handleClick} key={index} status={status} <VList key={index} status={status}
img={item.image_name} id={item.course_id} img={item.image_name} id={item.course_id}
info={Info}></VList> info={Info}></VList>
) )
......
src/components/classify/index.scss
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
width: 30.5%; width: 30.5%;
height: 76px; height: 76px;
margin-top: 10px; margin-top: 10px;
margin-right: 13px;
img { img {
width: 100%; width: 100%;
height: 100%; height: 100%;
......
src/components/coupons/Coupon/index.js
...@@ -5,8 +5,8 @@ import classnames from 'classnames' ...@@ -5,8 +5,8 @@ import classnames from 'classnames'
class Coupon extends PureComponent { class Coupon extends PureComponent {
pick = () => { pick = () => {
let {select, invalid} = this.props let {useCoupon, invalid} = this.props
!invalid && select && select(this.props.id) !invalid && useCoupon && useCoupon(this.props.id)
} }
GoToUse = () => { GoToUse = () => {
...@@ -22,7 +22,8 @@ class Coupon extends PureComponent { ...@@ -22,7 +22,8 @@ class Coupon extends PureComponent {
invalid, invalid,
course_title, course_title,
id, id,
selectedCouponId selectedCouponId,
showUseButton
} = this.props } = this.props
return ( return (
...@@ -55,6 +56,7 @@ class Coupon extends PureComponent { ...@@ -55,6 +56,7 @@ class Coupon extends PureComponent {
limit_course === 0 ? '可用于大于代金券金额的课程' : `仅适用于《${course_title}》` limit_course === 0 ? '可用于大于代金券金额的课程' : `仅适用于《${course_title}》`
}</span> }</span>
{ {
showUseButton &&
<button <button
className='use' className='use'
onClick={this.GoToUse} onClick={this.GoToUse}
......
src/components/coupons/Input/index.js
...@@ -4,24 +4,7 @@ import './input.scss' ...@@ -4,24 +4,7 @@ import './input.scss'
import classnames from 'classnames' import classnames from 'classnames'
class Input extends Component { class Input extends Component {
constructor(props) {
super(props)
this.state = {
value: ''
}
}
handleChange = (e) => {
this.setState({
value: e.target.value
})
this.props.onChange(e.target.value)
}
clearInput = () => { clearInput = () => {
this.setState({
value: ''
})
this.props.onChange('') this.props.onChange('')
} }
...@@ -33,15 +16,15 @@ class Input extends Component { ...@@ -33,15 +16,15 @@ class Input extends Component {
type={type} type={type}
className={classnames('custom-input')} className={classnames('custom-input')}
placeholder={placeholder} placeholder={placeholder}
onChange={this.handleChange} onChange={this.props.onChange}
value={this.state.value} value={this.props.value}
/> />
<i <i
className={classnames('iconfont icondanseshixintubiao-3', { className={classnames('iconfont icondanseshixintubiao-3', {
hide: this.state.value.length === 0 hide: this.props.value.length === 0
})} })}
onClick={this.clearInput} onClick={this.clearInput}
></i> />
</div> </div>
); );
} }
......
src/components/coupons/ExchangeBar/exchange-bar.scss → src/components/coupons/RedeemBar/exchange-bar.scss
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
width: 100%; width: 100%;
padding: 10px 12px; padding: 10px 12px;
border-bottom: 1px solid $border_e7eaf1; border-bottom: 1px solid $border_e7eaf1;
position: fixed; position: absolute;
top: 0; top: 44px;
left: 0; left: 0;
z-index: 10; z-index: 10;
background: $white; background: $white;
......
src/components/coupons/ExchangeBar/index.js → src/components/coupons/RedeemBar/index.js
...@@ -3,19 +3,20 @@ import './exchange-bar.scss' ...@@ -3,19 +3,20 @@ import './exchange-bar.scss'
import Input from '../Input' import Input from '../Input'
import classnames from 'classnames' import classnames from 'classnames'
class ExchangeBar extends Component { class RedeemBar extends Component {
state = {} state = {}
render() { render() {
const {onChange, exchangeCode, exchange} = this.props const {onChange, redeemCode, exchange} = this.props
return ( return (
<div className="exchange-bar"> <div className="exchange-bar">
<Input <Input
placeholder={'请输入优惠码'} placeholder={'请输入优惠码'}
onChange={onChange} onChange={onChange}
value={redeemCode}
/> />
<button className={classnames({ <button className={classnames({
active: exchangeCode && exchangeCode.length > 0 active: redeemCode && redeemCode.length > 0
})} onClick={exchange}>兑换 })} onClick={exchange}>兑换
</button> </button>
</div> </div>
...@@ -23,4 +24,4 @@ class ExchangeBar extends Component { ...@@ -23,4 +24,4 @@ class ExchangeBar extends Component {
} }
} }
export default ExchangeBar; export default RedeemBar;
\ No newline at end of file \ No newline at end of file
src/components/coupons/index.js
import React, { PureComponent } from 'react'; import React, { PureComponent } from 'react';
import './coupons.scss' import './coupons.scss'
import ExchangeaBar from "./ExchangeBar"; import RedeemBar from "./RedeemBar";
import Coupon from './Coupon' import Coupon from './Coupon'
import { http, api } from '@/utils' import { http, api, getParam } from '@/utils'
import { WithFullSize } from '@/HOCs' import { WithFullSize } from '@/HOCs'
import { Toast } from 'antd-mobile' import { Toast } from 'antd-mobile'
import { isEmpty } from 'lodash'
import { HeaderBar } from "@/common";
class UseCoupon extends PureComponent { class UseCoupon extends PureComponent {
state = { state = {
selectedCouponId: 0, selectedCouponId: 0,
exchangeCode: '', redeemCode: '',
couponList: [], couponList: [],
valid_coupons: [], valid_coupons: [],
invalid_coupons: [], invalid_coupons: [],
courseId: 139, courseId: getParam('id'),
showUseButton: false
} }
componentDidMount() { componentDidMount() {
const {history, location} = this.props
if (!this.state.courseId) {
location.state && location.state.from ? history.replace(location.state.from) : history.goBack()
}
const {state} = this.props.location const {state} = this.props.location
if (state && state.from) { if (state && state.from) {
switch (state.from) { switch (state.from) {
case '/my' : case '/my' :
this.getMyCoupons(); this.getMyCoupons();
this.setState({
showUseButton: true
})
break; break;
default: default:
this.getAllCoupons(); this.getAllCoupons();
...@@ -34,27 +44,47 @@ class UseCoupon extends PureComponent { ...@@ -34,27 +44,47 @@ class UseCoupon extends PureComponent {
} }
} }
select = val => { handleChange = e => {
this.setState({ let value = e ? e.target.value : ''
selectedCouponId: val === this.state.selectedCouponId ? 0 : val this.setState({redeemCode: value})
})
}
handleChange = val => {
this.setState({exchangeCode: val})
} }
exchange = () => { exchange = () => {
if (this.state.exchangeCode !== '') { if (this.state.redeemCode !== '') {
http.post(`${api.home}/m/coupon/exchange`, { http.post(`${api.home}/m/coupon/exchange`, {
code: this.state.exchangeCode code: this.state.redeemCode
}) })
.then(res => { .then(res => {
const data = res.data const data = res.data
if (data.code === 200) { if (data.code === 200) {
this.setState({
couponList: [data.data, ...this.state.couponList] const coupon = data.data
})
if (this.state.showUseButton) {
this.setState({
couponList: [...state.couponList, coupon],
redeemCode: ''
})
} else {
const coupon = data.data
if (coupon['ctype'] == 2
&& coupon['limit_course'] != this.state.courseId) {
this.setState({
invalid_coupons: [...this.state.invalid_coupons, coupon],
showUseButton: null
});
} else {
this.setState({
valid_coupons: [...this.state.valid_coupons, coupon],
redeemCode: ''
})
}
}
Toast.info('兑换成功') Toast.info('兑换成功')
} else { } else {
Toast.info(data.msg) Toast.info(data.msg)
...@@ -71,7 +101,7 @@ class UseCoupon extends PureComponent { ...@@ -71,7 +101,7 @@ class UseCoupon extends PureComponent {
const data = res.data const data = res.data
if (data.code === 200) { if (data.code === 200) {
this.setState({ this.setState({
couponList: data.data couponList: isEmpty(data.data) ? [] : data.data
}) })
} else { } else {
Toast.info(data.msg) Toast.info(data.msg)
...@@ -85,14 +115,15 @@ class UseCoupon extends PureComponent { ...@@ -85,14 +115,15 @@ class UseCoupon extends PureComponent {
const data = res.data const data = res.data
if (data.code === 200) { if (data.code === 200) {
const inuse_coupon = data.data.inuse_coupon; const inuse_coupon = data.data['inuse_coupon'];
this.setState({ this.setState({
valid_coupons: inuse_coupon valid_coupons: inuse_coupon
? [...inuse_coupon, ...data.data.valid_coupons] ? [...inuse_coupon, ...data.data.valid_coupons]
: data.data.valid_coupons, : data.data.valid_coupons,
invalid_coupons: data.data.invalid_coupons, invalid_coupons: data.data.invalid_coupons,
selectedCouponId: inuse_coupon ? inuse_coupon[0].id : 0 selectedCouponId: inuse_coupon.length ? inuse_coupon[0].id : 0
}) })
} else { } else {
...@@ -101,31 +132,83 @@ class UseCoupon extends PureComponent { ...@@ -101,31 +132,83 @@ class UseCoupon extends PureComponent {
}) })
} }
useCoupon = (val) => { useCoupon = val => {
const {history} = this.props
const coupon = this.state.couponList.find(item => item.id === val)
if (val) { if (val) {
http.post(`${api.home}/m/coupon/use`, { if (this.state.showUseButton) {
course_id: this.state.courseId,
coupon_id: val
})
.then(res => {
const data = res && res.data
if (data.code === 200) {
if (coupon['ctype'] === 1) {
history.push(`/classify`)
} else {
history.push(`/detail?id=${coupon['limit_course']}`)
}
} else { } else {
Toast.info(data.msg)
} const {courseId, selectedCouponId} = this.state
})
if (selectedCouponId === val) {
http.post(`${api.home}/m/coupon/cancel`, {
course_id: courseId
}).then(res => {
const data = res.data
if (data.code === 200) {
this.setState({
selectedCouponId: 0
})
} else {
Toast.info(data.msg)
}
})
} else {
http.post(`${api.home}/m/coupon/use`, {
course_id: this.state.courseId,
coupon_id: val
})
.then(res => {
const data = res && res.data
if (data.code === 200) {
this.setState({selectedCouponId: val})
this.props.history.goBack()
} else {
Toast.info(data.msg)
}
})
}
}
} else {
Toast.info('未知错误')
location.reload()
} }
} }
render() { render() {
const {state} = this.props.location const {state} = this.props.location
const {showUseButton, selectedCouponId} = this.state
return ( return (
<div className='use-coupon'> <div className='use-coupon'>
<ExchangeaBar onChange={this.handleChange} <HeaderBar title='优惠券' arrow={true}/>
exchange={this.exchange} <RedeemBar onChange={this.handleChange}
exchangeCode={this.state.exchangeCode}/> exchange={this.exchange}
redeemCode={this.state.redeemCode}/>
<div className="coupons-area"> <div className="coupons-area">
<Content <Content
coupons={ coupons={
...@@ -135,9 +218,8 @@ class UseCoupon extends PureComponent { ...@@ -135,9 +218,8 @@ class UseCoupon extends PureComponent {
? this.state.couponList ? this.state.couponList
: this.state.valid_coupons : this.state.valid_coupons
} }
showUseButton={false} showUseButton={showUseButton}
selected={this.state.selected} selectedCouponId={selectedCouponId}
selectedCouponId={this.state.selectedCouponId}
select={this.select} select={this.select}
useCoupon={this.useCoupon} useCoupon={this.useCoupon}
/> />
...@@ -148,7 +230,7 @@ class UseCoupon extends PureComponent { ...@@ -148,7 +230,7 @@ class UseCoupon extends PureComponent {
<div className='invalid-title'>- 不可使用的优惠券 -</div> <div className='invalid-title'>- 不可使用的优惠券 -</div>
<Content <Content
coupons={this.state.invalid_coupons} coupons={this.state.invalid_coupons}
selectedCouponId={this.state.selectedCouponId} selectedCouponId={selectedCouponId}
select={this.select} select={this.select}
purpose={'use'} purpose={'use'}
invalid={'invalid'} invalid={'invalid'}
......
src/components/detail/bargain/bargain.scss
.bargain { .bargain-func {
padding: 8px; padding: 8px;
border-top: 8px solid $bg_f5f5f5; border-top: 8px solid $bg_f5f5f5;
......
src/components/detail/bargain/index.js
...@@ -14,7 +14,7 @@ class Bargain extends Component { ...@@ -14,7 +14,7 @@ class Bargain extends Component {
render() { render() {
return ( return (
<div className={'bargain'}> <div className={'bargain-func'}>
<BargainIntro <BargainIntro
onClick={this.toggleCover} onClick={this.toggleCover}
/> />
......
src/components/detail/btnstatus/index.js
...@@ -35,7 +35,7 @@ class BtnStatus extends Component { ...@@ -35,7 +35,7 @@ class BtnStatus extends Component {
render() { render() {
let info = '' let info = ''
if (this.props.data.course_info) { if (this.props.data && this.props.data.course_info) {
info = this.props.data.course_info info = this.props.data.course_info
} }
return ( return (
...@@ -43,7 +43,7 @@ class BtnStatus extends Component { ...@@ -43,7 +43,7 @@ class BtnStatus extends Component {
<div> <div>
{/*正常购买*/} {/*正常购买*/}
{ {
info.is_baoming === 0 && info.is_baoming === 0 && info.group_status !== 3 &&
<div className='btns-box'> <div className='btns-box'>
<a className='consult consult-s' href="https://q.url.cn/AB8aue?_type=wpa&qidian=true"> <a className='consult consult-s' href="https://q.url.cn/AB8aue?_type=wpa&qidian=true">
<i className='iconfont iconerji'></i> <i className='iconfont iconerji'></i>
...@@ -75,7 +75,7 @@ class BtnStatus extends Component { ...@@ -75,7 +75,7 @@ class BtnStatus extends Component {
} }
{/*拼团 未开团*/} {/*拼团 未开团*/}
{ {
this.props.status === 2 && this.state.isbuy === 0 && info.is_baoming === 0 && info.group_status === 4&&
<div className='btns-box'> <div className='btns-box'>
<a className='consult consult-s' href="https://q.url.cn/AB8aue?_type=wpa&qidian=true"> <a className='consult consult-s' href="https://q.url.cn/AB8aue?_type=wpa&qidian=true">
<i className='iconfont iconerji'></i> <i className='iconfont iconerji'></i>
...@@ -93,15 +93,15 @@ class BtnStatus extends Component { ...@@ -93,15 +93,15 @@ class BtnStatus extends Component {
} }
{/*拼团 已开团*/} {/*拼团 已开团*/}
{ {
this.props.status === 2 && this.state.isbuy === 1 && info.is_baoming === 0 && info.group_status === 3 &&
<div className='btns-box'> <div className='btns-box'>
<a className='consult consult-s' href="https://q.url.cn/AB8aue?_type=wpa&qidian=true"> <a className='consult consult-s' href="https://q.url.cn/AB8aue?_type=wpa&qidian=true">
<i className='iconfont iconerji'></i> <i className='iconfont iconerji'></i>
<span>课程咨询</span> <span>课程咨询</span>
</a> </a>
<button className='btn btn-l bg-E02E24'> <Link to={`/togroup`} className='btn btn-l bg-E02E24'>
邀请好友参团 23:32:23 后结束 邀请好友参团 23:32:23 后结束
</button> </Link>
</div> </div>
} }
......
src/components/detail/btnstatus/index.scss
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
border-top: 1px solid $sp_e7eaf1; border-top: 1px solid $sp_e7eaf1;
z-index: 3;
.consult { .consult {
display: inline-block; display: inline-block;
......
src/components/detail/group/index.js 0 → 100644
import React, {Component} from 'react'
import './index.scss'
import {getParam} from "@/utils"
import {connect} from "react-redux"
import {Link} from "react-router-dom"
class Group extends Component {
constructor(props) {
super(props)
this.state = {
isShowMore: false
}
}
// 查看更多
getMore = () => {
this.setState({
isShowMore: true
})
}
// 关闭更多窗口
closeMore = () => {
this.setState({
isShowMore: false
})
}
render() {
let groupInfo = ''
if (this.props.courseInfo && this.props.courseInfo.courseInfo && this.props.courseInfo.courseInfo.course_info) {
groupInfo = this.props.courseInfo.courseInfo.course_info.pdd_group_info
}
return (
<div className='group-box'>
<div className="group-title">
<span>{groupInfo.now_groupon_total}人正在开团，可直接参与</span>
<span className='more' onClick={this.getMore}>
查看更多
<i className='iconfont iconiconfront-70'></i>
</span>
</div>
<ul className="group-list">
{
groupInfo.now_groupon_list && groupInfo.now_groupon_list.length > 0 && groupInfo.now_groupon_list.map((item, index) => {
return (
<li key={index} className='group-item'>
<img className='avatar' src={item.avatar} alt=""/>
<div className='user-name text-overflow-one'>
{item.user_name}
</div>
<div className='group-status'>
<p>还差<span className='red'>{item.number}人</span>拼成</p>
<p>剩余 {item.end_time}</p>
</div>
<Link to={`/order?id=${getParam('id')}&&groupon_code=${item.pdd_order_id}`}
className='topay'>去参团</Link>
</li>
)
})
}
</ul>
<div className="group-dec">
<span>
<i className='iconfont iconiconfront-1'></i>
·好友参团 ·人满成交 ·人不满退款
</span>
<span className='allNum'>累计856人成团</span>
</div>
{/*更多*/}
{
this.state.isShowMore &&
<div className="moreMbc">
<div className="content">
<div className="title-box">
正在拼团
</div>
<ul className='more-group-list'>
{
groupInfo.now_groupon_list && groupInfo.now_groupon_list.length > 0 && groupInfo.now_groupon_list.map((item, index) => {
return (
<li key={index} className='group-item'>
<img className='avatar' src={item.avatar} alt=""/>
<div className='user-name'>
<p className='name text-overflow-one'>{item.user_name}</p>
<p className='time'>剩余 {item.end_time}</p>
</div>
<p className='group-status'>还差{item.number}人</p>
<Link
to={`/order?id=${getParam('id')}&&groupon_code=${item.pdd_order_id}`}
className='topay'>去参团</Link>
</li>
)
})
}
</ul>
<div className='more-group-dec'>
仅显示10个正在开团的人
</div>
</div>
<i onClick={this.closeMore} className={'iconfont iconiconfront-2 close'}></i>
</div>
}
</div>
)
}
}
export default connect(
state => ({courseInfo: state}),
null
)(Group)
src/components/detail/group/index.scss 0 → 100644
.group-box {
border-top: 8px solid $bg_f5f5f5;
.group-title {
height: 40px;
line-height: 40px;
font-size: 14px;
padding: 0 12px;
display: flex;
justify-content: space-between;
color: $color_333;
.more {
color: $color_888;
i {
width: 12px;
height: 7px;
}
}
}
.group-list {
width: 100%;
border-top: 1px solid $sp_e7eaf1;
padding: 0 12px;
.group-item {
border-bottom: 1px solid $sp_e7eaf1;
height: 60px;
display: flex;
position: relative;
.avatar {
width: 44px;
height: 44px;
border-radius: 50%;
margin-top: 8px;
margin-right: 6px;
}
.user-name {
font-size: 16px;
color: $color_333;
max-width: 104px;
line-height: 60px;
}
.group-status {
line-height: 15px;
font-size: 12px;
position: absolute;
right: 72px;
p:nth-child(1) {
margin-top: 17px;
.red {
color: $red;
}
}
}
.topay {
width: 62px;
height: 28px;
border-radius: 5px;
background-color: $bg_E02E24;
color: $white;
font-size: 14px;
line-height: 28px;
text-align: center;
margin-top: 16px;
position: absolute;
right: 0;
}
}
}
.group-dec {
background-color: $bg_FAFAFA;
width: 100%;
padding: 0 12px;
height: 30px;
line-height: 30px;
font-size: 12px;
display: flex;
justify-content: space-between;
color: $color_999;
.allNum {
color: $color_333;
}
}
.moreMbc {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: rgba(0, 0, 0, .6);
z-index: 2;
.content {
width: 300px;
height: 388px;
background-color: $white;
border-radius: 3px;
margin: 139px auto 20px auto;
position: relative;
.title-box {
width: 100%;
height: 44px;
text-align: center;
color: $color_333;
font-size: 16px;
line-height: 44px;
}
.more-group-list {
width: 100%;
height: 302px;
overflow: auto;
border-top: 1px solid $sp_e7eaf1;
padding: 0 15px;
background-color: $bg_f5f5f5;
.group-item {
border-bottom: 1px solid $sp_e7eaf1;
height: 60px;
display: flex;
position: relative;
.avatar {
width: 44px;
height: 44px;
border-radius: 50%;
margin-top: 8px;
margin-right: 10px;
}
.user-name {
font-size: 12px;
color: $color_333;
max-width: 90px;
line-height: 15px;
.name {
margin-top: 16px;
}
.time{
color: $color_999;
}
}
.group-status {
line-height: 60px;
color: $color_666;
position: absolute;
right: 66px;
}
.topay {
width: 56px;
height: 26px;
border-radius: 5px;
background-color: $bg_E02E24;
color: $white;
font-size: 14px;
line-height: 26px;
text-align: center;
margin-top: 17px;
position: absolute;
right: 0;
}
}
}
}
.more-group-dec {
width: 100%;
position: absolute;
bottom: 0;
height: 42px;
font-size: 12px;
color: $color_999;
text-align: center;
line-height: 42px;
}
.close {
color: #fff;
font-size: 22px;
position: relative;
left: 50%;
margin-left: -11px;
}
}
}
\ No newline at end of file
src/components/detail/group/togroup.js 0 → 100644
import React, {Component} from 'react'
import './togroup.scss'
import {HeaderBar} from '../../../common'
import {VList} from '../../../common'
import {getParam} from "@/utils"
import {connect} from "react-redux"
import {Link} from "react-router-dom"
class ToGroup extends Component {
constructor(props) {
super(props)
this.state = {
data: {
'course_id': '140',
'course_title': '课程标题课程标题课程标题课程标题课程标题课程标题课程标题课程标题',
'simpledescription': '课程标题课程标题课程标题课程标题课程标题课程标题课程标题课程标题课程标题课程标题课程标题课程标题课程标题课程标题课程标题课程标题',
'image_name': 'https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/6479fe123a.jpg',
'price0': '140',
'price1': '140',
'success': false, // 拼团成功
'my': 0, // 0 自己发起的邀请好友 1 别人发起的，参别人的团
}
}
}
render() {
const Info = (
<div className="info">
<p className='title'>
<Link to={`/detail?id=${this.state.data.course_id}`}>
{this.state.data.course_title}
</Link>
</p>
<p className='contact text-overflow-2'>{this.state.data.simpledescription}</p>
<div className='des'>
<p className="course-price">
<span className="new">¥{this.state.data.price1}</span>
<span className="old">¥{this.state.data.price0}</span>
</p>
</div>
</div>
)
return (
<div className='to-group-box'>
<HeaderBar title='拼团' arrow={true} cart={false}></HeaderBar>
<VList img={this.state.data.image_name} id={this.state.data.course_id} info={Info}></VList>
<GorupContent data={this.state.data}/>
<div className="group-course">
<div className="top-title">
<span>本周特惠</span>
<Link to={`/preferential`} className='more'>更多<i className='iconfont iconiconfront-70'></i></Link>
</div>
<VList img={this.state.data.image_name} id={this.state.data.course_id} info={Info}></VList>
</div>
</div>
)
}
}
function GorupContent(props) {
console.log(props)
let tip, btn, dec
if (props.data.my === 0) {
tip = <p className='tip'>拼团省500元</p>
btn = <Link to={`/`} className='group-btn'>邀请好友参团 23：23：23 后结束</Link>
dec = <p className='dec'>分享到3个群后，成团率高达98%</p>
} else {
tip = <p className='tip'>拼团省500元</p>
btn = <Link to={`/`} className='group-btn'>一键参团</Link>
}
if (props.data.success) {
tip = <p className='success'>拼团成功</p>
btn = <Link to={`/play`} className='tostudy'>去学习</Link>
}
return (
<div className='gorup-content'>
{tip}
<img className='imgname' src={props.data.image_name} alt=""/>
<img className='imgname' src={props.data.image_name} alt=""/>
<img className='imgname' src={props.data.image_name} alt=""/>
{btn}
{dec}
{
!props.data.success &&
<div className="group-dec">
<span>
<i className='iconfont iconiconfront-1'></i>
·好友参团 ·人满成交 ·人不满退款
</span>
<span className='allNum'>累计856人成团</span>
</div>
}
</div>
)
}
export default ToGroup
src/components/detail/group/togroup.scss 0 → 100644
.to-group-box {
.v-list-item {
margin-top: 5px;
.content {
border-bottom: 1px solid #e7eaf1;
.cover {
flex: inherit;
width: 42.2%;
img {
width: 100%;
}
}
}
.info {
width: 52.3%;
position: relative;
display: block;
.title {
font-size: 16px;
color: $color_333;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
height: 16px;
line-height: 16px;
}
.contact {
font-size: 14px;
color: $color_666;
margin-top: 14px;
}
.des {
position: absolute;
bottom: 0;
.course-price {
.price {
color: $red;
font-size: 12px;
}
.new {
color: $red;
font-size: 16px;
}
.old {
color: $color_999;
font-size: 12px;
display: inline-block;
margin-left: 15px;
text-decoration: line-through;
}
}
}
}
}
.gorup-content {
padding: 20px;
text-align: center;
.imgname {
width: 44px;
height: 44px;
border-radius: 50%;
margin: 20px 20px 0 20px;
}
:nth-child(1) {
margin-left: 0;
}
.tip {
color: $bg_E02E24;
font-size: 16px;
}
.success {
color: $active;
font-size: 16px;
}
.group-btn, .tostudy {
display: inline-block;
width: 335px;
height: 44px;
border-radius: 5px;
background-color: $bg_E02E24;
font-size: 16px;
color: $white;
text-align: center;
line-height: 44px;
margin-top: 20px;
}
.tostudy {
background-color: $bg_active;
margin-top: 30px;
}
.dec {
font-size: 12px;
margin-top: 10px;
color: $color_666;
}
.group-dec {
background-color: $bg_FAFAFA;
width: 100%;
padding: 0 12px;
height: 30px;
line-height: 30px;
font-size: 12px;
display: flex;
justify-content: space-between;
color: $color_999;
margin-top: 15px;
.allNum {
color: $color_333;
}
}
}
.group-course {
.top-title {
height: 40px;
line-height: 40px;
font-size: 14px;
padding: 0 12px;
display: flex;
justify-content: space-between;
color: $color_333;
.more {
color: $active;
i {
width: 12px;
height: 7px;
}
}
}
}
}
\ No newline at end of file
src/components/detail/index.js
import React, {Component} from 'react' import React, {Component} from 'react'
import './index.scss' import './index.scss'
import Bargain from './bargain' import Bargain from './bargain'
import Group from './group'
import OutLine from './outline' import OutLine from './outline'
import {HeaderBar, ToApp} from '../../common' import {HeaderBar, ToApp} from '../../common'
import ShareRank from "./shareRank" import ShareRank from "./shareRank"
...@@ -51,17 +52,12 @@ class Detail extends Component { ...@@ -51,17 +52,12 @@ class Detail extends Component {
})); }));
} }
// 打开分销排行榜弹窗
openRanking = () => {
this.setState(status => ({
shareRank: true
}));
}
// 自组件传给父组件的boxHide // 自组件传给父组件的boxHide
boxHide = (val) => { boxHide = (val) => {
this.setState({auditionBox: val, singleBox: val, shareRank: val}) this.setState({auditionBox: val, singleBox: val})
} }
render() { render() {
...@@ -138,10 +134,16 @@ class Detail extends Component { ...@@ -138,10 +134,16 @@ class Detail extends Component {
{/*分享赚钱*/} {/*分享赚钱*/}
{ {
courseInfo.is_dist && courseInfo.is_dist &&
<ShareRank data={this.props.courseInfo} shareRank={this.state.shareRank} <ShareRank/>
openRanking={this.openRanking} boxHide={this.boxHide}/>
} }
{/*拼团*/}
{
courseInfo.group_status === 3 &&
<Group/>
}
{/*砍价*/} {/*砍价*/}
<Bargain/> <Bargain/>
......
src/components/detail/shareRank/index.js
import React, {Component} from 'react' import React, {Component} from 'react'
import './index.scss' import './index.scss'
import {api, getParam, http} from "@/utils" import {api, getParam, http} from "@/utils"
import {withRouter} from "react-router-dom"
import {Toast} from 'antd-mobile' import {Toast} from 'antd-mobile'
import {connect} from "react-redux"
import {withRouter} from 'react-router-dom'
import {compose} from "redux"
class ShareRank extends Component { class ShareRank extends Component {
...@@ -11,7 +13,8 @@ class ShareRank extends Component { ...@@ -11,7 +13,8 @@ class ShareRank extends Component {
this.state = { this.state = {
list: '', list: '',
rankingslice: '', rankingslice: '',
code: '' code: '',
shareRank: false
} }
} }
...@@ -21,8 +24,7 @@ class ShareRank extends Component { ...@@ -21,8 +24,7 @@ class ShareRank extends Component {
if (res.data.code === 200) { if (res.data.code === 200) {
this.setState({ this.setState({
list: res.data.data, list: res.data.data,
rankingslice: res.data.data.slice(0, 2), rankingslice: res.data.data.slice(0, 2)
courseInfo: this.props.data.course_info
}) })
} else { } else {
Toast.info(res.data.msg, 2) Toast.info(res.data.msg, 2)
...@@ -43,28 +45,38 @@ class ShareRank extends Component { ...@@ -43,28 +45,38 @@ class ShareRank extends Component {
}) })
} }
share = () => { share = (info) => {
const courseId = getParam('id') const courseId = getParam('id')
const dist_first = this.state.courseInfo.dist_first_level_ti const dist_first = info.dist_first_level_ti
const uid = this.state.courseInfo.uid const uid = info.uid
const dist_code = this.state.code const dist_code = this.state.code
this.props.history.push(`/shareposter?courseId=${courseId}&dist_first=${dist_first}&uid=${uid}&dist_code=${dist_code}`) this.props.history.push(`/shareposter?courseId=${courseId}&dist_first=${dist_first}&uid=${uid}&dist_code=${dist_code}`)
} }
// 打开分销排行榜弹窗
openRanking = () => {
this.setState({
shareRank: true
})
}
// 关闭弹窗 // 关闭弹窗
colse = () => { colse = () => {
this.props.boxHide(false) this.setState({
shareRank: false
})
} }
render() { render() {
let info = '' let info = ''
if (this.props.data.course_info) { if (this.props.courseInfo && this.props.courseInfo.courseInfo && this.props.courseInfo.courseInfo.course_info) {
info = this.props.data.course_info info = this.props.courseInfo.courseInfo.course_info
} }
return ( return (
<div className='share-ranking'> <div className='share-ranking'>
<span className="title">排行榜：</span> <span className="title">排行榜：</span>
<div className='ranking-box' onClick={this.props.openRanking}> <div className='ranking-box' onClick={this.openRanking}>
{ {
this.state.rankingslice && this.state.rankingslice.length > 0 && this.state.rankingslice.map((item, index) => { this.state.rankingslice && this.state.rankingslice.length > 0 && this.state.rankingslice.map((item, index) => {
return ( return (
...@@ -79,10 +91,10 @@ class ShareRank extends Component { ...@@ -79,10 +91,10 @@ class ShareRank extends Component {
<img className="ranking-ellipsis" <img className="ranking-ellipsis"
src="https://julyedu-img.oss-cn-beijing.aliyuncs.com/Image/train/ellipsis.png" alt=""/> src="https://julyedu-img.oss-cn-beijing.aliyuncs.com/Image/train/ellipsis.png" alt=""/>
</div> </div>
<button className="share" onClick={this.share}>分享赚{info.dist_first_level_ti}元</button> <button className="share" onClick={this.share.bind(this,info)}>分享赚{info.dist_first_level_ti}元</button>
{ {
this.props.shareRank && this.state.shareRank &&
<div className="shareMbc"> <div className="shareMbc">
<div className="content"> <div className="content">
<div className="title-box"> <div className="title-box">
...@@ -103,7 +115,7 @@ class ShareRank extends Component { ...@@ -103,7 +115,7 @@ class ShareRank extends Component {
} }
</ul> </ul>
<div className='shareBtn'> <div className='shareBtn'>
<button onClick={this.share}>分享赚{info.dist_first_level_ti}元</button> <button onClick={this.share.bind(this,info)}>分享赚{info.dist_first_level_ti}元</button>
</div> </div>
</div> </div>
<i onClick={this.colse} className={'iconfont iconiconfront-2 close'}></i> <i onClick={this.colse} className={'iconfont iconiconfront-2 close'}></i>
...@@ -114,4 +126,10 @@ class ShareRank extends Component { ...@@ -114,4 +126,10 @@ class ShareRank extends Component {
} }
} }
export default withRouter(ShareRank); export default compose(
connect(
state => ({courseInfo: state}),
null
),
withRouter
)(ShareRank)
src/components/detail/single/index.js
import React, {Component} from 'react' import React, {Component} from 'react'
import './index.scss' import './index.scss'
import {api, getParam, http, is_weixin} from "@/utils"; import {api, getParam, http, browser} from "@/utils";
import {Toast} from 'antd-mobile'; import {Toast} from 'antd-mobile';
import {Link} from "react-router-dom";
class Single extends Component { class Single extends Component {
...@@ -20,7 +21,7 @@ class Single extends Component { ...@@ -20,7 +21,7 @@ class Single extends Component {
if (getParam('is_class') === 1 || getParam('weixinpay')) { if (getParam('is_class') === 1 || getParam('weixinpay')) {
this.payCallback() this.payCallback()
} }
if (is_weixin) { if (browser.isWeixin) {
this.isweixinPay() this.isweixinPay()
} }
} }
...@@ -48,7 +49,7 @@ class Single extends Component { ...@@ -48,7 +49,7 @@ class Single extends Component {
// 微信支付 // 微信支付
weixinPay = (orderId) => { weixinPay = (orderId) => {
// 微信内部-支付 // 微信内部-支付
if (is_weixin) { if (browser.isWeixin) {
window.location.href = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx23dac6775ac82877&redirect_uri=" + encodeURIComponent(window.location.href + "&aa=bb").toLowerCase() + "&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect"; window.location.href = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx23dac6775ac82877&redirect_uri=" + encodeURIComponent(window.location.href + "&aa=bb").toLowerCase() + "&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
} else { } else {
// 微信外部-支付 // 微信外部-支付
...@@ -199,7 +200,7 @@ class Single extends Component { ...@@ -199,7 +200,7 @@ class Single extends Component {
<div className='payment-type'> <div className='payment-type'>
<label>支付方式：</label> <label>支付方式：</label>
{ {
!is_weixin() && !browser.isWeixin &&
<p onClick={this.check.bind(this, '1')}> <p onClick={this.check.bind(this, '1')}>
<i className='iconfont iconzhifubaox-'></i> <i className='iconfont iconzhifubaox-'></i>
<span>支付宝</span> <span>支付宝</span>
...@@ -259,7 +260,7 @@ class Single extends Component { ...@@ -259,7 +260,7 @@ class Single extends Component {
<i className='iconfont icondanseshixintubiao-5'></i> <i className='iconfont icondanseshixintubiao-5'></i>
<span>购买成功</span> <span>购买成功</span>
</div> </div>
<div className='btn btn-18B4ED'>去学习</div> <Link to={`/play?id=${getParam('id')}`} className='btn btn-18B4ED'>去学习</Link>
</div> </div>
} }
{ {
......
src/components/my/edit.js
...@@ -4,8 +4,7 @@ import {connect} from "react-redux" ...@@ -4,8 +4,7 @@ import {connect} from "react-redux"
import {Toast} from 'antd-mobile' import {Toast} from 'antd-mobile'
import {api, http} from "@/utils" import {api, http} from "@/utils"
import {HeaderBar} from "@/common" import {HeaderBar} from "@/common"
// import {logout} from '@/store/userAction' import {logout, updateUser} from '@/store/userAction'
class MyEdut extends PureComponent { class MyEdut extends PureComponent {
...@@ -39,12 +38,13 @@ class MyEdut extends PureComponent { ...@@ -39,12 +38,13 @@ class MyEdut extends PureComponent {
} }
// 退出登录 // 退出登录
outLogin = () => { outLogin = () => {
// this.props.logout() this.props.logout()
Toast.info('已退出', 2)
this.props.history.push('/my')
} }
// 确定修改 // 确定修改
submit = () => { submit = () => {
console.log(this.state.value)
if (this.state.value.length > 12) { if (this.state.value.length > 12) {
Toast.info('不超过12个字符', 2) Toast.info('不超过12个字符', 2)
} else if (this.state.value.length === 0) { } else if (this.state.value.length === 0) {
...@@ -58,6 +58,7 @@ class MyEdut extends PureComponent { ...@@ -58,6 +58,7 @@ class MyEdut extends PureComponent {
this.setState({ this.setState({
isShow: false isShow: false
}) })
this.props.updateUser({data: {username: this.state.value}})
Toast.info('修改成功', 2) Toast.info('修改成功', 2)
} else { } else {
Toast.info(res.data.msg, 2) Toast.info(res.data.msg, 2)
...@@ -108,5 +109,5 @@ class MyEdut extends PureComponent { ...@@ -108,5 +109,5 @@ class MyEdut extends PureComponent {
export default connect( export default connect(
state => ({user: state.user}), state => ({user: state.user}),
// {logout} {logout, updateUser}
)(MyEdut) )(MyEdut)
src/components/myOrders/index.js
...@@ -142,7 +142,7 @@ function PayInfo(props) { ...@@ -142,7 +142,7 @@ function PayInfo(props) {
props.item.pay_time === '0' && props.item.member_num === 0 && props.item.pay_time === '0' && props.item.member_num === 0 &&
<div className='btm-right'> <div className='btm-right'>
<button className='cancel' onClick={event => props.cancel(props.item.oid)}>取消订单</button> <button className='cancel' onClick={event => props.cancel(props.item.oid)}>取消订单</button>
<Link to='/order'>去支付</Link> <Link to={`/payorder?oid=${props.item.oid}`}>去支付</Link>
</div> </div>
} }
......
src/components/search/index.js
...@@ -7,13 +7,12 @@ import { Link } from 'react-router-dom' ...@@ -7,13 +7,12 @@ import { Link } from 'react-router-dom'
class Search extends PureComponent { class Search extends PureComponent {
constructor(props) {
super(props); state = {
this.state = { searchHistory: JSON.parse(localStorage.getItem('searchHistory')) || [],
history: JSON.parse(localStorage.getItem('history')) || [], hot_words: [],
hot_words: [], searchList: [],
searchList: [] value: ''
}
} }
async componentDidMount() { async componentDidMount() {
...@@ -25,26 +24,54 @@ class Search extends PureComponent { ...@@ -25,26 +24,54 @@ class Search extends PureComponent {
} }
} }
search = text => { clearHistory = () => {
localStorage.setItem('searchHistory', null)
this.setState({
searchHistory: []
})
}
handleChange = value => {
this.setState({value})
}
handleSearch = () => {
this.state.value && this.props.history.push(`/search-result?word=${encodeURIComponent(this.state.value)}`)
}
storeHistory = keyword => {
localStorage.setItem('searchHistory', JSON.stringify([...this.state.searchHistory, keyword]))
} }
render() { render() {
let querystring = this.props.location.query ? this.props.location.query.s : ''; const {searchHistory} = this.state
return ( return (
<div className="search-page"> <div className="search-page">
<SearchHead value={querystring} returnbtn={true}/> <SearchHead
searchHistory={this.state.searchHistory}
value={this.state.value}
handleChange={this.handleChange}
handleSearch={this.handleSearch}
/>
<div className="search-main"> <div className="search-main">
<div className="search-land search-history"> <div className="search-land">
<label> <div className='search-history'>
<span>最近搜索</span> <span>最近搜索</span>
<i className="iconfont iconiconfront-56"/> <i className="iconfont iconiconfront-56" onClick={this.clearHistory}/>
</label> </div>
<div className="search-tag"> <div className="search-tag">
{ {
this.state.history.length > 0 ? searchHistory.length > 0 ?
this.state.history.map((v, i) => { searchHistory.map((v, i) => {
return (<Tag key={i}>{v}</Tag>) return (
<Link
key={i}
to={`/search-result?word=${encodeURIComponent(v)}`}
>
<Tag>{v}</Tag>
</Link>
)
}) })
: <div style={{textAlign: 'center', padding: '20px'}}>暂无历史</div> : <div style={{textAlign: 'center', padding: '20px'}}>暂无历史</div>
} }
...@@ -59,7 +86,10 @@ class Search extends PureComponent { ...@@ -59,7 +86,10 @@ class Search extends PureComponent {
this.state['hot_words'].length > 0 ? this.state['hot_words'].length > 0 ?
this.state['hot_words'].map((v, i) => { this.state['hot_words'].map((v, i) => {
return ( return (
<Link key={i} to={`/search-result?word=${v}`}> <Link key={i}
to={`/search-result?word=${encodeURIComponent(v)}`}
onClick={this.storeHistory.bind(this, v)}
>
<Tag>{v}</Tag> <Tag>{v}</Tag>
</Link> </Link>
) )
......
src/components/search/index.scss
.search-page{ .search-page {
.search-main{ .search-main {
background-color: #fff; background-color: #fff;
padding:10px; padding: 10px;
.search-land{
label{ .search-land {
margin-bottom:10px; .search-history {
margin-bottom: 10px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
span{
font-size:16px; span {
font-size: 16px;
} }
img{
width:16px; img {
height:16px; width: 16px;
height: 16px;
display: block; display: block;
} }
} }
.search-tag{
.search-tag {
overflow: hidden; overflow: hidden;
} }
} }
.search-hot{
margin-top:10px; .search-hot {
margin-top: 10px;
} }
ul,li{
ul, li {
list-style: none; list-style: none;
padding:0; padding: 0;
margin:0; margin: 0;
} }
.list{
padding:10px 0; .list {
border-bottom:1px solid #eee; padding: 10px 0;
border-bottom: 1px solid #eee;
} }
.list:last-child{
border-bottom:0; .list:last-child {
border-bottom: 0;
} }
} }
.searct-lists{
padding:0 10px; .searct-lists {
padding: 0 10px;
} }
} }
\ No newline at end of file
src/components/search/recommendation/index.js 0 → 100644
import React, { Component } from "react";
import './recommendation.scss'
import { Course } from "@/common";
import { api, http } from "@/utils";
import { Toast } from 'antd-mobile'
import {withRouter} from 'react-router-dom'
class Recommendation extends Component {
state = {
courses: []
}
componentDidMount() {
http.get(`${api['search-api']}/search_hot_word`)
.then(res => {
if (res.data.errno === 0) {
this.setState({
courses: res.data.data.info.courses
})
} else {
Toast.info(res.data.msg)
}
})
}
handleClick = (id) => {
this.props.history.push(`/detail?id=${id}`)
}
render() {
const {courses} = this.state
return (
<div className="recommendation">
<div className="title">推荐课程</div>
<div className="courses">
{
courses.length > 0 &&
courses.map((item, index) => {
const Bottom = (
<div className='bottom'>
<span className='price'>{item['price1']}</span>
<span className='old-price'>{item['price0']}</span>
</div>
)
return (
<Course
key={item['course_id']}
id={item['course_id']}
img={item['image_name']}
title={item['course_title']}
bottom={Bottom}
handleClick={this.handleClick}
/>
)
})
}
</div>
</div>
)
}
}
export default withRouter(Recommendation)
src/components/search/recommendation/recommendation.scss 0 → 100644
.search-result {
.recommendation {
padding: 0 15px;
.title {
width: 100%;
font-size: 15px;
padding: 20px 0 5px;
text-align: center;
}
.courses {
display: flex;
flex-flow: wrap;
justify-content: space-between;
}
.bottom{
margin-top: 12px;
}
.price {
color: #FF2121;
font-size: 15px;
margin-right: 15px;
}
.old-price {
color: $color_999;
font-size: 11px;
text-decoration: line-through;
}
}
}
src/components/search/search-result.js
...@@ -3,7 +3,7 @@ import SearchHeader from './searchHead' ...@@ -3,7 +3,7 @@ import SearchHeader from './searchHead'
import VList from '@/common/VList' import VList from '@/common/VList'
import { http, api, getParam } from '@/utils' import { http, api, getParam } from '@/utils'
import './search-result.scss' import './search-result.scss'
import Recommendation from './recommendation'
const Bottom = ({item}) => { const Bottom = ({item}) => {
return ( return (
...@@ -17,55 +17,100 @@ const Bottom = ({item}) => { ...@@ -17,55 +17,100 @@ const Bottom = ({item}) => {
class SearchResult extends PureComponent { class SearchResult extends PureComponent {
state = { state = {
courseList: [] courseList: [],
value: '',
searchHistory: JSON.parse(localStorage.getItem('searchHistory')) || []
} }
componentDidMount() { componentDidMount() {
http.get(`${api['search-api']}/search/${encodeURIComponent(getParam('word'))}?type=course&page=1`) this.getCourses(getParam('word'))
}
getCourses = (word) => {
http.get(`${api['search-api']}/search/${word}?type=course&page=1`)
.then(res => { .then(res => {
const data = res.data const data = res.data
if (data.errno === 0) { if (data.errno === 0) {
this.setState({ this.setState({
courseList: data.data.info.search_data.course courseList: data.data.info['search_data'].course
}); });
} }
}) })
} }
handleClick = id => {
this.props.history.push(`/detail?id=${id}`)
}
handleSearch = () => {
this.state.value && this.getCourses(this.state.value)
}
handleChange = value => {
this.setState({value})
}
render() { render() {
const {courseList} = this.state const {courseList} = this.state
return ( return (
<div className='search-result'> <div className='search-result'>
<SearchHeader/> <SearchHeader
<ul> handleSearch={this.handleSearch}
{ value={this.state.value}
handleChange={this.handleChange}
courseList && courseList.length > 0 ? searchHistory={this.state.searchHistory}
courseList.map(item => { />
const Info = ( {
<div className="info">
<p className='title'>{item.course_title}</p> courseList && courseList.length > 0 ?
<p className='des'>{item.simpledescription}</p> <ul>
<Bottom {
item={item} courseList.map(item => {
const Info = (
<div className="info">
<p className='title'>{item.course_title}</p>
<p className='des'>{item.simpledescription}</p>
<Bottom
item={item}
/>
</div>
)
const status = (
(item['bargain_num'] || item['groupon_num']) ?
<div
className='status'>
{
item['bargain_num'] === 0 ? `砍价减${item['groupon_num']}元` : `拼团减${item['bargain_num']}元`
}
</div>
: null
)
return (
<VList img={item.image_name}
handleClick={this.handleClick}
key={item.course_id}
info={Info}
id={item['course_id']}
status={status}
/> />
</div> )
) })
return ( }
<VList img={item.image_name} </ul>
handleClick={this.handleClick} : <div className="empty">
key={item.course_id} 抱歉！没有搜到相关内容
info={Info}/> </div>
)
}) : null }
} <Recommendation/>
</ul>
</div> </div>
); );
} }
} }
export default SearchResult; export default SearchResult;
\ No newline at end of file
src/components/search/search-result.scss
...@@ -3,9 +3,23 @@ ...@@ -3,9 +3,23 @@
list-style: none; list-style: none;
} }
.v-list-item{
.content{
width: 100%;
}
}
.info { .info {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
width: 50%;
.title{
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.des { .des {
font-size: $font_14; font-size: $font_14;
...@@ -25,8 +39,30 @@ ...@@ -25,8 +39,30 @@
color: $color_999; color: $color_999;
font-size: $font_12; font-size: $font_12;
} }
.bottom{
.bottom {
align-self: flex-end; align-self: flex-end;
} }
} }
.empty {
font-size: 12px;
color: $color_666;
padding: 30px 0;
text-align: center;
background-color: $bg_ccc;
}
.status {
width: 100%;
position: absolute;
bottom: -2px;
left: 0;
height: 24px;
text-align: center;
line-height: 24px;
font-size: 13px;
color: $white;
background-color: rgba(224, 46, 36, 0.6);
}
} }
\ No newline at end of file
src/components/search/searchHead.js
...@@ -5,53 +5,46 @@ import { withRouter } from 'react-router-dom' ...@@ -5,53 +5,46 @@ import { withRouter } from 'react-router-dom'
import './search_header.scss' import './search_header.scss'
class SearchHead extends PureComponent { class SearchHead extends PureComponent {
constructor(props) {
super(props);
this.state = {
visible: false,
selected: '',
val: this.props.value || ''
}
}
// 返回某个页面 returnPage = () => {
returnPage() {
this.props.history.go(-1) this.props.history.go(-1)
} }
//组件装载完毕
componentDidMount() { componentDidMount() {
this.refs.search.focus(); this.refs.search.focus();
} }
search = () => {
this.storeKeyword()
this.props.handleSearch()
}
storeKeyword = () => {
let {searchHistory = [], value} = this.props
value && localStorage.setItem('searchHistory', JSON.stringify([...searchHistory, value]))
}
render() { render() {
return ( return (
<div className="search-head"> <div className="search-head">
<div className="left" onClick={() => { <div className="left" onClick={this.returnPage}>
// 返回某个页面
this.returnPage()
}}>
<i className="iconfont iconiconfront-68"/> <i className="iconfont iconiconfront-68"/>
</div> </div>
<div className="center"> <div className="center">
<SearchBar <SearchBar
value={this.state.val} value={this.props.value}
showCancelButton showCancelButton
cancelText={" "} cancelText={" "}
ref="search" ref="search"
focus={true} focus={true}
onChange={this.props.handleChange}
onChange={(val) => {
this.setState({val})
this.props.search.changeVal(val)
}}
placeholder="搜索课程"/> placeholder="搜索课程"/>
</div> </div>
<div className="right right-btn"> <div className="right right-btn" onClick={this.search}>
<div className="submit-btn" <div className="submit-btn">搜索
>搜索
</div> </div>
</div> </div>
</div> </div>
......
src/components/shopCart/index.js
...@@ -135,7 +135,6 @@ class Cart extends Component { ...@@ -135,7 +135,6 @@ class Cart extends Component {
Toast.info(res.data.msg, 2); Toast.info(res.data.msg, 2);
} }
}) })
} }
......
src/components/video/datum-catalog/index.js
...@@ -16,12 +16,13 @@ class DatumCatalog extends Component { ...@@ -16,12 +16,13 @@ class DatumCatalog extends Component {
} }
render() { render() {
const {datum} = this.props
return ( return (
<div className='datum-catalog'> <div className='datum-catalog'>
<p className='prompt'>课程资料请到PC端播放页下载</p> <p className='prompt'>课程资料请到PC端播放页下载</p>
<Accordion> <Accordion>
{ {
this.props.datum.map((item, index) => { datum && datum.length && datum.map((item, index) => {
return ( return (
<Accordion.Panel header={item.dir_name} key={index}> <Accordion.Panel header={item.dir_name} key={index}>
{ {
......
src/components/video/index.js
import React, { Component } from 'react'; import React, { Component } from 'react';
import HeaderBar from '@/common/HeaderBar' import HeaderBar from '@/common/HeaderBar'
import './video.scss' import './video.scss'
import { NavLink, Route } from 'react-router-dom'; import { NavLink, Route, Redirect, Switch } from 'react-router-dom';
import { http, api } from '@/utils' import { http, api, getParam } from '@/utils'
import Recommendation from './recommendation' import Recommendation from './recommendation'
import VideoCatalog from './video-catalog' import VideoCatalog from './video-catalog'
import DatumCatalog from './datum-catalog' import DatumCatalog from './datum-catalog'
import { Toast } from 'antd-mobile'; import { Toast } from 'antd-mobile';
import videojs from 'video.js' import videojs from 'video.js'
import 'video.js/dist/video-js.min.css' import 'video.js/dist/video-js.min.css'
// import 'video.scss' import { Modal } from "antd-mobile";
let alert = Modal.alert
class Video extends Component { class Video extends Component {
video; video
player
courseID
state = { state = {
title: '视频', title: '视频',
courseId: 140, courseId: null,
video_catalog: [], video_catalog: [],
datum: [] datum: [],
currentVideoSrc: '',
activeIndex: 0,
isAuth: true,
course: null,
salePrice: null
} }
componentDidMount() { componentDidMount() {
this.courseID = getParam('id')
this.setState({
courseId: this.courseID
})
this.getVideoCatalog()
this.getDatumCatalog()
}
initializePlayer = () => {
window.HELP_IMPROVE_VIDEOJS = false; window.HELP_IMPROVE_VIDEOJS = false;
videojs(this.video, { this.player = videojs(this.video, {
controls: true, controls: true,
autoplay: true,
preload: 'auto', preload: 'auto',
bigPlayButton: true, bigPlayButton: true,
textTrackDisplay: false, textTrackDisplay: false,
posterImage: false, posterImage: false,
errorDisplay: false, errorDisplay: false
}, function () { })
this.log.debug() this.player.enableTouchActivity()
}
componentWillUnmount() {
if (this.player) {
this.player.dispose()
}
}
handleClick = index => {
if (this.hasAuth()) {
this.setPlayerSrc(this.state.video_catalog[index]['play_url'])
this.playVideo()
}
this.setState({
activeIndex: index
}) })
this.getVideoCatalog()
this.getDatumCatalog()
} }
getVideoCatalog = () => { getVideoCatalog = () => {
http.get(`${api.home}/m/course/play/40`) http.get(`${api.home}/m/course/play/${this.courseID}`)
.then(res => { .then(res => {
const data = res.data const data = res.data
if (data.code === 200) { if (data.code === 200) {
this.setState({ this.setState(
video_catalog: data.data.lessons state => ({
}) video_catalog: data.data['lessons'],
currentVideoSrc: data.data['lessons'][state.activeIndex]['play_url'],
course: data.data.course,
courseId: data.data.course['course_id']
}),
() => {
if (this.lessonAvailable()) {
if (this.hasAuth(this.state.activeIndex)) {
this.initializePlayer()
this.playWithAuth()
} else {
this.getCoursePrice();
}
} else {
alert('暂无视频', '', [{
text: 'OK',
onPress: () => {
this.props.history.push('/')
}
}])
}
}
)
} else { } else {
Toast.info(data.msg) Toast.info(data.msg)
} }
}) })
} }
setPlayerSrc = src => {
this.player.src({
src,
type: 'application/x-mpegURL'
})
}
playVideo = () => {
this.player.play()
}
getDatumCatalog() { getDatumCatalog() {
http.get(`${api.home}/m/course/data/40`) http.get(`${api.home}/m/course/data/${this.courseID}`)
.then(res => { .then(res => {
const data = res.data const data = res.data
if (data.code === 200) { if (data.code === 200) {
...@@ -76,16 +141,84 @@ class Video extends Component { ...@@ -76,16 +141,84 @@ class Video extends Component {
}) })
} }
lessonAvailable = () => {
const {video_catalog, activeIndex} = this.state
return video_catalog[activeIndex]['video_size'] !== 0
}
getCoursePrice = () => {
http.get(`${api.home}/sys/course/price/${this.state.courseId}`)
.then(res => {
const {data} = res
if (data.code === 200) {
this.setState({
salePrice: data.data['sale_price']
})
}
})
}
playWithAuth = () => {
const {video_catalog, activeIndex} = this.state
if (this.hasAuth()) {
this.setPlayerSrc(video_catalog[activeIndex]['play_url'])
}
}
hasAuth = (index) => {
const {course, video_catalog, activeIndex} = this.state
let lesson = video_catalog[activeIndex]
if (!lesson['is_free']) {
if (course['is_audition']) {
this.setState({
isAuth: true
})
return true
} else {
if (lesson['video_auth']) {
this.setState({
isAuth: true
})
return true
}
this.setState({
isAuth: false
})
return false
}
}
this.setState({
isAuth: true
})
return true
}
render() { render() {
let {match} = this.props let {match} = this.props
const {video_catalog, activeIndex, isAuth, salePrice} = this.state
return ( return (
<div className='play'> <div className='play'>
<HeaderBar title={this.state.title}/> <HeaderBar title={this.state.title}/>
<div className="video"> <div className="video">
<video className={'video-js'} ref={el => this.video = el}> <video className={'video-js'} ref={el => this.video = el}>
<source src='/v2/ts/40/191/175d6e5a.m3u8' type='application/x-mpegURL'/> <source src={'/'} type='application/x-mpegURL'/>
</video> </video>
{
!isAuth && (
<div className="purchase-box">
<div className='hint'>您尚未购买该课时，请购买后学习。</div>
<div className='btns'>
<button type='button' className='purchase-class'>¥{salePrice} 购买课程</button>
<button type='button'
className='purchase-episode'>¥{video_catalog.length && video_catalog[activeIndex]['class_price']} 购买单集
</button>
</div>
</div>
)
}
</div> </div>
<div className='tab'> <div className='tab'>
<div> <div>
...@@ -101,15 +234,23 @@ class Video extends Component { ...@@ -101,15 +234,23 @@ class Video extends Component {
>资料</NavLink> >资料</NavLink>
</div> </div>
</div> </div>
{/*<Route path={`${match.path}/video`} render={props => { <Switch>
return <VideoCatalog videoCatalog={this.state.video_catalog} {...props}/> <Redirect exact from={'/play'} to={'/play/video'}/>
}}/> <Route path={`${match.path}/video`} render={props => {
<Route path={`${match.path}/datum`} render={props => { return <VideoCatalog
return <DatumCatalog {...props} datum={this.state.datum}/> activeIndex={this.state.activeIndex}
}}/> handleClick={this.handleClick}
videoCatalog={this.state.video_catalog}
{...props}/>
}}/>
<Route path={`${match.path}/datum`} render={props => {
return <DatumCatalog {...props} datum={this.state.datum}/>
}}/>
</Switch>
<Route render={props => { <Route render={props => {
return <Recommendation {...props} courseId={this.state.courseId}/> return this.state.courseId ? <Recommendation {...props} courseId={this.state.courseId}/>
}}/>*/} : null
}}/>
</div> </div>
); );
} }
......
src/components/video/recommendation/index.js
import React, { Component } from 'react'; import React, { PureComponent } from 'react';
import './recommendation.scss' import './recommendation.scss'
import { http, api } from '@/utils' import { http, api } from '@/utils'
import { Toast } from "antd-mobile"; import { Toast } from "antd-mobile";
...@@ -17,12 +17,14 @@ const Bottom = ({item}) => { ...@@ -17,12 +17,14 @@ const Bottom = ({item}) => {
class Recommendation extends Component { class Recommendation extends PureComponent {
state = { state = {
num: 10, num: 10,
list: [] list: [],
courseId: null
} }
componentDidMount() { componentDidMount() {
http.get(`${api.home}/m/play/recommend_course/${this.props.courseId}?num=${this.state.num}`) http.get(`${api.home}/m/play/recommend_course/${this.props.courseId}?num=${this.state.num}`)
.then(res => { .then(res => {
...@@ -39,6 +41,7 @@ class Recommendation extends Component { ...@@ -39,6 +41,7 @@ class Recommendation extends Component {
}) })
} }
handleClick = id => { handleClick = id => {
console.log(id) console.log(id)
} }
......
src/components/video/video-catalog/index.js
...@@ -5,14 +5,21 @@ import classnames from 'classnames' ...@@ -5,14 +5,21 @@ import classnames from 'classnames'
class VideoCatalog extends Component { class VideoCatalog extends Component {
handleClick = (i) => {
this.props.handleClick(i)
}
render() { render() {
return ( return (
<div className='video-catalog'> <div className='video-catalog'>
<ul> <ul>
{ {
this.props.videoCatalog.map(item => { this.props.videoCatalog.map((item, index) => {
return ( return (
<li key={item.id}> <li key={item.id}
className={classnames({active: this.props.activeIndex === index})}
onClick={this.handleClick.bind(this, index)}
>
<span className="title">{item.name}</span> <span className="title">{item.name}</span>
<span className='duration'>{item.duration}</span> <span className='duration'>{item.duration}</span>
<i className={classnames(`iconfont`, <i className={classnames(`iconfont`,
......
src/components/video/video.scss
...@@ -5,6 +5,66 @@ $tabHeight: 44px; ...@@ -5,6 +5,66 @@ $tabHeight: 44px;
width: 100%; width: 100%;
height: 215px; height: 215px;
background-color: $black; background-color: $black;
position: relative;
.video-js {
width: 100%;
height: 100%;
.vjs-big-play-button {
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
}
}
.purchase-box {
width: 100%;
height: 100%;
position: absolute;
left: 0;
top: 0;
background-color: rgba(0, 0, 0, 0.8);
display: flex;
flex-flow: column;
justify-content: center;
align-items: center;
.hint {
font-size: $font_14;
color: $white;
margin-bottom: 20px;
}
@mixin button{
display: block;
-webkit-appearance: none;
outline: none;
border: none;
background-color: transparent;
border-radius: 5px;
line-height: 30px;
font-size: 13px;
padding: 0 9px;
}
.btns {
width: 100%;
padding: 0 60px;
display: flex;
justify-content: space-around;
}
.purchase-class{
@include button;
background-color: $white;
color: $color_FF4000;
}
.purchase-episode{
@include button;
background-color: $bg_FF4000;
color: $white;
}
}
video { video {
width: 100%; width: 100%;
...@@ -35,7 +95,10 @@ $tabHeight: 44px; ...@@ -35,7 +95,10 @@ $tabHeight: 44px;
.active { .active {
color: $active; color: $active;
border-bottom: 1px solid $active;
.iconiconfront-74 {
color: $color_555;
}
} }
} }
\ No newline at end of file
src/router/router-config.js
...@@ -26,6 +26,7 @@ const Video = loadable(() => import(/* webpackChunkName: 'video'*/'@/components/ ...@@ -26,6 +26,7 @@ const Video = loadable(() => import(/* webpackChunkName: 'video'*/'@/components/
const sharePoster = loadable(() => import(/* webpackChunkName: 'shareposter'*/'@/components/sharePoster')) const sharePoster = loadable(() => import(/* webpackChunkName: 'shareposter'*/'@/components/sharePoster'))
const myOrders = loadable(() => import(/* webpackChunkName: 'myorders'*/'@/components/myOrders')) const myOrders = loadable(() => import(/* webpackChunkName: 'myorders'*/'@/components/myOrders'))
const Purchased = loadable(() => import(/* webpackChunkName: 'purchased'*/'@/components/purchased')) const Purchased = loadable(() => import(/* webpackChunkName: 'purchased'*/'@/components/purchased'))
const ToGroup = loadable(() => import(/* webpackChunkName: 'togroup'*/'@/components/detail/group/togroup'))
export default [ export default [
{ {
path: '/', path: '/',
...@@ -46,7 +47,8 @@ export default [ ...@@ -46,7 +47,8 @@ export default [
}, },
{ {
path: '/myedit', path: '/myedit',
component: MyEdit component: MyEdit,
isPrivate: true
}, },
{ {
path: '/courselist', path: '/courselist',
...@@ -113,7 +115,8 @@ export default [ ...@@ -113,7 +115,8 @@ export default [
}, },
{ {
path: '/shareposter', path: '/shareposter',
component: sharePoster component: sharePoster,
isPrivate: true
}, },
{ {
path: '/myorders', path: '/myorders',
...@@ -129,4 +132,10 @@ export default [ ...@@ -129,4 +132,10 @@ export default [
path: '/payOrder', path: '/payOrder',
component: PayOrder component: PayOrder
}, },
{
path: '/togroup',
component: ToGroup,
isPrivate: true
},
] ]
\ No newline at end of file
src/store/userAction.js
...@@ -57,9 +57,18 @@ const logout = () => dispatch => { ...@@ -57,9 +57,18 @@ const logout = () => dispatch => {
} }
const UPDATE_USER = 'UPDATE_USER'
const updateUser = payload => ({
type: UPDATE_USER,
payload
})
export { export {
accountLogin, accountLogin,
SET_CURRENT_USER, SET_CURRENT_USER,
setCurrentUser, setCurrentUser,
quickLogin quickLogin,
logout,
UPDATE_USER,
updateUser
} }
\ No newline at end of file
src/store/userReducer.js
import { SET_CURRENT_USER } from '@/store/userAction'; import { SET_CURRENT_USER, UPDATE_USER } from '@/store/userAction';
import { merge } from 'lodash'
const initialState = { const initialState = {
...@@ -15,11 +16,12 @@ const initialState = { ...@@ -15,11 +16,12 @@ const initialState = {
} }
export default function (state = initialState, action) { export default function (state = initialState, action) {
switch (action.type) { switch (action.type) {
case SET_CURRENT_USER: case SET_CURRENT_USER:
return action.payload return action.payload
case UPDATE_USER:
return merge({}, state, action.payload)
default: default:
return state return state
} }
......
src/utils/index.js
export { default as http } from './http' export { default as http } from './http'
export { default as api } from './api' export { default as api } from './api'
export { html, initCaptcha, validateTel, validateEmail } export { html, initCaptcha, validateTel, validateEmail,browser }
export const getParam = (key, str) => { export const getParam = (key, str) => {
...@@ -78,3 +78,13 @@ function validateEmail(email) { ...@@ -78,3 +78,13 @@ function validateEmail(email) {
var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
return re.test(String(email).toLowerCase()); return re.test(String(email).toLowerCase());
} }
const browser = (function () {
const ua = navigator.userAgent
return {
isWeixin: /MicroMessenger/i.test(ua),
isAndroid: /Android/i.test(ua),
isIOS: /\(i[^;]+;( U;)? CPU.+Mac OS X/i.test(ua),
isIPad: /iPad/i.test(ua)
}
})()
\ No newline at end of file
src/utils/proxy-config.js
...@@ -14,7 +14,7 @@ const config = { ...@@ -14,7 +14,7 @@ const config = {
v2: { v2: {
development: '/v2', development: '/v2',
test: 'https://v2.julyedu.com', test: 'https://v2.julyedu.com',
production: 'https://search.julyedu.com', production: 'https://v2.julyedu.com',
proxy: { proxy: {
secure: false, secure: false,
} }
......
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