Skip to content

M
mr-julyedu
Commit 938ee639 by xuzhenghua
Options

Merge branch 'newbug' 

# Conflicts:
#	build/asset-manifest.json
#	build/index.html
#	build/service-worker.js
#	src/components/myOrders/index.js
#	src/components/passport/forgotPassword/index.js
parents 83d70c8a fe367f30
Showing with 70 additions and 42 deletions
src/components/classify/index.js
import React, {Component} from 'react';
import {WithTab} from '@/HOCs'
import './index.scss';
import { http } from "@/utils";
import {http} from "@/utils";
import {Link} from 'react-router-dom'
import {Toast} from 'antd-mobile'
import {HeaderBar} from "@/common"
......@@ -32,14 +32,14 @@ class Classify extends Component {
if (res.data.data.common.length > 0) {
this.setState({
basics: res.data.data.common[0],
advanced: res.data.data.common[1],
advanced: res.data.data.common[1] || [],
})
}
if (res.data.data.special.length > 0) {
this.setState({
camp: res.data.data.special[0],
employment: res.data.data.special[1],
special: res.data.data.special[2],
employment: res.data.data.special[1] || [],
special: res.data.data.special[2] || [],
})
}
} else {
......
src/components/myOrders/index.js
......@@ -6,35 +6,47 @@ import {http, api} from "@/utils"
import {Link} from 'react-router-dom'
import {Modal, Toast} from 'antd-mobile'
import Loading from '@/common/Loading'
import InfiniteScroll from 'react-infinite-scroller'
import {debounce} from 'lodash'
const alert = Modal.alert
class MyOrders extends Component {
page = 1
constructor(props) {
super(props)
this.state = {
data: [],
isLoading: true
pageNum: 1,
isLoading: true,
total: 0,
}
}
componentDidMount() {
this.getList()
this.getList(this.page)
}
getMore = debounce(() => {
if(this.state.data.length % 10 === 0){
this.getList(++this.page)
}
}, 200)
// 获取订单
getList = () => {
http.get(`${API.home}/m/my/orders/1/1`,).then((res) => {
http.get(`${API.home}/m/my/orders/${this.page}/10`,).then((res) => {
if (res.data.code === 200) {
this.setState({
data: res.data.data,
data: this.state.data.concat(res.data.data),
isLoading: false
})
} else {
Toast.info(res.data.msg, 2);
}
})
}
// 取消订单
......@@ -68,42 +80,54 @@ class MyOrders extends Component {
<Loading isLoading={this.state.isLoading}>
{
this.state.data && this.state.data.length > 0 ?
this.state.data.map((item, index) => {
return (
<div className="order-body" key={index}>
<OrderInfo item={item}/>
{
item.course && item.course.length > 0 && item.course.map((item, index) => {
const Info = (
<div className="order-info">
<p className='order-title text-overflow-one'>
<Link
to={`/detail?id=${item.course_id}`}>{item.course_title}</Link>
</p>
<p className='order-content text-overflow-2'>{item.description}</p>
<p className='order-des'>
<span className='order-newprice'>¥{item.pay_amount}</span>
<span className='order-price'>¥{item.price0}</span>
</p>
</div>
)
return (
<div className="order-wrap" key={index}>
<OrderList info={Info} src={item.image_name} isSign={item.is_aist}
id={item.course_id}></OrderList>
</div>
)
})
}
<PayInfo item={item} cancel={this.cancel}/>
</div>
)
}) : <div className="cart-tip">
<InfiniteScroll
pageStart={0}
hasMore={true}
loadMore={this.getMore.bind(this)}
useWindow={true}
>
{
this.state.data.map((item, index) => {
return (
<div className="order-body" key={index}>
<OrderInfo item={item}/>
{
item.course && item.course.length > 0 && item.course.map((item, index) => {
const Info = (
<div className="order-info">
<p className='order-title text-overflow-one'>
<Link
to={`/detail?id=${item.course_id}`}>{item.course_title}</Link>
</p>
<p className='order-content text-overflow-2'>{item.description}</p>
<p className='order-des'>
<span
className='order-newprice'>¥{item.pay_amount}</span>
<span
className='order-price'>¥{item.price0}</span>
</p>
</div>
)
return (
<div className="order-wrap" key={index}>
<OrderList info={Info} src={item.image_name}
isSign={item.is_aist}
id={item.course_id}></OrderList>
</div>
)
})
}
<PayInfo item={item} cancel={this.cancel}/>
</div>
)
})
} </InfiniteScroll> : <div className="cart-tip">
<p className='cart-mess'>您还没有订单哦，快去逛逛吧~</p>
<Link to='/classify'>去逛逛</Link>
</div>
}
</Loading>
</div>
)
......
src/components/order/index.js
......@@ -80,7 +80,7 @@ class Order extends Component {
perfect: this.props.location.state,
user_account: 0.00, // 账户余额
total: 0.00, // 需要支付总金额
discount: 0.00, //
discount: 0.00, //
useBalance: false,
orderList: [],
info: false,
......@@ -353,7 +353,7 @@ class Order extends Component {
{
useBalance ? (
<>
<span style={{ color: '#FF2121', fontSize: '15px', marginRight: "6px" }}>{`-${offset}`}</span>
<span style={{ color: '#FF2121', fontSize: '15px', marginRight: "6px" }}>{`-¥${offset}`}</span>
<i className={`iconfont icondanseshixintubiao-5 balance-used`} onClick={throttle(this.useBalance, 600)}></i>
</>
) : (
......
src/components/shopCart/index.js
......@@ -153,6 +153,10 @@ class Cart extends Component {
http.post(`${API.home}/m/cart/remove`, data).then((res) => {
if (res.data.code === 200) {
this.getList()
this.setState({
allPrice: 0,
checkedNum: 0
})
} else {
Toast.info(res.data.msg, 2);
}
......
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