del build again

src/App.js

@@ -3,7 +3,7 @@ import Routes from './router'
 import cookie from 'js-cookie'
 import { connect } from "react-redux"
 import { setCurrentUser, startFetchUser } from "@/store/userAction"
-import {initialState} from "@/store/userReducer"
+import { initialState } from "@/store/userReducer"
 import { withRouter, Link } from 'react-router-dom'
 import { compose } from 'redux'
 import { getParam, http, browser } from "@/utils"
@@ -34,18 +34,22 @@ class App extends Component {
   pathnameBlacklist = ['/country', '/passport']
 
   firstLoad = true
-  componentWillMount(){
+
+  componentWillMount() {
     if (!getParam('version')) {
-      if(!cookie.get('qimoClientIdedu')){
+      if (!cookie.get('qimoClientIdedu')) {
         this.getqimoClientId()
       } else {
-        window.qimoClientId = cookie.get('qimoClientIdedu')}
+        window.qimoClientId = cookie.get('qimoClientIdedu')
+      }
     }
   }
+
   componentDidMount() {
     this.umengStatistic()
     //平台信息
-    cookie.set('plat', '5', {domain: '.julyedu.com'})
+    !getParam('version') && cookie.set('plat', '5', {domain: '.julyedu.com'})
+
 
     if (browser.isWeixin && browser.isIOS) {
       sessionStorage.setItem('enter_url', window.location.href)
@@ -285,7 +289,7 @@ class App extends Component {
 
 
   // 七陌客服代码 start
-  getqimoClientId =()=>{
+  getqimoClientId = () => {
     http.post(`${API['home']}/qiMoUserId`)
       .then(res => {
         if (res.data.code == 200) {
@@ -297,7 +301,7 @@ class App extends Component {
       })
   }
 
-  QimoClient=()=>{
+  QimoClient = () => {
     let utm_source = getParam('utm_source')
     let utm_medium = getParam('utm_medium')
     let utm_campaign = getParam('utm_campaign')
@@ -307,10 +311,10 @@ class App extends Component {
     var src = ''
     // 知乎投放
     if (utm_term && utm_source && utm_medium && utm_campaign && utm_content) {
-      src = 'https://webchat.7moor.com/javascripts/7moorInit.js?accessId=e2ca4f90-2d04-11ea-84c3-43908ae47640&autoShow=true&language=ZHCN'
+      src = 'https://webchat.7moor.com/javascripts/7moorInit.js?accessId=e2ca4f90-2d04-11ea-84c3-43908ae47640&autoShow=false&language=ZHCN'
     } else {
       // m端
-      src = 'https://webchat.7moor.com/javascripts/7moorInit.js?accessId=fbcf9aa0-2d03-11ea-84c3-43908ae47640&autoShow=true&language=ZHCN'
+      src = 'https://webchat.7moor.com/javascripts/7moorInit.js?accessId=fbcf9aa0-2d03-11ea-84c3-43908ae47640&autoShow=false&language=ZHCN'
     }
 
     var script = document.createElement('script')
@@ -320,12 +324,17 @@ class App extends Component {
     document.body.appendChild(script)
 
   }
-  // 七陌客服代码 end
 
+  // 七陌客服代码 end
 
 
   render() {
-    return <Routes/>
+    return <>
+      <Routes/>
+      {/*<Link className={'year19-index'} to="/year/yearindex">*/}
+        {/*<img src="https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/PC/pc-yearindex.png" alt=""/>*/}
+      {/*</Link>*/}
+    </>
   }
 }
 

src/assets/css/index.scss

@@ -512,3 +512,18 @@ input[type="radio"]:checked:before {
   color: #333;
   font-size: 15px;
 }
+
+.year19-index {
+  display: block;
+  width: 58px;
+  height: 70px;
+  position: fixed;
+  top: 50%;
+  right: 0;
+  margin-top: -35px;
+  z-index: 9;
+  img {
+    width: 100%;
+    height: 100%;
+  }
+}
\ No newline at end of file

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

@@ -114,7 +114,7 @@ class Prizes extends Component {
                         item.grant_max
                           ?
                           <div className='bottom-bar'>
-                            <div className="progress-bar"><span className={'progress'}/></div>
+                            <div className="progress-bar"><span className={'progress'} style={{width: `${(item.surplus / item.grant_max) * 100}%`}}/></div>
                             <span>限量{item.grant_max}份</span>
                           </div>
                           : <span className='no-limit'>不限量</span>

src/components/activity/newyear-2019/common/prizes/prizes.scss

@@ -178,7 +178,7 @@
                     position: absolute;
                     right: 0;
                     top: 0;
-                    width: 80%;
+                    //width: 80%;
                     height: 100%;
                     background: linear-gradient(-90deg, rgba(255, 140, 0, 1) 0%, rgba(255, 23, 0, 1) 100%);
                     border-radius: 1px;

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

@@ -41,7 +41,7 @@ class Landing extends Component {
     this.getStage();
     this.fetchPageData()
     window.showFollowAlert = this.remind.bind(this, 'create')
-    document.title = '七月在线年终大回馈，幸运宝箱随你开，100%有奖！'
+    document.title = '七月在线新春献礼，幸运宝箱随你开，100%有奖！“薪”年好课免费学，精品课程1分秒！'
     const landing = document.querySelector('#landing')
     const boxContainer = document.querySelector('.box-container')
     if (boxContainer.offsetHeight < window.innerHeight) {

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

@@ -43,7 +43,7 @@ class MyTreasure extends Component {
   componentDidMount() {
     this.fetchMyTreasure()
     this.fetchActivityStatus()
-    document.title = '七月在线年终大回馈，幸运宝箱随你开，100%有奖！人气好课免费学，精品课程1分抢！';
+    document.title = '七月在线新春献礼，幸运宝箱随你开，100%有奖！“薪”年好课免费学，精品课程1分秒！';
   }
 
   componentWillReceiveProps(nextProp) {

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

@@ -141,7 +141,7 @@ class LiveRoom extends Component {
           )
         }
 
-        <CommonContainer title='大咖直播' id="year-live">
+        <CommonContainer title='“薪”年好课免费学' id="year-live">
           <ul className='live__list'>
             {
               list.length && (
@@ -153,39 +153,39 @@ class LiveRoom extends Component {
                         <span>主题：</span>
                         <p>{item.title}</p>
                       </div>
-                      <div className="info__item">
-                        <span>时间：</span>
-                        <p>{item.date}</p>
-                      </div>
+                      {/*<div className="info__item">*/}
+                        {/*<span>时间：</span>*/}
+                        {/*<p>{item.date}</p>*/}
+                      {/*</div>*/}
                       <div className="info__item">
                         <span>讲师：</span>
                         <p>{item.teacher}</p>
                       </div>
-                      {
-                        item.on_live == 0 && item.is_end == 0 && item.is_subscribe == 0 && (
-                          <span onClick={ ()=>this.subscribe(item.live_id)} className="order__btn">立即预约</span>
-                        )
-                      }
+                      {/*{*/}
+                        {/*item.on_live == 0 && item.is_end == 0 && item.is_subscribe == 0 && (*/}
+                          {/*<span onClick={ ()=>this.subscribe(item.live_id)} className="order__btn">立即预约</span>*/}
+                        {/*)*/}
+                      {/*}*/}
 
-                      {
-                        item.is_end == 1 && item.transcribe_url=='' && (
-                          <span className="order__btn live__end">已结束</span>
-                        )
-                      }
+                      {/*{*/}
+                        {/*item.is_end == 1 && item.transcribe_url=='' && (*/}
+                          {/*<span className="order__btn live__end">已结束</span>*/}
+                        {/*)*/}
+                      {/*}*/}
 
+                      {/*{*/}
+                        {/*item.on_live == 0 && item.is_end == 0 && item.is_subscribe == 1 && (*/}
+                          {/*<span onClick={this.tip} className="order__btn subscribed">已预约</span>*/}
+                        {/*)*/}
+                      {/*}*/}
+                      {/*{*/}
+                        {/*item.on_live == 1 && item.is_end == 0 && (*/}
+                          {/*<span onClick={()=>this.toLivingRoom(item.room_url)} className="order__btn living">正在直播</span>*/}
+                        {/*)*/}
+                      {/*}*/}
                       {
-                        item.on_live == 0 && item.is_end == 0 && item.is_subscribe == 1 && (
-                          <span onClick={this.tip} className="order__btn subscribed">已预约</span>
-                        )
-                      }
-                      {
-                        item.on_live == 1 && item.is_end == 0 && (
-                          <span onClick={()=>this.toLivingRoom(item.room_url)} className="order__btn living">正在直播</span>
-                        )
-                      }
-                      {
-                        item.is_end == 1 && item.transcribe_url != '' && (
-                          <span onClick={() => this.checkVideo(item.transcribe_url)} className="order__btn check__video">查看回放</span>
+                        item.transcribe_url != '' && (
+                          <span onClick={() => this.checkVideo(item.transcribe_url)} className="order__btn check__video">点击查看</span>
                         )
                       }
 

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

@@ -10,6 +10,36 @@
     margin: 12px auto 0;
   }
 
+  .course-conter {
+    .course-item {
+      width: 168px;
+      padding: 4px;
+      background-color: #fff;
+      position: relative;
+      border-radius: 2px;
+      span {
+        position: absolute;
+        right: 4px;
+        top: 4px;
+        width: 60px;
+        display: block;
+        text-align: center;
+        padding-left: 5px;
+        border-radius: 0 0 0 10px;
+        background-color: #EB1612;
+        color: #fff;
+        font-size: 12px;
+      }
+      a {
+        width: 160px;
+        height: 104px;
+        img {
+          width: 100%;
+          height: 100%;
+        }
+      }
+    }
+  }
   .course-box {
     display: flex;
     justify-content: space-between;

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

@@ -29,7 +29,7 @@ export default class index extends Component {
         userInfo: {},
         isAppUpdate: false,
         showMark: false,
-        banner: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/m_banner_bj%402x.png'
+        banner: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/new-year/m-banner.png'
     }
 
     componentDidMount() {
@@ -39,7 +39,7 @@ export default class index extends Component {
             _this.loginInfo(result)
         }
         _this.getStage()
-        document.title = '七月在线年终大回馈，幸运宝箱随你开，100%有奖！人气好课免费学，精品课程1分抢！';
+        document.title = '七月在线新春献礼，幸运宝箱随你开，100%有奖！“薪”年好课免费学，精品课程1分秒！';
     }
 
     // 获取app登录数据
@@ -147,7 +147,7 @@ export default class index extends Component {
                     })
                 } else {
                     this.setState({
-                        banner: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/m_banner_bj%402x.png',
+                        banner: 'https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/new-year/m-banner.png',
                     })
                 }
             } else {

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

@@ -17,9 +17,9 @@
   }
 
   .banner-treasure__decorate {
-    height: 35px;
-    background-size: cover;
-    background-image: url('https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/m_nv_bj%402x.png');
+    height: 20px;
+    //background-size: cover;
+    //background-image: url('https://julyedu-cdn.oss-cn-beijing.aliyuncs.com/newyear20/H5/m_nv_bj%402x.png');
   }
 
   .sub__code_container {

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

@@ -13,20 +13,24 @@ class TreasureNav extends Component {
       navs: [
         {
           id: 'year-live',
-          name: '大咖直播'
+          name: '好课免费学'
         },
         {
           id: 'year-treasure',
           name: '组队开宝箱'
         },
         {
-          id: 'year-course',
-          name: '重磅好课'
+          id: 'year-wuhan',
+          name: '驰援武汉'
         },
         {
-          id: 'year-free',
-          name: '免费学'
+          id: 'year-course',
+          name: '重磅好课'
         },
+        // {
+        //   id: 'year-free',
+        //   name: '免费学'
+        // },
         {
           id: 'year-group',
           name: '1分拼团'

src/components/passport/setPassword/index.js

@@ -69,7 +69,9 @@ const formikConfig = {
   },
   handleSubmit: (values, {props}) => {
 
-    let from = props.location.state && props.location.state.from || {pathname: '/'}
+    const {location} = props
+
+    let from = location.state && location.state.records && location.state.records[location.state.records.length - 2] || {pathname: '/'}
     if (from.pathname.includes('forgot-password')) {
       forgotPasswordReset(values, props)
     } else {