Skip to content

M
mr-julyedu
Commit 6d7eb011 by xuzhenghua
Options

kanjia

parent 9544334e
Showing with 266 additions and 94 deletions
src/components/bargainMiddlePage/bargain-middle-page.scss
......@@ -162,7 +162,20 @@
margin-top: 10px;
}
button {
.artifact-btn {
float: right;
position: relative;
top: -20px;
width: 61px;
height: 24px;
background: $bg_FF4000;
border-radius: 12px;
font-size: 12px;
border: none;
color: $white;
}
.active-btn {
width: 210px;
height: 30px;
box-shadow: 0px 1px 3px 0px rgba(255, 64, 0, 0.5);
......@@ -175,10 +188,14 @@
}
.invalid-btn {
width: 210px;
height: 30px;
background: $bg_999;
color: $white;
font-size: 16px;
box-shadow: none;
border-radius: 15px;
border: none;
}
}
}
......@@ -273,7 +290,7 @@
.subtitle {
font-size: $font_14;
color: #FF4000;
color: $color_FF4000;
}
}
......@@ -294,6 +311,9 @@
border: none;
color: $color_FF4000;
-webkit-appearance: none;
display: inline-block;
text-align: center;
line-height: 30px;
}
.btns {
......@@ -304,14 +324,23 @@
width: 80px;
height: 30px;
background: $bg_FADD29;
text-align: center;
line-height: 28px;
border: none;
color: $color_FF4000;
-webkit-appearance: none;
}
.invalid {
width: 80px;
height: 30px;
background: $bg_999;
color: $white;
border: none;
-webkit-appearance: none;
border-radius: 2px;
}
.purchase-btn {
......@@ -372,9 +401,11 @@
line-height: 12px;
}
button {
.bargain-href {
display: inline-block;
width: 260px;
height: 30px;
line-height: 28px;
background-color: $bg_FADD29;
color: $color_FF4000;
font-size: 16px;
......@@ -538,3 +569,141 @@
}
.close-bargain-success {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
}
.bargain-success {
width: 290px;
height: 109px;
padding: 15px;
background: $white;
border-radius: 5px;
text-align: center;
margin: 100px auto 20px auto;
position: relative;
p:nth-of-type(2) {
font-size: 14px;
margin-top: 10px;
}
p:nth-of-type(1) {
font-size: 12px;
margin-top: 10px;
}
.indicator {
color: $color_FE2F2F;
}
.iconyindao {
display: inline-block;
width: 60px;
height: 44px;
position: absolute;
top: -60px;
right: 0;
color: $white;
font-size: 40px;
}
.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: 340px;
background-color: $white;
border-radius: 3px;
margin: 130px auto 20px auto;
position: relative;
.title-box {
width: 100%;
height: 45px;
text-align: center;
color: $color_202426;
font-size: 16px;
line-height: 45px;
}
.more-bargain-list {
width: 100%;
height: 253px;
overflow: auto;
border-top: 1px solid $sp_e7eaf1;
padding: 0 15px;
background-color: $bg_f5f5f5;
.bargain-item {
border-bottom: 1px solid $sp_e7eaf1;
height: 50px;
display: flex;
position: relative;
.avatar {
width: 30px;
height: 30px;
border-radius: 50%;
margin-top: 10px;
margin-right: 10px;
}
.name {
font-size: 14px;
color: $color_333;
max-width: 130px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
line-height: 50px;
}
.bargain-status {
line-height: 50px;
color: $color_333;
font-size: 14px;
position: absolute;
right: 0;
}
}
}
}
.more-bargain-dec {
width: 100%;
position: absolute;
bottom: 0;
height: 42px;
font-size: 12px;
color: $color_FF4000;
text-align: center;
line-height: 42px;
}
.close {
color: #fff;
font-size: 22px;
position: relative;
left: 50%;
margin-left: -11px;
}
}
}
src/components/detail/bargain/bargain.scss
......@@ -99,7 +99,10 @@
color: $color_FF4000;
font-size: 12px;
text-align: center;
line-height: 48px;
padding-top: 10px;
.unit {
color: $color_333;
}
.time {
display: inline-block;
......
src/components/detail/bargain/index.js
......@@ -3,7 +3,7 @@ import './bargain.scss'
import {Flex, Toast} from "antd-mobile"
import Overlay from '../overlay'
import BargainInfo from './bargainInfo'
import {differenceInSeconds, differenceInMinutes, differenceInHours} from "date-fns"
import {differenceInSeconds, differenceInMinutes, differenceInHours, differenceInDays} from "date-fns"
import {api, getParam, http} from "@/utils"
import Ranking from "@/components/bargainMiddlePage/ranking"
import {compose} from "redux"
......@@ -77,6 +77,7 @@ class Bargain extends Component {
isShowMore: true
})
}
// 自组件传给父组件的boxHide
boxHide = (val) => {
this.setState({isShowMore: val})
......@@ -125,23 +126,8 @@ class Bargain extends Component {
// 我要砍价
iWantBargain = () => {
// 判断用户是否绑定了手机号
http.get(`${api.home}/sys/userStatus`).then((res) => {
if (res.data.code === 200) {
// 0-都没绑定 1-只绑定公众号 2-只绑定手机号 3-都绑定
if (res.data.data.status === 0 || res.data.data.status === 1) {
this.setState({
isShowOverlay: true,
status: 3,
})
} else {
this.toKanjia(getParam('id'), 1, 0)
}
} else {
Toast.info(res.data.msg, 2)
}
})
}
// 砍价接口
toKanjia = (id, type, uid) => {
......@@ -150,15 +136,23 @@ class Bargain extends Component {
type: type, // 1 用户自己砍价 2 使用砍价神器 3 好友助力砍价 4 好友第二次助力
parent_uid: uid // 被助力人id 【自己本人操作传0】
}
http.post(`${api.home}/m/to_bargain`, data).then((res) => {
http.post(`${api.home}/m/bargain/toBargain`, data).then((res) => {
if (res.data.code === 200) {
// this.getBargainInfo()
document.location.reload()
if (type === 2) {
this.setState({
isShowOverlay: true,
status: 2,
})
} else {
if (res.data.data.user_status === 2) {
this.setState({
isShowOverlay: true,
status: 3,
})
} else {
// this.getBargainInfo()
document.location.reload()
}
}
} else {
......@@ -206,11 +200,6 @@ class Bargain extends Component {
<BargainInfo/>
}
{/*砍价成功去分享*/}
{
this.state.status === 0 &&
<BargainSuccess/>
}
{/*领取砍价神器*/}
......@@ -266,9 +255,10 @@ function BargainIntro(props) {
function BargainStatus(props) {
const [hour, setHour] = useState()
const [min, setMin] = useState()
const [sec, setSec] = useState()
const [day, setDay] = useState(0)
const [hour, setHour] = useState(0)
const [min, setMin] = useState(0)
const [sec, setSec] = useState(0)
let thirdRow, btn
......@@ -293,6 +283,7 @@ function BargainStatus(props) {
setSec(differenceInSeconds(new Date(date), now) % 60)
setMin(differenceInMinutes(new Date(date), now) % 60)
setHour(differenceInHours(new Date(date), now) % 24)
setDay(differenceInDays(new Date(date), now) % 24)
}, 1000)
......@@ -308,9 +299,9 @@ function BargainStatus(props) {
<div className={'first-row'}>
<div>
已砍<span className={'indicator'}>{props.info.bargain_price}元</span>
<span className={'time hour'}>{String(hour).padStart(2,0)}</span> :&nbsp;
<span className={'time min'}>{String(min).padStart(2,0)}</span> :&nbsp;
<span className={'time sec'}>{String(sec).padStart(2,0)}</span>
<span className={'time hour'}>{String(hour).padStart(2, 0)}</span> :&nbsp;
<span className={'time min'}>{String(min).padStart(2, 0)}</span> :&nbsp;
<span className={'time sec'}>{String(sec).padStart(2, 0)}</span>
<span className='over'>后砍价结束</span>
</div>
<div onClick={props.getMore}>{props.info.assist_num}位好友助力></div>
......@@ -352,9 +343,12 @@ function BargainStatus(props) {
</div>
<div className="time-tobuy">
砍价金额将于
<span className={'time hour'}>{String(hour).padStart(2,0)}</span> :&nbsp;
<span className={'time min'}>{String(min).padStart(2,0)}</span> :&nbsp;
<span className={'time sec'}>{String(sec).padStart(2,0)}</span>
<span className={'time hour'}>{String(day).padStart(2, 0)}</span><span
className={'unit'}> 天 </span>
<span className={'time min'}>{String(hour).padStart(2, 0)}</span><span
className={'unit'}> 时 </span>
<span className={'time sec'}>{String(min).padStart(2, 0)}</span><span
className={'unit'}>分</span>
后清零，请尽快完成支付
</div>
</Flex>
......@@ -364,22 +358,6 @@ function BargainStatus(props) {
)
}
function BargainSuccess() {
return (
<div className="bargain-success">
<p className={'title'}>
恭喜你，一刀砍了
<span className={'indicator'}>39.8元</span>
</p>
<p>分享到微信群邀请更多好友帮忙砍价</p>
<p>
超过20位好友助力可获得
<span className={'indicator'} style={{color: '#FF4000'}}>【砍价神器】</span>
哦
</p>
</div>
)
}
{/*领取砍价神器*/
}
......
src/components/detail/btnstatus/index.js
......@@ -27,7 +27,6 @@ class BtnStatus extends Component {
// 加入购物车 type：1 加入购物车，2加入购物车并跳转到购物车页面去支付
toCart = (type) => {
console.log(type)
let data = {
course_id: getParam('id')
};
......@@ -38,11 +37,14 @@ class BtnStatus extends Component {
// this.props.getCourses()
document.location.reload()
} else {
window.location.href = '/shopcart'
// window.location.href = '/shopcart'
this.props.history.replace('/shopcart');
}
} else if (res.data.code === 15001) {
window.location.href = '/shopcart'
// window.location.href = '/shopcart'
this.props.history.replace('/shopcart');
} else {
Toast.info(res.data.msg, 2);
}
......@@ -60,20 +62,7 @@ class BtnStatus extends Component {
})
}
}
// 直接购买 TODO 等弄清楚了逻辑 再和加入购物车合并
toBuy = () => {
let data = {
course_id: getParam('id')
};
http.post(`${api.home}/m/cart/add`, data).then((res) => {
if(res.data.code !== 200) {
Toast.info(res.data.msg, 2);
return;
}
this.props.history.replace('/shopcart');
})
}
// 取消砍价
cancel = () => {
......@@ -105,7 +94,7 @@ class BtnStatus extends Component {
type: 1, // 1 用户自己砍价 2 使用砍价神器 3 好友助力砍价 4 好友第二次助力
parent_uid: 0 // 被助力人id 【自己本人操作传0】
}
http.post(`${api.home}/m/to_bargain`, data).then((res) => {
http.post(`${api.home}/m/bargain/toBargain`, data).then((res) => {
if (res.data.code === 200) {
// this.props.getBargainInfo()
document.location.reload()
......@@ -165,7 +154,7 @@ class BtnStatus extends Component {
<i className='iconfont iconerji'></i>
<span>课程咨询</span>
</a>
<button className='btn btn-s bg-F4AAA7' onClick={this.toBuy}>
<button className='btn btn-s bg-F4AAA7' onClick={e => this.toCart(2)}>
<span>{`¥ ${info.price1}`}</span>
<span>直接购买</span>
</button>
......
src/components/detail/index.js
......@@ -14,7 +14,6 @@ import {fetchCoursesListIfNeeded} from "./actions"
import {api, getParam, http, browser} from "@/utils";
import {Toast} from 'antd-mobile';
class Detail extends Component {
constructor(props) {
......@@ -61,8 +60,8 @@ class Detail extends Component {
}
invitedFriends = () => {
const {course_title,image_name, course_id, pdd_group_info, pdd_group_info: {groupon_member, groupon_member: { number }, price}} = this.props.courseInfo.course_info;
if(browser.isWeixin) {
const {course_title, image_name, course_id, pdd_group_info, pdd_group_info: {groupon_member, groupon_member: {number}, price}} = this.props.courseInfo.course_info;
if (browser.isWeixin) {
let share = this.state.share;
this.setState({
share: !share,
......@@ -95,7 +94,7 @@ class Detail extends Component {
wx.ready(function () { //需在用户可能点击分享按钮前就先调用
wx.hideAllNonBaseMenuItem();
wx.showMenuItems({
menuList: ['menuItem:share:appMessage' , 'menuItem:share:timeline'] // 要显示的菜单项，所有menu项见附录3
menuList: ['menuItem:share:appMessage', 'menuItem:share:timeline'] // 要显示的菜单项，所有menu项见附录3
});
wx.updateAppMessageShareData({
...shareData,
......@@ -110,7 +109,7 @@ class Detail extends Component {
}
})
});
}else{
} else {
Toast.info('请在微信中使用分享功能！', 2);
}
}
......@@ -144,18 +143,18 @@ class Detail extends Component {
if (this.props.courseInfo.course_info) {
courseInfo = this.props.courseInfo.course_info;
service = courseInfo.service;
if(courseInfo.group_status !== 0) {
if (courseInfo.group_status !== 0) {
number = courseInfo.pdd_group_info.groupon_member.number;
}
}
const {
is_bargain, // 是否是砍价课程
} = this.props;
const { share } = this.state;
const {share} = this.state;
return (
<div className='detail-box'>
<CallApp className='toapp'></CallApp>
<HeaderBar title='课程详情' arrow={true} cart={true}></HeaderBar>
<CallApp className='toapp'></CallApp>
{/*弹幕*/}
<Carouselw></Carouselw>
{/*课程*/}
......@@ -239,11 +238,15 @@ class Detail extends Component {
<OutLine data={this.props.courseInfo} toAudition={this.toAudition} toSingleset={this.toSingleset}/>
{/*课程按钮*/}
<BtnStatus data={this.props.courseInfo} barInfo={this.state.barInfo} getBargainInfo={this.getBargainInfo} invitedFriends={this.invitedFriends} history={this.props.history}></BtnStatus>
<BtnStatus data={this.props.courseInfo} barInfo={this.state.barInfo}
getBargainInfo={this.getBargainInfo} invitedFriends={this.invitedFriends}
history={this.props.history}></BtnStatus>
{
share ? (
<div className='groupSuccessMbc' onClick={()=>{this.setState({share: false})}}>
<div className='groupSuccessMbc' onClick={() => {
this.setState({share: false})
}}>
<div className='tipContent'>
{`还差${number}人，分享到3个群，成团率高达98%`}
......
src/components/detail/shareRank/index.scss
......@@ -59,16 +59,13 @@
}
.share {
// position: absolute;
// right: 12px;
// padding: 5px 6px;
border: 1px solid $red;
border-radius: 3px;
color: $red;
background-color: $bg_fff;
width: 76px;
height: 22px;
line-height: 22px;
line-height: 20px;
text-align: center;
}
......
src/components/detail/single/index.js
......@@ -2,17 +2,23 @@ import React, {Component} from 'react'
import './index.scss'
import {api, getParam, http, browser} from "@/utils";
import {Toast} from 'antd-mobile';
import {Link} from "react-router-dom";
import {Link, withRouter} from "react-router-dom";
import {compose} from "redux";
import {connect} from "react-redux";
import {differenceInHours, differenceInMinutes, differenceInSeconds} from "date-fns";
class Single extends Component {
constructor(props) {
super(props)
this.state = {
status: 1,
status: 3,
orderId: '',
nowPrice: '',
laterPrice: '',
hour: '',
min: '',
sec: '',
payType: '0', // 1支付宝 0微信
}
}
......@@ -177,6 +183,25 @@ class Single extends Component {
}
render() {
// if (this.state.bargainData.expire_time) {
let date = 1561140170*1000
let now = Date.now()
setInterval(() => {
date -= 1000
let s = differenceInSeconds(new Date(date), now) % 60,
m = differenceInMinutes(new Date(date), now) % 60,
h = differenceInHours(new Date(date), now) % 24
this.setState({
hour: h,
min: m,
sec: s,
})
}, 1000)
// }
return (
<div>
{
......@@ -271,17 +296,19 @@ class Single extends Component {
<span>参团成功</span>
</div>
<div className='group-img'>
<img src={this.props.user.data.avatar} alt=""/>
<img
src='https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/vu/image_head/Sv3Vz4B8Tp.jpg'
alt=""/>
<img
src='https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/vu/image_head/CwJoTNA21g.jpg'
src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/images/weekend/train7/ellipsis.png"
alt=""/>
<img
src='https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/vu/image_head/Sv3Vz4B8Tp.jpg'
src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/images/weekend/train7/ellipsis.png"
alt=""/>
</div>
<div className='btn-l btn-FF4000'>
剩余{String(this.state.hour).padStart(2, 0)}：{String(this.state.min).padStart(2, 0)}：{String(this.state.sec).padStart(2, 0)}
邀请好友参团
</div>
<div className='btn-l btn-FF4000'>剩余23：59：23 邀请好友参团</div>
</div>
}
<i onClick={this.colse} className={'iconfont iconiconfront-2 close'}></i>
......@@ -294,4 +321,10 @@ class Single extends Component {
}
export default Single
export default compose(
connect(
state => ({user: state.user}),
null
),
withRouter
)(Single)
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