课后题返回按钮

65928344 · FE · 6e87ca62 · 65928344 · 65928344 · 65928344
Commit 65928344 authored Aug 26, 2019 by FE
6 changed files
--- a/build/precache-manifest.8a9f4c3d3a7b25d637f2fec28dc4425c.js
+++ b/build/precache-manifest.8a9f4c3d3a7b25d637f2fec28dc4425c.js
+self.__precacheManifest = [
+  {
+    "revision": "efbabb4cb4f981304307",
+    "url": "/static/js/purchased.67a5b4ae.chunk.js"
+  },
+  {
+    "revision": "55f37ad82c7119c8500c",
+    "url": "/static/css/BargainMiddlePage.f15334d9.chunk.css"
+  },
+  {
+    "revision": "8b048df16e82f0d6ecd9",
+    "url": "/static/css/Classify.4393f5d0.chunk.css"
+  },
+  {
+    "revision": "8b048df16e82f0d6ecd9",
+    "url": "/static/js/Classify.b43b1f1f.chunk.js"
+  },
+  {
+    "revision": "325658841e3a4be58a3b",
+    "url": "/static/css/CourseList.3e2390c5.chunk.css"
+  },
+  {
+    "revision": "325658841e3a4be58a3b",
+    "url": "/static/js/CourseList.c0e75e45.chunk.js"
+  },
+  {
+    "revision": "d3b538a339bf93467b7b",
+    "url": "/static/css/DrawDocument.58508f31.chunk.css"
+  },
+  {
+    "revision": "d3b538a339bf93467b7b",
+    "url": "/static/js/DrawDocument.7725e9ac.chunk.js"
+  },
+  {
+    "revision": "2dd00425b4029e54ef8b",
+    "url": "/static/css/Examination.02475a25.chunk.css"
+  },
+  {
+    "revision": "2dd00425b4029e54ef8b",
+    "url": "/static/js/Examination.402592d7.chunk.js"
+  },
+  {
+    "revision": "de4907261ee45fbdb17a",
+    "url": "/static/js/MyEdit.274c9305.chunk.js"
+  },
+  {
+    "revision": "a4d63bc6d91f8ba371cc",
+    "url": "/static/css/Order.5199031c.chunk.css"
+  },
+  {
+    "revision": "a4d63bc6d91f8ba371cc",
+    "url": "/static/js/Order.0a8e5b31.chunk.js"
+  },
+  {
+    "revision": "06c022aacf1932f6b64d",
+    "url": "/static/js/Orderinfo.896f1700.chunk.js"
+  },
+  {
+    "revision": "10d13ff4d8fc80b24c76",
+    "url": "/static/css/PayOrder.4a91788c.chunk.css"
+  },
+  {
+    "revision": "10d13ff4d8fc80b24c76",
+    "url": "/static/js/PayOrder.bfc0a77e.chunk.js"
+  },
+  {
+    "revision": "5f9d6942c66fbab6e584",
+    "url": "/static/css/Preferential.aced1689.chunk.css"
+  },
+  {
+    "revision": "5f9d6942c66fbab6e584",
+    "url": "/static/js/Preferential.f0c2b5c7.chunk.js"
+  },
+  {
+    "revision": "0f672dc3b0c70a9e0cb0",
+    "url": "/static/css/SearchResult.bbdc2bc7.chunk.css"
+  },
+  {
+    "revision": "0f672dc3b0c70a9e0cb0",
+    "url": "/static/js/SearchResult.a3f98b21.chunk.js"
+  },
+  {
+    "revision": "fcad4a29a4944515159d",
+    "url": "/static/css/ShopCart.f39ca42e.chunk.css"
+  },
+  {
+    "revision": "fcad4a29a4944515159d",
+    "url": "/static/js/ShopCart.04b8f275.chunk.js"
+  },
+  {
+    "revision": "e538d1f4b36058e80f30",
+    "url": "/static/css/aist-share.01bc9663.chunk.css"
+  },
+  {
+    "revision": "e538d1f4b36058e80f30",
+    "url": "/static/js/aist-share.c722aa8c.chunk.js"
+  },
+  {
+    "revision": "341567f455eae2212731",
+    "url": "/static/css/coupons.c48c0144.chunk.css"
+  },
+  {
+    "revision": "341567f455eae2212731",
+    "url": "/static/js/coupons.aab15c32.chunk.js"
+  },
+  {
+    "revision": "c724db06e3ac2852bc71",
+    "url": "/static/css/detail.1eb8b1b7.chunk.css"
+  },
+  {
+    "revision": "c724db06e3ac2852bc71",
+    "url": "/static/js/detail.9e03dd13.chunk.js"
+  },
+  {
+    "revision": "1a6d7468778810e5d99a",
+    "url": "/static/css/main.5d8a546a.chunk.css"
+  },
+  {
+    "revision": "1a6d7468778810e5d99a",
+    "url": "/static/js/main.569f01c3.chunk.js"
+  },
+  {
+    "revision": "a49b981a7948be020ffa",
+    "url": "/static/css/myorders.1dbd49e2.chunk.css"
+  },
+  {
+    "revision": "a49b981a7948be020ffa",
+    "url": "/static/js/myorders.3458ee22.chunk.js"
+  },
+  {
+    "revision": "efbabb4cb4f981304307",
+    "url": "/static/css/purchased.a14c858f.chunk.css"
+  },
+  {
+    "revision": "55f37ad82c7119c8500c",
+    "url": "/static/js/BargainMiddlePage.feecff2d.chunk.js"
+  },
+  {
+    "revision": "912eef5593728b228e77",
+    "url": "/static/js/runtime~main.093c746b.js"
+  },
+  {
+    "revision": "6f17ecdcf62f9fcac25e",
+    "url": "/static/css/search.85280180.chunk.css"
+  },
+  {
+    "revision": "6f17ecdcf62f9fcac25e",
+    "url": "/static/js/search.b3c0a898.chunk.js"
+  },
+  {
+    "revision": "e13c1afc9a5fe639090b",
+    "url": "/static/css/shareposter.4618854a.chunk.css"
+  },
+  {
+    "revision": "e13c1afc9a5fe639090b",
+    "url": "/static/js/shareposter.3b56bacd.chunk.js"
+  },
+  {
+    "revision": "ea69eb055394a4d1eb82",
+    "url": "/static/css/study.d12e7b47.chunk.css"
+  },
+  {
+    "revision": "ea69eb055394a4d1eb82",
+    "url": "/static/js/study.689e6a24.chunk.js"
+  },
+  {
+    "revision": "0940280258ce860aeb44",
+    "url": "/static/css/togroup.acc61e40.chunk.css"
+  },
+  {
+    "revision": "0940280258ce860aeb44",
+    "url": "/static/js/togroup.9f1d2516.chunk.js"
+  },
+  {
+    "revision": "b6f18e552cce0ab77cdf",
+    "url": "/static/css/video.918e8086.chunk.css"
+  },
+  {
+    "revision": "b6f18e552cce0ab77cdf",
+    "url": "/static/js/video.2a3acc0d.chunk.js"
+  },
+  {
+    "revision": "80011994e30adf599e5f47fcc81bc06d",
+    "url": "/static/media/progress-share-bg.80011994.png"
+  },
+  {
+    "revision": "96e4c35670d8d8f5aa75",
+    "url": "/static/js/24.f686a34a.chunk.js"
+  },
+  {
+    "revision": "7f3acc087130c2daaeea",
+    "url": "/static/js/25.29681c9e.chunk.js"
+  },
+  {
+    "revision": "81a489ac63f2f2df5ab412e0782bd54c",
+    "url": "/static/media/kanjia_cg_icon.81a489ac.png"
+  },
+  {
+    "revision": "affa94a0fe715bb0d970",
+    "url": "/static/js/26.1eb4af6d.chunk.js"
+  },
+  {
+    "revision": "13e8fbe2b0e4d85ba038",
+    "url": "/static/js/27.4dd08449.chunk.js"
+  },
+  {
+    "revision": "f983caa7c06f105373e7e1aec42da261",
+    "url": "/static/media/iconfont.f983caa7.svg"
+  },
+  {
+    "revision": "9eec6a42ecdd7b78065e",
+    "url": "/static/js/28.76c0aaf3.chunk.js"
+  },
+  {
+    "revision": "145742789ab409c81f28938b15b5dee7",
+    "url": "/static/media/iconfont.14574278.ttf"
+  },
+  {
+    "revision": "a93048a28bc5890d6b5d",
+    "url": "/static/js/29.874e245a.chunk.js"
+  },
+  {
+    "revision": "cd1c41437a2e35a283e4b16b620a8c9e",
+    "url": "/static/media/iconfont.cd1c4143.eot"
+  },
+  {
+    "revision": "ed737da84f6fd336fba0",
+    "url": "/static/js/30.45467a9d.chunk.js"
+  },
+  {
+    "revision": "7b542c778563daa7cc420d21ed1601b3",
+    "url": "/static/media/iconfont.7b542c77.woff"
+  },
+  {
+    "revision": "eb21c2f86d04e38fed37",
+    "url": "/static/js/31.20f868b0.chunk.js"
+  },
+  {
+    "revision": "eb21c2f86d04e38fed37",
+    "url": "/static/css/31.ffbe0560.chunk.css"
+  },
+  {
+    "revision": "ed737da84f6fd336fba0",
+    "url": "/static/css/30.44620a41.chunk.css"
+  },
+  {
+    "revision": "a93048a28bc5890d6b5d",
+    "url": "/static/css/29.fd1b61f1.chunk.css"
+  },
+  {
+    "revision": "9eec6a42ecdd7b78065e",
+    "url": "/static/css/28.415f421f.chunk.css"
+  },
+  {
+    "revision": "affa94a0fe715bb0d970",
+    "url": "/static/css/26.2833f269.chunk.css"
+  },
+  {
+    "revision": "96e4c35670d8d8f5aa75",
+    "url": "/static/css/24.62b6292a.chunk.css"
+  },
+  {
+    "revision": "0658d9acff7d70528c0a409aed878e33",
+    "url": "/index.html"
+  }
+];
\ No newline at end of file
--- a/src/components/detail/index.js
+++ b/src/components/detail/index.js
@@ -454,8 +454,11 @@ class Detail extends Component {
            }
        // }
        const {share, countdown, list, outList} = this.state;
