3

src/components/blessingPreheat/collectBlessing/index.js

@@ -8,7 +8,7 @@ import ListHeader from './../listHeader';
 import './index.scss';
 
 @connect(({user})=> ({
-  uid: user.data.uid || ''
+  uid: user && user.data && user.data.uid ? user.data.uid :''
 }))
 class CollectBlessing extends Component {
 

src/components/blessingPreheat/courseList/index.js

@@ -6,6 +6,7 @@ import ListFrame from './../listFrame/index';
 import CourseItem from './../courseItem/index';
 import ListHeader from './../listHeader';
 import './index.scss';
+import cookie from "js-cookie";
 
 class CourseList extends Component {
   constructor(props) {
@@ -62,6 +63,27 @@ class CourseList extends Component {
     this.fetchAICourse('four');
   }
 
+  shouldComponentUpdate(nextProps, nextState, nextContext) {
+    if(this.props.isApp !== nextProps.isApp) {
+      // 精品课程-集训营、就业班/AI特训营
+      this.fetchCourseData();
+
+      // AI之路-基础
+      this.fetchAICourse('one');
+
+      // AI之路-进阶
+      this.fetchAICourse('two');
+
+      // AI之路-高阶
+      this.fetchAICourse('three');
+
+      // AI之路-拓展
+      this.fetchAICourse('four');
+      return false;
+    }
+    return true;
+  }
+
   fetchAICourse = (key) => {
     const { basic, advanced, higher, expand } = this.state;
     http.get(`${API.home}/sys/ai_grow_up_courses/${key}`).then(res => {
@@ -222,6 +244,9 @@ class CourseList extends Component {
 
   toReceiveCoupon(id, key = '') {
     const {isLogin, toLogin} = this.props;
+
+    alert(cookie.get("uid"))
+
     if(isLogin) {
       http.post(`${API.home}/sys/activity/coupon/receive`, {
         course_id: id
@@ -405,12 +430,22 @@ class CourseList extends Component {
                               <em>¥{item.coupon}</em>
                               <i>代金券</i>
                             </span>
+<<<<<<< HEAD
                             <span className="coupon-course__button-label">立即领券</span>
                           </a>
                         }
                         {
                           (isFormal === 0 && item.course_status === 2) &&
                           <a className="coupon-course__button">
+=======
+                                <span className="coupon-course__button-label">立即领券</span>
+                              </a>
+                            }
+
+                            {
+                              (isFormal === 0 && item.course_status === 2) &&
+                              <a className="coupon-course__button">
+>>>>>>> 6dd7b3c93601d587e25fa3320135ff2407451de6
                             <span className="coupon-course__button-price">
                               <em>¥{item.coupon}</em>
                               <i>代金券</i>