Skip to content

M
mr-julyedu
Commit 854a13ab by FE
Options

del build

parents de62c028 078c92f7
Showing with 623 additions and 212 deletions
config/webpack.config.js
...@@ -209,7 +209,7 @@ module.exports = function(webpackEnv) { ...@@ -209,7 +209,7 @@ module.exports = function(webpackEnv) {
// https://github.com/facebook/create-react-app/issues/5250 // https://github.com/facebook/create-react-app/issues/5250
// Pending futher investigation: // Pending futher investigation:
// https://github.com/terser-js/terser/issues/120 // https://github.com/terser-js/terser/issues/120
inline: 2, inline: 2
}, },
mangle: { mangle: {
safari10: true, safari10: true,
......
package-lock.json
...@@ -3692,11 +3692,6 @@ ...@@ -3692,11 +3692,6 @@
"resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
"integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=" "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk="
}, },
"clipboard-copy": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/clipboard-copy/-/clipboard-copy-3.1.0.tgz",
"integrity": "sha512-Xsu1NddBXB89IUauda5BIq3Zq73UWkjkaQlPQbLNvNsd5WBMnTWPNKYR6HGaySOxGYZ+BKxP2E9X4ElnI3yiPA=="
},
"cliui": { "cliui": {
"version": "4.1.0", "version": "4.1.0",
"resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
...@@ -3989,6 +3984,14 @@ ...@@ -3989,6 +3984,14 @@
"resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
"integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40="
}, },
"copy-to-clipboard": {
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.2.0.tgz",
"integrity": "sha512-eOZERzvCmxS8HWzugj4Uxl8OJxa7T2k1Gi0X5qavwydHIfuSHq2dTD09LOg/XyGq4Zpb5IsR/2OJ5lbOegz78w==",
"requires": {
"toggle-selection": "^1.0.6"
}
},
"core-js": { "core-js": {
"version": "2.6.5", "version": "2.6.5",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz", "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.5.tgz",
...@@ -12084,6 +12087,15 @@ ...@@ -12084,6 +12087,15 @@
} }
} }
}, },
"react-copy-to-clipboard": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.1.tgz",
"integrity": "sha512-ELKq31/E3zjFs5rDWNCfFL4NvNFQvGRoJdAKReD/rUPA+xxiLPQmZBZBvy2vgH7V0GE9isIQpT9WXbwIVErYdA==",
"requires": {
"copy-to-clipboard": "^3",
"prop-types": "^15.5.8"
}
},
"react-dev-utils": { "react-dev-utils": {
"version": "8.0.0", "version": "8.0.0",
"resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-8.0.0.tgz", "resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-8.0.0.tgz",
...@@ -14502,6 +14514,11 @@ ...@@ -14502,6 +14514,11 @@
"repeat-string": "^1.6.1" "repeat-string": "^1.6.1"
} }
}, },
"toggle-selection": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz",
"integrity": "sha1-bkWxJj8gF/oKzH2J14sVuL932jI="
},
"topo": { "topo": {
"version": "2.0.2", "version": "2.0.2",
"resolved": "https://registry.npmjs.org/topo/-/topo-2.0.2.tgz", "resolved": "https://registry.npmjs.org/topo/-/topo-2.0.2.tgz",
...@@ -15067,6 +15084,11 @@ ...@@ -15067,6 +15084,11 @@
"minimalistic-assert": "^1.0.0" "minimalistic-assert": "^1.0.0"
} }
}, },
"web-launch-app": {
"version": "2.1.9",
"resolved": "https://registry.npmjs.org/web-launch-app/-/web-launch-app-2.1.9.tgz",
"integrity": "sha512-9zBCrr2msXKMh7qcYg1zqG+CCtzwSA1g9AM+4IPljklzcd2krTJAE7XdVwwWANFemwQyjRRWUVaAuEi8+z55kg=="
},
"web-namespaces": { "web-namespaces": {
"version": "1.1.2", "version": "1.1.2",
"resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.2.tgz", "resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.2.tgz",
......
package.json
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
"terser-webpack-plugin": "1.2.2", "terser-webpack-plugin": "1.2.2",
"url-loader": "1.1.2", "url-loader": "1.1.2",
"video.js": "^7.6.0", "video.js": "^7.6.0",
"web-launch-app": "^2.1.9",
"webpack": "4.28.3", "webpack": "4.28.3",
"webpack-dev-server": "3.1.14", "webpack-dev-server": "3.1.14",
"webpack-manifest-plugin": "2.0.4", "webpack-manifest-plugin": "2.0.4",
......
src/App.js
import React, { Component } from 'react' import React, {Component} from 'react'
import Routes from './router' import Routes from './router'
import cookie from 'js-cookie' import cookie from 'js-cookie'
import { connect } from "react-redux"; import {connect} from "react-redux";
import { setCurrentUser, startFetchUser } from "@/store/userAction"; import {setCurrentUser, startFetchUser} from "@/store/userAction";
import { withRouter } from 'react-router-dom' import {withRouter} from 'react-router-dom'
import { compose } from 'redux' import {compose} from 'redux'
import { getParam, http, browser } from "@/utils"; import {getParam, http, browser} from "@/utils";
import { Toast } from "antd-mobile"; import {Toast} from "antd-mobile";
import { addDays } from 'date-fns' import {addDays} from 'date-fns'
//拦截ajax请求，返回mock数据 //拦截ajax请求，返回mock数据
...@@ -57,15 +57,14 @@ class App extends Component { ...@@ -57,15 +57,14 @@ class App extends Component {
if (browser.isWeixin && browser.isIOS) { if (browser.isWeixin && browser.isIOS) {
sessionStorage.setItem('enter_url', window.location.href) sessionStorage.setItem('enter_url', window.location.href)
} }
this.getUser() this.getUser()
this.utm() this.utm()
const routeMatchRule = /binding-tel|forgot|set-password/ const routeMatchRule = /binding-tel|forgot|set-password/
const {history} = this.props const {history} = this.props
history.listen((location, action) => { history.listen((location, action) => {
this.utm()
this.firstLoad = false this.firstLoad = false
this.setNavigationRecord(location, action) this.setNavigationRecord(location, action)
this.utm()
if (cookie.get('uid') && this.props.user.hasError) { if (cookie.get('uid') && this.props.user.hasError) {
this.getUser() this.getUser()
} }
...@@ -89,13 +88,13 @@ class App extends Component { ...@@ -89,13 +88,13 @@ class App extends Component {
setNavigationRecord = (location, action) => { setNavigationRecord = (location, action) => {
const {pathname, search, hash} = location const {pathname, search, hash} = location
let isLastRecord = location.pathname === this.records.length && this.records[this.records.length - 1].pathname let isLastRecord = location.pathname === (this.records.length && this.records[this.records.length - 1].pathname)
switch (action) { switch (action) {
case 'POP': case 'POP':
this.firstLoad ? this.records.push({pathname, search, hash}) : this.records.pop() this.firstLoad ? this.records.push({pathname, search, hash}) : this.records.pop()
break break
case 'REPLACE': case 'REPLACE':
this.records[this.records.length - 1] = {pathname, search, hash} this.records.length > 1 && (this.records[this.records.length - 1] = {pathname, search, hash})
break break
default: default:
!isLastRecord && this.records.push({pathname, search, hash}) !isLastRecord && this.records.push({pathname, search, hash})
...@@ -171,8 +170,6 @@ class App extends Component { ...@@ -171,8 +170,6 @@ class App extends Component {
componentDidUpdate() { componentDidUpdate() {
this.setPreviousLocation()
if (!this.props.user.hasError && getParam('redirect')) { if (!this.props.user.hasError && getParam('redirect')) {
window.location.href = getParam('redirect') window.location.href = getParam('redirect')
} }
...@@ -180,22 +177,23 @@ class App extends Component { ...@@ -180,22 +177,23 @@ class App extends Component {
setPreviousLocation = () => { setPreviousLocation = () => {
const {location, history: {action}} = this.props const {location, history: {action}} = this.props
if (location.pathname.startsWith('/passport')) { if (location.pathname.startsWith('/passport')) {
let index = this.records.findIndex(item => item.pathname.startsWith('/passport')) /*let index = this.records.findIndex(item => item.pathname.startsWith('/passport'))
this.previousLocation = index > 0 this.previousLocation = index > 0
? this.records[index - 1] ? this.records[index - 1]
: this.records.length : this.records.length
? this.records[this.records.length - 1] ? this.records[this.records.length - 1]
: null : null*/
} else { } else {
if (action === 'POP' || action === 'REPLACE') { if (action === 'POP' || action === 'REPLACE') {
let index = this.records.findIndex(item => item.pathname.startsWith('/passport')) let index = this.records.findIndex(item => item.pathname.startsWith('/passport'))
this.previousLocation = index > 0 ? this.records[index - 1] : this.records[this.records.length - 1] this.previousLocation = index > 0 ? this.records[index - 1] : this.records[this.records.length - 1]
} else { } else {
this.previousLocation = location this.previousLocation = location
} }
} }
} }
transformUser = res => { transformUser = res => {
......
src/common/CallApp/index.js
import React, { Component } from 'react' import React, { Component } from 'react';
import CallApp from 'callapp-lib' import CallApp from 'callapp-lib'
const options = { const options = {
...@@ -24,23 +24,29 @@ const options = { ...@@ -24,23 +24,29 @@ const options = {
class OpenApp extends Component { class OpenApp extends Component {
// callApp = new CallApp(options) callApp = new CallApp(options)
callApp = null // callApp = null
static defaultProps = { static defaultProps = {
text: '在APP打开' text: '在APP打开'
} }
componentWillMount() { componentWillMount() {
this.callApp = new CallApp({ // this.callApp = new CallApp({});
...options,
path: this.props.path || '/'
});
} }
handleClick = () => { handleClick = () => {
this.callApp.open({}) this.callApp.open({
path: '',
param: {
},
callback: () => {
window.location.href = "http://www.julyedu.com/weekend/redir1";
}
});
} }
render() { render() {
......
src/common/Captcha/index.js
import React, { Component } from 'react'; import React, { Component } from 'react';
import { initCaptcha } from '@/utils'; import { initCaptcha } from '@/utils';
import { BarLoader } from 'react-spinners';
import './index.scss';
const CAPTCHAID = '6b0f5f6c8f334f3693ee754ba5692e36' const CAPTCHAID = '6b0f5f6c8f334f3693ee754ba5692e36'
class Captcha extends Component { class Captcha extends Component {
state = {
isReady: false
}
componentDidMount() { componentDidMount() {
const {getInstance, handleError, onVerify} = this.props const {getInstance, handleError, onVerify} = this.props;
const _this = this;
const el = document.getElementById('captcha'); const el = document.getElementById('captcha');
el && initCaptcha(function () { el && initCaptcha(function () {
initNECaptcha({ initNECaptcha({
...@@ -14,6 +22,13 @@ class Captcha extends Component { ...@@ -14,6 +22,13 @@ class Captcha extends Component {
captchaId: CAPTCHAID, captchaId: CAPTCHAID,
mode: 'float', mode: 'float',
width: 'auto', width: 'auto',
onReady: function (instance) {
// 验证码一切准备就绪，此时可正常使用验证码的相关功能
console.log(_this);
_this.setState({
isReady: true
});
},
onVerify: function (err, data) { onVerify: function (err, data) {
onVerify(err,data) onVerify(err,data)
} }
...@@ -30,7 +45,25 @@ class Captcha extends Component { ...@@ -30,7 +45,25 @@ class Captcha extends Component {
render() { render() {
return ( return (
<div id={'captcha'} style={{'marginBottom': this.props.mrBtm}}></div> <div
className="captcha-container"
style={{
'marginBottom': this.props.mrBtm
}}
>
{
!this.state.isReady &&
<div className="captcha-animation">
<BarLoader />
</div>
}
<div
id={'captcha'}
style={{
'marginBottom': this.props.mrBtm
}}
/>
</div>
); );
} }
} }
......
src/common/Captcha/index.scss 0 → 100644
.captcha-container {
position: relative;
width: 100%;
height: 40px;
}
.captcha-animation {
display: flex;
align-items: center;
justify-content: center;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
}
\ No newline at end of file
src/common/HeaderBar/index.js
...@@ -15,6 +15,8 @@ class HeaderBar extends Component { ...@@ -15,6 +15,8 @@ class HeaderBar extends Component {
} }
if(state.records && state.records.length > 1){ if(state.records && state.records.length > 1){
window.history.go(-1); window.history.go(-1);
}else if(state.from && state.from.pathname) {
location.replace(`${state.from.pathname}${state.from.search}`)
}else{ }else{
window.location.href = window.location.origin window.location.href = window.location.origin
} }
......
src/common/Loading/index.js
...@@ -36,12 +36,18 @@ class Loading extends Component { ...@@ -36,12 +36,18 @@ class Loading extends Component {
}) })
}, fake) }, fake)
}else { }else {
if(prevProps.isLoading != isLoading){ if(prevProps.isLoading) {
this.setState({ this.setState(()=>({
isLoading isLoading: false
}) }))
} }
} }
}else{
if(prevProps.isLoading !== isLoading) {
this.setState(()=>({
isLoading: true
}))
}
} }
} }
......
src/components/bargainMiddlePage/barcode/index.js
...@@ -23,11 +23,12 @@ class FollowBarcode extends Component { ...@@ -23,11 +23,12 @@ class FollowBarcode extends Component {
this.setState({ this.setState({
url: data.url url: data.url
}); });
const _this = this;
return new Promise(resolve => { return new Promise(resolve => {
QRCode.toDataURL(data.url, {}, function (err, url) { QRCode.toDataURL(data.url, {}, function (err, url) {
this.setState({ _this.setState({
codeUrl: url codeUrl: url
}) });
}); });
resolve(); resolve();
}); });
......
src/components/bargainMiddlePage/index.js
...@@ -171,6 +171,7 @@ class BargainMiddlePage extends Component { ...@@ -171,6 +171,7 @@ class BargainMiddlePage extends Component {
// } // }
// }) // })
} }
// 我要砍价列表的去支付 // 我要砍价列表的去支付
toCartBottom = (id) => { toCartBottom = (id) => {
http.get(`${API['base-api']}/m/cart/addtopreorder/[${id}]`).then((res) => { http.get(`${API['base-api']}/m/cart/addtopreorder/[${id}]`).then((res) => {
...@@ -195,6 +196,7 @@ class BargainMiddlePage extends Component { ...@@ -195,6 +196,7 @@ class BargainMiddlePage extends Component {
isShowMore: true isShowMore: true
}) })
} }
// 自组件传给父组件的boxHide // 自组件传给父组件的boxHide
boxHide = (val) => { boxHide = (val) => {
this.setState({isShowMore: val}) this.setState({isShowMore: val})
...@@ -202,8 +204,9 @@ class BargainMiddlePage extends Component { ...@@ -202,8 +204,9 @@ class BargainMiddlePage extends Component {
// 领取砍价神器 // 领取砍价神器
toArtifact = () => { toArtifact = () => {
const { course: { course_id = '' } } = this.state;
let data = { let data = {
courseId: getParam('id') courseId: getParam('id')? getParam('id') : course_id
} }
http.post(`${API.home}/m/bargain/receiveLimit`, data).then((res) => { http.post(`${API.home}/m/bargain/receiveLimit`, data).then((res) => {
if (res.data.code === 200) { if (res.data.code === 200) {
...@@ -219,7 +222,9 @@ class BargainMiddlePage extends Component { ...@@ -219,7 +222,9 @@ class BargainMiddlePage extends Component {
// 使用砍价神器 // 使用砍价神器
useArtifact = () => { useArtifact = () => {
this.toKanjia(getParam('id'), 2, 0) const { course: { course_id = '' } } = this.state;
const id = getParam('id')? getParam('id') : course_id;
this.toKanjia(id, 2, 0);
} }
// 砍价接口 // 砍价接口
...@@ -298,12 +303,16 @@ class BargainMiddlePage extends Component { ...@@ -298,12 +303,16 @@ class BargainMiddlePage extends Component {
// 帮好友砍价第一刀 // 帮好友砍价第一刀
friendBargainFirst = () => { friendBargainFirst = () => {
this.toKanjia(getParam('id'), 3, this.state.originatorUid) const { course: { course_id = '' } } = this.state;
const id = getParam('id')? getParam('id') : course_id;
this.toKanjia(id, 3, this.state.originatorUid);
} }
// 帮好友砍价第二刀 // 帮好友砍价第二刀
friendBargainSecond = () => { friendBargainSecond = () => {
this.toKanjia(getParam('id'), 4, this.state.originatorUid) const { course: { course_id = '' } } = this.state;
const id = getParam('id')? getParam('id') : course_id;
this.toKanjia(id, 4, this.state.originatorUid);
} }
// 邀请好友砍价 // 邀请好友砍价
...@@ -312,8 +321,7 @@ class BargainMiddlePage extends Component { ...@@ -312,8 +321,7 @@ class BargainMiddlePage extends Component {
isShowOverlay: true, isShowOverlay: true,
status: 7, status: 7,
isshowYindao: browser.isWeixin ? true : false isshowYindao: browser.isWeixin ? true : false
}) });
wxShare({ wxShare({
title: `我发现一门好课，快来帮我砍价吧！`, title: `我发现一门好课，快来帮我砍价吧！`,
...@@ -328,7 +336,7 @@ class BargainMiddlePage extends Component { ...@@ -328,7 +336,7 @@ class BargainMiddlePage extends Component {
this.setState({ this.setState({
isShowOverlay: false, isShowOverlay: false,
status: '', status: '',
}) });
} }
toCourseDetail = (id) => { toCourseDetail = (id) => {
...@@ -634,6 +642,9 @@ function CourseBottom(props) { ...@@ -634,6 +642,9 @@ function CourseBottom(props) {
} else if (props.item.bargain_status === 3) { } else if (props.item.bargain_status === 3) {
Buttons = <Link to={`/play/video?id=${props.item.v_course_id}`} Buttons = <Link to={`/play/video?id=${props.item.v_course_id}`}
className={classnames('bargain', 'button--study')}>去学习</Link> className={classnames('bargain', 'button--study')}>去学习</Link>
if(props.item.course_id === 139) {
Buttons = <a onClick={() => props.toDetail(props.item.course_id)} className={'bargain bargian-study'}>我要砍价</a>
}
} else { } else {
Buttons = ( Buttons = (
<div className="btns"> <div className="btns">
......
src/components/classify/courselist.js
...@@ -82,6 +82,9 @@ class Classify extends Component { ...@@ -82,6 +82,9 @@ class Classify extends Component {
// 获取课程接口 // 获取课程接口
getList = () => { getList = () => {
const _this = this const _this = this
_this.setState((state, props)=>({
isLoading: true
}));
http.get(`${API.home}/m/course/list/${getParam('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({ _this.setState({
......
src/components/classify/courselist.scss
...@@ -29,6 +29,10 @@ html,body,#root { ...@@ -29,6 +29,10 @@ html,body,#root {
background: #fff; background: #fff;
} }
.am-tabs-top {
height: 93vh;
}
.v-list-item { .v-list-item {
padding: 10px 0 0; padding: 10px 0 0;
......
src/components/country/countryRedux.js
...@@ -22,7 +22,8 @@ export default (state = {num: 86, code: null}, action) => { ...@@ -22,7 +22,8 @@ export default (state = {num: 86, code: null}, action) => {
return { return {
...state, ...state,
num: '', num: '',
code: '' code: '',
from: ''
}; };
default: default:
return state; return state;
......
src/components/country/index.js
...@@ -1069,7 +1069,8 @@ class Country extends Component { ...@@ -1069,7 +1069,8 @@ class Country extends Component {
const { history, addCountryNum } = this.props; const { history, addCountryNum } = this.props;
addCountryNum({ addCountryNum({
num, num,
code: getParam('share_code') code: getParam('share_code'),
from: getParam('from')
}); });
// history.push(`/detail?id=${getParam('id')}`); // history.push(`/detail?id=${getParam('id')}`);
history.go(-1) history.go(-1)
......
src/components/detail/bargain/bargainInfo/bargain-info.scss
.bargain-bind-phone { .bargain-phone-popup {
display: flex;
flex-flow: column;
width: 300px; width: 300px;
height: 195px; height: 195px;
margin: 200px auto 20px;
padding: 20px; padding: 20px;
background: $white;
border-radius: 3px; border-radius: 3px;
margin: 200px auto 20px auto; background-color: $white;
}
.title {
text-align: center;
font-size: $font_16;
margin-bottom: 12px;
}
button, .button { .bargain-phone-popup__title {
display: inline-block; margin: 0 0 12px;
width: 260px; font-size: 15px;
height: 30px; font-weight: normal;
background: $bg_999; text-align: center;
line-height: 28px; line-height: 1;
text-align: center; }
-webkit-appearance: none;
border: none;
font-size: $font_16; .bargain-phone-popup__item {
color: $white; display: flex;
align-items: center;
width: 100%;
height: 30px;
margin-top: 15px;
border: 1px solid #ddd;
box-sizing: border-box;
&.active { &.active {
background-color: #FADD29; border: 1px solid $active;
color: #FF4000; color: $active;
}
} }
input { input {
width: 100%; width: 100%;
height: 30px;
-webkit-appearance: none;
outline: 0;
border: 1px solid #DDDDDD;
margin-bottom: 15px;
padding-left: 10px; padding-left: 10px;
border-style: none;
outline: 0;
-webkit-appearance: none;
&::-webkit-input-placeholder { &::-webkit-input-placeholder {
color: $color_999; color: $color_999;
} }
&:focus { &.bargain-phone-popup__ipt {
border: 1px solid $active; border-left: 1px solid #ddd;
color: $active;
} }
} }
}
label {
display: block; .bargain-phone-popup__button--num {
position: relative; display: inline-flex;
align-items: center;
padding: 0 5px;
color: $color_999;
}
.bargain-phone-popup__button--send {
width: 136px;
border-style: none;
font-size: 13px;
color: $color_999;
text-align: right;
background-color: transparent;
cursor: pointer;
outline: none;
&.active {
color: $active;
}
}
.bargain-phone-popup__button--bargain {
display: block;
width: 100%;
height: 30px;
margin-top: 20px;
border-style: none;
font-size: 15px;
color: $white;
line-height: 30px;
text-align: center;
background-color: $bg_999;
outline: none;
-webkit-appearance: none;
&.active {
color: #FF4000;
background-color: #FADD29;
} }
}
.send-code { .popup-bind--bargain {
position: absolute;
right: 15px; .popup-bind__content {
top: 8px; width: 300px;
font-size: 13px; margin: 200px auto 20px;
color: $color_999; padding: 20px;
border-radius: 3px;
}
.popup-bind__title {
margin: 0 0 12px;
font-size: 15px;
font-weight: normal;
}
.popup-bind__desc {
padding: 0;
font-size: 12px;
}
.popup-bind__button {
padding: 0;
} }
} }
\ No newline at end of file
src/components/detail/bargain/bargainInfo/index.js
...@@ -3,8 +3,9 @@ import {InputItem, List} from "antd-mobile"; ...@@ -3,8 +3,9 @@ import {InputItem, List} from "antd-mobile";
import './bargain-info.scss' import './bargain-info.scss'
import {validateTel} from "@/utils"; import {validateTel} from "@/utils";
import {Toast} from 'antd-mobile' import {Toast} from 'antd-mobile'
import { http } from "@/utils"; import { http, getParam } from "@/utils";
import {Link} from "react-router-dom"; import {Link} from "react-router-dom";
import classnames from 'classnames';
class BargainInfo extends Component { class BargainInfo extends Component {
...@@ -12,7 +13,13 @@ class BargainInfo extends Component { ...@@ -12,7 +13,13 @@ class BargainInfo extends Component {
state = { state = {
mobile: '', mobile: '',
code: '', code: '',
isBargain: true num: '86',
isBargain: true,
isFocus: false,
bindInfo: {},
isTip: false,
seconds: 60,
isTimer: false, // 是否开始倒计时
} }
handleChange = e => { handleChange = e => {
...@@ -24,77 +31,272 @@ class BargainInfo extends Component { ...@@ -24,77 +31,272 @@ class BargainInfo extends Component {
}) })
} }
// 获取短信验证码
sendCode = () => { sendCode = () => {
const { country } = this.props;
let { mobile, isTimer, seconds } = this.state;
if(!isTimer) {
if(!/^\d+$/.test(mobile)){
Toast.info('请输入正确的手机号');
return;
}
console.log(validateTel(this.state.mobile)); // 获取验证码
http.post(
if (!validateTel(this.state.mobile)) { `${API['passport-api']}/m/personal/bindPhoneSendCode`,
Toast.info('请输入正确的手机号') {
return area_code: `00${country}`,
phone_num: mobile
}
).then(res => {
const { errno, msg } = res.data;
if(errno === 200) {
Toast.info('验证码发送成功', 2, null, false);
// 倒计时
this.timer = window.setInterval(() => {
console.log(seconds);
if (seconds <= 0) {
window.clearInterval(this.timer);
this.setState({
isTimer: false,
seconds: 60
});
}else {
this.setState({
isTimer: true,
seconds: --seconds
});
}
}, 1000);
}else {
Toast.info(msg);
}
});
} }
// http.post(`${API['base-api']}/sys/bind_send_sms`, {
http.post(`${API['base-api']}/sys/bind_send_sms`, { // phone_num: this.state.mobile
phone_num: this.state.mobile // }).then(res => {
}).then(res => { // if (res.data.code == 200) {
if (res.data.code == 200) { // Toast.info('验证码发送成功', 2, null, false)
Toast.info('验证码发送成功', 2, null, false) // } else if (res.data.errno === 410) {
} else if (res.data.errno === 410) { // Toast.info('该手机号已注册，请使用该手机号登录，发起砍价。', 3, null, false)
Toast.info('该手机号已注册，请使用该手机号登录，发起砍价。', 3, null, false) // this.setState({
this.setState({ // isBargain: false
isBargain: false // })
}) // } else {
} else { // Toast.info(res.data.msg)
Toast.info(res.data.msg) // }
} // })
})
} }
handleClick = () => { // 绑定手机号
if (!this.state.code) { handleClick = (isValid = 1) => {
Toast.info('请填写验证码') const { country, iWantBargain } = this.props;
return const { code, mobile } = this.state;
if (!mobile) {
Toast.info('请填手机号码');
return;
}
if (!code) {
Toast.info('请填写验证码');
return;
} }
http.post(`${API.home}/m/user/bindMobile`, { // is_valid 是否验证 1:验证（默认）,0不验证
...this.state http.post(
}).then(res => { `${API['passport-api']}/m/personal/bindPhone`,
if (res.data.code == 200) { {
Toast.info('绑定手机号成功', 2, null, false) area_code: `00${country}`,
this.props.iWantBargain() phone_num: mobile,
} else { code: code,
Toast.info(res.data.msg) type: 1,
is_valid: isValid
} }
}) ).then(res => {
const { errno, data, msg } = res.data;
if(errno === 200) {
if(isValid) {
if(data.tip_info) {
this.setState({
isTip: true,
bindInfo: data.tip_info
})
}else {
iWantBargain();
}
}else {
iWantBargain();
}
}else {
Toast.info(msg);
}
});
// http.post(`${API.home}/m/user/bindMobile`, {
// ...this.state
// }).then(res => {
// if (res.data.code == 200) {
// Toast.info('绑定手机号成功', 2, null, false)
// this.props.iWantBargain()
// } else {
// Toast.info(res.data.msg)
// }
// })
} }
render() { render() {
let {mobile, code} = this.state const { country, toClose } = this.props;
const { mobile, code, isBargain, isFocus, bindInfo, isTip, isTimer, seconds } = this.state;
const bool = /^\d+$/.test(mobile);
return ( return (
<div className={'bargain-bind-phone'}> <>
<div className="title">绑定手机，先砍一刀</div> {/* 该手机号已绑定其他帐号 */}
<List className={'list'}>
<input type="tel" onChange={this.handleChange} name='mobile' placeholder='手机号' maxLength={11}/>
<label htmlFor="code">
<input type="tel" id='code' onChange={this.handleChange} name='code' placeholder='验证码'
maxLength={6}/>
<div className={'send-code'} onClick={this.sendCode}>发送验证码</div>
</label>
</List>
{ {
this.state.isBargain && isTip &&
<button onClick={this.handleClick} <div className="popup-bind popup-bind--bargain">
className={validateTel(mobile) && code ? 'active' : ''}>先砍一刀</button> <div className="popup-bind__content">
<h4 className="popup-bind__title">绑定确认</h4>
<p className="popup-bind__desc">该手机号已绑定到以下账号，继续绑定将解除以下绑定状态</p>
<ul className="popup-bind__list">
{
bindInfo['email'] &&
<li className="popup-bind__account">
{/* 邮箱 */}
<i className="iconfont iconduanxin"></i>
<p className="popup-bind__account--name">{bindInfo['email']}</p>
</li>
}
{
bindInfo['wechat_nickname'] &&
<li className="popup-bind__account">
{/* wechat */}
<i className="icon-wachat"></i>
<p className="popup-bind__account--name">{bindInfo['wechat_nickname']}</p>
</li>
}
{
bindInfo['qq_nickname'] &&
<li className="popup-bind__account">
{/* qq */}
<i className="icon-qq"></i>
<p className="popup-bind__account--name">{bindInfo['qq_nickname']}</p>
</li>
}
{
bindInfo['sina_nickname'] &&
<li className="popup-bind__account">
{/* 微博 */}
<i className="icon-sina"></i>
<p className="popup-bind__account--name">{bindInfo['sina_nickname']}</p>
</li>
}
</ul>
<div className="popup-bind__button">
<button
className="popup-bind__button--cancle"
onClick={toClose}>取消</button>
<button
className="popup-bind__button--confirm"
onClick={() => this.handleClick(0)}>继续绑定</button>
</div>
</div>
</div>
} }
{ {
!this.state.isBargain && !isTip &&
<Link className='button active' to={`/passport/login`}>去登录</Link> <div className="bargain-phone-popup">
<h2 className="bargain-phone-popup__title">绑定手机，先砍一刀</h2>
<div
className={classnames(
"bargain-phone-popup__item",
{
'active': isFocus
}
)}
>
<Link
className="bargain-phone-popup__button--num"
to={`/country?id=${getParam('id')}&from=bargain`}
>
+{country}
<i className="iconfont iconiconfront-69"></i>
</Link>
<input
className="bargain-phone-popup__ipt"
type="tel"
onChange={this.handleChange}
onFocus={() => {
this.setState({
isFocus: true
});
}}
onBlur={() => {
this.setState({
isFocus: false
});
}}
name='mobile'
placeholder='手机号'
maxLength={11}
/>
</div>
<div className="bargain-phone-popup__item">
<input
type="tel"
id='code'
onChange={this.handleChange}
name='code'
placeholder='验证码'
maxLength={6}
/>
<button
type="button"
className={classnames(
'bargain-phone-popup__button--send',
{
'active': bool
}
)}
onClick={this.sendCode}
>
{isTimer? `重新发送${seconds}s` : '发送验证码'}
</button>
</div>
{
isBargain
? (
<button
type="button"
onClick={() => this.handleClick()}
className={classnames(
'bargain-phone-popup__button--bargain',
{
'active': bool && code
}
)}
>先砍一刀</button>
)
: (
<Link
className='bargain-phone-popup__button--bargain active'
to={`/passport/login`}
>去登录</Link>
)
}
</div>
} }
</div> </>
); );
} }
} }
export default BargainInfo export default BargainInfo;
\ No newline at end of file \ No newline at end of file
src/components/detail/bargain/index.js
...@@ -24,14 +24,31 @@ class Bargain extends Component { ...@@ -24,14 +24,31 @@ class Bargain extends Component {
status: '', status: '',
bargainCode: '', bargainCode: '',
time: '', time: '',
barInfo: {} barInfo: {},
country: '86'
} }
} }
componentDidMount() { componentDidMount() {
this.getBargainInfo(); this.getBargainInfo();
this.judgePopupTypeFromCountry();
} }
// 选择区号后进入
judgePopupTypeFromCountry = () => {
const { country, delCountryNum } = this.props;
if(country.from && country.from === 'bargain') {
this.setState({
country: country.num,
isShowOverlay: true,
status: 3,
});
// 清除
delCountryNum();
}
}
// 获取助理好友 // 获取助理好友
getBargainRankList = (params = {}) => { getBargainRankList = (params = {}) => {
http.post(`${API.home}/m/bargain/rankList`, params).then((res) => { http.post(`${API.home}/m/bargain/rankList`, params).then((res) => {
...@@ -63,7 +80,7 @@ class Bargain extends Component { ...@@ -63,7 +80,7 @@ class Bargain extends Component {
}); });
// 砍价状态 0-砍价中，1砍价结束，待支付，2砍价过期（没有砍价记录没有砍价信息），3已购买 // 砍价状态 0-砍价中，1砍价结束，待支付，2砍价过期（没有砍价记录没有砍价信息），3已购买
if (data.bargain_status === 0) { if (data.bargain_status === 0 || data.bargain_status === 1 ) {
this.getBargainRankList({ this.getBargainRankList({
type: 0, type: 0,
bargain_code: data.bargain_code bargain_code: data.bargain_code
...@@ -131,12 +148,12 @@ class Bargain extends Component { ...@@ -131,12 +148,12 @@ class Bargain extends Component {
// 我要砍价 // 我要砍价
iWantBargain = () => { iWantBargain = () => {
const {user} = this.props const { history, user } = this.props
const uid = user && user.data && user.data.uid const uid = user && user.data && user.data.uid;
if(!uid){ if(!uid){
this.props.history.push('/passport/login') history.push('/passport/login');
} else { } else {
this.toKanjia(getParam('id'), 1, 0) this.toKanjia(getParam('id'), 1, 0);
} }
} }
...@@ -146,26 +163,44 @@ class Bargain extends Component { ...@@ -146,26 +163,44 @@ class Bargain extends Component {
course_id: id, course_id: id,
type: type, // 1 用户自己砍价 2 使用砍价神器 3 好友助力砍价 4 好友第二次助力 type: type, // 1 用户自己砍价 2 使用砍价神器 3 好友助力砍价 4 好友第二次助力
parent_uid: uid // 被助力人id 【自己本人操作传0】 parent_uid: uid // 被助力人id 【自己本人操作传0】
} };
const { history } = this.props; const { history } = this.props;
http.post(`${API.home}/m/bargain/toBargain`, data).then((res) => { http.post(`${API.home}/m/bargain/toBargain`, data).then((res) => {
const { data: { data, code } } = res; const { data: { data, code } } = res;
if (code === 200) { if (code === 200) {
if (type === 2) {
// user_status 用户状态 1-关注公众号，2-绑定手机号 3-再砍一刀 （是发起人没有这个字段）
if(data.user_status === 2) {
this.setState({ this.setState({
isShowOverlay: true, isShowOverlay: true,
status: 2, status: 3,
}) });
} else { }else {
if (data.user_status === 2) { if(type === 2) {
this.setState({ this.setState({
isShowOverlay: true, isShowOverlay: true,
status: 3, status: 2,
}) });
} else { }else {
history.push(`/bargain-middle-page?id=${getParam('id')}&bargaincode=${data.bargain_code}&is_originator=1`) history.push(`/bargain-middle-page?id=${getParam('id')}&bargaincode=${data.bargain_code}&is_originator=1`)
} }
} }
// if (type === 2) {
// this.setState({
// isShowOverlay: true,
// status: 2,
// })
// } else {
// // user_status 用户状态 1-关注公众号，2-绑定手机号 3-再砍一刀 （是发起人没有这个字段）
// if (data.user_status === 2) {
// this.setState({
// isShowOverlay: true,
// status: 3,
// })
// } else {
// history.push(`/bargain-middle-page?id=${getParam('id')}&bargaincode=${data.bargain_code}&is_originator=1`)
// }
// }
} else { } else {
Toast.info(res.data.msg, 2) Toast.info(res.data.msg, 2)
} }
...@@ -182,7 +217,7 @@ class Bargain extends Component { ...@@ -182,7 +217,7 @@ class Bargain extends Component {
} }
render() { render() {
const { list, outList, barInfo } = this.state; const { list, outList, barInfo, country } = this.state;
const {user} = this.props const {user} = this.props
const uid = user && user.data && user.data.uid const uid = user && user.data && user.data.uid
return ( return (
...@@ -190,7 +225,7 @@ class Bargain extends Component { ...@@ -190,7 +225,7 @@ class Bargain extends Component {
{/*bargain_status 砍价状态 0-砍价中，1砍价结束，待支付，2砍价过期（没有砍价记录没有砍价信息），3已购买*/} {/*bargain_status 砍价状态 0-砍价中，1砍价结束，待支付，2砍价过期（没有砍价记录没有砍价信息），3已购买*/}
{ {
(barInfo.bargain_status === 2 || !uid) && (barInfo.bargain_status === 2 || (getParam('id') === '139' && barInfo.bargain_status === 3) || !uid) &&
<BargainIntro limitPeople={barInfo.limit_people} iWantBargain={this.iWantBargain}/> <BargainIntro limitPeople={barInfo.limit_people} iWantBargain={this.iWantBargain}/>
} }
{ {
...@@ -212,7 +247,7 @@ class Bargain extends Component { ...@@ -212,7 +247,7 @@ class Bargain extends Component {
{/*绑定手机号*/} {/*绑定手机号*/}
{ {
this.state.status === 3 && this.state.status === 3 &&
<BargainInfo iWantBargain={this.iWantBargain}/> <BargainInfo country={country} iWantBargain={this.iWantBargain} toClose={this.close} />
} }
......
src/components/detail/btnstatus/index.js
...@@ -332,7 +332,7 @@ class BtnStatus extends Component { ...@@ -332,7 +332,7 @@ class BtnStatus extends Component {
<span onClick={this.tobuy}>直接购买</span> <span onClick={this.tobuy}>直接购买</span>
</button> </button>
{ {
(barInfo.bargain_status === 2 || !uid) && (barInfo.bargain_status === 2|| (getParam('id') === '139' && barInfo.bargain_status === 3) || !uid) &&
<button className='btn btn-s bg-E02E24' onClick={this.toKanjia}> <button className='btn btn-s bg-E02E24' onClick={this.toKanjia}>
我要砍价 我要砍价
</button> </button>
......
src/components/detail/index.js
...@@ -318,15 +318,13 @@ class Detail extends Component { ...@@ -318,15 +318,13 @@ class Detail extends Component {
} }
// 点击子组件试听按钮 // 点击子组件试听按钮
toAudition = () => { toAudition = (v_course_id, video_id) => {
const {user} = this.props const {user} = this.props
const uid = user && user.data && user.data.uid const uid = user && user.data && user.data.uid
if (!uid) { if (!uid) {
this.props.history.push('/passport/login') this.props.history.push('/passport/login')
} else { } else {
this.setState({ this.props.history.push(`/play/video?id=${v_course_id}&video_id=${video_id}`);
auditionBox: true,
})
} }
} }
// 点击子组件单集购买按钮 // 点击子组件单集购买按钮
...@@ -621,10 +619,18 @@ class Detail extends Component { ...@@ -621,10 +619,18 @@ class Detail extends Component {
/> />
} }
{/*砍价*/} {/*
* 砍价
* is_baoming 否报名 0-未购买弹出报名 1-已购买弹出开始学习
* is_dist 是否分销课程
* is_bargain 是否砍价课程
*/}
{ {
course_info.is_baoming === 0 && (!course_info.is_aist) && course_info.is_bargain && course_info.is_baoming === 0 && (!course_info.is_aist) && course_info.is_bargain &&
<Bargain/> <Bargain
country={this.props.country}
delCountryNum={this.props.delCountryNum}
/>
} }
{/*课程介绍、大纲*/} {/*课程介绍、大纲*/}
......
src/components/detail/outline/index.js
...@@ -93,9 +93,9 @@ class OutLine extends Component { ...@@ -93,9 +93,9 @@ class OutLine extends Component {
6-可试听但无试听权限 6-可试听但无试听权限
*/} */}
{ // 试听 { // 试听
!introduce.is_aist && item.class_status === 6 && !introduce.is_aist && (item.class_status === 6 || item.class_status === 5) &&
<span className='btn-right-10 audition' <span className='btn-right-10 audition'
onClick={this.props.toAudition}>试听 onClick={e => this.props.toAudition(introduce.v_course_id, item.video_id)}>试听
<i className='iconfont iconcelluar'></i> <i className='iconfont iconcelluar'></i>
</span> </span>
} }
......
src/components/detail/redPacket/index.js
...@@ -125,7 +125,6 @@ class RedPacket extends PureComponent { ...@@ -125,7 +125,6 @@ class RedPacket extends PureComponent {
// 获取分享信息 // 获取分享信息
fetchShareInfo = () => { fetchShareInfo = () => {
const share_code = getParam('share_code'); const share_code = getParam('share_code');
http.get(`${API.home}/sys/redPacket/shareUrl/${getParam('id')}`).then(res => { http.get(`${API.home}/sys/redPacket/shareUrl/${getParam('id')}`).then(res => {
const { code, data } = res.data; const { code, data } = res.data;
...@@ -467,7 +466,7 @@ class RedPacket extends PureComponent { ...@@ -467,7 +466,7 @@ class RedPacket extends PureComponent {
} }
handleToSend = ({tel, code}) => { handleToSend = ({tel, code}) => {
let { validate, seconds, isFirst, isTimer, captchaInstance, country: {num = '0086'} } = this.state; let { validate, seconds, isFirst, isTimer, captchaInstance, country: {num = '86'} } = this.state;
if(validate) { if(validate) {
if (!isFirst) { if (!isFirst) {
Toast.info('请重新进行滑块验证', 2, null, false); Toast.info('请重新进行滑块验证', 2, null, false);
...@@ -489,7 +488,7 @@ class RedPacket extends PureComponent { ...@@ -489,7 +488,7 @@ class RedPacket extends PureComponent {
http.post( http.post(
`${API['passport-api']}/m/personal/bindPhoneSendCode`, `${API['passport-api']}/m/personal/bindPhoneSendCode`,
{ {
area_code: '00'+num, area_code: `00${num}`,
phone_num: tel phone_num: tel
} }
).then(res => { ).then(res => {
...@@ -570,12 +569,12 @@ class RedPacket extends PureComponent { ...@@ -570,12 +569,12 @@ class RedPacket extends PureComponent {
// 绑定手机 // 绑定手机
toContinueBind = (isValid = 1) => { toContinueBind = (isValid = 1) => {
const { accountInfo: { tel, code}, country: {num = '0086'} } = this.state; const { accountInfo: { tel, code}, country: {num = '86'} } = this.state;
// is_valid 是否验证 1:验证（默认）,0不验证 // is_valid 是否验证 1:验证（默认）,0不验证
http.post( http.post(
`${API['passport-api']}/m/personal/bindPhone`, `${API['passport-api']}/m/personal/bindPhone`,
{ {
area_code: '00'+num, area_code: `00${num}`,
phone_num: tel, phone_num: tel,
code: code, code: code,
type: 1, type: 1,
......
src/components/detail/single/index.js
...@@ -340,6 +340,11 @@ class Single extends Component { ...@@ -340,6 +340,11 @@ class Single extends Component {
</div> </div>
<div className='payment-type'> <div className='payment-type'>
<label>支付方式：</label> <label>支付方式：</label>
<p onClick={this.check.bind(this, '0')}>
<i className='iconfont iconweixinzhifu buy'></i>
<span>微信支付</span>
<i className={`iconfont icondanseshixintubiao-5 redio ${this.state.payType === '0' ? 'redioed' : ''}`}></i>
</p>
{ {
!browser.isWeixin && !browser.isWeixin &&
<p onClick={this.check.bind(this, '1')}> <p onClick={this.check.bind(this, '1')}>
...@@ -349,11 +354,6 @@ class Single extends Component { ...@@ -349,11 +354,6 @@ class Single extends Component {
</p> </p>
} }
<p onClick={this.check.bind(this, '0')}>
<i className='iconfont iconweixinzhifu buy'></i>
<span>微信支付</span>
<i className={`iconfont icondanseshixintubiao-5 redio ${this.state.payType === '0' ? 'redioed' : ''}`}></i>
</p>
</div> </div>
<div className='btn btn-18B4ED' onClick={this.toBuy}>确认购买</div> <div className='btn btn-18B4ED' onClick={this.toBuy}>确认购买</div>
</div> </div>
......
src/components/order/payOrder/PayOrder.js
...@@ -18,8 +18,8 @@ if (browser.isWeixin) { ...@@ -18,8 +18,8 @@ if (browser.isWeixin) {
]; ];
} else { } else {
mockData = [ mockData = [
{value: 0, label: '支付宝', icon: 'iconalipay'},
{value: 1, label: '微信支付', icon: 'iconweixinzhifu'}, {value: 1, label: '微信支付', icon: 'iconweixinzhifu'},
{value: 0, label: '支付宝', icon: 'iconalipay'},
// { value: 2, label: '花呗分期', icon: 'iconhuabei' }, // { value: 2, label: '花呗分期', icon: 'iconhuabei' },
]; ];
} }
...@@ -30,7 +30,7 @@ export default class PayOrder extends Component { ...@@ -30,7 +30,7 @@ export default class PayOrder extends Component {
super(props); super(props);
this.state = { this.state = {
pay_amount: 0, pay_amount: 0,
payType: 0, payType: 1,
stageNumber: 0, stageNumber: 0,
checkPeriod: false, checkPeriod: false,
singleMoney: 0, singleMoney: 0,
......
src/components/passport/setPassword/index.js
...@@ -15,8 +15,6 @@ import { connect } from "react-redux"; ...@@ -15,8 +15,6 @@ import { connect } from "react-redux";
class SetPassword extends Component { class SetPassword extends Component {
render() { render() {
let {values, errors, location} = this.props let {values, errors, location} = this.props
let {from} = location.state || {from: {pathname: '/'}} let {from} = location.state || {from: {pathname: '/'}}
......
src/components/search/search-result.js
...@@ -76,34 +76,47 @@ class SearchResult extends PureComponent { ...@@ -76,34 +76,47 @@ class SearchResult extends PureComponent {
} }
handleScroll = throttle(() => { handleScroll = throttle(() => {
let y = window.scrollY, headY = this.searchHead.current.offsetTop let y = window.scrollY,
if (y < this.prevScrollY) { headY = this.searchHead.current.offsetTop;
console.log(headY,'headY');
console.log(document.querySelector('body').offsetHeight);
// 向上滑动
if (y < this.prevScrollY && y > 0) {
console.log(0);
console.log(this.state.swipeDirection);
if (this.state.swipeDirection === this.swipeDown) { if (this.state.swipeDirection === this.swipeDown) {
console.log(1);
y <= headY && this.state.searchHeadStyle.position !== 'fixed' && this.setState({ y <= headY && this.state.searchHeadStyle.position !== 'fixed' &&
this.setState({
searchHeadStyle: { searchHeadStyle: {
top: `0`, top: `0`,
position: 'fixed' position: 'fixed'
} }
}) })
} else { } else {
console.log(2);
this.setState({ this.setState({
swipeDirection: this.swipeDown swipeDirection: this.swipeDown
}, () => { }, () => {
if (this.state.swipeDirection === this.swipeDown) { if (this.state.swipeDirection === this.swipeDown) {
this.setState({ let h = y > document.querySelector('body').offsetHeight? document.querySelector('body').offsetHeight: y;
searchHeadStyle: { let h1 = this.searchHead.current.offsetHeight
top: `${y > headY ? y - 44 : y}px` this.setState({
} searchHeadStyle: {
}) // top: `${h > headY ? h - h1 : h}px`
top: `${y}px`
}
})
} }
}) })
} }
} else { } else {
console.log(3);
this.state.swipeDirection !== this.swipeUp && this.state.swipeDirection !== this.swipeUp &&
this.setState({ this.setState({
swipeDirection: this.swipeUp, swipeDirection: this.swipeUp,
...@@ -112,9 +125,8 @@ class SearchResult extends PureComponent { ...@@ -112,9 +125,8 @@ class SearchResult extends PureComponent {
top: `${y}px` top: `${y}px`
} }
}) })
} }
this.prevScrollY = y this.prevScrollY = y;
}, 0) }, 0)
render() { render() {
......
src/components/video/index.js
...@@ -756,7 +756,11 @@ class Video extends Component { ...@@ -756,7 +756,11 @@ class Video extends Component {
}}/> }}/>
<Loading isLoading={this.state.isLoading}> <Loading isLoading={this.state.isLoading}>
<div className="video"> <div className="video">
<video className={'video-js'} ref={el => this.video = el}> <video className={'video-js'} ref={el => this.video = el}
webkit-playsinline="true"
playsInline={true}
x-webkit-airplay="allow"
x5-video-player-type="h5">
<source src={'/'} type='application/x-mpegURL'/> <source src={'/'} type='application/x-mpegURL'/>
</video> </video>
{ {
......
yarn.lock
...@@ -2772,11 +2772,6 @@ cli-width@^2.0.0: ...@@ -2772,11 +2772,6 @@ cli-width@^2.0.0:
resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
clipboard-copy@^3.1.0:
version "3.1.0"
resolved "https://registry.npm.taobao.org/clipboard-copy/download/clipboard-copy-3.1.0.tgz#4c59030a43d4988990564a664baeafba99f78ca4"
integrity sha1-TFkDCkPUmImQVkpmS66vupn3jKQ=
cliui@^3.2.0: cliui@^3.2.0:
version "3.2.0" version "3.2.0"
resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d" resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
...@@ -11598,6 +11593,11 @@ wbuf@^1.1.0, wbuf@^1.7.3: ...@@ -11598,6 +11593,11 @@ wbuf@^1.1.0, wbuf@^1.7.3:
dependencies: dependencies:
minimalistic-assert "^1.0.0" minimalistic-assert "^1.0.0"
web-launch-app@^2.1.9:
version "2.1.9"
resolved "https://registry.npm.taobao.org/web-launch-app/download/web-launch-app-2.1.9.tgz#8da6e2b53331881d00e4ee3a8c2d630c29fc4550"
integrity sha1-jabitTMxiB0A5O46jC1jDCn8RVA=
web-namespaces@^1.1.2: web-namespaces@^1.1.2:
version "1.1.2" version "1.1.2"
resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.2.tgz#c8dc267ab639505276bae19e129dbd6ae72b22b4" resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.2.tgz#c8dc267ab639505276bae19e129dbd6ae72b22b4"
......
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