-        let href = this.props.location && this.props.location.state? this.props.location.state.href : undefined;
+        let href = '';
        const { location: { state = {}} } = this.props;
+        if(state.to && state.to === 'classify') {
+            href = '/classify'
+        }
        if(state.oid) {
            href='/classify'
        }
@@ -469,6 +472,7 @@ class Detail extends Component {
                    title='课程详情'
                    arrow={true}
                    cart={true}
+                    toHref={href}
                />
                <CallApp className='toapp' />


--- a/src/components/video/camp/campResolve.js
+++ b/src/components/video/camp/campResolve.js
@@ -35,7 +35,21 @@ class CampResolve extends Component {
            this.body = document.getElementsByTagName('body')[0];
            this.body.style.position = 'static';
        } else {
-            this.props.history.push(`${this.props.location.state.from}`,{href: '/purchased'})
+            const { history, location: { state={} } } = this.props;
+            let to = '';
+            if(state.from && state.from.indexOf('video') !== -1) {
+                to='detail'
+            }
+            if(state.from && state.from.indexOf('detail') !== -1) {
+                to='classify'
+            }
+            console.log(this.props);
+            history.push(
+                `${state.from}`,
+                {
+                    to
+                }
+            );
        }
    };
    componentDidMount() {

--- a/src/components/video/camp/campTest.js
+++ b/src/components/video/camp/campTest.js
@@ -71,7 +71,21 @@ class CampTest extends Component {
            this.body = document.getElementsByTagName('body')[0];
            this.body.style.position = 'static';
        } else {
-            this.props.history.push(`${this.props.location.state.from}`,{href: '/classify'})
+            const { history, location: { state={} } } = this.props;
+            let to = '';
+            if(state.from && state.from.indexOf('video') !== -1) {
+                to='detail'
+            }
+            if(state.from && state.from.indexOf('detail') !== -1) {
+                to='classify'
+            }
+            console.log(this.props);
+            history.push(
+                `${state.from}`,
+                {
+                    to
+                }
+            );
        }
    };
    // 选择答案

