pull

src/components/activity/newyear-2019/common/prizes/index.js

@@ -52,7 +52,7 @@ class Prizes extends Component {
     Popup({
       title: '组队开宝箱活动规则',
       className: 'landing-treasure-rules',
-      content: this.state.rule,
+      content: <div dangerouslySetInnerHTML={{__html: this.state.rule}}/>,
       closeIcon: this.closeIcon
     })
   }

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

@@ -18,7 +18,7 @@
     text-align: center;
 
     #to-square {
-        position: relative;
+        position: fixed;
         width: 100%;
         height: 30px;
         background: #FF2121;
@@ -26,7 +26,7 @@
         font-size: 14px;
         line-height: 30px;
         text-align: center;
-        z-index: 10;
+        z-index: 21;
     }
 
     .box-container {
@@ -35,7 +35,7 @@
 
     .snow-deco {
         position: absolute;
-        top: 0;
+        top: 30px;
         left: 0;
         display: block;
         width: 100%;

src/components/activity/newyear-2019/preheat/YearCourse/index.js

@@ -327,11 +327,11 @@ class YearCourse extends Component {
 
     isFollow = (id, key) => {
         const _this = this
-        http.get(`${API.home}/m/live/isFollow`).then(res => {
+        http.get(`${API.home}/sys/user/isFollowWeChat`).then(res => {
             const {code, data, msg} = res.data
             if (code === 200) {
                 _this.setState({
-                    isshowFollow: data.status == 0 ? true : false
+                    isshowFollow: !data.is_follow
                 })
 
                 if (!_this.state.isshowFollow) {

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

@@ -10,11 +10,14 @@ import {setCurrentUser, startFetchUser} from "@/store/userAction"
 import {SendMessageToApp, getParam, http} from '@/utils'
 import {addDays} from "date-fns"
 import {connect} from "react-redux"
-import { Toast } from 'antd-mobile';
+import {Toast} from 'antd-mobile'
+import {compose} from "redux"
 
 @connect(state => ({
-    user: state.user
-}))
+        user: state.user
+    }),
+    {setCurrentUser, startFetchUser}
+)
 
 export default class index extends Component {
     state = {
@@ -35,8 +38,7 @@ export default class index extends Component {
         window['loginInfo'] = result => {
             _this.loginInfo(result)
         }
-
-        _this.getStage();
+        _this.getStage()
     }
 
     // 获取app登录数据
@@ -126,16 +128,16 @@ export default class index extends Component {
     // 获取活动以及宝箱的阶段
     getStage = () => {
         http.get(`${API.home}/activity/stage`).then(res => {
-            const { code, data, msg } = res.data;
-            if(code === 200) {
-              // treasure_stage，宝箱阶段，0-不在活动时间，1-活动时间内
-              this.setState({
-                treasure_stage: data.treasure_stage
-              })
-            }else{
-                Toast.info(msg, 2);
+            const {code, data, msg} = res.data
+            if (code === 200) {
+                // treasure_stage，宝箱阶段，0-不在活动时间，1-活动时间内
+                this.setState({
+                    treasure_stage: data.treasure_stage
+                })
+            } else {
+                Toast.info(msg, 2)
             }
-        });
+        })
     }
 
     toYearWish = () => {
@@ -152,9 +154,9 @@ export default class index extends Component {
 
     }
 
-    sonToPar(e){
+    sonToPar(e) {
         this.setState({
-            txt1:e
+            txt1: e
         })
     }
 
@@ -174,11 +176,17 @@ export default class index extends Component {
                 <div className='nav-right'>
                     <span onClick={this.toBoxList} className='nav-right__link'>
                         未拆宝箱
-                        <i className="nav-right__number">{removable}</i>
+                        {
+                            removable > 0 &&
+                            <i className="nav-right__number">{removable}</i>
+                        }
                     </span>
                     <a onClick={() => this.toYearWish()} className='nav-right__link'>
                         心愿单
-                        <i className="nav-right__number">{this.state.txt1}</i>
+                        {
+                            this.state.txt1 > 0 &&
+                            <i className="nav-right__number">{this.state.txt1}</i>
+                        }
                     </a>
                 </div>
                 {/* 大咖直播 */}
@@ -186,7 +194,7 @@ export default class index extends Component {
 
                 {/* 组队开宝箱 */}
                 {
-                    treasure_stage === 1 && <TreasureBox getRemovable={this.getRemovable} />
+                    treasure_stage === 1 && <TreasureBox getRemovable={this.getRemovable}/>
                 }
 
                 {/*课程*/}

src/components/activity/newyear-2019/preheat/nav.js

@@ -25,15 +25,15 @@ class TreasureNav extends Component {
         },
         {
           id: 'year-free',
-          name: '免费专区'
+          name: '免费学'
         },
         {
           id: 'year-group',
-          name: '一分拼团'
+          name: '1分拼团'
         },
         {
           id: 'year-discount',
-          name: '一折专区'
+          name: '抄低专区'
         },
       ]
     };
@@ -108,9 +108,9 @@ class TreasureNav extends Component {
       <div className={classnames("treasure-nav", {'fixed': isFixed})} data-skip="nav">
         {
           formatNavs.map((item, index) => (
-            <a 
-              href={`#${item.id}`} 
-              className={classnames("treasure-nav__item", {'active': index === curIndex})} 
+            <a
+              href={`#${item.id}`}
+              className={classnames("treasure-nav__item", {'active': index === curIndex})}
               key={item.id}
               onClick={() => this.selectToNav(index)}
             >{item.name}</a>