Skip to content

M
mr-julyedu
Commit 9d9cc01d by xuzhenghua
Options

11-11

parent 7c373247
Showing with 28 additions and 23 deletions
build/asset-manifest.json
......@@ -56,8 +56,8 @@
"aist-share.js": "/mrstatic/js/aist-share.3a04b022.chunk.js",
"aist-share.js.map": "/mrstatic/js/aist-share.3a04b022.chunk.js.map",
"blessing-preheat.css": "/mrstatic/css/blessing-preheat.564d8d7c.chunk.css",
"blessing-preheat.js": "/mrstatic/js/blessing-preheat.282c572b.chunk.js",
"blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.282c572b.chunk.js.map",
"blessing-preheat.js": "/mrstatic/js/blessing-preheat.1aa114da.chunk.js",
"blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.1aa114da.chunk.js.map",
"blessing-rank.css": "/mrstatic/css/blessing-rank.edf00bf8.chunk.css",
"blessing-rank.js": "/mrstatic/js/blessing-rank.9beb2e6a.chunk.js",
"blessing-rank.js.map": "/mrstatic/js/blessing-rank.9beb2e6a.chunk.js.map",
......@@ -85,8 +85,8 @@
"purchased.css": "/mrstatic/css/purchased.bb758677.chunk.css",
"purchased.js": "/mrstatic/js/purchased.a38723f4.chunk.js",
"purchased.js.map": "/mrstatic/js/purchased.a38723f4.chunk.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.b2fba7d4.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.b2fba7d4.js.map",
"runtime~main.js": "/mrstatic/js/runtime~main.5c966386.js",
"runtime~main.js.map": "/mrstatic/js/runtime~main.5c966386.js.map",
"search.css": "/mrstatic/css/search.5716d9b3.chunk.css",
"search.js": "/mrstatic/js/search.589ab26a.chunk.js",
"search.js.map": "/mrstatic/js/search.589ab26a.chunk.js.map",
......@@ -166,6 +166,6 @@
"mrstatic/media/iconfont.css": "/mrstatic/media/iconfont.e0655d4d.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.61b0a53e0967927e06e2c3c57d490af2.js": "/precache-manifest.61b0a53e0967927e06e2c3c57d490af2.js",
"precache-manifest.d46e99695e7f288aa585f81cd582827f.js": "/precache-manifest.d46e99695e7f288aa585f81cd582827f.js",
"service-worker.js": "/service-worker.js"
}
\ No newline at end of file
build/mrstatic/js/blessing-preheat.1aa114da.chunk.js.map 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
build/mrstatic/js/blessing-preheat.282c572b.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/precache-manifest.61b0a53e0967927e06e2c3c57d490af2.js → build/precache-manifest.d46e99695e7f288aa585f81cd582827f.js
......@@ -84,8 +84,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/MyEdit.fea133fd.chunk.js"
},
{
"revision": "7aa984cefad739ea18edb76c541aa1fd",
"url": "/mrstatic/media/iconfont.7aa984ce.eot"
"revision": "258b4b114d3d9be3018cd113b2470a13",
"url": "/mrstatic/media/iconfont.258b4b11.ttf"
},
{
"revision": "a28bdbb65926824a31b2",
......@@ -96,8 +96,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/Orderinfo.57e0641d.chunk.js"
},
{
"revision": "258b4b114d3d9be3018cd113b2470a13",
"url": "/mrstatic/media/iconfont.258b4b11.ttf"
"revision": "7aa984cefad739ea18edb76c541aa1fd",
"url": "/mrstatic/media/iconfont.7aa984ce.eot"
},
{
"revision": "17e2d9973e72bb3206ae",
......@@ -148,8 +148,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/38.6484232f.chunk.js"
},
{
"revision": "106b6bf10865abbc24f9",
"url": "/mrstatic/js/blessing-preheat.282c572b.chunk.js"
"revision": "b7eccfcdfebdd4a0dafa",
"url": "/mrstatic/js/blessing-preheat.1aa114da.chunk.js"
},
{
"revision": "ce643559cbe26713d628",
......@@ -208,8 +208,8 @@ self.__precacheManifest = [
"url": "/mrstatic/js/myorders.5b24e8bb.chunk.js"
},
{
"revision": "54e744b89b4da3b319b4",
"url": "/mrstatic/js/runtime~main.b2fba7d4.js"
"revision": "2173ee46d857c1d29381",
"url": "/mrstatic/js/runtime~main.5c966386.js"
},
{
"revision": "480dec355e65b21ce336",
......@@ -288,7 +288,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/38.bff100af.chunk.css"
},
{
"revision": "106b6bf10865abbc24f9",
"revision": "b7eccfcdfebdd4a0dafa",
"url": "/mrstatic/css/blessing-preheat.564d8d7c.chunk.css"
},
{
......@@ -372,7 +372,7 @@ self.__precacheManifest = [
"url": "/mrstatic/css/2.bf839917.chunk.css"
},
{
"revision": "17cca7ea8f17b5fc3f8bc421b481a5df",
"revision": "03421c21e6899c8f60de1468a443fab9",
"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.61b0a53e0967927e06e2c3c57d490af2.js"
"/precache-manifest.d46e99695e7f288aa585f81cd582827f.js"
);
workbox.clientsClaim();
......
src/components/blessingPreheat/collectBlessing/index.js
......@@ -8,7 +8,7 @@ import ListHeader from './../listHeader';
import './index.scss';
@connect(({user})=> ({
uid: user.data.uid || ''
uid: user && user.data && user.data.uid ? user.data.uid :''
}))
class CollectBlessing extends Component {
......@@ -231,7 +231,7 @@ class CollectBlessing extends Component {
<i className="collect-blessing__num">{index+1}</i>
<p className="collect-blessing__title">{item}</p>
{
index === 0 &&
index === 0 &&
<>
{
(isLogin && isSign)
......
src/components/blessingPreheat/index.js
......@@ -81,7 +81,8 @@ class BlessingPreheat extends Component {
},
],
index: 0,
userHasError: props.user.hasError
userHasError: props.user.hasError,
isApp: false
}
}
......@@ -110,7 +111,6 @@ class BlessingPreheat extends Component {
this.handleToAddBlessing(result);
}
}
......@@ -138,6 +138,9 @@ class BlessingPreheat extends Component {
if (cookie.get("token") && cookie.get("uid")) {
this.fetchUserBlessing();
this.setState({
isApp: true
})
}
this.props.setCurrentUser(this.transformUser(this.state.userInfoList))
......@@ -419,11 +422,11 @@ class BlessingPreheat extends Component {
isSign,
showRecordList,
shareMark,
index
index,
isApp
} = this.state;
const {history} = this.props;
const isLogin = !this.props.user.hasError
const uid = this.props.user.data.uid
return (
<div id={'blessing-preheat'}>
<Banner
......@@ -473,9 +476,9 @@ class BlessingPreheat extends Component {
{/* 精品课程特惠专区 */}
<ListHeader id={'best-courses'} text="精品课程特惠专区" styles={{margin: '30px 0 15px'}}/>
<CourseList
isApp={isApp}
isFormal={isFormal}
isLogin={isLogin}
uid={uid}
history={this.props.history}
toLogin={this.toLogin}
/>
......
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