Merge branch '11-11' of gitlab.julyedu.com:baiguangyao/mr-julyedu into 11-11

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.3ea8b615.chunk.css",
-  "blessing-preheat.js": "/mrstatic/js/blessing-preheat.67d508c4.chunk.js",
-  "blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.67d508c4.chunk.js.map",
+  "blessing-preheat.js": "/mrstatic/js/blessing-preheat.6dff43d3.chunk.js",
+  "blessing-preheat.js.map": "/mrstatic/js/blessing-preheat.6dff43d3.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",
@@ -74,19 +74,19 @@
   "detail.js": "/mrstatic/js/detail.34640f52.chunk.js",
   "detail.js.map": "/mrstatic/js/detail.34640f52.chunk.js.map",
   "main.css": "/mrstatic/css/main.f9f26bcf.chunk.css",
-  "main.js": "/mrstatic/js/main.e50a2e09.chunk.js",
-  "main.js.map": "/mrstatic/js/main.e50a2e09.chunk.js.map",
+  "main.js": "/mrstatic/js/main.2b14c8b9.chunk.js",
+  "main.js.map": "/mrstatic/js/main.2b14c8b9.chunk.js.map",
   "myorders.css": "/mrstatic/css/myorders.494a90ad.chunk.css",
-  "myorders.js": "/mrstatic/js/myorders.5cdbf8f6.chunk.js",
-  "myorders.js.map": "/mrstatic/js/myorders.5cdbf8f6.chunk.js.map",
+  "myorders.js": "/mrstatic/js/myorders.5b24e8bb.chunk.js",
+  "myorders.js.map": "/mrstatic/js/myorders.5b24e8bb.chunk.js.map",
   "prize-winner-list.css": "/mrstatic/css/prize-winner-list.7ff5ff63.chunk.css",
   "prize-winner-list.js": "/mrstatic/js/prize-winner-list.44109093.chunk.js",
   "prize-winner-list.js.map": "/mrstatic/js/prize-winner-list.44109093.chunk.js.map",
   "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.fca95e3f.js",
-  "runtime~main.js.map": "/mrstatic/js/runtime~main.fca95e3f.js.map",
+  "runtime~main.js": "/mrstatic/js/runtime~main.867a9d58.js",
+  "runtime~main.js.map": "/mrstatic/js/runtime~main.867a9d58.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.31c8f36b2ba83b92f8723a3a7a0e70cf.js": "/precache-manifest.31c8f36b2ba83b92f8723a3a7a0e70cf.js",
+  "precache-manifest.adc2d73282fb1dc223c86cdc4ce50684.js": "/precache-manifest.adc2d73282fb1dc223c86cdc4ce50684.js",
   "service-worker.js": "/service-worker.js"
 }
\ No newline at end of file

build/precache-manifest.31c8f36b2ba83b92f8723a3a7a0e70cf.js → build/precache-manifest.adc2d73282fb1dc223c86cdc4ce50684.js

