Merge branch 'bug' into pre

# Conflicts:
#	src/components/video/index.js

src/App.js

@@ -82,8 +82,8 @@ class App extends Component {
         location.state = {
             ...state, ...{
                 record: _state.record ?
-                    [..._state.record, {pathname: location.pathname}] :
-                    [{pathname: location.pathname}]
+                    [..._state.record, {pathname: location.pathname, search: location.search, hash: location.hash}] :
+                    [{pathname: location.pathname, search: '', hash: ''}]
             }
         }
     }

src/components/video/index.js

 import React, { Component } from 'react'
 import HeaderBar from '@/common/HeaderBar'
 import './video.scss'
-import {NavLink, Route, Redirect, Switch, Link} from 'react-router-dom'
-import {http, getParam, browser} from '@/utils'
+import { NavLink, Route, Redirect, Switch, Link } from 'react-router-dom'
+import { http, getParam, browser } from '@/utils'
 import Recommendation from './recommendation'
 import VideoCatalog from './video-catalog'
 import DatumCatalog from './datum-catalog'
@@ -118,8 +118,8 @@ class Video extends Component {
         this.setState({
             courseId: this.courseID
         })
-        const { location: { state = {} } } = this.props;
-        if(state.oid) {
+        const {location: {state = {}}} = this.props;
+        if (state.oid) {
             this.check(state.oid);
         }
         if (getParam('is_class') === 1 || getParam('weixinpay')) {
@@ -137,7 +137,7 @@ class Video extends Component {
     // 直接购买
     tobuy = () => {
         // 详情页单集购买到该页面，url中的id不是课程id
-        const { course={} } = this.state;
+        const {course = {}} = this.state;
         http.get(`${API['base-api']}/m/cart/addtopreorder/[${course.course_id}]`).then((res) => {
             if (res.data.errno === 0) {
                 this.props.history.push(`/order?id=${course.course_id}`, {simple: 1})
@@ -163,11 +163,11 @@ class Video extends Component {
     }
 
     // 单集购买 H5支付成功后回调
-    payCallback =() => {
+    payCallback = () => {
         const _this = this;
-        if(!getParam('oid')) {
+        if (!getParam('oid')) {
             return;
-        }else{
+        } else {
             this.setState({
                 singMess: JSON.parse(window.localStorage.getItem('singMess'))
             })
@@ -210,7 +210,7 @@ class Video extends Component {
         }
     };
     // 单集购买 微信内支付成功后回调
-    isweixinPay =()=> {
+    isweixinPay = () => {
         let _this = this;
         let weixin_code = getParam('code');
         if (weixin_code) {
@@ -224,6 +224,7 @@ class Video extends Component {
                 http.get(`${API['base-api']}/pay/wxpay/pub_charge/oid/${getParam('oid')}/code/${weixin_code}`).then((res) => {
                     if (res.data.errno === 0) {
                         const data = res.data.data;
+
                         function onBridgeReady() {
                             WeixinJSBridge.invoke(
                                 'getBrandWCPayRequest', {
@@ -279,6 +280,7 @@ class Video extends Component {
                                 }
                             )
                         }
+
                         if (typeof WeixinJSBridge == "undefined") {
                             if (document.addEventListener) {
                                 document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false)
@@ -415,8 +417,8 @@ class Video extends Component {
 
     //告诉服务端计算进度 普通课程不发送
     countSchedule = () => {
-        const {videoList, activeIndex, vCourseId, course={}} = this.state
-        if(Number(course.course_id) === 0 || course.course_id === '') {
+        const {videoList, activeIndex, vCourseId, course = {}} = this.state
+        if (Number(course.course_id) === 0 || course.course_id === '') {
             console.log('免费课程 拦截');
             return;
         }
@@ -425,7 +427,7 @@ class Video extends Component {
             console.log('5001 时间足够');
             return;
         }
-        if(course.is_aist) {
+        if (course.is_aist) {
             // 返现课程
             this.sendMessage({
                 mtype: 'count_schedule',
@@ -433,7 +435,7 @@ class Video extends Component {
                 token: this.token,
                 platform: 5
             })
-        }else{
+        } else {
             // 普通课程
             this.sendMessage({
                 mtype: 'c_count_schedule',
@@ -451,12 +453,12 @@ class Video extends Component {
     sendWatchTime = (sec, rate) => {
         const {videoList, activeIndex, vCourseId, course = {}} = this.state
         // 免费课程不发送
-        if(Number(course.course_id) === 0 || course.course_id === '') {
+        if (Number(course.course_id) === 0 || course.course_id === '') {
             console.log('免费课程 拦截');
             return;
         }
         // 时间为0 不发送消息
-        if(Number(sec) === 0) {
+        if (Number(sec) === 0) {
             return;
         }
         // 时间足够不发送
@@ -465,7 +467,7 @@ class Video extends Component {
             return;
         }
         let info_type = 'c_watch_time';
-        if(course.is_aist) {
+        if (course.is_aist) {
             info_type = 'watch_time';
         }
         this.sendMessage({
@@ -573,7 +575,7 @@ class Video extends Component {
                     this.setPlayerSrc(this.state.videoList[index]['play_url'])
                     this.sendLastRecord()
                     this.playVideo()
-                }else {
+                } else {
                     this.getCoursePrice();
                 }
             }
@@ -592,7 +594,7 @@ class Video extends Component {
             url = `${API.home}/m/course/play/${this.courseID}`
         }
         http.get(url).then(res => {
-            const { data={}, code } = res.data;
+                const {data = {}, code} = res.data;
                 if (code === 200) {
                     this.setState(
                         state => ({
@@ -615,7 +617,7 @@ class Video extends Component {
 
     playSetup = () => {
         // is_aist,是否AI特训营
-        const { course={} } = this.state;
+        const {course = {}} = this.state;
         if (Number(course.course_id) === 0 || course.course_id === '') {
             console.log('免费课程 拦截');
         }else{
@@ -694,7 +696,7 @@ class Video extends Component {
     }
 
     getCoursePrice = () => {
-        const { course = {} } = this.state;
+        const {course = {}} = this.state;
         http.get(`${API.home}/sys/course/price/${course.course_id}`)
             .then(res => {
                 const {data} = res
@@ -738,19 +740,19 @@ class Video extends Component {
         let {match, location, history} = this.props
         const {videoList, activeIndex, isAuth, salePrice, course, singleBox, singleType} = this.state;
         let toHref = '';
-        if(location.state && location.state.to && location.state.to === 'detail') {
-            toHref=`/detail?id=${course.course_id}`
+        if (location.state && location.state.to && location.state.to === 'detail') {
+            toHref = `/detail?id=${course.course_id}`
         }
         return (
             <div className='play'>
-                <HeaderBar title={this.state.title} arrow={true} toHref={()=>{
-                    history.push(
+                <HeaderBar title={this.state.title} arrow={true} toHref={() => {
+                    toHref ? history.push(
                         toHref,
                         {
                             to: 'classify'
                         }
-                    )
-                }} />
+                    ) : history.go(-1)
+                }}/>
                 <Loading isLoading={this.state.isLoading}>
                     <div className="video">
                         <video className={'video-js'} ref={el => this.video = el}>