Skip to content

M
mr-julyedu
Commit c4ebb26d by xuzhenghua
Options

detail

parent df76033c
Showing with 75 additions and 47 deletions
src/common/HeaderSearch/index.js
...@@ -7,7 +7,7 @@ class HeaderBar extends Component { ...@@ -7,7 +7,7 @@ class HeaderBar extends Component {
window.location.href ='/search' window.location.href ='/search'
} }
return() { return() {
window.location.href ='/index' window.location.href ='/'
} }
render() { render() {
......
src/components/Index/index.js
...@@ -5,7 +5,7 @@ import {WithTab} from '@/HOCs' ...@@ -5,7 +5,7 @@ import {WithTab} from '@/HOCs'
import Swiper from 'react-mobile-swiper' import Swiper from 'react-mobile-swiper'
import createStyle from './createStyle' import createStyle from './createStyle'
import LazyLoad from 'react-lazy-load' import LazyLoad from 'react-lazy-load'
import {api} from '@/utils' import {http, api} from '@/utils'
import LiveRoom from './liveRoom' import LiveRoom from './liveRoom'
...@@ -53,7 +53,7 @@ class Index extends Component { ...@@ -53,7 +53,7 @@ class Index extends Component {
componentDidMount() { componentDidMount() {
// 首页课程 // 首页课程
api.get('/m/home').then((res) => { http.get(`${api.home}/m/home`).then((res) => {
if (res.data.code === 200) { if (res.data.code === 200) {
this.setState({ this.setState({
banner: res.data.data.banner, banner: res.data.data.banner,
......
src/components/Index/liveRoom.js
import React, {Component} from 'react'; import React, {Component} from 'react';
import './index.scss'; import './index.scss';
import {api} from '@/utils' import {http, api} from '@/utils'
class LiveRoom extends Component { class LiveRoom extends Component {
constructor(props) { constructor(props) {
...@@ -16,18 +16,18 @@ class LiveRoom extends Component { ...@@ -16,18 +16,18 @@ class LiveRoom extends Component {
componentDidMount() { componentDidMount() {
// this.livePrepare(this.props.roomId,'',2,'') // this.livePrepare(this.props.roomId,'',2,'')
} }
// 直播间预约接口公共方法 // 直播间预约接口公共方法
livePrepare=(room_id,type,source,mobile)=>{ livePrepare = (room_id, type, source, mobile) => {
let data = { let data = {
room_id: room_id, // 直播间id room_id: room_id, // 直播间id
type: type, // 1-为微信服务通知预约 2-为手机号预约 type: type, // 1-为微信服务通知预约 2-为手机号预约
source: source, // 1-为微信内置浏览器 2-为wap（微信外 source: source, // 1-为微信内置浏览器 2-为wap（微信外
mobile: mobile // 手机号 当type为2时，该参数为必填 mobile: mobile // 手机号 当type为2时，该参数为必填
}; };
api.post('/m/live/prepare',data).then((res) => { http.post(`${api.home}/m/live/prepare`, data).then((res) => {
/* status 0表示预约成功 /* status 0表示预约成功
1表示预约失败 1表示预约失败
2表示未关注服务号 2表示未关注服务号
...@@ -35,12 +35,12 @@ class LiveRoom extends Component { ...@@ -35,12 +35,12 @@ class LiveRoom extends Component {
4表示手机号不能为空 4表示手机号不能为空
*/ */
if (res.data.code === 200) { if (res.data.code === 200) {
if (res.data.data.status === 0){ if (res.data.data.status === 0) {
alert(res.data.data.msg) alert(res.data.data.msg)
this.setState(status => ({ this.setState(status => ({
success: true, success: true,
toSubscribe: false toSubscribe: false
})); }));
// if (type === 1){ // if (type === 1){
// this.setState(status => ({ // this.setState(status => ({
...@@ -52,11 +52,11 @@ class LiveRoom extends Component { ...@@ -52,11 +52,11 @@ class LiveRoom extends Component {
// success: true, // success: true,
// toSubscribe: false // toSubscribe: false
// })); // }));
// } // }
} else if (res.data.data.status === 1){ } else if (res.data.data.status === 1) {
alert(res.data.data.msg) alert(res.data.data.msg)
} else if (res.data.data.status === 2){ } else if (res.data.data.status === 2) {
alert(res.data.data.msg) alert(res.data.data.msg)
this.setState(status => ({ this.setState(status => ({
toSubscribe: true, toSubscribe: true,
...@@ -64,13 +64,13 @@ class LiveRoom extends Component { ...@@ -64,13 +64,13 @@ class LiveRoom extends Component {
isfollow: true isfollow: true
})); }));
} else if (res.data.data.status === 3){ } else if (res.data.data.status === 3) {
alert(res.data.data.msg) alert(res.data.data.msg)
this.setState(status => ({ this.setState(status => ({
issubscribe: 1, issubscribe: 1,
})); }));
} else if (res.data.data.status === 4){ } else if (res.data.data.status === 4) {
alert(res.data.data.msg) alert(res.data.data.msg)
} else { } else {
alert(res.data.data.msg) alert(res.data.data.msg)
...@@ -84,25 +84,30 @@ class LiveRoom extends Component { ...@@ -84,25 +84,30 @@ class LiveRoom extends Component {
} }
}) })
} }
// 关闭弹窗 // 关闭弹窗
liveColse() { liveColse() {
this.props.colseBox(false); this.props.colseBox(false);
} }
// 点击预约 // 点击预约
toSubscribe() { toSubscribe() {
this.props.colseBox(false); this.props.colseBox(false);
this.livePrepare(this.props.roomId,'',2,'') this.livePrepare(this.props.roomId, '', 2, '')
} }
// 手机号预约 // 手机号预约
iphoneStep() { iphoneStep() {
this.setState(status => ({ this.setState(status => ({
step: 1 step: 1
})); }));
} }
// 服务号预约 // 服务号预约
serverStep() { serverStep() {
this.livePrepare(this.props.roomId,1,2,'') this.livePrepare(this.props.roomId, 1, 2, '')
} }
// 最后提交 // 最后提交
submit() { submit() {
if (this.state.step === 1) { if (this.state.step === 1) {
...@@ -112,6 +117,7 @@ class LiveRoom extends Component { ...@@ -112,6 +117,7 @@ class LiveRoom extends Component {
this.livePrepare(this.props.roomId, 1, 1, '') this.livePrepare(this.props.roomId, 1, 1, '')
} }
} }
// 取消预约 关闭弹窗 // 取消预约 关闭弹窗
subscribeColse() { subscribeColse() {
this.setState(status => ({ this.setState(status => ({
......
src/components/classify/courselist.js
...@@ -3,7 +3,7 @@ import {VList} from '../../common'; ...@@ -3,7 +3,7 @@ import {VList} from '../../common';
import {Tabs, WhiteSpace} from 'antd-mobile'; import {Tabs, WhiteSpace} from 'antd-mobile';
import './courselist.scss'; import './courselist.scss';
import HeaderSearch from '../../common/HeaderSearch/index' import HeaderSearch from '../../common/HeaderSearch/index'
import {api, getParam} from "@/utils"; import {http, api, getParam} from "@/utils";
class Classify extends Component { class Classify extends Component {
...@@ -15,19 +15,20 @@ class Classify extends Component { ...@@ -15,19 +15,20 @@ class Classify extends Component {
arr: [{basics: []}, {advanced: []}], arr: [{basics: []}, {advanced: []}],
allClass: [], allClass: [],
data: [], data: [],
activeTab: decodeURIComponent(getParam('name'))
} }
} }
componentDidMount() { componentDidMount() {
this.getTabs() this.getTabs()
this.getList(getParam('id')) this.getList()
} }
// 获取tabs接口 // 获取tabs接口
getTabs = () => { getTabs = () => {
let data = 0 let data = 0
api.get(`/m/course/classify/${data}`,) http.get(`${api.home}/m/course/classify/${data}`,)
.then((res) => { .then((res) => {
const _this = this const _this = this
if (res.data.code === 200) { if (res.data.code === 200) {
...@@ -54,8 +55,8 @@ class Classify extends Component { ...@@ -54,8 +55,8 @@ class Classify extends Component {
} }
// 获取课程接口 // 获取课程接口
getList = (id) => { getList = () => {
api.get(`/m/course/list/${id}`,).then((res) => { http.get(`${api.home}/m/course/list/${getParam('id')}`,).then((res) => {
if (res.data.code === 200) { if (res.data.code === 200) {
this.setState(status => ({ this.setState(status => ({
data: res.data.data, data: res.data.data,
...@@ -71,7 +72,11 @@ class Classify extends Component { ...@@ -71,7 +72,11 @@ class Classify extends Component {
// 点击横向滚动tab查询 // 点击横向滚动tab查询
ontabclick = (tab) => { ontabclick = (tab) => {
this.getList(tab.id) this.props.history.push(`/courselist?id=${tab.id}&name=${tab.title}`)
this.getList()
this.setState({
activeTab: decodeURIComponent(getParam('name'))
});
} }
// 上下展示 // 上下展示
...@@ -83,11 +88,13 @@ class Classify extends Component { ...@@ -83,11 +88,13 @@ class Classify extends Component {
} }
// 弹窗里面tab点击查询 // 弹窗里面tab点击查询
labelclick = (id,index) => { labelclick = (item) => {
this.getList(id) this.props.history.push(`/courselist?id=${item.c_id}&name=${item.c_name}`)
this.getList()
this.setState(status => ({ this.setState(status => ({
ispull: !status.ispull, ispull: !status.ispull,
display: status.ispull ? 'none' : 'block' display: status.ispull ? 'none' : 'block',
activeTab: decodeURIComponent(getParam('name'))
})) }))
} }
...@@ -99,6 +106,8 @@ class Classify extends Component { ...@@ -99,6 +106,8 @@ class Classify extends Component {
<i className={'iconfont iconiconfront-71 pull-down'}></i> <i className={'iconfont iconiconfront-71 pull-down'}></i>
) )
let page = this.state.allClass.findIndex((item) => item.title === this.state.activeTab)
return ( return (
<div className='class-child'> <div className='class-child'>
<HeaderSearch></HeaderSearch> <HeaderSearch></HeaderSearch>
...@@ -110,6 +119,7 @@ class Classify extends Component { ...@@ -110,6 +119,7 @@ class Classify extends Component {
<Tabs <Tabs
tabs={this.state.allClass} tabs={this.state.allClass}
animated={false} animated={false}
page={page}
onChange={(tab) => this.ontabclick(tab)} onChange={(tab) => this.ontabclick(tab)}
> >
<div className='tabs'> <div className='tabs'>
...@@ -134,10 +144,10 @@ class Classify extends Component { ...@@ -134,10 +144,10 @@ class Classify extends Component {
const status = ( const status = (
<div> <div>
{item.bargain_num === 0 && item.groupon_num !== 0 && {item.bargain_num === 0 && item.groupon_num !== 0 &&
<p className='course-status'>拼团减{item.price}元</p> <p className='course-status'>拼团减{item.groupon_num}元</p>
} }
{item.bargain_num !== 0 && item.groupon_num === 0 && {item.bargain_num !== 0 && item.groupon_num === 0 &&
<p className='course-status'>砍价减{item.price2}元</p> <p className='course-status'>砍价减{item.bargain_num}元</p>
} }
</div> </div>
) )
...@@ -156,10 +166,10 @@ class Classify extends Component { ...@@ -156,10 +166,10 @@ class Classify extends Component {
{ {
this.state.arr.basics && this.state.arr.basics &&
<div className="tabcontent"> <div className="tabcontent">
<ClassCourse data={this.state.arr.basics.list} title={this.state.arr.basics.name} <ClassCourse activeTab={this.state.activeTab} data={this.state.arr.basics.list}
labelclick={this.labelclick}/> title={this.state.arr.basics.name} labelclick={this.labelclick}/>
<ClassCourse data={this.state.arr.advanced.list} title={this.state.arr.advanced.name} <ClassCourse activeTab={this.state.activeTab} data={this.state.arr.advanced.list}
labelclick={this.labelclick}/> title={this.state.arr.advanced.name} labelclick={this.labelclick}/>
</div> </div>
} }
</div> </div>
...@@ -178,8 +188,8 @@ function ClassCourse(props) { ...@@ -178,8 +188,8 @@ function ClassCourse(props) {
{ {
props.data && props.data.length > 0 && props.data.map((item, index) => { props.data && props.data.length > 0 && props.data.map((item, index) => {
return ( return (
<span key={index} onClick={e => props.labelclick(item.c_id,index)} <span className={props.activeTab === item.c_name ? 'active-label' : 'item-label'}
className='item-label'>{item.c_name}</span> key={index} onClick={e => props.labelclick(item)}>{item.c_name}</span>
) )
}) })
} }
......
src/components/classify/courselist.scss
...@@ -175,6 +175,18 @@ ...@@ -175,6 +175,18 @@
margin-top: 15px; margin-top: 15px;
margin-bottom: -5px; margin-bottom: -5px;
} }
.active-label {
display: inline-block;
width: 30.5%;
height: 30px;
line-height: 30px;
text-align: center;
background-color: $bg_active;
border-radius: 15px;
margin-top: 15px;
margin-bottom: -5px;
color: $white;
}
} }
} }
......
src/components/classify/index.js
import React, {Component} from 'react'; import React, {Component} from 'react';
import {WithTab} from '@/HOCs' import {WithTab} from '@/HOCs'
import './index.scss'; import './index.scss';
import {api} from "@/utils"; import {http, api} from "@/utils";
import { Link } from 'react-router-dom' import { Link } from 'react-router-dom'
class Classify extends Component { class Classify extends Component {
...@@ -19,7 +19,7 @@ class Classify extends Component { ...@@ -19,7 +19,7 @@ class Classify extends Component {
componentDidMount() { componentDidMount() {
let data = 1 let data = 1
api.get(`/m/course/classify/${data}`,).then((res) => { http.get(`${api.home}/m/course/classify/${data}`,).then((res) => {
if (res.data.code === 200) { if (res.data.code === 200) {
if (res.data.data.common.length > 0) { if (res.data.data.common.length > 0) {
this.setState({ this.setState({
...@@ -83,7 +83,7 @@ function ClassCourseB(props) { ...@@ -83,7 +83,7 @@ function ClassCourseB(props) {
{ {
props.data && props.data.length > 0 && props.data.map((item, index) => { props.data && props.data.length > 0 && props.data.map((item, index) => {
return ( return (
<Link to={`/courselist?id=${item.c_id}`} key={index} className='item-label'> <Link to={`/courselist?id=${item.c_id}&name=${item.c_name}`} key={index} className='item-label'>
{item.c_name} {item.c_name}
</Link> </Link>
) )
......
src/components/preferential/index.js
...@@ -3,7 +3,7 @@ import {VList} from '../../common' ...@@ -3,7 +3,7 @@ import {VList} from '../../common'
import {Tabs, WhiteSpace} from 'antd-mobile' import {Tabs, WhiteSpace} from 'antd-mobile'
import './index.scss' import './index.scss'
import HeaderSearch from '../../common/HeaderSearch/index' import HeaderSearch from '../../common/HeaderSearch/index'
import {api} from "@/utils" import {http, api} from "@/utils"
class Preferential extends Component { class Preferential extends Component {
constructor(props) { constructor(props) {
...@@ -20,7 +20,7 @@ class Preferential extends Component { ...@@ -20,7 +20,7 @@ class Preferential extends Component {
// 限时特惠 // 限时特惠
specialSale = () => { specialSale = () => {
api.get('/m/home/weekDiscounts').then((res) => { http.get(`${api.home}/m/home/weekDiscounts`).then((res) => {
if (res.data.code === 200) { if (res.data.code === 200) {
this.setState({ this.setState({
dataList: res.data.data dataList: res.data.data
...@@ -30,7 +30,7 @@ class Preferential extends Component { ...@@ -30,7 +30,7 @@ class Preferential extends Component {
} }
// 砍价专区 // 砍价专区
bargain = () => { bargain = () => {
api.get('/m/home/bargainZone').then((res) => { http.get(`${api.home}/m/home/bargainZone`).then((res) => {
if (res.data.code === 200) { if (res.data.code === 200) {
this.setState({ this.setState({
dataList: res.data.data dataList: res.data.data
...@@ -40,7 +40,7 @@ class Preferential extends Component { ...@@ -40,7 +40,7 @@ class Preferential extends Component {
} }
// 一键拼团 // 一键拼团
group = () => { group = () => {
api.get('/m/home/grouponList').then((res) => { http.get(`${api.home}/m/home/grouponList`).then((res) => {
if (res.data.code === 200) { if (res.data.code === 200) {
this.setState({ this.setState({
dataList: res.data.data dataList: res.data.data
...@@ -98,8 +98,8 @@ class Preferential extends Component { ...@@ -98,8 +98,8 @@ class Preferential extends Component {
{this.state.courseStatus === 0 && {this.state.courseStatus === 0 &&
<span className='price'>特惠价：</span> <span className='price'>特惠价：</span>
} }
<span className="new">¥{item.price2}</span> <span className="new">¥{item.price1}</span>
<span className="old">¥{item.price1}</span> <span className="old">¥{item.price0}</span>
</p> </p>
} }
{!item.is_buy && {!item.is_buy &&
...@@ -111,7 +111,7 @@ class Preferential extends Component { ...@@ -111,7 +111,7 @@ class Preferential extends Component {
const status = ( const status = (
<div> <div>
{this.state.courseStatus === 1 && {this.state.courseStatus === 1 &&
<p className='course-status'>砍价减{item.price2}元</p> <p className='course-status'>砍价减{item.price1}元</p>
} }
{this.state.courseStatus === 2 && {this.state.courseStatus === 2 &&
<p className='course-status'>拼团减{item.price}元</p> <p className='course-status'>拼团减{item.price}元</p>
......
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