--- a/src/components/video/index.js
+++ b/src/components/video/index.js
@@ -669,11 +669,22 @@ class Video extends Component {


    render() {
-        let {match, location} = this.props
+        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}`
+        }
        return (
            <div className='play'>
-                <HeaderBar title={this.state.title} arrow={true}/>
+                <HeaderBar title={this.state.title} arrow={true} toHref={()=>{
+                    history.push(
+                        toHref,
+                        {
+                            to: 'classify'
+                        }
+                    )
+                }} />
                <Loading isLoading={this.state.isLoading}>
                    <div className="video">
                        <video className={'video-js'} ref={el => this.video = el}>

--- a/src/components/video/video-catalog/index.js
+++ b/src/components/video/video-catalog/index.js
@@ -35,11 +35,15 @@ class VideoCatalog extends Component {
                                    </div>
                                    {
                                        (item.practice && item.practice.qid)
-                                            ? <Link to={{
-                                                pathname: item.practice.is_tested ? '/campResolve' : '/campTest',
-                                                search: `?keshi_id=${item.id}&qid=${item.practice.qid}`,
-                                                state: {from: `/play/video${window.location.search}`}
-                                            }}>
+                                            ? <Link 
+                                                to={{
+                                                    pathname: item.practice.is_tested ? '/campResolve' : '/campTest',
+                                                    search: `?keshi_id=${item.id}&qid=${item.practice.qid}`,
+                                                    state: {
+                                                        from: `/play/video${window.location.search}`
+                                                    }
+                                                }}
+                                            >
                                                <div className="exercise">
                                                    课后练习：{item.practice.title}
                                                    <i className={classnames('iconfont',!item.video_auth ? 'iconiconfront-74' : item.practice.is_tested ? 'iconiconfront-3' : '')}/>