pull

src/components/bargainMiddlePage/index.js

@@ -376,6 +376,9 @@ class BargainMiddlePage extends Component {
             if(bargain_status === 0) {
                 bargainBtn = <button className='active-btn' onClick={this.shareFriendBargain}>邀请好友砍价</button>
             }
+            else {
+                bargainBtn = <button className={'invalid-btn'}>砍价结束</button>
+            }
         }else {
             if(assist_status === 0 && bargain_status === 0) {
                 bargainBtn = <button className='active-btn' onClick={this.friendBargainFirst}>帮好友砍一刀</button>
@@ -422,6 +425,9 @@ class BargainMiddlePage extends Component {
                             />
                         </ul>
                         <div className="bargain-detail">
+                            {
+                                (this.state.data.bargain_status == 0 || this.state.data.bargain_status == 1) &&
+                                <div>
                                     <div className="top">
                                         <div>
                                             已砍<span className={'reduced-price'}>{this.state.bargainData.bargain_price}元</span>
@@ -446,6 +452,8 @@ class BargainMiddlePage extends Component {
                                     <div className="middle">
                                         <span style={{width: this.state.width}}></span>
                                     </div>
+                                </div>
+                            }
                             {
                                 this.state.isOriginator === 1 && this.state.data.bargain_status === 0 &&
                                 <div>
@@ -625,13 +633,13 @@ function CourseDes(props) {
                 <span className={'discount-price'}>￥{course.course_price}</span>
                 {/* is_originator 是否发起人 0-否 1-是 */}
                 {
-                    (is_originator === 1 && bargain_status !== 3) &&
+                    (is_originator == 1 && bargain_status == 0 || bargain_status == 1) &&
                     <button className={'purchase-btn'} onClick={toCart}>
                         ¥{course.pay_price}去支付
                     </button>
                 }
                 {
-                    (is_originator === 1 && bargain_status === 3) &&
+                    (is_originator == 1 && bargain_status == 3) &&
                     <span className="course-button__buy--done">已购买</span>
                 }
             </div>

src/components/blessingPreheat/index.js

@@ -182,9 +182,12 @@ class BlessingPreheat extends Component {
   }
 
   componentWillUpdate() {
-    const {isFormal} = this.state;
+    const {isFormal,onlyShow} = this.state;
     if(isFormal === 1) {
       document.title = `11.11-11.13 AI充电节，为AI出击！重磅好课1折秒，海量奖品来就送-七月在线`
+      if(onlyShow) {
+        document.title = `11.14 AI充电节 返场钜惠！200本纸质书送完即止！`
+      }
     }else{
       document.title = `11.11-11.13 AI充电节，预热来袭！积福气享1折秒课，海量奖品来就送-七月在线`
     }

src/components/detail/group/togroup.js

@@ -65,19 +65,16 @@ class ToGroup extends Component {
 
             if (res.data.data.is_success === 0) {
                 let date = res.data.data.end_time * 1000,
-                    day = 0,
                     hours = 0,
                     minutes = 0,
                     seconds = 0;
                 setInterval(() => {
                     date -= 1000
-                    day = `${parseInt(date / (3600000 * 24))}`.padStart(2, 0);
-                    hours = `${parseInt((date- day * 3600000 * 24)/3600000)}`.padStart(2, 0);
-                    minutes = `${parseInt((date - day * 3600000 * 24 - hours * 3600000) / 60000)}`.padStart(2, 0);
-                    seconds = `${parseInt((date - day * 3600000 * 24 - hours * 3600000 - minutes * 60000) / 1000)}`.padStart(2, 0);
+                    hours = `${parseInt(date / (60 * 60 * 1000))}`.padStart(2, 0);
+                    minutes = `${parseInt((date - hours * 3600000) / 60000)}`.padStart(2, 0);
+                    seconds = `${parseInt((date - hours * 3600000 - minutes * 60000) / 1000)}`.padStart(2, 0);
                     this.setState({
-                        // countdown: `${day}:${hours}:${minutes}:${seconds}`
-                        countdown: `${day}天${hours}时${minutes}分`
+                        countdown: `${hours}:${minutes}:${seconds}`
                     });
                 }, 1000)
             }

src/components/detail/index.js

@@ -345,19 +345,16 @@ class Detail extends Component {
                     if (course_info.group_status === 3 || course_info.group_status === 4) {
                         let endTime = course_info.pdd_group_info.groupon_member.end_time;
                         let date = endTime * 1000,
-                            day = 0,
                             hours = 0,
                             minutes = 0,
                             seconds = 0;
                         setInterval(() => {
                             date -= 1000
-                            day = `${parseInt(date / (3600000 * 24))}`.padStart(2, 0);
-                            hours = `${parseInt((date- day * 3600000 * 24)/3600000)}`.padStart(2, 0);
-                            minutes = `${parseInt((date - day * 3600000 * 24 - hours * 3600000) / 60000)}`.padStart(2, 0);
-                            seconds = `${parseInt((date - day * 3600000 * 24 - hours * 3600000 - minutes * 60000) / 1000)}`.padStart(2, 0);
+                            hours = `${parseInt(date / (60 * 60 * 1000))}`.padStart(2, 0);
+                            minutes = `${parseInt((date - hours * 3600000) / 60000)}`.padStart(2, 0);
+                            seconds = `${parseInt((date - hours * 3600000 - minutes * 60000) / 1000)}`.padStart(2, 0);
                             this.setState({
-                                // countdown: `${day}:${hours}:${minutes}:${seconds}`
-                                countdown: `${day}天${hours}时${minutes}分`
+                                countdown: `${hours}:${minutes}:${seconds}`
                             });
                         }, 1000)
                     }
@@ -704,15 +701,15 @@ class Detail extends Component {
                      */
                     }
                     {/*双十一期间不需要显示 不要删除*/}
-                    {/*{*/}
-                        {/*isCent && !course_info.is_aist && (course_info.group_status === 3 || course_info.group_status === 4) &&*/}
-                        {/*<Group*/}
-                            {/*courseInfo={course_info}*/}
-                            {/*history={this.props.history}*/}
-                            {/*countdown={countdown}*/}
-                            {/*invitedFriends={this.invitedFriends}*/}
-                        {/*/>*/}
-                    {/*}*/}
+                    {
+                        isCent && !course_info.is_aist && (course_info.group_status === 3 || course_info.group_status === 4) &&
+                        <Group
+                            courseInfo={course_info}
+                            history={this.props.history}
+                            countdown={countdown}
+                            invitedFriends={this.invitedFriends}
+                        />
+                    }
 
                     {/*
                       * 砍价