Merge branch '2020-717-formal'

src/App.js

@@ -331,7 +331,7 @@ class App extends Component {
     return <>
       <Routes/>
       {
-        isShowActivityEntry &&
+        !!isShowActivityEntry &&
         <div className="year19-index">
           <i className={'iconfont iconiconfront-2'} onClick={this.closeGlobalEntry}></i>
           <a href={jumpUrl}>

src/components/preferential/index.js

-import React, {Component} from 'react'
-import {VList} from '../../common'
-import {Tabs, WhiteSpace, Toast} from 'antd-mobile'
+import React, { Component } from 'react'
+import { VList } from '../../common'
+import { Tabs, WhiteSpace, Toast } from 'antd-mobile'
 import './index.scss'
 import HeaderSearch from '../../common/HeaderSearch/index'
-import {http} from "@/utils"
+import { http } from "@/utils"
 import Loading from '@/common/Loading'
-import {connect} from 'react-redux';
+import { connect } from 'react-redux';
 
 @connect(({user}) => ({
-    user
+  user,
 }))
 class Preferential extends Component {
   constructor(props) {
@@ -16,7 +16,7 @@ class Preferential extends Component {
     this.state = {
       dataList: [],
       courseStatus: 0,
-            isLoading: true
+      isLoading: true,
     }
   }
 
@@ -30,7 +30,7 @@ class Preferential extends Component {
       if (res.data.code === 200) {
         this.setState({
           dataList: res.data.data,
-                    isLoading: false
+          isLoading: false,
         })
       } else {
         Toast.info(res.data.msg, 2)
@@ -43,7 +43,7 @@ class Preferential extends Component {
     http.get(`${API.home}/m/home/bargainZone`).then((res) => {
       if (res.data.code === 200) {
         this.setState({
-                    dataList: JSON.stringify(res.data.data) == '{}' ? []:res.data.data,
+          dataList: JSON.stringify(res.data.data) == '{}' ? [] : res.data.data,
           isLoading: false,
         })
       } else {
@@ -93,7 +93,7 @@ class Preferential extends Component {
     const tabs = [
       {title: '限时特惠'},
       {title: '砍价专区'},
-            {title: '一键拼团'}
+      {title: '一键拼团'},
     ]
     const {user = {}} = this.props;
     let isLogin = user.data && user.data.uid ? true : false;
@@ -117,7 +117,7 @@ class Preferential extends Component {
             </Tabs>
             <div className='tabs'>
               {
-                                this.state.dataList.length>0?
+                this.state.dataList.length > 0 ?
                   <ul>
                     {this.state.dataList.map((item, index) => {
                       const Info = (
@@ -170,7 +170,7 @@ class Preferential extends Component {
                         />
                       )
                     })}
-                                </ul>:<div className={'notdata'}>砍价的课程已被设置为双十一活动课程，参加双十一活动购买课程优惠更多哦！</div>
+                  </ul> : <div className={'notdata'}>特惠课程都去参加活动了，可以去活动页看看哦~</div>
               }
 
             </div>

src/components/preferential/index.scss

@@ -151,7 +151,6 @@
 
   .notdata{
     width: 100%;
-    padding: 0 35px;
     text-align: center;
     margin-top: 100px;
     color: #666;