Merge branch '00' into dev

src/components/activity/newyear-2019/landing/index.js

@@ -34,6 +34,7 @@ class Landing extends Component {
 
   componentDidMount() {
     this.fetchPageData()
+    window.showFollowAlert = this.remind('create')
   }
 
   componentDidUpdate(prevProps) {
@@ -54,7 +55,8 @@ class Landing extends Component {
 
           this.setState({
             teamData: data,
-            isCaptain: sessionStorage.getItem('isCaptain') ? sessionStorage.getItem('isCaptain') : getParam('origin') == 1
+            isCaptain: sessionStorage.getItem('isCaptain') ? sessionStorage.getItem('isCaptain') : getParam('origin') == 1,
+            activityEnd: data.status == 5
           })
 
           let searchParams = new URLSearchParams(window.location.search)
@@ -67,12 +69,6 @@ class Landing extends Component {
           this.showSharePromptWithParam()
 
 
-        } else if (code === 12005) {
-
-          this.setState({
-            activityEnd: true
-          })
-
         } else {
           Toast.info(msg, 2, null, false)
         }
@@ -235,7 +231,7 @@ class Landing extends Component {
   }
 
   remind = (type = 'create', treasure_code, origin = 1) => {
-    const {match, history, user} = this.props
+    const {user} = this.props
     http.get(`${API["base-api"]}/wx/user_temporary_qrcode/${user.data.uid}`)
       .then(res => {
         const {data} = res.data
@@ -289,11 +285,13 @@ class Landing extends Component {
         closable: false,
         close: () => {
           sessionStorage.removeItem('showShareTip')
+          if (!user.hasError) {
             this.getFollowStatus()
               .then(isFollow => {
                 !isFollow && this.remind('create', getParam('treasure_code'), 1)
               })
           }
+        }
       })
     }
   }

src/components/activity/newyear-2019/landing/landing.scss

@@ -391,3 +391,7 @@
         width: 312px;
     }
 }
+
+.year19-index{
+    display: none;
+}