@@ -16,16 +16,16 @@ self.__precacheManifest = [
     "url": "/mrstatic/js/2.f02a0573.chunk.js"
   },
   {
-    "revision": "6902434f8f18a23319d57d0ac8aaea8c",
-    "url": "/mrstatic/media/redb_sp_bj@2x.6902434f.png"
+    "revision": "c79abf5cb7ae8a82009cf68fe44d1078",
+    "url": "/mrstatic/media/redb_money_bj@2x.c79abf5c.png"
   },
   {
     "revision": "f8b11e0088ed6e17f173",
     "url": "/mrstatic/js/Activity.73c8f0a9.chunk.js"
   },
   {
-    "revision": "c79abf5cb7ae8a82009cf68fe44d1078",
-    "url": "/mrstatic/media/redb_money_bj@2x.c79abf5c.png"
+    "revision": "6902434f8f18a23319d57d0ac8aaea8c",
+    "url": "/mrstatic/media/redb_sp_bj@2x.6902434f.png"
   },
   {
     "revision": "9a7afeee0f7f7550064e",
@@ -148,8 +148,8 @@ self.__precacheManifest = [
     "url": "/mrstatic/js/38.6484232f.chunk.js"
   },
   {
-    "revision": "55aee8460843efa59700",
-    "url": "/mrstatic/js/blessing-preheat.67d508c4.chunk.js"
+    "revision": "dfdbc575880c062a3a79",
+    "url": "/mrstatic/js/blessing-preheat.6dff43d3.chunk.js"
   },
   {
     "revision": "ce643559cbe26713d628",
@@ -196,20 +196,20 @@ self.__precacheManifest = [
     "url": "/mrstatic/js/shareposter.bc3debb9.chunk.js"
   },
   {
-    "revision": "74643f400c1c978a8c14",
-    "url": "/mrstatic/js/main.e50a2e09.chunk.js"
+    "revision": "2f35198047ffa9a2f863",
+    "url": "/mrstatic/js/main.2b14c8b9.chunk.js"
   },
   {
     "revision": "137ceebdec9f801afd6c",
     "url": "/mrstatic/js/search.589ab26a.chunk.js"
   },
   {
-    "revision": "70ccea8c2752e40f6481",
-    "url": "/mrstatic/js/myorders.5cdbf8f6.chunk.js"
+    "revision": "3d9dd8e8732c2b017b64",
+    "url": "/mrstatic/js/myorders.5b24e8bb.chunk.js"
   },
   {
-    "revision": "bbe2c2b6e757623fc7ea",
-    "url": "/mrstatic/js/runtime~main.fca95e3f.js"
+    "revision": "6230249f57b7cc4a91dc",
+    "url": "/mrstatic/js/runtime~main.867a9d58.js"
   },
   {
     "revision": "480dec355e65b21ce336",
@@ -256,11 +256,11 @@ self.__precacheManifest = [
     "url": "/mrstatic/css/detail.c31f1b41.chunk.css"
   },
   {
-    "revision": "74643f400c1c978a8c14",
+    "revision": "2f35198047ffa9a2f863",
     "url": "/mrstatic/css/main.f9f26bcf.chunk.css"
   },
   {
-    "revision": "70ccea8c2752e40f6481",
+    "revision": "3d9dd8e8732c2b017b64",
     "url": "/mrstatic/css/myorders.494a90ad.chunk.css"
   },
   {
@@ -288,7 +288,7 @@ self.__precacheManifest = [
     "url": "/mrstatic/css/38.bff100af.chunk.css"
   },
   {
-    "revision": "55aee8460843efa59700",
+    "revision": "dfdbc575880c062a3a79",
     "url": "/mrstatic/css/blessing-preheat.3ea8b615.chunk.css"
   },
   {
@@ -372,7 +372,7 @@ self.__precacheManifest = [
     "url": "/mrstatic/css/2.bf839917.chunk.css"
   },
   {
-    "revision": "0b6022c61b68b66e0df9ed70d2d09e32",
+    "revision": "d55f7bf9048a9672b9d46014caa7f175",
     "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.31c8f36b2ba83b92f8723a3a7a0e70cf.js"
+  "/precache-manifest.adc2d73282fb1dc223c86cdc4ce50684.js"
 );
 
 workbox.clientsClaim();

src/components/blessingPreheat/index.js

@@ -34,7 +34,6 @@ class BlessingPreheat extends Component {
         this.navTop = 183
         this.prevY = 0
         this.state = {
-            isLogin: false,
             userInfoList: [],
             isRule: false,
             isCourse: false,
@@ -104,17 +103,6 @@ class BlessingPreheat extends Component {
 
     }
 
-    componentDidUpdate(prevProps, prevState){
-        let {user} = this.props
-        console.log(this.props.user.hasError,this.state.userHasError);
-        if (this.props.user.hasError !== this.state.userHasError) {
-            const uid = user && user.data && user.data.uid;
-            this.setState({
-                isLogin: !uid ? false : true,
-                userHasError: user.hasError
-            })
-        }
-    }
 
     // 获取app登录数据
     loginInfo = (result) => {
@@ -206,7 +194,6 @@ class BlessingPreheat extends Component {
     }
 
     fetchUserBlessing() {
-        // 判断登录未登录 根据this.state.isLogin
         Toast.info('fetchUserBlessing', 2)
 
         const {userInfo} = this.state;
@@ -254,7 +241,9 @@ class BlessingPreheat extends Component {
 
     handleToShow = (key, isLogin = false) => {
         // 需要用户登录 并且用户未登录
-        if (isLogin && !this.state.isLogin) {
+        const isLoginnew = !this.props.user.hasError
+
+        if (isLogin && isLoginnew) {
             this.toLogin()
         } else {
             let obj = {}
@@ -267,7 +256,7 @@ class BlessingPreheat extends Component {
 
     // 邀请好友注册
     handleToShowInvite = () => {
-        const {isLogin} = this.state;
+        const isLogin = !this.props.user.hasError
         if (isLogin) {
             if (!getParam('version')) {
                 QRCode.toDataURL(`${API.m}/invite`, {
@@ -391,7 +380,6 @@ class BlessingPreheat extends Component {
         const {
             navs,
             userInfo,
-            isLogin,
             isRule,
             isCourse,
             inviteUrl,
@@ -405,6 +393,7 @@ class BlessingPreheat extends Component {
             index
         } = this.state;
         const {history} = this.props;
+        const isLogin = !this.props.user.hasError
         return (
             <div id={'blessing-preheat'}>
                 <Banner

src/components/blessingPreheat/luckDraw/index.js

@@ -37,9 +37,9 @@ class LuckDraw extends Component {
     const { tabs, prizes } = this.state;
     return (
       <div className="luck-draw__container">
-        <Tabs 
+        <Tabs swipeable={false}
           tabs={tabs}
-          tabBarBackgroundColor="transparent" 
+          tabBarBackgroundColor="transparent"
           tabBarUnderlineStyle={{
             display: 'none'
           }}