Skip to content

M
mr-julyedu
Commit c2713c0f by xuzhenghua
Options

youhua

parents 06cd9f3a 2dd8b0c3
Showing with 100 additions and 45 deletions
build/asset-manifest.json
......@@ -83,14 +83,14 @@
"detail.js": "/mrstatic/js/detail.44589fbd.chunk.js",
"detail.js.map": "/mrstatic/js/detail.44589fbd.chunk.js.map",
"main.css": "/mrstatic/css/main.22eaa155.chunk.css",
"main.js": "/mrstatic/js/main.43bbbb72.chunk.js",
"main.js.map": "/mrstatic/js/main.43bbbb72.chunk.js.map",
"main.js": "/mrstatic/js/main.ab2b3ed2.chunk.js",
"main.js.map": "/mrstatic/js/main.ab2b3ed2.chunk.js.map",
"myorders.css": "/mrstatic/css/myorders.179a42fc.chunk.css",
"myorders.js": "/mrstatic/js/myorders.122809d7.chunk.js",
"myorders.js.map": "/mrstatic/js/myorders.122809d7.chunk.js.map",
"newyear-2019-landing.css": "/mrstatic/css/newyear-2019-landing.57b46b09.chunk.css",
"newyear-2019-landing.js": "/mrstatic/js/newyear-2019-landing.d43f8992.chunk.js",
"newyear-2019-landing.js.map": "/mrstatic/js/newyear-2019-landing.d43f8992.chunk.js.map",
"newyear-2019-landing.js": "/mrstatic/js/newyear-2019-landing.d7c3d74f.chunk.js",
"newyear-2019-landing.js.map": "/mrstatic/js/newyear-2019-landing.d7c3d74f.chunk.js.map",
"newyear-yearIndex.css": "/mrstatic/css/newyear-yearIndex.50beb090.chunk.css",
"newyear-yearIndex.js": "/mrstatic/js/newyear-yearIndex.ecc6b24e.chunk.js",
"newyear-yearIndex.js.map": "/mrstatic/js/newyear-yearIndex.ecc6b24e.chunk.js.map",
......@@ -103,8 +103,8 @@
"python-class.css": "/mrstatic/css/python-class.1fe9d108.chunk.css",
"python-class.js": "/mrstatic/js/python-class.5cca1ffb.chunk.js",
"python-class.js.map": "/mrstatic/js/python-class.5cca1ffb.chunk.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.cf07b0e4.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.cf07b0e4.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.6f966b6a.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.6f966b6a.js.map",
"search.css": "/mrstatic/css/search.5716d9b3.chunk.css",
"search.js": "/mrstatic/js/search.20bbab86.chunk.js",
"search.js.map": "/mrstatic/js/search.20bbab86.chunk.js.map",
......@@ -121,11 +121,11 @@
"togroup.js": "/mrstatic/js/togroup.a2d9f8b7.chunk.js",
"togroup.js.map": "/mrstatic/js/togroup.a2d9f8b7.chunk.js.map",
"treasure-box-home.css": "/mrstatic/css/treasure-box-home.d7bb8063.chunk.css",
"treasure-box-home.js": "/mrstatic/js/treasure-box-home.911fee53.chunk.js",
"treasure-box-home.js.map": "/mrstatic/js/treasure-box-home.911fee53.chunk.js.map",
"treasure-box-home.js": "/mrstatic/js/treasure-box-home.65ce5812.chunk.js",
"treasure-box-home.js.map": "/mrstatic/js/treasure-box-home.65ce5812.chunk.js.map",
"treasure-box-mybox.css": "/mrstatic/css/treasure-box-mybox.b5f40384.chunk.css",
"treasure-box-mybox.js": "/mrstatic/js/treasure-box-mybox.5d14604c.chunk.js",
"treasure-box-mybox.js.map": "/mrstatic/js/treasure-box-mybox.5d14604c.chunk.js.map",
"treasure-box-mybox.js": "/mrstatic/js/treasure-box-mybox.5f131f10.chunk.js",
"treasure-box-mybox.js.map": "/mrstatic/js/treasure-box-mybox.5f131f10.chunk.js.map",
"video.css": "/mrstatic/css/video.e614ee3d.chunk.css",
"video.js": "/mrstatic/js/video.740c74ff.chunk.js",
"video.js.map": "/mrstatic/js/video.740c74ff.chunk.js.map",
......@@ -244,6 +244,6 @@
"mrstatic/media/iconfont.css": "/mrstatic/media/iconfont.f2f4294d.woff",
"mrstatic/media/kanjia_cg_icon.png": "/mrstatic/media/kanjia_cg_icon.81a489ac.png",
"mrstatic/media/video.scss": "/mrstatic/media/progress-share-bg.80011994.png",
"precache-manifest.f5a61bbc0c7a3238c6e7ceb353154ff4.js": "/precache-manifest.f5a61bbc0c7a3238c6e7ceb353154ff4.js",
"precache-manifest.4f139c9fd3c399cc2f47bac47b867aea.js": "/precache-manifest.4f139c9fd3c399cc2f47bac47b867aea.js",
"service-worker.js": "/service-worker.js"
}
\ No newline at end of file
build/mrstatic/js/main.43bbbb72.chunk.js.map deleted 100644 → 0
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/main.43bbbb72.chunk.js → build/mrstatic/js/main.ab2b3ed2.chunk.js
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/main.ab2b3ed2.chunk.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
build/precache-manifest.f5a61bbc0c7a3238c6e7ceb353154ff4.js → build/precache-manifest.4f139c9fd3c399cc2f47bac47b867aea.js
......@@ -88,8 +88,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/Examination.003c1591.chunk.js"
},
{
"revision": "99b2454970e48c8bb00578cdca15b3d2",
"url": "/mrstatic/media/iconfont.99b24549.ttf"
"revision": "64fd0b167457064e12ff8a6afcd31720",
"url": "/mrstatic/media/iconfont.64fd0b16.eot"
},
{
"revision": "c6bcaaaf577ed3e8727d",
......@@ -100,8 +100,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/MyEdit.7a287fd0.chunk.js"
},
{
"revision": "64fd0b167457064e12ff8a6afcd31720",
"url": "/mrstatic/media/iconfont.64fd0b16.eot"
"revision": "99b2454970e48c8bb00578cdca15b3d2",
"url": "/mrstatic/media/iconfont.99b24549.ttf"
},
{
"revision": "eb28da5ffa448e93bf1b",
......@@ -220,8 +220,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/50.41881c23.chunk.js"
},
{
"revision": "1d6852d1c16e63d72b7f",
"url": "/mrstatic/js/main.43bbbb72.chunk.js"
"revision": "2ddbc356e1b515dd34bb",
"url": "/mrstatic/js/main.ab2b3ed2.chunk.js"
},
{
"revision": "c524204d27fb998820d1",
......@@ -236,8 +236,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/48.5ce7e070.chunk.js"
},
{
"revision": "4d975309ae2aa022bc0d",
"url": "/mrstatic/js/newyear-2019-landing.d43f8992.chunk.js"
"revision": "52f73b0b0d62ae46ad0e",
"url": "/mrstatic/js/newyear-2019-landing.d7c3d74f.chunk.js"
},
{
"revision": "0c92200a7bb344715069",
......@@ -272,20 +272,20 @@ self.__precacheManifest = [
"url": "/mrstatic/js/python-class.5cca1ffb.chunk.js"
},
{
"revision": "db24a933e588942d7113",
"url": "/mrstatic/js/runtime~main.cf07b0e4.js"
"revision": "561e661b9b1bc602f710",
"url": "/mrstatic/js/runtime~main.6f966b6a.js"
},
{
"revision": "734674d9a8b8cfd19d5d",
"url": "/mrstatic/js/treasure-box-mybox.5d14604c.chunk.js"
"revision": "602e7c833e2ac47b90f8",
"url": "/mrstatic/js/treasure-box-mybox.5f131f10.chunk.js"
},
{
"revision": "0723110b47af657e05ae",
"url": "/mrstatic/js/search.20bbab86.chunk.js"
},
{
"revision": "8928f35adff28bc8e44a",
"url": "/mrstatic/js/treasure-box-home.911fee53.chunk.js"
"revision": "0734927c33de37a03257",
"url": "/mrstatic/js/treasure-box-home.65ce5812.chunk.js"
},
{
"revision": "a50a87d4623731173d76",
......@@ -316,7 +316,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/togroup.f08bc5f3.chunk.css"
},
{
"revision": "8928f35adff28bc8e44a",
"revision": "0734927c33de37a03257",
"url": "/mrstatic/css/treasure-box-home.d7bb8063.chunk.css"
},
{
......@@ -324,7 +324,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/video.e614ee3d.chunk.css"
},
{
"revision": "734674d9a8b8cfd19d5d",
"revision": "602e7c833e2ac47b90f8",
"url": "/mrstatic/css/treasure-box-mybox.b5f40384.chunk.css"
},
{
......@@ -364,7 +364,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/48.ae54e35c.chunk.css"
},
{
"revision": "4d975309ae2aa022bc0d",
"revision": "52f73b0b0d62ae46ad0e",
"url": "/mrstatic/css/newyear-2019-landing.57b46b09.chunk.css"
},
{
......@@ -380,7 +380,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/50.820320a6.chunk.css"
},
{
"revision": "1d6852d1c16e63d72b7f",
"revision": "2ddbc356e1b515dd34bb",
"url": "/mrstatic/css/main.22eaa155.chunk.css"
},
{
......@@ -528,7 +528,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/1.037b510f.chunk.css"
},
{
"revision": "5b9b2186adf7f39cf6c6a30234f12599",
"revision": "29a1d721756306b38c3f44e2ffa2d83e",
"url": "/index.html"
}
];
\ No newline at end of file
build/service-worker.js
......@@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/3.6.3/workbox-sw.js");
importScripts(
"/precache-manifest.f5a61bbc0c7a3238c6e7ceb353154ff4.js"
"/precache-manifest.4f139c9fd3c399cc2f47bac47b867aea.js"
);
workbox.clientsClaim();
......
src/components/activity/treasure-box/landing/index.js
......@@ -43,7 +43,7 @@ class Landing extends Component {
this.fetchPageData()
this.getIndexData()
window.showFollowAlert = this.remind.bind(this, 'create')
document.title = 'AI充电季，开宝箱免费学AI爆款好课，300本程序员必备纸质书免费送，AI进阶宝典来就送！-七月在线'
document.title = 'AI就业季，开宝箱免费拿VIP年会员，200本程序员必备纸质书免费包邮送！- 七月在线'
const landing = document.querySelector('#landing')
const boxContainer = document.querySelector('.box-container')
if (boxContainer.offsetHeight < window.innerHeight) {
......
src/components/activity/treasure-box/myTreasure/index.js
......@@ -43,7 +43,7 @@ class MyTreasure extends Component {
componentDidMount() {
this.fetchMyTreasure()
this.fetchActivityStatus()
document.title = 'AI充电季，开宝箱免费学AI爆款好课，300本程序员必备纸质书免费送，AI进阶宝典来就送！-七月在线';
document.title = 'AI就业季，开宝箱免费拿VIP年会员，200本程序员必备纸质书免费包邮送！- 七月在线';
}
componentWillReceiveProps(nextProp) {
......
src/components/activity/treasure-box/preheat/index.js
......@@ -39,7 +39,7 @@ export default class index extends Component {
_this.loginInfo(result)
}
_this.getStage()
document.title = 'AI充电季，开宝箱免费学AI爆款好课，300本程序员必备纸质书免费送，AI进阶宝典来就送！-七月在线';
document.title = 'AI就业季，开宝箱免费拿VIP年会员，200本程序员必备纸质书免费包邮送！- 七月在线';
}
// 获取app登录数据
......
src/components/activity/treasure-box/year-wish/index.js
......@@ -23,9 +23,9 @@ class YarnWish extends Component {
componentWillUpdate() {
const {activityStage} = this.state
if (activityStage == 1) {
document.title = `七月在线年终大回馈，人气好课免费学，精品课程1分抢！`
document.title = `AI就业季，开宝箱免费拿VIP年会员，200本程序员必备纸质书免费包邮送！- 七月在线`
} else {
document.title = `七月在线年终大回馈，人气好课免费学，精品课程1分抢！`
document.title = `AI就业季，开宝箱免费拿VIP年会员，200本程序员必备纸质书免费包邮送！- 七月在线`
}
}
......
src/components/passport/login/index.js
......@@ -71,6 +71,21 @@ class Login extends Component {
history.push('/passport/student-login')
}
componentDidMount() {
const {location} = this.props
const {action} = this.props.history
let pathname = location.state && location.state.from && location.state.from.pathname
let search = location.state && location.state.from && location.state.from.search
console.log(action,pathname,search);
if(action !== 'POP'){
let historyUrl = `${pathname}${search}`
window.localStorage.setItem('HistoryUrl',historyUrl)
}
}
render() {
const {
loginWays,
......@@ -122,7 +137,7 @@ class Login extends Component {
onVerify={this.onVerify}
/>
<LoginButton active={values.tel && values.veriCode && isEmpty(errors)}/>
{/* 助学计划 */}
<div className="student-root">
<a className="student-root__button" onClick={this.toStudentRegister}>助学计划</a>
......
src/components/passport/setPassword/index.js
......@@ -15,6 +15,35 @@ import { connect } from "react-redux"
import { setCurrentUser } from '@/store/userAction'
class SetPassword extends Component {
toFrom = () => {
let historyUrl = window.localStorage.getItem('HistoryUrl')
const {history} = this.props
history.push(historyUrl)
// window.localStorage.removeItem('HistoryUrl')
return
}
//
// componentDidMount() {
// const {location} = this.props
// const {action} = this.props.history
// let pathname = location.state && location.state.from && location.state.from.pathname
// let search = location.state && location.state.from && location.state.from.search
//
// console.log(location);
// console.log(location.state);
// console.log(action,pathname,search);
//
// // if(action !== 'PUSH'){
// // let historyUrl = `${pathname}${search}`
// // window.localStorage.setItem('HistoryUrl',historyUrl)
// // }
//
// }
render() {
let {values, errors, location} = this.props
let {from} = location.state || {from: {pathname: '/'}}
......@@ -52,7 +81,7 @@ class SetPassword extends Component {
</Form>
<div className="skip"
style={{display: from && from.pathname.includes('forgot-password') ? 'none' : 'block'}}>
<Link replace to='/passport/account-login'>跳过</Link>
<span onClick={this.toFrom}>跳过</span>
</div>
</div>
</>
......@@ -68,7 +97,6 @@ const formikConfig = {
}
},
handleSubmit: (values, {props}) => {
const {location} = props
let from = location.state && location.state.records && location.state.records[location.state.records.length - 2] || {pathname: '/'}
......@@ -108,7 +136,7 @@ function forgotPasswordReset(values, props) {
if (res.data.errno == 200) {
Toast.info('密码设置成功')
setTimeout(function () {
props.history.replace('/passport/account-login')
props.history.replace('/passport/account-login')
}, 1000)
} else {
Toast.info(res.data.msg, 2, null, false)
......@@ -117,7 +145,6 @@ function forgotPasswordReset(values, props) {
}
function bindMobileSetPassword(values, props) {
http.post(`${API['passport-api']}/bind_mobile/set_pwd_new`, {
uid: props.user.data.uid,
password: encrypt(values.password)
......@@ -128,10 +155,21 @@ function bindMobileSetPassword(values, props) {
Toast.info('密码设置成功')
let from = location.state && location.state.from || {pathname: '/'}
let local_redirect_url = JSON.parse(window.localStorage.getItem('binding_redirect'))
setTimeout(function () {
if (local_redirect_url) {
const {pathname, search, hash} = local_redirect_url
history.replace(pathname + search + hash)
// setTimeout(function () {
// if (local_redirect_url) {
// const {pathname, search, hash} = local_redirect_url
// history.replace(pathname + search + hash)
// } else {
// history.replace(from.pathname)
// }
// }, 1000)
let HistoryUrl = window.localStorage.getItem('HistoryUrl')
setTimeout(()=> {
if (HistoryUrl) {
let historyUrl = window.localStorage.getItem('HistoryUrl')
props.history.push(historyUrl)
} else {
history.replace(from.pathname)
}
......
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